Update CalculatorResourceTest.java

src/test/java/CalculatorResourceTest.java

@@ -9,61 +9,74 @@ public class CalculatorResourceTest{
     public void testCalculate(){
         CalculatorResource calculatorResource = new CalculatorResource();
 
-        String expression = "100+300+100";
-        assertEquals(500, calculatorResource.calculate(expression));
+        String expression = "100+300";
+        assertEquals("400", calculatorResource.calculate(expression));
 
-        expression = " 300 - 99 - 1 ";
-        assertEquals(200, calculatorResource.calculate(expression));
+        expression = " 300 - 99 ";
+        assertEquals("201", calculatorResource.calculate(expression));
 
-        expression = " 10 * 10 * 10 ";
-        assertEquals(1000, calculatorResource.calculate(expression));
+        expression = " 10 * 10";
+        assertEquals("100", calculatorResource.calculate(expression));
+
+        expression = " 10 / 2";
+        assertEquals("5", calculatorResource.calculate(expression));
+
+        expression = "100+10+10+10";
+        assertEquals("130", calculatorResource.calculate(expression));
+
+        expression = "100-10-10-10";
+        assertEquals("70", calculatorResource.calculate(expression));
+
+        expression = "2*2*2";
+        assertEquals("8", calculatorResource.calculate(expression));
+
+        expression = "100/2/2";
+        assertEquals("25", calculatorResource.calculate(expression));
 
-        expression = " 300/3/20 ";
-        assertEquals(5, calculatorResource.calculate(expression));
     }
 
     @Test
     public void testSum(){
         CalculatorResource calculatorResource = new CalculatorResource();
 
-        String expression = "100+300+200";
-        assertEquals(600, calculatorResource.sum(expression));
+        String expression = "100+300";
+        assertEquals(400, calculatorResource.sum(expression));
 
-        expression = "300+99+100+200+300+400";
-        assertEquals(1399, calculatorResource.sum(expression));
+        expression = "300+99";
+        assertEquals(399, calculatorResource.sum(expression));
     }
 
     @Test
     public void testSubtraction(){
         CalculatorResource calculatorResource = new CalculatorResource();
 
-        String expression = "999-100-100";
-        assertEquals(799, calculatorResource.subtraction(expression));
+        String expression = "999-100";
+        assertEquals(899, calculatorResource.subtraction(expression));
 
-        expression = "20-2-2-2-2-2";
-        assertEquals(10, calculatorResource.subtraction(expression));
+        expression = "20-2";
+        assertEquals(18, calculatorResource.subtraction(expression));
     }
 
     @Test
     public void testMultiplication(){
         CalculatorResource calculatorResource = new CalculatorResource();
 
-        String expression = "10*10*10";
-        assertEquals(1000, calculatorResource.multiplication(expression));
+        String expression = "100*300";
+        assertEquals(30000, calculatorResource.multiplication(expression));
 
-        expression = "5*10*5";
-        assertEquals(250, calculatorResource.multiplication(expression));
+        expression = "10*2";
+        assertEquals(20, calculatorResource.multiplication(expression));
     }
 
     @Test
     public void testDivision(){
         CalculatorResource calculatorResource = new CalculatorResource();
 
-        String expression = "100/10/5";
-        assertEquals(2, calculatorResource.division(expression));
+        String expression = "10/2";
+        assertEquals(5, calculatorResource.division(expression));
 
-        expression = "50/5/5";
-        assertEquals(2, calculatorResource.division(expression));
+        expression = "500/25";
+        assertEquals(20, calculatorResource.division(expression));
     }
 
 }