#42 Joson added Divide

Open
jaejoson wants to merge 1 commits from jaejoson/CR-Calcul8r:master into master
6 changed files with 46 additions and 1 deletions
  1. BIN
      Operations.class
  2. 15
    0
      Operations.ctxt
  3. 13
    1
      Operations.java
  4. BIN
      OperationsTest.class
  5. 11
    0
      OperationsTest.ctxt
  6. 7
    0
      OperationsTest.java

BIN
Operations.class View File


+ 15
- 0
Operations.ctxt View File

@@ -0,0 +1,15 @@
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
+comment4.text=\n\ The\ divide\ function\n\ @param\ x\ The\ first\ operand\n\ @param\ y\ The\ second\ operand\n\ @return\ x\ divided\ by\ y\n
15
+numComments=5

+ 13
- 1
Operations.java View File

@@ -30,4 +30,16 @@ public class Operations {
30 30
     public static int multiply(int x, int y) {
31 31
         return x * y;
32 32
     }
33
-}
33
+    
34
+    
35
+    
36
+    /**
37
+     * The divide function
38
+     * @param x The first operand
39
+     * @param y The second operand
40
+     * @return x divided by y
41
+     */
42
+    public static int divide(int x, int y) {
43
+        return x / y;
44
+    }
45
+}

BIN
OperationsTest.class View File


+ 11
- 0
OperationsTest.ctxt View File

@@ -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 View File

@@ -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() throws Exception {
22
+        Assert.assertEquals(4, Operations.divide(8, 2));
23
+    }
19 24
 }
25
+
26
+