calculator test revisions

src/test/java/rocks/zipcode/quiz3a/fundamentals/calculator/AddTest.java

@@ -11,37 +11,34 @@ public class AddTest {
     @Test
     public void test1() {
         // given
-        test(32.70, 49.04);
+        test(81.74, 32.70, 49.04);
     }
 
     @Test
     public void test2() {
         // given
-        test(689.93, 746.00);
+        test(1435.93, 689.93, 746.00);
     }
 
     @Test
     public void test3() {
         // given
-        test(35354.0, 74542.0);
+        test(109896.0, 35354.0, 74542.0);
     }
 
     @Test
     public void test4() {
         // given
-        test(746.93774653, 889409027.3737773635554244);
+        test(12.0, 4.0, 8.0);
     }
 
     @Test
     public void test5() {
         // given
-        test(99873636.94874, 839.03);
+        test(22.10, 7.06, 15.04);
     }
 
-    private void test(Double input1, Double input2) {
-        // given
-        Double expected = input1 + input2;
-
+    private void test(Double expected, Double input1, Double input2) {
         // when
         Calculator calculator = new Calculator();
         Double actual = calculator.add(input1, input2);

src/test/java/rocks/zipcode/quiz3a/fundamentals/calculator/DivideTest.java

@@ -11,37 +11,34 @@ public class DivideTest {
     @Test
     public void test1() {
         // given
-        test(64.0, 8.0);
+        test(12.0, 144.0, 12.0);
     }
 
     @Test
     public void test2() {
         // given
-        test(19640.0, 8.00);
+        test(5.0, 60.0, 12.0);
     }
 
     @Test
     public void test3() {
         // given
-        test(363.0, 3.0);
+        test(6.0, 36.0, 6.0);
     }
 
     @Test
     public void test4() {
         // given
-        test(746.93774653, 889409027.3737773635554244);
+        test(9.0, 63.0, 5.0);
     }
 
     @Test
     public void test5() {
         // given
-        test(720.0, 9.0);
+        test(8.0, 72.0, 9.0);
     }
 
-    private void test(Double input1, Double input2) {
-        // given
-        Double expected = input1 / input2;
-
+    private void test(Double expected, Double input1, Double input2) {
         // when
         Calculator calculator = new Calculator();
         Double actual = calculator.divide(input1, input2);

src/test/java/rocks/zipcode/quiz3a/fundamentals/calculator/SquareRootTest.java

@@ -7,37 +7,34 @@ public class SquareRootTest {
     @Test
     public void test1() {
         // given
-        test(64.0);
+        test(8.0, 64.0);
     }
 
     @Test
     public void test2() {
         // given
-        test(44100.0);
+        test(438.0, 191844.0);
     }
 
     @Test
     public void test3() {
         // given
-        test(144.0);
+        test(12.0, 144.0);
     }
 
     @Test
     public void test4() {
         // given
-        test(390625.0);
+        test(864.0, 746496.0);
     }
 
     @Test
     public void test5() {
         // given
-        test(36.0);
+        test(6.0, 36.0);
     }
 
-    private void test(Double input) {
-        // given
-        Double expected = Math.sqrt(input);
-
+    private void test(Double expected, Double input) {
         // when
         Calculator calculator = new Calculator();
         Double actual = calculator.squareRoot(input);

src/test/java/rocks/zipcode/quiz3a/fundamentals/calculator/SquareRootsTest.java

@@ -12,42 +12,34 @@ public class SquareRootsTest {
     @Test
     public void test1() {
         // given
-        test(64.0, 81.0, 96.0, 9.0);
+        test(new Double[]{8.0, 9.0, 10.0, 3.0}, 64.0, 81.0, 100.0, 9.0);
     }
 
     @Test
     public void test2() {
         // given
-        test(44100.0, 86943.0, 9.0, 16.0);
+        test(new Double[]{864.0, 3.0, 4.0}, 746496.0, 9.0, 16.0);
     }
 
     @Test
     public void test3() {
         // given
-        test(144.0, 72.98, 81.0);
+        test(new Double[]{12.0, 438.0, }, 144.0, 191844.0, 81.0);
     }
 
     @Test
     public void test4() {
         // given
-        test(390625.0, 36.0, 64.0, 144.0);
+        test(new Double[]{6.0, 8.0, 12.0}, 36.0, 64.0, 144.0);
     }
 
     @Test
     public void test5() {
         // given
-        test(36.0, 255.0, 144.0, 81.0);
+        test(new Double[]{6.0, 12.0, 9.0}, 36.0, 144.0, 81.0);
     }
 
-    private void test(Double... inputArray) {
-        // given
-        Double sqRootInput;
-        Double[] expected = new Double[inputArray.length];
-        for(int i = 0; i < inputArray.length; i++) {
-            sqRootInput = Math.sqrt(inputArray[i]);
-            expected[i] = sqRootInput;
-        }
-
+    private void test(Double[] expected, Double... inputArray) {
         // when
         Calculator calculator = new Calculator();
         Double[] actual = calculator.squareRoots(inputArray);

src/test/java/rocks/zipcode/quiz3a/fundamentals/calculator/SquareTest.java

@@ -11,37 +11,34 @@ public class SquareTest {
     @Test
     public void test1() {
         // given
-        test(32.70);
+        test(1069.29, 32.70);
     }
 
     @Test
     public void test2() {
         // given
-        test(689.93);
+        test(476003.4049, 689.93);
     }
 
     @Test
     public void test3() {
         // given
-        test(35354.0);
+        test(36.0, 6.0);
     }
 
     @Test
     public void test4() {
         // given
-        test(746.93774653);
+        test(64.0, 8.0);
     }
 
     @Test
     public void test5() {
         // given
-        test(99873636.94874);
+        test(321489.0, 567.0);
     }
 
-    private void test(Double input) {
-        // given
-        Double expected = input * input;
-
+    private void test(Double expected, Double input) {
         // when
         Calculator calculator = new Calculator();
         Double actual = calculator.square(input);

src/test/java/rocks/zipcode/quiz3a/fundamentals/calculator/SquaresTest.java

@@ -11,42 +11,34 @@ public class SquaresTest {
     @Test
     public void test1() {
         // given
-        test(32.70, 738.08, 523.735, 837.90);
+        test(new Double[]{4.0,16.0, 144.0}, 2.0,4.0,12.0);
     }
 
     @Test
     public void test2() {
         // given
-        test(689.93, 847.95, 3736.0, 8.0, 3.0);
+        test(new Double[]{100.00, 49.0, 64.0, 36.0},10.0, 7.0, 8.0, 6.0);
     }
 
     @Test
     public void test3() {
         // given
-        test(35354.0, 3.5, 7.8, 6354495875.00, 725.0);
+        test(new Double[]{9.0, 25.0, 121.0, 169.0}, 3.0, 5.0, 11.0, 13.0);
     }
 
     @Test
     public void test4() {
         // given
-        test(746.93774653, 2.0, 6.0, 47.0, 74.0, 838.0);
+        test(new Double[]{16.0, 9.0, 64.0, 81.0}, 4.0, 3.0, 8.0, 9.0);
     }
 
     @Test
     public void test5() {
         // given
-        test(99873636.94874);
+        test(new Double[]{4.0, 25.0, 81.0}, 2.0, 5.0, 9.0);
     }
 
-    private void test(Double... inputArray) {
-        // given
-        Double squaredInput;
-        Double[] expected = new Double[inputArray.length];
-        for(int i = 0; i < inputArray.length; i++) {
-            squaredInput = inputArray[i] * inputArray[i];
-            expected[i] = squaredInput;
-        }
-
+    private void test(Double[] expected, Double... inputArray) {
         // when
         Calculator calculator = new Calculator();
         Double[] actual = calculator.squares(inputArray);