From d4f8bd9165f56fc1ba13186d184bcba4c6cf4721 Mon Sep 17 00:00:00 2001
From: Martin Dolmen Helmersen <marthelm@stud.ntnu.no>
Date: Mon, 8 Mar 2021 16:40:24 +0100
Subject: [PATCH] changes to method tests
---
src/test/java/CalculatorResourceTest.java | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/test/java/CalculatorResourceTest.java b/src/test/java/CalculatorResourceTest.java
index e4c1c94..e43b9b4 100644
--- a/src/test/java/CalculatorResourceTest.java
+++ b/src/test/java/CalculatorResourceTest.java
@@ -12,8 +12,8 @@ public class CalculatorResourceTest{
String expression = "100+300";
assertEquals(400, calculatorResource.calculate(expression));
- expression = " 300 - 99 ";
- assertEquals(201, calculatorResource.calculate(expression));
+ expression = " 300 - 99 - 100";
+ assertEquals(101, calculatorResource.calculate(expression));
}
@Test
@@ -23,8 +23,8 @@ public class CalculatorResourceTest{
String expression = "100+300";
assertEquals(400, calculatorResource.sum(expression));
- expression = "300+99";
- assertEquals(399, calculatorResource.sum(expression));
+ expression = "300+99+100";
+ assertEquals(499, calculatorResource.sum(expression));
}
@Test
@@ -34,24 +34,24 @@ public class CalculatorResourceTest{
String expression = "999-100";
assertEquals(899, calculatorResource.subtraction(expression));
- expression = "20-2";
- assertEquals(18, calculatorResource.subtraction(expression));
+ expression = "20-2-8";
+ assertEquals(10, calculatorResource.subtraction(expression));
}
@Test
public void testMultiplication(){
CalculatorResource calculatorResource = new CalculatorResource();
- String equation = "5*5";
- assertEquals(25, calculatorResource.multiplication(equation));
+ String equation = "5*5*10";
+ assertEquals(250, calculatorResource.multiplication(equation));
}
@Test
public void testDivision(){
CalculatorResource calculatorResource = new CalculatorResource();
- String equation = "16/4";
- assertEquals(4, calculatorResource.division(equation));
+ String equation = "16/4/2";
+ assertEquals(2, calculatorResource.division(equation));
}
}
--
GitLab