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

Update CalculatorResourceTest.java

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