From 70b5dbcfd1e92886af60cc7c7e112b6c9dd3b357 Mon Sep 17 00:00:00 2001 From: Lauramuecke Date: Sat, 31 Oct 2020 15:54:06 +0100 Subject: [PATCH 1/5] =?UTF-8?q?zweiter=20gr=C3=BCner=20Test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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 3bf16e9..e385915 100644 --- a/src/test/java/tdd/setup/CalculatorTest.java +++ b/src/test/java/tdd/setup/CalculatorTest.java @@ -16,4 +16,15 @@ void calculatorCanDoTwoPlusTwo() { calc.pressEquals(); assertEquals("4", calc.readScreen()); } + @Test + @DisplayName("should display clear result after divide two positive numbers") + void calculatorCanClearDisplay() { + Calculator calc = new Calculator(); + calc.pressDigitKey(3); + calc.pressOperationKey("/"); + calc.pressDigitKey(2); + calc.pressEquals(); + calc.pressClearKey(); + assertEquals("0", calc.readScreen()); + } } From e7469e2552aead40d13ba8f7890c2783ba1ead9a Mon Sep 17 00:00:00 2001 From: Lauramuecke Date: Sat, 31 Oct 2020 15:56:47 +0100 Subject: [PATCH 2/5] erster roter Test --- src/test/java/tdd/setup/CalculatorTest.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/test/java/tdd/setup/CalculatorTest.java b/src/test/java/tdd/setup/CalculatorTest.java index e385915..aad799b 100644 --- a/src/test/java/tdd/setup/CalculatorTest.java +++ b/src/test/java/tdd/setup/CalculatorTest.java @@ -27,4 +27,13 @@ void calculatorCanClearDisplay() { calc.pressClearKey(); assertEquals("0", calc.readScreen()); } + @Test + @DisplayName("New Button for Fractional") + void calculatorFractional() { + Calculator calc = new Calculator(); + calc.pressDigitKey(3); + calc.pressOperationKey("1/x"); + calc.pressEquals(); + assertEquals("0.3333333333333333", calc.readScreen()); + } } From 23ef8b44d472703d3be1319e2581bfd7c3e24317 Mon Sep 17 00:00:00 2001 From: Lauramuecke Date: Sat, 31 Oct 2020 15:59:39 +0100 Subject: [PATCH 3/5] =?UTF-8?q?Bugfix=20f=C3=BCr=20erster=20roter=20Test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/tdd/setup/Calculator.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/tdd/setup/Calculator.java b/src/main/java/tdd/setup/Calculator.java index 171f6d6..e499d2e 100644 --- a/src/main/java/tdd/setup/Calculator.java +++ b/src/main/java/tdd/setup/Calculator.java @@ -47,6 +47,7 @@ public void pressEquals() { case "-" -> latestValue - Double.parseDouble(screen); case "x" -> latestValue * Double.parseDouble(screen); case "/" -> latestValue / Double.parseDouble(screen); + case "1/x" -> 1 / Double.parseDouble(screen); default -> throw new IllegalArgumentException(); }; screen = Double.toString(result); From 291fa5e26f4be58c045adaf58f89fd1d7384fb2d Mon Sep 17 00:00:00 2001 From: Lauramuecke Date: Sat, 31 Oct 2020 16:03:23 +0100 Subject: [PATCH 4/5] zweiter roter Test --- src/test/java/tdd/setup/CalculatorTest.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/test/java/tdd/setup/CalculatorTest.java b/src/test/java/tdd/setup/CalculatorTest.java index aad799b..e7062fd 100644 --- a/src/test/java/tdd/setup/CalculatorTest.java +++ b/src/test/java/tdd/setup/CalculatorTest.java @@ -36,4 +36,13 @@ void calculatorFractional() { calc.pressEquals(); assertEquals("0.3333333333333333", calc.readScreen()); } + + @Test + @DisplayName("Processing negative numbers") + void calculatorNegativeNumbers() { + Calculator calc = new Calculator(); + calc.pressDigitKey(9); + calc.pressNegative(); + assertEquals("-9", calc.readScreen()); + } } From 41372ba2ee2a6a7472aff2e4f54620abaf053739 Mon Sep 17 00:00:00 2001 From: Lauramuecke Date: Sat, 31 Oct 2020 16:07:59 +0100 Subject: [PATCH 5/5] =?UTF-8?q?Bugfix=20f=C3=BCr=20zweiter=20roter=20Test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/tdd/setup/Calculator.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/tdd/setup/Calculator.java b/src/main/java/tdd/setup/Calculator.java index e499d2e..0be3c90 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; @@ -37,8 +37,11 @@ public void pressDotKey() { if(!screen.endsWith(".")) screen = screen + "."; } - public void pressNegative() { - screen = screen.startsWith("-") ? screen.substring(1) : "-" + screen; + public void pressNegative(){ + if(!screen.startsWith("-")) screen = "-" + screen; + else { + if (!screen.endsWith("-")) screen = screen + "-"; + } } public void pressEquals() {