From b9073b530ee8c087c2ba5b78b8f34a4b1647499e Mon Sep 17 00:00:00 2001 From: Ahmad Date: Thu, 29 Oct 2020 11:41:23 +0100 Subject: [PATCH 01/10] =?UTF-8?q?gr=C3=BCnertest?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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 3bf16e9..193d0a7 100644 --- a/src/test/java/tdd/setup/CalculatorTest.java +++ b/src/test/java/tdd/setup/CalculatorTest.java @@ -16,4 +16,14 @@ void calculatorCanDoTwoPlusTwo() { calc.pressEquals(); assertEquals("4", calc.readScreen()); } + @Test + @DisplayName("mein test") + void calculatorCanDoTwoMinusTwo() { + Calculator calc = new Calculator(); + calc.pressDigitKey(2); + calc.pressOperationKey("-"); + calc.pressDigitKey(2); + calc.pressEquals(); + assertEquals("0", calc.readScreen()); + } } From 85c3d01d706b6773be655965ab21c818af06ae26 Mon Sep 17 00:00:00 2001 From: Ahmad Date: Thu, 29 Oct 2020 18:28:03 +0100 Subject: [PATCH 02/10] roter test --- src/main/main.iml | 11 +++++++++++ src/test/java/tdd/setup/CalculatorTest.java | 13 +++++++++++++ src/test/test.iml | 11 +++++++++++ 3 files changed, 35 insertions(+) create mode 100644 src/main/main.iml create mode 100644 src/test/test.iml diff --git a/src/main/main.iml b/src/main/main.iml new file mode 100644 index 0000000..2185ddd --- /dev/null +++ b/src/main/main.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/java/tdd/setup/CalculatorTest.java b/src/test/java/tdd/setup/CalculatorTest.java index 193d0a7..74bb958 100644 --- a/src/test/java/tdd/setup/CalculatorTest.java +++ b/src/test/java/tdd/setup/CalculatorTest.java @@ -26,4 +26,17 @@ void calculatorCanDoTwoMinusTwo() { calc.pressEquals(); assertEquals("0", calc.readScreen()); } + @Test + @DisplayName("mein test") + void calculatorCanDoEightyPlusTwenty() { + Calculator calc = new Calculator(); + calc.pressDigitKey(8); + calc.pressDigitKey(0); + calc.pressOperationKey("+"); + calc.pressDigitKey(2); + calc.pressDigitKey(0); + calc.pressEquals(); + assertEquals("100", calc.readScreen()); + } + } diff --git a/src/test/test.iml b/src/test/test.iml new file mode 100644 index 0000000..9077291 --- /dev/null +++ b/src/test/test.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file From 3fa24fdcef0ca82916901252a601d8987b3b2a1d Mon Sep 17 00:00:00 2001 From: Ahmad Date: Thu, 29 Oct 2020 20:05:55 +0100 Subject: [PATCH 03/10] =?UTF-8?q?bug=20fix=20f=C3=BCr=20den=20ersten=20rot?= =?UTF-8?q?en=20test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/tdd/setup/Calculator.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/tdd/setup/Calculator.java b/src/main/java/tdd/setup/Calculator.java index 171f6d6..ff67116 100644 --- a/src/main/java/tdd/setup/Calculator.java +++ b/src/main/java/tdd/setup/Calculator.java @@ -1,5 +1,7 @@ package tdd.setup; +import com.sun.source.tree.ClassTree; + // behaviour inspired by https://www.online-calculator.com/ public class Calculator { @@ -18,8 +20,12 @@ public void pressDigitKey(int digit) { if(latestOperation.isEmpty()) { screen = screen + digit; } else { - latestValue = Double.parseDouble(screen); - screen = Integer.toString(digit); + if (latestValue == 0) { + latestValue = Double.parseDouble(screen); + screen = "0"; + } + screen = screen + digit; + } } From f0baf700363eb20b795c2f8c98f0ceccfeab7779 Mon Sep 17 00:00:00 2001 From: Ahmad Date: Thu, 29 Oct 2020 20:09:44 +0100 Subject: [PATCH 04/10] =?UTF-8?q?unn=C3=B6tigen=20import=20gel=C3=B6scht?= 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 deletion(-) diff --git a/src/main/java/tdd/setup/Calculator.java b/src/main/java/tdd/setup/Calculator.java index ff67116..728d6b8 100644 --- a/src/main/java/tdd/setup/Calculator.java +++ b/src/main/java/tdd/setup/Calculator.java @@ -1,6 +1,5 @@ package tdd.setup; -import com.sun.source.tree.ClassTree; // behaviour inspired by https://www.online-calculator.com/ public class Calculator { From cf10061bb36028b58dec984e84666a01cbc3e1bc Mon Sep 17 00:00:00 2001 From: Ahmad Date: Thu, 29 Oct 2020 20:27:30 +0100 Subject: [PATCH 05/10] 2. roter 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 74bb958..7821afe 100644 --- a/src/test/java/tdd/setup/CalculatorTest.java +++ b/src/test/java/tdd/setup/CalculatorTest.java @@ -38,5 +38,13 @@ void calculatorCanDoEightyPlusTwenty() { calc.pressEquals(); assertEquals("100", calc.readScreen()); } + @Test + @DisplayName("mein test") + void calculatorCanDoJustTwo() { + Calculator calc = new Calculator(); + calc.pressDigitKey(2); + calc.pressEquals(); + assertEquals("2", calc.readScreen()); + } } From 4929663dd024faab919bf25f8d7061c8a513c385 Mon Sep 17 00:00:00 2001 From: Ahmad Date: Thu, 29 Oct 2020 20:33:02 +0100 Subject: [PATCH 06/10] 2. bugfix --- 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 728d6b8..b0c7ebe 100644 --- a/src/main/java/tdd/setup/Calculator.java +++ b/src/main/java/tdd/setup/Calculator.java @@ -52,6 +52,7 @@ public void pressEquals() { case "-" -> latestValue - Double.parseDouble(screen); case "x" -> latestValue * Double.parseDouble(screen); case "/" -> latestValue / Double.parseDouble(screen); + case "" -> latestValue = Double.parseDouble(screen); default -> throw new IllegalArgumentException(); }; screen = Double.toString(result); From 7e5cb2b8c93ee8a0e4a502b843c1a5c3b9377916 Mon Sep 17 00:00:00 2001 From: Ahmad Date: Fri, 30 Oct 2020 09:42:51 +0100 Subject: [PATCH 07/10] roter test press clear --- src/test/java/tdd/setup/CalculatorTest.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/test/java/tdd/setup/CalculatorTest.java b/src/test/java/tdd/setup/CalculatorTest.java index 7821afe..ea5a351 100644 --- a/src/test/java/tdd/setup/CalculatorTest.java +++ b/src/test/java/tdd/setup/CalculatorTest.java @@ -16,6 +16,7 @@ void calculatorCanDoTwoPlusTwo() { calc.pressEquals(); assertEquals("4", calc.readScreen()); } + @Test @DisplayName("mein test") void calculatorCanDoTwoMinusTwo() { @@ -26,6 +27,7 @@ void calculatorCanDoTwoMinusTwo() { calc.pressEquals(); assertEquals("0", calc.readScreen()); } + @Test @DisplayName("mein test") void calculatorCanDoEightyPlusTwenty() { @@ -38,6 +40,7 @@ void calculatorCanDoEightyPlusTwenty() { calc.pressEquals(); assertEquals("100", calc.readScreen()); } + @Test @DisplayName("mein test") void calculatorCanDoJustTwo() { @@ -47,4 +50,13 @@ void calculatorCanDoJustTwo() { assertEquals("2", calc.readScreen()); } + @Test + @DisplayName("mein test") + void calculatorCanDoClear() { + Calculator calc = new Calculator(); + calc.pressDigitKey(2); + calc.pressClear(); + assertEquals("0", calc.readScreen()); + } } + From 1dbc07d8b40b6743bfb75647e53e953af8ee78af Mon Sep 17 00:00:00 2001 From: Ahmad Date: Fri, 30 Oct 2020 09:52:38 +0100 Subject: [PATCH 08/10] press clear bug fix --- src/main/java/tdd/setup/Calculator.java | 1 + src/test/java/tdd/setup/CalculatorTest.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/tdd/setup/Calculator.java b/src/main/java/tdd/setup/Calculator.java index b0c7ebe..129bff8 100644 --- a/src/main/java/tdd/setup/Calculator.java +++ b/src/main/java/tdd/setup/Calculator.java @@ -53,6 +53,7 @@ public void pressEquals() { case "x" -> latestValue * Double.parseDouble(screen); case "/" -> latestValue / Double.parseDouble(screen); case "" -> latestValue = Double.parseDouble(screen); + //case "" -> latestValue Double.parseDouble(screen); default -> throw new IllegalArgumentException(); }; screen = Double.toString(result); diff --git a/src/test/java/tdd/setup/CalculatorTest.java b/src/test/java/tdd/setup/CalculatorTest.java index ea5a351..878d49d 100644 --- a/src/test/java/tdd/setup/CalculatorTest.java +++ b/src/test/java/tdd/setup/CalculatorTest.java @@ -55,7 +55,7 @@ void calculatorCanDoJustTwo() { void calculatorCanDoClear() { Calculator calc = new Calculator(); calc.pressDigitKey(2); - calc.pressClear(); + calc.pressClearKey(); assertEquals("0", calc.readScreen()); } } From 61cf3b60e9f9037326e97c2e14cbaf3cab31146b Mon Sep 17 00:00:00 2001 From: Ahmad Date: Fri, 30 Oct 2020 11:18:53 +0100 Subject: [PATCH 09/10] roter test press 2x dot --- src/main/java/tdd/setup/Calculator.java | 2 ++ src/test/java/tdd/setup/CalculatorTest.java | 35 ++++++++++++++++++--- 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/src/main/java/tdd/setup/Calculator.java b/src/main/java/tdd/setup/Calculator.java index 129bff8..96c0358 100644 --- a/src/main/java/tdd/setup/Calculator.java +++ b/src/main/java/tdd/setup/Calculator.java @@ -6,6 +6,7 @@ public class Calculator { private String screen = "0"; + private double latestValue; private String latestOperation = ""; @@ -44,6 +45,7 @@ public void pressDotKey() { public void pressNegative() { screen = screen.startsWith("-") ? screen.substring(1) : "-" + screen; + } public void pressEquals() { diff --git a/src/test/java/tdd/setup/CalculatorTest.java b/src/test/java/tdd/setup/CalculatorTest.java index 878d49d..36edc6f 100644 --- a/src/test/java/tdd/setup/CalculatorTest.java +++ b/src/test/java/tdd/setup/CalculatorTest.java @@ -18,7 +18,7 @@ void calculatorCanDoTwoPlusTwo() { } @Test - @DisplayName("mein test") + @DisplayName("mein test1") void calculatorCanDoTwoMinusTwo() { Calculator calc = new Calculator(); calc.pressDigitKey(2); @@ -29,7 +29,7 @@ void calculatorCanDoTwoMinusTwo() { } @Test - @DisplayName("mein test") + @DisplayName("mein test2") void calculatorCanDoEightyPlusTwenty() { Calculator calc = new Calculator(); calc.pressDigitKey(8); @@ -42,7 +42,7 @@ void calculatorCanDoEightyPlusTwenty() { } @Test - @DisplayName("mein test") + @DisplayName("mein test3") void calculatorCanDoJustTwo() { Calculator calc = new Calculator(); calc.pressDigitKey(2); @@ -51,12 +51,37 @@ void calculatorCanDoJustTwo() { } @Test - @DisplayName("mein test") + @DisplayName("mein test4") void calculatorCanDoClear() { Calculator calc = new Calculator(); calc.pressDigitKey(2); + calc.pressOperationKey("-"); + calc.pressDigitKey(3); calc.pressClearKey(); assertEquals("0", calc.readScreen()); } -} + + @Test + @DisplayName("mein test5") + void calculatorCanDoNegative() { + Calculator calc = new Calculator(); + calc.pressNegative(); + calc.pressDigitKey(2); + calc.pressEquals(); + assertEquals("-2", calc.readScreen()); + } + + @Test + @DisplayName("mein test6") + void calculatorCanDot() { + Calculator calc = new Calculator(); + calc.pressDigitKey(0); + calc.pressDotKey(); + calc.pressDigitKey(2); + calc.pressDotKey(); + calc.pressEquals(); + assertEquals("0.2", calc.readScreen()); + } + + } From eafc977be6dd9ea53395d53c85343d0ec6ab8df8 Mon Sep 17 00:00:00 2001 From: Ahmad Date: Fri, 30 Oct 2020 12:20:17 +0100 Subject: [PATCH 10/10] bug fix press 2x dot --- 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 96c0358..480f4e1 100644 --- a/src/main/java/tdd/setup/Calculator.java +++ b/src/main/java/tdd/setup/Calculator.java @@ -40,7 +40,7 @@ public void pressOperationKey(String operation) { } public void pressDotKey() { - if(!screen.endsWith(".")) screen = screen + "."; + if(!screen.contains(".")) screen = screen + "."; } public void pressNegative() {