Skip to content
Snippets Groups Projects
Commit be4e77ad authored by Sigurd Almåsbakk Skogmo's avatar Sigurd Almåsbakk Skogmo
Browse files

Merge branch 'regnefiks' into 'master'

Fikset regnemetodene (Test)

See merge request !5
parents 6e270604 14c274c8
Branches
No related tags found
1 merge request!5Fikset regnemetodene (Test)
Pipeline #72020 passed
......@@ -21,7 +21,7 @@ public class CalculatorResource {
@POST
@Consumes(MediaType.TEXT_PLAIN)
@Produces(MediaType.TEXT_PLAIN)
public int calculate(String expression){
public String calculate(String expression){
// Removes all whitespaces
String expressionTrimmed = expression.replaceAll("\\s+","");
......@@ -41,8 +41,9 @@ 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 input";
return result;
return String.valueOf(result);
}
/**
......
......@@ -10,16 +10,20 @@ public class CalculatorResourceTest{
CalculatorResource calculatorResource = new CalculatorResource();
String expression = "100+300";
assertEquals(400, calculatorResource.calculate(expression));
String ans1 = calculatorResource.calculate(expression);
assertEquals("400", ans1);
expression = " 300 - 99 ";
assertEquals(201, calculatorResource.calculate(expression));
String ans2 = calculatorResource.calculate(expression);
assertEquals("201", ans2);
expression = "42 * 3";
assertEquals(126, calculatorResource.calculate(expression));
String ans3 = calculatorResource.calculate(expression);
assertEquals("126", ans3);
expression = "28 / 7";
assertEquals(4, calculatorResource.calculate(expression));
String ans4 = calculatorResource.calculate(expression);
assertEquals("4", ans4);
}
@Test
......@@ -27,13 +31,16 @@ public class CalculatorResourceTest{
CalculatorResource calculatorResource = new CalculatorResource();
String expression = "100+300";
assertEquals(400, calculatorResource.sum(expression));
String ans1 = Integer.toString(calculatorResource.sum(expression));
assertEquals("400", ans1);
expression = "300+99";
assertEquals(399, calculatorResource.sum(expression));
String ans2 = Integer.toString(calculatorResource.sum(expression));
assertEquals("399", ans2);
expression = "50+10+100";
assertEquals(160, calculatorResource.sum(expression));
String ans3 = Integer.toString(calculatorResource.sum(expression));
assertEquals("160", ans3);
}
@Test
......@@ -41,10 +48,12 @@ public class CalculatorResourceTest{
CalculatorResource calculatorResource = new CalculatorResource();
String expression = "999-100";
assertEquals(899, calculatorResource.subtraction(expression));
String ans1 = Integer.toString(calculatorResource.subtraction(expression));
assertEquals("899", ans1);
expression = "20-2";
assertEquals(18, calculatorResource.subtraction(expression));
String ans2 = Integer.toString(calculatorResource.subtraction(expression));
assertEquals("18", ans2);
}
@Test
......@@ -52,20 +61,24 @@ public class CalculatorResourceTest{
CalculatorResource calculatorResource = new CalculatorResource();
String expression = "10*10";
assertEquals(100, calculatorResource.multiplication(expression));
String ans1 = Integer.toString(calculatorResource.multiplication(expression));
assertEquals("100", ans1);
expression = "10*7";
assertEquals(70, calculatorResource.multiplication(expression));
String ans2 = Integer.toString(calculatorResource.multiplication(expression));
assertEquals("70", ans2);
}
@Test
public void testDivision(){
CalculatorResource calculatorResource = new CalculatorResource();
String division = "100/5";
assertEquals(20, calculatorResource.division(division));
String expression = "100/5";
String ans1 = Integer.toString(calculatorResource.division(expression));
assertEquals("20", ans1);
division = "200/10";
assertEquals(20, calculatorResource.division(division));
expression = "200/10";
String ans2 = Integer.toString(calculatorResource.division(expression));
assertEquals("20", ans2);
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment