Multiplication og division i calc

src/main/java/resources/CalculatorResource.java

@@ -70,4 +70,22 @@ public class CalculatorResource {
 
         return number1 - number2;
     }
+
+    public int multiplication(String expression){
+        String[] split = expression.split("[*]");
+
+        int number1 = Integer.parseInt(split[0]);
+        int number2 = Integer.parseInt(split[1]);
+
+        return number1 * number2;
+    }
+
+    public int division(String expression){
+        String[] split = expression.split("[/]");
+
+        int number1 = Integer.parseInt(split[0]);
+        int number2 = Integer.parseInt(split[1]);
+
+        return number1 / number2;
+    }
 }

src/test/java/CalculatorResourceTest.java

@@ -14,6 +14,12 @@ public class CalculatorResourceTest{
 
         expression = " 300 - 99 ";
         assertEquals(201, calculatorResource.calculate(expression));
+
+        expression = " 10*10 ";
+        assertEquals(100, calculatorResource.calculate(expression));
+
+        expression = " 10/2 ";
+        assertEquals(5, calculatorResource.calculate(expression));
     }
 
     @Test
@@ -37,4 +43,26 @@ public class CalculatorResourceTest{
         expression = "20-2";
         assertEquals(18, calculatorResource.subtraction(expression));
     }
+
+    @Test
+    public void testMultiplication(){
+        CalculatorResource calculatorResource = new CalculatorResource();
+
+        String expression = "10*10";
+        assertEquals(100, calculatorResource.multiplication(expression));
+
+        expression = "10*2";
+        assertEquals(20, calculatorResource.multiplication(expression));
+    }
+
+    @Test
+    public void testDivision(){
+        CalculatorResource calculatorResource = new CalculatorResource();
+
+        String expression = "10/10";
+        assertEquals(1, calculatorResource.division(expression));
+
+        expression = "10/2";
+        assertEquals(5, calculatorResource.division(expression));
+    }
 }