From 89609d1cb37af3ae4e16d6d65e1aefeb97d8034a Mon Sep 17 00:00:00 2001 From: LeanderGal Date: Wed, 28 Oct 2020 23:21:47 +0100 Subject: [PATCH 1/5] Erster Test --- src/main/java/tdd/setup/Calculator.java | 1 + src/test/java/tdd/setup/CalculatorTest.java | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/src/main/java/tdd/setup/Calculator.java b/src/main/java/tdd/setup/Calculator.java index 171f6d6..5751b71 100644 --- a/src/main/java/tdd/setup/Calculator.java +++ b/src/main/java/tdd/setup/Calculator.java @@ -52,4 +52,5 @@ public void pressEquals() { screen = Double.toString(result); if(screen.endsWith(".0")) screen = screen.substring(0,screen.length()-2); } + } diff --git a/src/test/java/tdd/setup/CalculatorTest.java b/src/test/java/tdd/setup/CalculatorTest.java index 3bf16e9..e876778 100644 --- a/src/test/java/tdd/setup/CalculatorTest.java +++ b/src/test/java/tdd/setup/CalculatorTest.java @@ -16,4 +16,17 @@ void calculatorCanDoTwoPlusTwo() { calc.pressEquals(); assertEquals("4", calc.readScreen()); } + @Test + @DisplayName("should display result after subtracting two positive numbers") + void calculatorCanDoTwoMinusTwo() { + Calculator calc = new Calculator(); + calc.pressDigitKey(2); + calc.pressOperationKey("-"); + calc.pressDigitKey(2); + calc.pressEquals(); + assertEquals("0", calc.readScreen()); + } + + + } From eb695631de4f25b40469a72385b637150fe3fec0 Mon Sep 17 00:00:00 2001 From: LeanderGal Date: Wed, 28 Oct 2020 23:28:17 +0100 Subject: [PATCH 2/5] Erster negativer Test --- src/test/java/tdd/setup/CalculatorTest.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/test/java/tdd/setup/CalculatorTest.java b/src/test/java/tdd/setup/CalculatorTest.java index e876778..f720e36 100644 --- a/src/test/java/tdd/setup/CalculatorTest.java +++ b/src/test/java/tdd/setup/CalculatorTest.java @@ -26,6 +26,14 @@ void calculatorCanDoTwoMinusTwo() { calc.pressEquals(); assertEquals("0", calc.readScreen()); } + @Test + @DisplayName("should display result after changing a Number to negative") + void calculatorCanDoNegative() { + Calculator calc = new Calculator(); + calc.pressNegative(); + calc.pressDigitKey(2); + assertEquals("-2", calc.readScreen()); + } From 1b3163e71ca39983da7dae6f2441c370018027df Mon Sep 17 00:00:00 2001 From: LeanderGal Date: Wed, 28 Oct 2020 23:30:43 +0100 Subject: [PATCH 3/5] Erster Bugfix --- src/main/java/tdd/setup/Calculator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/tdd/setup/Calculator.java b/src/main/java/tdd/setup/Calculator.java index 5751b71..650bd9f 100644 --- a/src/main/java/tdd/setup/Calculator.java +++ b/src/main/java/tdd/setup/Calculator.java @@ -3,7 +3,7 @@ // behaviour inspired by https://www.online-calculator.com/ public class Calculator { - private String screen = "0"; + private String screen = ""; private double latestValue; From fd0f5a3a23571b4f721c4f0de7f7a4e14c5a2378 Mon Sep 17 00:00:00 2001 From: LeanderGal Date: Wed, 28 Oct 2020 23:34:03 +0100 Subject: [PATCH 4/5] Zweiter Negativtest --- src/test/java/tdd/setup/CalculatorTest.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/test/java/tdd/setup/CalculatorTest.java b/src/test/java/tdd/setup/CalculatorTest.java index f720e36..6aecdf8 100644 --- a/src/test/java/tdd/setup/CalculatorTest.java +++ b/src/test/java/tdd/setup/CalculatorTest.java @@ -35,6 +35,17 @@ void calculatorCanDoNegative() { assertEquals("-2", calc.readScreen()); } + @Test + @DisplayName("should display result after multiplying two positive two digit numbers") + void calculatorCanMultiplyTwoTwoDigitNumbers() { + Calculator calc = new Calculator(); + calc.pressDigitKey(20); + calc.pressOperationKey("x"); + calc.pressDigitKey(25); + calc.pressEquals(); + assertEquals("500", calc.readScreen()); + } + } From ad824d96c20c7f9d0c1d18068a4b672eab97354b Mon Sep 17 00:00:00 2001 From: LeanderGal Date: Wed, 28 Oct 2020 23:38:13 +0100 Subject: [PATCH 5/5] zweiter Bugfix --- src/main/java/tdd/setup/Calculator.java | 2 +- src/test/java/tdd/setup/CalculatorTest.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/tdd/setup/Calculator.java b/src/main/java/tdd/setup/Calculator.java index 650bd9f..4d6ff48 100644 --- a/src/main/java/tdd/setup/Calculator.java +++ b/src/main/java/tdd/setup/Calculator.java @@ -15,7 +15,7 @@ public String readScreen() { public void pressDigitKey(int digit) { if(digit > 9 || digit < 0) throw new IllegalArgumentException(); - if(latestOperation.isEmpty()) { + if(latestOperation.isEmpty() || latestValue != 0.0) { screen = screen + digit; } else { latestValue = Double.parseDouble(screen); diff --git a/src/test/java/tdd/setup/CalculatorTest.java b/src/test/java/tdd/setup/CalculatorTest.java index 6aecdf8..4a56608 100644 --- a/src/test/java/tdd/setup/CalculatorTest.java +++ b/src/test/java/tdd/setup/CalculatorTest.java @@ -39,9 +39,11 @@ void calculatorCanDoNegative() { @DisplayName("should display result after multiplying two positive two digit numbers") void calculatorCanMultiplyTwoTwoDigitNumbers() { Calculator calc = new Calculator(); - calc.pressDigitKey(20); + calc.pressDigitKey(2); + calc.pressDigitKey(0); calc.pressOperationKey("x"); - calc.pressDigitKey(25); + calc.pressDigitKey(2); + calc.pressDigitKey(5); calc.pressEquals(); assertEquals("500", calc.readScreen()); }