From c9f0b6cd89b094c6248030a294ec8d256dee1112 Mon Sep 17 00:00:00 2001 From: Bobbi-Z <85585077+Bobbi-Z@users.noreply.github.com> Date: Sun, 27 Jun 2021 23:12:25 -0400 Subject: [PATCH 01/10] square root --- .../scientificcalculator/CalculatorEngine.java | 11 +++++++++-- .../scientificcalculator/Scientific.java | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorEngine.java b/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorEngine.java index a38435e..0a28818 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorEngine.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorEngine.java @@ -8,12 +8,12 @@ public static Double sum(double firstNum, double secondNum) { value = firstNum + secondNum; return value; } - public Double subtract(Double firstNum, Double secondNum) { + public Double subtract(double firstNum, double secondNum) { value = firstNum - secondNum; return value; } - public Double divide(Double firstNum, Double secondNum) { + public Double divide(double firstNum, double secondNum) { value = firstNum / secondNum; return value; } @@ -22,4 +22,11 @@ public Double multiply(double firstNum, double secondNum) { value = firstNum * secondNum; return value; } + + public Double sqrt(double firstNum){ + value = Math.sqrt(firstNum); + return value; + + } + } diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java index b4ba80b..a5830a4 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java @@ -1,4 +1,4 @@ -/* + package com.zipcodewilmington.scientificcalculator; import com.sun.codemodel.internal.JSwitch; From 9b9dc257926daf89dddfdddcc20e148e62b4e119 Mon Sep 17 00:00:00 2001 From: Bobbi-Z <85585077+Bobbi-Z@users.noreply.github.com> Date: Sun, 27 Jun 2021 23:41:10 -0400 Subject: [PATCH 02/10] square root test --- .../scientificcalculator/CalculatorEngine.java | 11 ++++++++--- .../CalculatorEngineTest.java | 18 ++++++++++++++++-- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorEngine.java b/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorEngine.java index 0a28818..cdfb22c 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorEngine.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorEngine.java @@ -23,10 +23,15 @@ public Double multiply(double firstNum, double secondNum) { return value; } - public Double sqrt(double firstNum){ - value = Math.sqrt(firstNum); + public Double square(double firstNum){ + double sr; + double Value = firstNum / 2; + do { + sr = value; + value = (sr +(firstNum / sr)) / 2; + } + while ((sr - value) != 0); return value; - } } diff --git a/src/test/java/com/zipcodewilmington/scientific_calculator/CalculatorEngineTest.java b/src/test/java/com/zipcodewilmington/scientific_calculator/CalculatorEngineTest.java index 7875439..ff99799 100644 --- a/src/test/java/com/zipcodewilmington/scientific_calculator/CalculatorEngineTest.java +++ b/src/test/java/com/zipcodewilmington/scientific_calculator/CalculatorEngineTest.java @@ -14,7 +14,7 @@ public void testSum1() { CalculatorEngine calculatorEngine = new CalculatorEngine(); // When Double result; - result = calculatorEngine.sum(2.00, 2.00); + result = CalculatorEngine.sum(2.00, 2.00); // Then if (result != 4.00) { // if 2 + 2 != 4 Assert.fail(); @@ -26,7 +26,7 @@ public void testSum2() { CalculatorEngine calculatorEngine = new CalculatorEngine(); // When Double result; - result = calculatorEngine.sum(1200.00, 500.00); + result = CalculatorEngine.sum(1200.00, 500.00); // Then if (result != 1700.00) { // if 1200 + 500 != 1700 Assert.fail(); @@ -63,6 +63,7 @@ public void testDivide1() { Double result; result = calculatorEngine.divide(6.00, 3.00); if (result != 2.00); { + Assert.fail(); } } @@ -72,6 +73,7 @@ public void testDivide2() { Double result; result = calculatorEngine.divide(33.33, 11.11); if (result != 3.00); { + Assert.fail(); } } @@ -81,6 +83,7 @@ public void testMultiply1() { Double result; result = calculatorEngine.multiply(5.00, 20.00); if (result != 100.00); { + Assert.fail(); } } @@ -90,8 +93,19 @@ public void testMultiply2() { Double result; result = calculatorEngine.multiply(7.00, 20.00); if (result != 140.00); { + Assert.fail(); } } + @Test + public void testSquare1(){ + CalculatorEngine calculatorEngine = new CalculatorEngine(); + Double result; + result = calculatorEngine.square(9.00); + if (result != 3.00);{ + Assert.fail(); + } + + } } From e7307cf8e3b27e52f08b3d43e351305c836ab4c8 Mon Sep 17 00:00:00 2001 From: Bobbi-Z <85585077+Bobbi-Z@users.noreply.github.com> Date: Sun, 27 Jun 2021 23:45:19 -0400 Subject: [PATCH 03/10] square root test --- .../scientific_calculator/CalculatorEngineTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/com/zipcodewilmington/scientific_calculator/CalculatorEngineTest.java b/src/test/java/com/zipcodewilmington/scientific_calculator/CalculatorEngineTest.java index ff99799..77a9013 100644 --- a/src/test/java/com/zipcodewilmington/scientific_calculator/CalculatorEngineTest.java +++ b/src/test/java/com/zipcodewilmington/scientific_calculator/CalculatorEngineTest.java @@ -11,7 +11,7 @@ public class CalculatorEngineTest { @Test public void testSum1() { // Given - CalculatorEngine calculatorEngine = new CalculatorEngine(); + CalculatorEngine CalculatorEngine = new CalculatorEngine(); // When Double result; result = CalculatorEngine.sum(2.00, 2.00); @@ -23,7 +23,7 @@ public void testSum1() { @Test public void testSum2() { // Given - CalculatorEngine calculatorEngine = new CalculatorEngine(); + CalculatorEngine CalculatorEngine = new CalculatorEngine(); // When Double result; result = CalculatorEngine.sum(1200.00, 500.00); From c70a2ac550a0a98f2096252f10c06d341625fc94 Mon Sep 17 00:00:00 2001 From: Bobbi-Z <85585077+Bobbi-Z@users.noreply.github.com> Date: Sun, 27 Jun 2021 23:49:49 -0400 Subject: [PATCH 04/10] square root test2 --- .../scientificcalculator/CalculatorEngine.java | 13 ++++++------- .../scientific_calculator/CalculatorEngineTest.java | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorEngine.java b/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorEngine.java index cdfb22c..6ad8bcf 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorEngine.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorEngine.java @@ -1,7 +1,6 @@ package com.zipcodewilmington.scientificcalculator; public class CalculatorEngine { - CalculatorEngine calculatorEngine = new CalculatorEngine(); private static Double value; public static Double sum(double firstNum, double secondNum) { @@ -23,14 +22,14 @@ public Double multiply(double firstNum, double secondNum) { return value; } - public Double square(double firstNum){ - double sr; - double Value = firstNum / 2; + public Double squareRoot(double firstNum){ + double s; + double value = firstNum / 2; do { - sr = value; - value = (sr +(firstNum / sr)) / 2; + s = value; + value = (s +(firstNum / s)) / 2; } - while ((sr - value) != 0); + while ((s - value) != 0); return value; } diff --git a/src/test/java/com/zipcodewilmington/scientific_calculator/CalculatorEngineTest.java b/src/test/java/com/zipcodewilmington/scientific_calculator/CalculatorEngineTest.java index 77a9013..5a22ee5 100644 --- a/src/test/java/com/zipcodewilmington/scientific_calculator/CalculatorEngineTest.java +++ b/src/test/java/com/zipcodewilmington/scientific_calculator/CalculatorEngineTest.java @@ -100,7 +100,7 @@ public void testMultiply2() { public void testSquare1(){ CalculatorEngine calculatorEngine = new CalculatorEngine(); Double result; - result = calculatorEngine.square(9.00); + result = calculatorEngine.squareRoot(9.00); if (result != 3.00);{ Assert.fail(); } From 60531d5e70c55137670051e7bc68c4d15f2d09b8 Mon Sep 17 00:00:00 2001 From: Bobbi-Z <85585077+Bobbi-Z@users.noreply.github.com> Date: Mon, 28 Jun 2021 01:48:54 -0400 Subject: [PATCH 05/10] fixing tests --- .../CalculatorDisplay.java | 8 +-- .../CalculatorEngine.java | 24 +++---- .../scientificcalculator/Scientific.java | 12 ++-- .../CalculatorEngineTest.java | 66 ++++++++++--------- 4 files changed, 55 insertions(+), 55 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorDisplay.java b/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorDisplay.java index 2d82140..5973193 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorDisplay.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorDisplay.java @@ -15,10 +15,10 @@ public static void menuOption1() { System.out.println("Here are some Scientific Functions. \nSine() \nCosine() \nTangent()"); break; case "3": - String userInput = Console.getStringInput("Time for some math? \n ( Y / N )"); - if(userInput.equalsIgnoreCase("Y")) { - break outerLoop; - } + String userInput = Console.getStringInput("Time for some math? \n ( Y / N )"); + if (userInput.equalsIgnoreCase("Y")) { + break outerLoop; + } break; default: Console.println("[ %s ] is not a valid input!", prompt); diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorEngine.java b/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorEngine.java index 6780879..c9198fc 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorEngine.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorEngine.java @@ -4,26 +4,23 @@ public class CalculatorEngine { // CalculatorEngine calculatorEngine = new CalculatorEngine(); private static Double value; - public static Double sum(Double firstNum, Double secondNum) { - value = firstNum + secondNum; - return value; + public Double sum(Double firstNum, Double secondNum) { + return firstNum + secondNum; } + public Double subtract(Double firstNum, Double secondNum) { - value = firstNum - secondNum; - return value; + return firstNum - secondNum; } - public Double divide(Double firstNum, Double secondNum) { - value = firstNum / secondNum; - return value; + public static Double divide(Double firstNum, Double secondNum) { + return firstNum / secondNum; } - public Double multiply(Double firstNum, Double secondNum) { - value = firstNum * secondNum; - return value; + public static Double multiply(Double firstNum, Double secondNum) { + return firstNum * secondNum; } - public Double squareRoot(Double firstNum){ + public static Double squareRoot(Double firstNum){ double s; double value = firstNum / 2; do { @@ -34,4 +31,7 @@ public Double squareRoot(Double firstNum){ return value; } + public static Double square(Double firstNum){ + return firstNum * firstNum; + } } diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java index 7d264d4..fe3a9a8 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java @@ -1,6 +1,6 @@ package com.zipcodewilmington.scientificcalculator; - +/* public class Scientific { public static void main(String[] args) { @@ -77,21 +77,17 @@ public static void main(String[] args) { default System.out.println("ERR"); } - */public static boolean isRadian ( double input){ + /* public static boolean isRadian( double input){ double to180 = (input + ((180 / Math.PI) - input)); // 57 is 180 degrees rounded to whole number if (Math.round(to180) == 57) { return true; } else { - /*}return false; + return false; + } } } } -//<<<<<<< master -//======= */ - - -//>>>>>>> master diff --git a/src/test/java/com/zipcodewilmington/scientific_calculator/CalculatorEngineTest.java b/src/test/java/com/zipcodewilmington/scientific_calculator/CalculatorEngineTest.java index 5a22ee5..d9af6dd 100644 --- a/src/test/java/com/zipcodewilmington/scientific_calculator/CalculatorEngineTest.java +++ b/src/test/java/com/zipcodewilmington/scientific_calculator/CalculatorEngineTest.java @@ -4,6 +4,7 @@ import org.junit.Assert; import org.junit.Test; +import static com.zipcodewilmington.scientificcalculator.CalculatorEngine.*; public class CalculatorEngineTest { @@ -59,52 +60,55 @@ public void testSubtract2() { @Test public void testDivide1() { - CalculatorEngine calculatorEngine = new CalculatorEngine(); - Double result; - result = calculatorEngine.divide(6.00, 3.00); - if (result != 2.00); { - Assert.fail(); - } + Double expected = 100.00; + Double firstNum = 1000.00; + Double secondNum = 10.00; + Double actual = CalculatorEngine.divide(firstNum, secondNum); + Assert.assertEquals(expected, actual); } @Test public void testDivide2() { - CalculatorEngine calculatorEngine = new CalculatorEngine(); - Double result; - result = calculatorEngine.divide(33.33, 11.11); - if (result != 3.00); { - Assert.fail(); - } + Double expected = 4.00; + Double firstNum = 20.00; + Double secondNum = 5.00; + Double actual = CalculatorEngine.divide(firstNum, secondNum); + Assert.assertEquals(expected, actual); } @Test public void testMultiply1() { - CalculatorEngine calculatorEngine = new CalculatorEngine(); - Double result; - result = calculatorEngine.multiply(5.00, 20.00); - if (result != 100.00); { - Assert.fail(); + Double expected = 100.00; + Double firstNum = 20.00; + Double secondNum = 5.00; + Double actual = multiply(firstNum, secondNum); + Assert.assertEquals(expected, actual); } - } + @Test public void testMultiply2() { - CalculatorEngine calculatorEngine = new CalculatorEngine(); - Double result; - result = calculatorEngine.multiply(7.00, 20.00); - if (result != 140.00); { - Assert.fail(); - } + Double expected = 4.00; + Double firstNum = 2.00; + Double secondNum = 2.0; + Double actual = multiply(firstNum, secondNum); + Assert.assertEquals(expected, actual); } + @Test - public void testSquare1(){ - CalculatorEngine calculatorEngine = new CalculatorEngine(); - Double result; - result = calculatorEngine.squareRoot(9.00); - if (result != 3.00);{ - Assert.fail(); - } + public void testSquareRoot(){ + Double expected = 2.00; + Double firstNum = 4.00; + Double actual = squareRoot(firstNum); + Assert.assertEquals(expected, actual); + } + @Test + public void testSquare(){ + Double expected = 16.00; + Double firstNum = 4.00; + Double actual = square(firstNum); + Assert.assertEquals(expected, actual); } } From 42e7a083e837c07af6b8b5a24d8eea47fdf6f47a Mon Sep 17 00:00:00 2001 From: Bobbi-Z <85585077+Bobbi-Z@users.noreply.github.com> Date: Mon, 28 Jun 2021 06:06:13 -0400 Subject: [PATCH 06/10] root and square - all tests pass --- .../CalculatorEngine.java | 26 ++++++++++++++++++- .../scientificcalculator/Scientific.java | 2 +- .../CalculatorEngineTest.java | 18 +++++++++++++ 3 files changed, 44 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorEngine.java b/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorEngine.java index c9198fc..a971214 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorEngine.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorEngine.java @@ -34,4 +34,28 @@ public static Double squareRoot(Double firstNum){ public static Double square(Double firstNum){ return firstNum * firstNum; } -} + + public static Double squareY(Double firstNum, Double secondNum) { + return Math.pow(firstNum, secondNum); + + } + + public static Double squareRootY(Double firstNum, Double secondNum){ + double xPre = Math.random() % 10; + double eps = 0.001; + double delX = 2147483647; + double xK = 0.00; + double A = firstNum; + double N = secondNum; + + + while (delX > eps){ + xK = ((N - 1.0) * xPre + A / Math.pow(xPre, N - 1)) / N; + delX = Math.abs(xK - xPre); + xPre = xK; + } + double value = Math.round(xK * 1000.00) / 1000.00; + return value; + } + + } diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java index fe3a9a8..bf77835 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java @@ -1,6 +1,6 @@ package com.zipcodewilmington.scientificcalculator; -/* + public class Scientific { public static void main(String[] args) { diff --git a/src/test/java/com/zipcodewilmington/scientific_calculator/CalculatorEngineTest.java b/src/test/java/com/zipcodewilmington/scientific_calculator/CalculatorEngineTest.java index d9af6dd..fd83f0f 100644 --- a/src/test/java/com/zipcodewilmington/scientific_calculator/CalculatorEngineTest.java +++ b/src/test/java/com/zipcodewilmington/scientific_calculator/CalculatorEngineTest.java @@ -4,6 +4,7 @@ import org.junit.Assert; import org.junit.Test; +import static com.sun.tools.doclint.Entity.divide; import static com.zipcodewilmington.scientificcalculator.CalculatorEngine.*; @@ -110,6 +111,23 @@ public void testSquare(){ Double actual = square(firstNum); Assert.assertEquals(expected, actual); } + @Test + public void testSquareY(){ + Double expected = 7776.00; + Double firstNum = 6.00; + Double secondNumb = 5.00; + Double actual = CalculatorEngine.squareY(firstNum, secondNumb); + Assert.assertEquals(expected, actual); + } + + @Test + public void testSquareRootY(){ + Double expected = 1.431; + Double firstNum = 6.00; + Double secondNumb = 5.00; + Double actual = CalculatorEngine.squareRootY(firstNum, secondNumb); + Assert.assertEquals(expected, actual); + } } From 28fcabee40cc8f2e5146e67fbd811e4af766ee77 Mon Sep 17 00:00:00 2001 From: Bobbi-Z <85585077+Bobbi-Z@users.noreply.github.com> Date: Mon, 28 Jun 2021 06:08:23 -0400 Subject: [PATCH 07/10] Add files via upload --- CalculatorEngineTest.java | 142 ++++++++++++++++++++++++++++++++++++++ TestMainApplication.java | 7 ++ 2 files changed, 149 insertions(+) create mode 100644 CalculatorEngineTest.java create mode 100644 TestMainApplication.java diff --git a/CalculatorEngineTest.java b/CalculatorEngineTest.java new file mode 100644 index 0000000..fd83f0f --- /dev/null +++ b/CalculatorEngineTest.java @@ -0,0 +1,142 @@ +package com.zipcodewilmington.scientific_calculator; + +import com.zipcodewilmington.scientificcalculator.CalculatorEngine; +import org.junit.Assert; +import org.junit.Test; + +import static com.sun.tools.doclint.Entity.divide; +import static com.zipcodewilmington.scientificcalculator.CalculatorEngine.*; + + +public class CalculatorEngineTest { + + @Test + public void testSum1() { + // Given + CalculatorEngine CalculatorEngine = new CalculatorEngine(); + // When + Double result; + result = CalculatorEngine.sum(2.00, 2.00); + // Then + if (result != 4.00) { // if 2 + 2 != 4 + Assert.fail(); + } + } + @Test + public void testSum2() { + // Given + CalculatorEngine CalculatorEngine = new CalculatorEngine(); + // When + Double result; + result = CalculatorEngine.sum(1200.00, 500.00); + // Then + if (result != 1700.00) { // if 1200 + 500 != 1700 + Assert.fail(); + } + } + @Test + public void testSubtract1() { + // Given + CalculatorEngine calculatorEngine = new CalculatorEngine(); + // When + Double result; + result = calculatorEngine.subtract(10.00, 5.00); + // Then + if (result != 5.00) { // 10 - 5 = 5 + Assert.fail(); + } + } + @Test + public void testSubtract2() { + // Given + CalculatorEngine calculatorEngine = new CalculatorEngine(); + // When + Double result; + result = calculatorEngine.subtract(20.00, 3.00); + // Then + if (result != 17.00) { // 20 - 3 = 17 + Assert.fail(); + } + } + + @Test + public void testDivide1() { + Double expected = 100.00; + Double firstNum = 1000.00; + Double secondNum = 10.00; + Double actual = CalculatorEngine.divide(firstNum, secondNum); + Assert.assertEquals(expected, actual); + } + + @Test + public void testDivide2() { + Double expected = 4.00; + Double firstNum = 20.00; + Double secondNum = 5.00; + Double actual = CalculatorEngine.divide(firstNum, secondNum); + Assert.assertEquals(expected, actual); + } + + @Test + public void testMultiply1() { + Double expected = 100.00; + Double firstNum = 20.00; + Double secondNum = 5.00; + Double actual = multiply(firstNum, secondNum); + Assert.assertEquals(expected, actual); + } + + + @Test + public void testMultiply2() { + Double expected = 4.00; + Double firstNum = 2.00; + Double secondNum = 2.0; + Double actual = multiply(firstNum, secondNum); + Assert.assertEquals(expected, actual); + } + + @Test + public void testSquareRoot(){ + Double expected = 2.00; + Double firstNum = 4.00; + Double actual = squareRoot(firstNum); + Assert.assertEquals(expected, actual); + } + + @Test + public void testSquare(){ + Double expected = 16.00; + Double firstNum = 4.00; + Double actual = square(firstNum); + Assert.assertEquals(expected, actual); + } + @Test + public void testSquareY(){ + Double expected = 7776.00; + Double firstNum = 6.00; + Double secondNumb = 5.00; + Double actual = CalculatorEngine.squareY(firstNum, secondNumb); + Assert.assertEquals(expected, actual); + } + + @Test + public void testSquareRootY(){ + Double expected = 1.431; + Double firstNum = 6.00; + Double secondNumb = 5.00; + Double actual = CalculatorEngine.squareRootY(firstNum, secondNumb); + Assert.assertEquals(expected, actual); + } +} + + + +/* @Test(expected = ArithmeticException.class) + public void testDivideWillThrowExceptionWhenDivideOnZero() { + Calculator calculator = new Calculator(); + calculator.divide(6, 0); + } +} */ + + diff --git a/TestMainApplication.java b/TestMainApplication.java new file mode 100644 index 0000000..94e8d98 --- /dev/null +++ b/TestMainApplication.java @@ -0,0 +1,7 @@ +package com.zipcodewilmington.scientific_calculator; + +/** + * Created by leon on 2/9/18. + */ +public class TestMainApplication { +} From 7023e2496ab3542d10388d676666bb5e73468a7a Mon Sep 17 00:00:00 2001 From: Bobbi-Z <85585077+Bobbi-Z@users.noreply.github.com> Date: Mon, 28 Jun 2021 06:12:12 -0400 Subject: [PATCH 08/10] Delete TestMainApplication.java --- TestMainApplication.java | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 TestMainApplication.java diff --git a/TestMainApplication.java b/TestMainApplication.java deleted file mode 100644 index 94e8d98..0000000 --- a/TestMainApplication.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.zipcodewilmington.scientific_calculator; - -/** - * Created by leon on 2/9/18. - */ -public class TestMainApplication { -} From 9113a1aa721381245c7a55d572d3b639717f54bb Mon Sep 17 00:00:00 2001 From: Bobbi-Z <85585077+Bobbi-Z@users.noreply.github.com> Date: Mon, 28 Jun 2021 06:12:27 -0400 Subject: [PATCH 09/10] Delete CalculatorEngineTest.java --- CalculatorEngineTest.java | 142 -------------------------------------- 1 file changed, 142 deletions(-) delete mode 100644 CalculatorEngineTest.java diff --git a/CalculatorEngineTest.java b/CalculatorEngineTest.java deleted file mode 100644 index fd83f0f..0000000 --- a/CalculatorEngineTest.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.zipcodewilmington.scientific_calculator; - -import com.zipcodewilmington.scientificcalculator.CalculatorEngine; -import org.junit.Assert; -import org.junit.Test; - -import static com.sun.tools.doclint.Entity.divide; -import static com.zipcodewilmington.scientificcalculator.CalculatorEngine.*; - - -public class CalculatorEngineTest { - - @Test - public void testSum1() { - // Given - CalculatorEngine CalculatorEngine = new CalculatorEngine(); - // When - Double result; - result = CalculatorEngine.sum(2.00, 2.00); - // Then - if (result != 4.00) { // if 2 + 2 != 4 - Assert.fail(); - } - } - @Test - public void testSum2() { - // Given - CalculatorEngine CalculatorEngine = new CalculatorEngine(); - // When - Double result; - result = CalculatorEngine.sum(1200.00, 500.00); - // Then - if (result != 1700.00) { // if 1200 + 500 != 1700 - Assert.fail(); - } - } - @Test - public void testSubtract1() { - // Given - CalculatorEngine calculatorEngine = new CalculatorEngine(); - // When - Double result; - result = calculatorEngine.subtract(10.00, 5.00); - // Then - if (result != 5.00) { // 10 - 5 = 5 - Assert.fail(); - } - } - @Test - public void testSubtract2() { - // Given - CalculatorEngine calculatorEngine = new CalculatorEngine(); - // When - Double result; - result = calculatorEngine.subtract(20.00, 3.00); - // Then - if (result != 17.00) { // 20 - 3 = 17 - Assert.fail(); - } - } - - @Test - public void testDivide1() { - Double expected = 100.00; - Double firstNum = 1000.00; - Double secondNum = 10.00; - Double actual = CalculatorEngine.divide(firstNum, secondNum); - Assert.assertEquals(expected, actual); - } - - @Test - public void testDivide2() { - Double expected = 4.00; - Double firstNum = 20.00; - Double secondNum = 5.00; - Double actual = CalculatorEngine.divide(firstNum, secondNum); - Assert.assertEquals(expected, actual); - } - - @Test - public void testMultiply1() { - Double expected = 100.00; - Double firstNum = 20.00; - Double secondNum = 5.00; - Double actual = multiply(firstNum, secondNum); - Assert.assertEquals(expected, actual); - } - - - @Test - public void testMultiply2() { - Double expected = 4.00; - Double firstNum = 2.00; - Double secondNum = 2.0; - Double actual = multiply(firstNum, secondNum); - Assert.assertEquals(expected, actual); - } - - @Test - public void testSquareRoot(){ - Double expected = 2.00; - Double firstNum = 4.00; - Double actual = squareRoot(firstNum); - Assert.assertEquals(expected, actual); - } - - @Test - public void testSquare(){ - Double expected = 16.00; - Double firstNum = 4.00; - Double actual = square(firstNum); - Assert.assertEquals(expected, actual); - } - @Test - public void testSquareY(){ - Double expected = 7776.00; - Double firstNum = 6.00; - Double secondNumb = 5.00; - Double actual = CalculatorEngine.squareY(firstNum, secondNumb); - Assert.assertEquals(expected, actual); - } - - @Test - public void testSquareRootY(){ - Double expected = 1.431; - Double firstNum = 6.00; - Double secondNumb = 5.00; - Double actual = CalculatorEngine.squareRootY(firstNum, secondNumb); - Assert.assertEquals(expected, actual); - } -} - - - -/* @Test(expected = ArithmeticException.class) - public void testDivideWillThrowExceptionWhenDivideOnZero() { - Calculator calculator = new Calculator(); - calculator.divide(6, 0); - } -} */ - - From 7d29c67c58d02609f9c3bc715d11a55f65ab588a Mon Sep 17 00:00:00 2001 From: Bobbi-Z <85585077+Bobbi-Z@users.noreply.github.com> Date: Mon, 28 Jun 2021 06:30:49 -0400 Subject: [PATCH 10/10] double check all code --- .../scientificcalculator/CalculatorEngine.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorEngine.java b/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorEngine.java index ef03bde..c83459f 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorEngine.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorEngine.java @@ -4,7 +4,7 @@ public class CalculatorEngine { // CalculatorEngine calculatorEngine = new CalculatorEngine(); private static Double value; - public Double sum(Double firstNum, Double secondNum) { + public static Double sum(Double firstNum, Double secondNum) { return firstNum + secondNum; }