Merge branch 'revert-2c844508' into 'master'

Revert "kalkulator-respons"

See merge request !3

src/main/java/resources/CalculatorResource.java

@@ -21,7 +21,7 @@ public class CalculatorResource {
     @POST
     @Consumes(MediaType.TEXT_PLAIN)
     @Produces(MediaType.TEXT_PLAIN)
-    public String calculate(String expression){
+    public int calculate(String expression){
         // Removes all whitespaces
         String expressionTrimmed = expression.replaceAll("\\s+","");
 
@@ -41,9 +41,8 @@ public class CalculatorResource {
         else if(expressionTrimmed.matches("^\\d+(?:\\s*[-]\\s*\\d+)*$")) result = subtraction(expressionTrimmed);
         else if(expressionTrimmed.matches("^\\d+(?:\\s*[*]\\s*\\d+)*$")) result = multiplication(expressionTrimmed);
         else if(expressionTrimmed.matches("^\\d+(?:\\s*[/]\\s*\\d+)*$")) result = division(expressionTrimmed);
-        else return "Ugyldig inndata"
 
-        return String.valueOf(result);
+        return result;
     }
 
     /**

src/test/java/CalculatorResourceTest.java

@@ -10,20 +10,16 @@ public class CalculatorResourceTest{
         CalculatorResource calculatorResource = new CalculatorResource();
 
         String expression = "100+300";
-        assertEquals("400", calculatorResource.calculate(expression));
+        assertEquals(400, calculatorResource.calculate(expression));
 
         expression = " 300 - 99 ";
-        assertEquals("201", calculatorResource.calculate(expression));
+        assertEquals(201, calculatorResource.calculate(expression));
 
         expression = "42 * 3";
-        assertEquals("126", calculatorResource.calculate(expression));
+        assertEquals(126, calculatorResource.calculate(expression));
 
         expression = "28 / 7";
-        assertEquals("4", calculatorResource.calculate(expression));
-
-        expression = "42 - 28 + 1";
-        assertEquals("Ugyldig inndata", calculatorResource.calculate(expression));
-
+        assertEquals(4, calculatorResource.calculate(expression));
     }
 
     @Test
@@ -31,13 +27,13 @@ public class CalculatorResourceTest{
         CalculatorResource calculatorResource = new CalculatorResource();
 
         String expression = "100+300";
-        assertEquals("400", calculatorResource.sum(expression));
+        assertEquals(400, calculatorResource.sum(expression));
 
         expression = "300+99";
-        assertEquals("399", calculatorResource.sum(expression));
+        assertEquals(399, calculatorResource.sum(expression));
 
         expression = "50+10+100";
-        assertEquals("160", calculatorResource.sum(expression));
+        assertEquals(160, calculatorResource.sum(expression));
     }
 
     @Test
@@ -45,10 +41,10 @@ public class CalculatorResourceTest{
         CalculatorResource calculatorResource = new CalculatorResource();
 
         String expression = "999-100";
-        assertEquals("899", calculatorResource.subtraction(expression));
+        assertEquals(899, calculatorResource.subtraction(expression));
 
         expression = "20-2";
-        assertEquals("18", calculatorResource.subtraction(expression));
+        assertEquals(18, calculatorResource.subtraction(expression));
     }
 
     @Test
@@ -56,10 +52,10 @@ public class CalculatorResourceTest{
         CalculatorResource calculatorResource = new CalculatorResource();
 
         String expression = "10*10";
-        assertEquals("100", calculatorResource.multiplication(expression));
+        assertEquals(100, calculatorResource.multiplication(expression));
 
         expression = "10*7";
-        assertEquals("70", calculatorResource.multiplication(expression));
+        assertEquals(70, calculatorResource.multiplication(expression));
     }
 
     @Test
@@ -67,9 +63,9 @@ public class CalculatorResourceTest{
         CalculatorResource calculatorResource = new CalculatorResource();
 
         String division = "100/5";
-        assertEquals("20", calculatorResource.division(division));
+        assertEquals(20, calculatorResource.division(division));
 
         division = "200/10";
-        assertEquals("20", calculatorResource.division(division));
+        assertEquals(20, calculatorResource.division(division));
     }
 }