Skip to content
Snippets Groups Projects
Commit 4b808059 authored by yasinhessnawi's avatar yasinhessnawi
Browse files

Merge remote-tracking branch 'origin/main'

# Conflicts:
#	src/main/java/resources/CalculatorResource.java
got an ide from internet to how to configure the regex to take the decimal.
parents 7d4c9817 5bd67d52
No related branches found
No related tags found
No related merge requests found
...@@ -15,6 +15,12 @@ public class CalculatorResourceTest{ ...@@ -15,6 +15,12 @@ public class CalculatorResourceTest{
expression = " 300 - 99 "; expression = " 300 - 99 ";
assertEquals(201, calculatorResource.calculate(expression)); assertEquals(201, calculatorResource.calculate(expression));
expression = "5*2";
assertEquals(10, calculatorResource.calculate(expression));
expression = "5/2";
assertEquals(2.5, calculatorResource.calculate(expression));
} }
@Test @Test
...@@ -38,24 +44,31 @@ public class CalculatorResourceTest{ ...@@ -38,24 +44,31 @@ public class CalculatorResourceTest{
expression = "20-2"; expression = "20-2";
assertEquals(18, calculatorResource.subtraction(expression)); assertEquals(18, calculatorResource.subtraction(expression));
} }
@Test @Test
public void testMultiplication (){ public void testMultiplication (){
CalculatorResource calculatorResource = new CalculatorResource(); CalculatorResource calculatorResource = new CalculatorResource();
String expression = "999*100"; String expression = "5*12";
assertEquals(99900, calculatorResource.multiplication(expression)); assertEquals(60, calculatorResource.multiplication(expression));
expression = "9.9*2"; expression = "5*0";
assertEquals(19.8, calculatorResource.multiplication(expression)); assertEquals(0, calculatorResource.multiplication(expression));
} }
@Test @Test
public void testDivision() { public void testDivision() {
CalculatorResource calculatorResource = new CalculatorResource(); CalculatorResource calculatorResource = new CalculatorResource();
String expression = "999/100"; String expression = "12/2";
assertEquals(9.99, calculatorResource.division(expression)); assertEquals(6, calculatorResource.division(expression));
//test case for divide by 0
expression = "12/0";
assertEquals("error", calculatorResource.division(expression));
expression = "9.9/2"; expression = "1/4";
assertEquals(4.95, calculatorResource.division(expression)); assertEquals(0.25, calculatorResource.division(expression));
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment