From ad146bb4d7acae2727bc9273de346a2f76a78b36 Mon Sep 17 00:00:00 2001 From: Biiichngoooc Date: Thu, 29 Oct 2020 20:33:23 +0100 Subject: [PATCH 1/5] =?UTF-8?q?1.neuer=20gr=C3=BCner=20Test=20mit=20Clear-?= =?UTF-8?q?Button?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/test/java/tdd/setup/CalculatorTest.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/test/java/tdd/setup/CalculatorTest.java b/src/test/java/tdd/setup/CalculatorTest.java index 3bf16e9..f9ac8e0 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 0 after pressing the clear key") + void calculatorCanDoClear() { + Calculator calc = new Calculator(); + calc.pressDigitKey(2); + calc.pressOperationKey("x"); + calc.pressDigitKey(5); + calc.pressEquals(); + calc.pressClearKey(); + assertEquals("0", calc.readScreen()); + } + } From 3e1371c91b49b2c1c848dfcaa134764029c2ad04 Mon Sep 17 00:00:00 2001 From: Biiichngoooc Date: Thu, 29 Oct 2020 20:34:51 +0100 Subject: [PATCH 2/5] 2.neuer roter Test mit Dot-Button --- 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 f9ac8e0..8d578bc 100644 --- a/src/test/java/tdd/setup/CalculatorTest.java +++ b/src/test/java/tdd/setup/CalculatorTest.java @@ -29,4 +29,15 @@ void calculatorCanDoClear() { assertEquals("0", calc.readScreen()); } + @Test + @DisplayName("should display result after pressing a dezimal number") + void calculatorCanDoDotKey() { + Calculator calc = new Calculator(); + calc.pressDigitKey(0); + calc.pressDotKey(); + calc.pressDigitKey(1); + assertEquals("0.1", calc.readScreen()); + } + + } From cbc3003fa81e569b1969864ca4568a734b9fc3f7 Mon Sep 17 00:00:00 2001 From: Biiichngoooc Date: Thu, 29 Oct 2020 20:36:26 +0100 Subject: [PATCH 3/5] 3.Fix zu rotem Test mit Dot-Button --- src/main/java/tdd/setup/Calculator.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/tdd/setup/Calculator.java b/src/main/java/tdd/setup/Calculator.java index 171f6d6..0c71cfb 100644 --- a/src/main/java/tdd/setup/Calculator.java +++ b/src/main/java/tdd/setup/Calculator.java @@ -16,7 +16,10 @@ public void pressDigitKey(int digit) { if(digit > 9 || digit < 0) throw new IllegalArgumentException(); if(latestOperation.isEmpty()) { - screen = screen + digit; + if (screen == "0") + screen = Integer.toString(digit); + else screen = screen + digit; + } else { latestValue = Double.parseDouble(screen); screen = Integer.toString(digit); From 6b32b38e3de47b1b3b369fc2b03d2f2bf7f41398 Mon Sep 17 00:00:00 2001 From: Biiichngoooc Date: Thu, 29 Oct 2020 20:37:55 +0100 Subject: [PATCH 4/5] 4.weiterer neuer roter Test mit Negativ-Button --- src/test/java/tdd/setup/CalculatorTest.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/test/java/tdd/setup/CalculatorTest.java b/src/test/java/tdd/setup/CalculatorTest.java index 8d578bc..d0c6359 100644 --- a/src/test/java/tdd/setup/CalculatorTest.java +++ b/src/test/java/tdd/setup/CalculatorTest.java @@ -39,5 +39,15 @@ void calculatorCanDoDotKey() { assertEquals("0.1", calc.readScreen()); } + @Test + @DisplayName("should display result after pressing a negative number") + void calculatorCanDoNegative() { + Calculator calc = new Calculator(); + calc.pressNegative(); + calc.pressDigitKey(5); + assertEquals("-5", calc.readScreen()); + } + + } From fff7df2777608f3b123b5d8d5c62ec9ab5208fc4 Mon Sep 17 00:00:00 2001 From: Biiichngoooc Date: Thu, 29 Oct 2020 20:39:02 +0100 Subject: [PATCH 5/5] 5. Fix zu diesem Test mit Negativ-Button --- 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 0c71cfb..1bebc53 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;