Browse Source

Committing CR-Calculator

Navya Sanal 6 years ago
parent
commit
97513ca690
7 changed files with 51 additions and 3 deletions
  1. BIN
      Operations.class
  2. 14
    0
      Operations.ctxt
  3. 16
    0
      Operations.java
  4. BIN
      OperationsTest.class
  5. 11
    0
      OperationsTest.ctxt
  6. 7
    0
      OperationsTest.java
  7. 3
    3
      package.bluej

BIN
Operations.class View File


+ 14
- 0
Operations.ctxt View File

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

+ 16
- 0
Operations.java View File

@@ -30,4 +30,20 @@ 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
+    }
37
+    
38
+    
39
+    
40
+    
41
+    
42
+    
43
+    
44
+    
45
+    
46
+    
47
+    
48
+    
33 49
 }

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

+ 3
- 3
package.bluej View File

@@ -7,13 +7,13 @@ editor.fx.0.width=800
7 7
 editor.fx.0.x=320
8 8
 editor.fx.0.y=75
9 9
 objectbench.height=164
10
-objectbench.width=776
10
+objectbench.width=461
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