From bc3ad288f07a30d8a16271db5623dd718ef83bce Mon Sep 17 00:00:00 2001 From: LennardZuendorf Date: Thu, 29 Oct 2020 11:23:05 +0100 Subject: [PATCH 1/5] C.01 - GreenTest1 --- 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..674afa6 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("Test: should display result after multiplying two positive numbers") + void calculatorCanMultiplicate() { + Calculator calc = new Calculator(); + calc.pressDigitKey(3); + calc.pressOperationKey("x"); + calc.pressDigitKey(4); + calc.pressEquals(); + assertEquals("12", calc.readScreen()); + } } From 4cf3068493a304fb2cb866b020aff344e6bc7e95 Mon Sep 17 00:00:00 2001 From: LennardZuendorf Date: Thu, 29 Oct 2020 11:31:30 +0100 Subject: [PATCH 2/5] C.02 - RedTest1 --- src/test/java/tdd/setup/CalculatorTest.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/test/java/tdd/setup/CalculatorTest.java b/src/test/java/tdd/setup/CalculatorTest.java index 674afa6..6374fc4 100644 --- a/src/test/java/tdd/setup/CalculatorTest.java +++ b/src/test/java/tdd/setup/CalculatorTest.java @@ -27,4 +27,19 @@ void calculatorCanMultiplicate() { calc.pressEquals(); assertEquals("12", calc.readScreen()); } + + @Test + @DisplayName("Test: should display result after double using pressNegative") + void calculatorUsesMinusCorrectly() { + Calculator calc = new Calculator(); + calc.pressDigitKey(5); + calc.pressNegative(); + calc.pressNegative(); + calc.pressOperationKey("x"); + calc.pressDigitKey(4); + calc.pressNegative(); + calc.pressEquals(); + assertEquals("20", calc.readScreen()); + + } } From 0ee0940df018cf70ad01c5100eef0a4956935b89 Mon Sep 17 00:00:00 2001 From: LennardZuendorf Date: Thu, 29 Oct 2020 11:34:57 +0100 Subject: [PATCH 3/5] C.03 - BugFixRedTest1 --- 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 171f6d6..7cb4d1f 100644 --- a/src/main/java/tdd/setup/Calculator.java +++ b/src/main/java/tdd/setup/Calculator.java @@ -38,7 +38,7 @@ public void pressDotKey() { } public void pressNegative() { - screen = screen.startsWith("-") ? screen.substring(1) : "-" + screen; + if (!screen.startsWith("-")) screen = "-" + screen; } public void pressEquals() { From 3664fac4bc7c84075640fb3ecd7f4ac16ef9360b Mon Sep 17 00:00:00 2001 From: LennardZuendorf Date: Thu, 29 Oct 2020 11:36:04 +0100 Subject: [PATCH 4/5] C.04 - RedTest2 --- src/test/java/tdd/setup/CalculatorTest.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/test/java/tdd/setup/CalculatorTest.java b/src/test/java/tdd/setup/CalculatorTest.java index 6374fc4..af0c9c3 100644 --- a/src/test/java/tdd/setup/CalculatorTest.java +++ b/src/test/java/tdd/setup/CalculatorTest.java @@ -42,4 +42,18 @@ void calculatorUsesMinusCorrectly() { assertEquals("20", calc.readScreen()); } + + @Test + @DisplayName("Test: should display result after double using pressDotKey") + void calculatorCanClearContents() { + Calculator calc = new Calculator(); + calc.pressDigitKey(3); + calc.pressDotKey(); + calc.pressDigitKey(5); + calc.pressDotKey(); + calc.pressOperationKey("x"); + calc.pressDigitKey(4); + calc.pressEquals(); + assertEquals("14", calc.readScreen()); + } } From f8f3943b86c14a7a8c4b59aafcc6cbb4b2e5647d Mon Sep 17 00:00:00 2001 From: LennardZuendorf Date: Thu, 29 Oct 2020 11:36:53 +0100 Subject: [PATCH 5/5] C.05 - BugFixRedTest2 --- 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 7cb4d1f..f0c12b7 100644 --- a/src/main/java/tdd/setup/Calculator.java +++ b/src/main/java/tdd/setup/Calculator.java @@ -34,7 +34,7 @@ public void pressOperationKey(String operation) { } public void pressDotKey() { - if(!screen.endsWith(".")) screen = screen + "."; + if (!screen.contains(".")) screen = screen + "."; } public void pressNegative() {