Browse Source

CR-Calcul8r commit

Nicholas Satinover 6 years ago
parent
commit
2f6a8a9cbc
7 changed files with 52 additions and 11 deletions
  1. BIN
      Operations.class
  2. 15
    0
      Operations.ctxt
  3. 10
    0
      Operations.java
  4. BIN
      OperationsTest.class
  5. 11
    0
      OperationsTest.ctxt
  6. 5
    0
      OperationsTest.java
  7. 11
    11
      package.bluej

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\ division\ function\n\ @param\ x\ The\ first\ operand\n\ @param\ y\ The\ second\ operand\n\ @return\ x\ divide\ y\n
15
+numComments=5

+ 10
- 0
Operations.java View File

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

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(10, Operations.divide(20, 2));
23
+    }    
19 24
 }

+ 11
- 11
package.bluej View File

@@ -2,20 +2,20 @@
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=709
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
-objectbench.width=776
11
-package.divider.horizontal=0.6
12
-package.divider.vertical=0.6845018450184502
13
-package.editor.height=364
14
-package.editor.width=674
15
-package.editor.x=-1455
16
-package.editor.y=82
17
-package.frame.height=600
18
-package.frame.width=800
10
+objectbench.width=701
11
+package.divider.horizontal=0.5619047619047619
12
+package.divider.vertical=0.7373271889400922
13
+package.editor.height=473
14
+package.editor.width=1154
15
+package.editor.x=0
16
+package.editor.y=23
17
+package.frame.height=709
18
+package.frame.width=1280
19 19
 package.numDependencies=1
20 20
 package.numTargets=2
21 21
 package.showExtends=true