From 112aef3f534c95ca6dc3a5461527e9c1974637b0 Mon Sep 17 00:00:00 2001
From: snegard <stiande@stud.ntnu.no>
Date: Tue, 3 Mar 2020 12:29:33 +0100
Subject: [PATCH] Multiplication og division i calc
---
.../java/resources/CalculatorResource.java | 18 ++++++++++++
src/test/java/CalculatorResourceTest.java | 28 +++++++++++++++++++
2 files changed, 46 insertions(+)
diff --git a/src/main/java/resources/CalculatorResource.java b/src/main/java/resources/CalculatorResource.java
index 8d30f8d..8abfbc2 100644
--- a/src/main/java/resources/CalculatorResource.java
+++ b/src/main/java/resources/CalculatorResource.java
@@ -70,4 +70,22 @@ public class CalculatorResource {
return number1 - number2;
}
+
+ public int multiplication(String expression){
+ String[] split = expression.split("[*]");
+
+ int number1 = Integer.parseInt(split[0]);
+ int number2 = Integer.parseInt(split[1]);
+
+ return number1 * number2;
+ }
+
+ public int division(String expression){
+ String[] split = expression.split("[/]");
+
+ int number1 = Integer.parseInt(split[0]);
+ int number2 = Integer.parseInt(split[1]);
+
+ return number1 / number2;
+ }
}
diff --git a/src/test/java/CalculatorResourceTest.java b/src/test/java/CalculatorResourceTest.java
index 84e0680..422ca82 100644
--- a/src/test/java/CalculatorResourceTest.java
+++ b/src/test/java/CalculatorResourceTest.java
@@ -14,6 +14,12 @@ public class CalculatorResourceTest{
expression = " 300 - 99 ";
assertEquals(201, calculatorResource.calculate(expression));
+
+ expression = " 10*10 ";
+ assertEquals(100, calculatorResource.calculate(expression));
+
+ expression = " 10/2 ";
+ assertEquals(5, calculatorResource.calculate(expression));
}
@Test
@@ -37,4 +43,26 @@ public class CalculatorResourceTest{
expression = "20-2";
assertEquals(18, calculatorResource.subtraction(expression));
}
+
+ @Test
+ public void testMultiplication(){
+ CalculatorResource calculatorResource = new CalculatorResource();
+
+ String expression = "10*10";
+ assertEquals(100, calculatorResource.multiplication(expression));
+
+ expression = "10*2";
+ assertEquals(20, calculatorResource.multiplication(expression));
+ }
+
+ @Test
+ public void testDivision(){
+ CalculatorResource calculatorResource = new CalculatorResource();
+
+ String expression = "10/10";
+ assertEquals(1, calculatorResource.division(expression));
+
+ expression = "10/2";
+ assertEquals(5, calculatorResource.division(expression));
+ }
}
--
GitLab