Browse Source

Added divide function and unit tests

Connor Dunnigan 6 years ago
parent
commit
5e527782e1
6 changed files with 41 additions and 1 deletions
  1. BIN
      Operations.class
  2. 15
    0
      Operations.ctxt
  3. 10
    1
      Operations.java
  4. BIN
      OperationsTest.class
  5. 11
    0
      OperationsTest.ctxt
  6. 5
    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

+ 10
- 1
Operations.java View File

@@ -19,7 +19,6 @@ public class Operations {
19 19
     public static int subtract(int x, int y) {
20 20
         return x - y;
21 21
     }
22
-    
23 22
 
24 23
     /**
25 24
      * The multiplication function
@@ -30,4 +29,14 @@ public class Operations {
30 29
     public static int multiply(int x, int y) {
31 30
         return x * y;
32 31
     }
32
+
33
+    /**
34
+     * The Divide function
35
+     * @param x The first operand
36
+     * @param y The second operand
37
+     * @return x divided by y
38
+     */
39
+    public static double divide(int x, int y) {
40
+        return (double)x / y;
41
+    }
33 42
 }

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

+ 5
- 0
OperationsTest.java View File

@@ -16,4 +16,9 @@ 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(2, Operations.divide(6, 3));
23
+    }
19 24
 }