#40 Calculator lab

Отворено
jonathan-hinds жели да споји 1 комит(е) из jonathan-hinds/CR-Calcul8r:master у master
7 измењених фајлова са 40 додато и 4 уклоњено
  1. BIN
      Operations.class
  2. 14
    0
      Operations.ctxt
  3. 4
    0
      Operations.java
  4. BIN
      OperationsTest.class
  5. 11
    0
      OperationsTest.ctxt
  6. 7
    0
      OperationsTest.java
  7. 4
    4
      package.bluej

+ 14
- 0
Operations.ctxt Прегледај датотеку

@@ -0,0 +1,14 @@
1
+#BlueJ class context
2
+comment0.target=Operations
3
+comment1.params=x\ y
4
+comment1.target=int\ add(int,\ int)
5
+comment1.text=\n\ The\ addition\ function.\n\ @param\ x\ The\ first\ operand\n\ @param\ y\ The\ second\ operand\n\ @return\ the\ sum\ of\ x\ and\ y\n
6
+comment2.params=x\ y
7
+comment2.target=int\ subtract(int,\ int)
8
+comment2.text=\n\ The\ subtraction\ function\n\ @param\ x\ The\ first\ operand\n\ @param\ y\ The\ second\ operand\n\ @return\ y\ taken\ from\ x\n
9
+comment3.params=x\ y
10
+comment3.target=int\ multiply(int,\ int)
11
+comment3.text=\n\ The\ multiplication\ function\n\ @param\ x\ The\ first\ operand\n\ @param\ y\ The\ second\ operand\n\ @return\ x\ times\ y\n
12
+comment4.params=x\ y
13
+comment4.target=int\ divide(int,\ int)
14
+numComments=5

+ 4
- 0
Operations.java Прегледај датотеку

@@ -30,4 +30,8 @@ public class Operations {
30 30
     public static int multiply(int x, int y) {
31 31
         return x * y;
32 32
     }
33
+    
34
+    public static int divide(int x, int y){
35
+        return (x / y);
36
+    }
33 37
 }

BIN
OperationsTest.class Прегледај датотеку


+ 11
- 0
OperationsTest.ctxt Прегледај датотеку

@@ -0,0 +1,11 @@
1
+#BlueJ class context
2
+comment0.target=OperationsTest
3
+comment1.params=
4
+comment1.target=void\ testAdd()
5
+comment2.params=
6
+comment2.target=void\ testSubtract()
7
+comment3.params=
8
+comment3.target=void\ testMultiply()
9
+comment4.params=
10
+comment4.target=void\ testDivide()
11
+numComments=5

+ 7
- 0
OperationsTest.java Прегледај датотеку

@@ -16,4 +16,11 @@ public class OperationsTest {
16 16
     public void testMultiply() throws Exception {
17 17
         Assert.assertEquals(4, Operations.multiply(2, 2));
18 18
     }
19
+
20
+    @Test
21
+    public void testDivide()
22
+    {
23
+        Assert.assertEquals(5, Operations.divide(10, 2));
24
+    }
19 25
 }
26
+

+ 4
- 4
package.bluej Прегледај датотеку

@@ -2,18 +2,18 @@
2 2
 dependency1.from=OperationsTest
3 3
 dependency1.to=Operations
4 4
 dependency1.type=UsesDependency
5
-editor.fx.0.height=722
5
+editor.fx.0.height=714
6 6
 editor.fx.0.width=800
7 7
 editor.fx.0.x=320
8
-editor.fx.0.y=75
8
+editor.fx.0.y=23
9 9
 objectbench.height=164
10 10
 objectbench.width=776
11 11
 package.divider.horizontal=0.6
12 12
 package.divider.vertical=0.6845018450184502
13 13
 package.editor.height=364
14 14
 package.editor.width=674
15
-package.editor.x=-1455
16
-package.editor.y=82
15
+package.editor.x=100
16
+package.editor.y=100
17 17
 package.frame.height=600
18 18
 package.frame.width=800
19 19
 package.numDependencies=1