Skip to content
Snippets Groups Projects
Commit 2f242a70 authored by Halvard Forsland's avatar Halvard Forsland
Browse files

Update CalculatorResourceTest.java for new calculator resource

parent 12d53509
No related branches found
No related tags found
No related merge requests found
Pipeline #121114 passed
......@@ -21,10 +21,10 @@ public class CalculatorResourceTest{
CalculatorResource calculatorResource = new CalculatorResource();
String expression = "100+300";
assertEquals(400, calculatorResource.sum(expression),1.0f);
assertEquals(400, calculatorResource.calculate(expression),1.0f);
expression = "300+99";
assertEquals(399, calculatorResource.sum(expression),1.0f);
assertEquals(399, calculatorResource.calculate(expression),1.0f);
}
@Test
......@@ -32,10 +32,10 @@ public class CalculatorResourceTest{
CalculatorResource calculatorResource = new CalculatorResource();
String expression = "999-100";
assertEquals(899, calculatorResource.subtraction(expression),1.0f);
assertEquals(899, calculatorResource.calculate(expression),1.0f);
expression = "20-2";
assertEquals(18, calculatorResource.subtraction(expression),1.0f);
assertEquals(18, calculatorResource.calculate(expression),1.0f);
}
@Test
public void testMultiplication(){
......@@ -43,10 +43,10 @@ public class CalculatorResourceTest{
CalculatorResource calculatorResource = new CalculatorResource();
String expression = "40*5";
assertEquals(200, calculatorResource.multiplication(expression),1.0f);
assertEquals(200, calculatorResource.calculate(expression),1.0f);
expression = "32*9";
assertEquals(288, calculatorResource.multiplication(expression),1.0f);
assertEquals(288, calculatorResource.calculate(expression),1.0f);
}
@Test
......@@ -55,10 +55,10 @@ public class CalculatorResourceTest{
CalculatorResource calculatorResource = new CalculatorResource();
String expression = "30/5";
assertEquals(6.0f, calculatorResource.division(expression),1.0f);
assertEquals(6.0f, calculatorResource.calculate(expression),1.0f);
expression = "10/5";
assertEquals(2.0f, calculatorResource.division(expression),1.0f);
assertEquals(2.0f, calculatorResource.calculate(expression),1.0f);
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment