Added Subtraction with test cases <Incomplete>

Author: JeremySabina

src/main/java/com/zipcodewilmington/scientificcalculator/Calculator.java

@@ -1,9 +1,15 @@
 package com.zipcodewilmington.scientificcalculator;
 
 public class Calculator {
+    private static int result;
+
     public static int sum(int firstNum, int secondNum) {
-        int result;
         result = firstNum + secondNum;
         return result;
     }
+
+    public int subtract(int firstNum, int secondNum) {
+        result = firstNum - secondNum;
+        return result;
+    }
 }

src/main/java/com/zipcodewilmington/scientificcalculator/Console.java renamed to src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorEngine.java

@@ -5,7 +5,7 @@
 /**
  * Created by leon on 2/9/18.
  */
-public class Console {
+public class CalculatorEngine {
 
     public static void print(String output, Object... args) {
         System.out.printf(output, args);

src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java renamed to src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorInterface.java

@@ -5,25 +5,24 @@
 /**
  * Created by leon on 2/9/18.
  */
-public class MainApplication {
+public class CalculatorInterface {
     public static void main(String[] args) {
 
         Integer y = 0;
         Integer z = 0;
 
         Scanner scanObject = new Scanner(System.in);
 
-        Console.println("Welcome to my calculator!");
-
-    // Connected the sum method
+        CalculatorEngine.println("Welcome to the calculator!\nWhat would you like to do?");
+        System.out.println("1. Basic Functions \n2. Scientific Functions \n3. Something Fun!");
 
         System.out.println("Please enter a number");
 
         y = scanObject.nextInt();
         scanObject.nextLine();
 
        // System.out.println(y);
-
+        // Connected the sum method
         System.out.println("Please enter another number");
         z = scanObject.nextInt();
        // scanObject.nextLine();
@@ -33,14 +32,14 @@ public static void main(String[] args) {
         System.out.println(x);
 
 
-        String s = Console.getStringInput("Enter a string");
+        String s = CalculatorEngine.getStringInput("Enter a string");
 
 
 
-        Double d = Console.getDoubleInput("Enter a double.");
+        Double d = CalculatorEngine.getDoubleInput("Enter a double.");
 
-        Console.println("The user input %s as a string", s);
+        CalculatorEngine.println("The user input %s as a string", s);
         // Console.println("The user input %s as a integer", i);
-        Console.println("The user input %s as a d", d);
+        CalculatorEngine.println("The user input %s as a d", d);
     }
 }

src/test/java/com/zipcodewilmington/scientific_calculator/CalculatorEngineTest.java renamed to src/test/java/com/zipcodewilmington/scientific_calculator/CalculatorInterfacesTest.java

@@ -6,7 +6,7 @@
 
 
 
-public class CalculatorEngineTest {
+public class CalculatorInterfacesTest {
 
     @Test
     public void testSum() {
@@ -32,5 +32,29 @@ public void testSum1() {
             Assert.fail();
         }
     }
-}
+    @Test
+    public void testSubtract() {
+        // Given
+        Calculator calculator = new Calculator();
+        // When
+        int result;
+        result = calculator.subtract(10, 5);
+        // Then
+        if (result != 5) {   // 10 - 5 = 5
+            Assert.fail();
+        }
+    }
+    @Test
+    public void testSubtract1() {
+            // Given
+            Calculator calculator = new Calculator();
+            // When
+            int result;
+            result = calculator.subtract(20, 3);
+            // Then
+            if (result != 17) {   // 20 - 3 = 17
+                Assert.fail();
+            }
+        }
+    }