Merge remote-tracking branch 'origin/main'

src/main/java/resources/CalculatorResource.java

@@ -58,11 +58,12 @@ public class CalculatorResource {
      */
     public double sum(String expression){
         String[] split = expression.split("[+]");
+        double result = 0;
+        for (String s : split) {
+            result += Double.parseDouble(s);
+        }
 
-        double number1 = Double.parseDouble(split[0]);
-        double number2 = Double.parseDouble(split[1]);
-
-        return number1 + number2;
+        return result;
     }
 
     /**
@@ -72,11 +73,16 @@ public class CalculatorResource {
      */
     public double subtraction(String expression){
         String[] split = expression.split("[-]");
+        double result = 0;
+        for (String s : split) {
+            if(result == 0) {
+                result = Double.parseDouble(s);
+            } else {
+                result = result - Double.parseDouble(s);
+            }
+        }
 
-        double number1 = Double.parseDouble(split[0]);
-        double number2 = Double.parseDouble(split[1]);
-
-        return number1 - number2;
+        return result;
     }
     /**
      * Method used to calculate a product expression.
@@ -85,11 +91,16 @@ public class CalculatorResource {
      */
     public double multiplication(String expression){
         String[] split = expression.split("[*]");
+        double result = 0;
+        for (String s : split) {
+            if(result == 0) {
+                result = Double.parseDouble(s);
+            } else {
+                result = result * Double.parseDouble(s);
+            }
+        }
 
-        double number1 = Double.parseDouble(split[0]);
-        double number2 = Double.parseDouble(split[1]);
-
-        return number1 * number2;
+        return result;
     }
     /**
      * Method used to calculate a quotient expression.
@@ -99,9 +110,15 @@ public class CalculatorResource {
     public double division(String expression){
         String[] split = expression.split("[/]");
 
-        double number1 = Double.parseDouble(split[0]);
-        double number2 = Double.parseDouble(split[1]);
+        double result = 0;
+        for (String s : split) {
+            if(result == 0) {
+                result = Double.parseDouble(s);
+            } else {
+                result = result / Double.parseDouble(s);
+            }
+        }
 
-        return number1 / number2;
+        return result;
     }
 }

src/test/java/CalculatorResourceTest.java

@@ -32,6 +32,8 @@ public class CalculatorResourceTest{
 
         expression = "300+99";
         assertEquals(399, calculatorResource.sum(expression));
+        expression = "300+99+100";
+        assertEquals(499, calculatorResource.sum(expression));
     }
 
     @Test