From 840284ac5dd4b9c823065f0218d6742e96e43d4c Mon Sep 17 00:00:00 2001 From: FelixKopmann Date: Tue, 27 Oct 2020 17:21:47 +0100 Subject: [PATCH 01/10] all files --- src/main/java/tdd/setup/Calculator.java | 5 +++- .../tdd/setup/CalculatorRoundingTest.java | 23 +++++++++++++++++++ src/test/java/tdd/setup/CalculatorTest2.java | 22 ++++++++++++++++++ .../java/tdd/setup/MultipleOperationTest.java | 21 +++++++++++++++++ 4 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 src/test/java/tdd/setup/CalculatorRoundingTest.java create mode 100644 src/test/java/tdd/setup/CalculatorTest2.java create mode 100644 src/test/java/tdd/setup/MultipleOperationTest.java diff --git a/src/main/java/tdd/setup/Calculator.java b/src/main/java/tdd/setup/Calculator.java index 171f6d6..7992c39 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() || screen.substring(screen.length()-1).equals(".")) { screen = screen + digit; } else { latestValue = Double.parseDouble(screen); @@ -30,6 +30,9 @@ public void pressClearKey() { } public void pressOperationKey(String operation) { + if (!this.latestOperation.isEmpty()) { + pressEquals() ; + } latestOperation = operation; } diff --git a/src/test/java/tdd/setup/CalculatorRoundingTest.java b/src/test/java/tdd/setup/CalculatorRoundingTest.java new file mode 100644 index 0000000..ca9ab09 --- /dev/null +++ b/src/test/java/tdd/setup/CalculatorRoundingTest.java @@ -0,0 +1,23 @@ +package tdd.setup; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; + +@DisplayName("Retro calculator") +class CalculatorRoundingTest { + @Test + @DisplayName("should display a rounded number") + void calculatorCanDoTwoPlusTwo() { + Calculator calc = new Calculator(); + calc.pressDigitKey(1); + calc.pressDotKey(); + calc.pressDigitKey(5); + calc.pressOperationKey("+"); + calc.pressDigitKey(1); + calc.pressDotKey(); + calc.pressDigitKey(5); + calc.pressEquals(); + assertEquals("3", calc.readScreen()); + } +} diff --git a/src/test/java/tdd/setup/CalculatorTest2.java b/src/test/java/tdd/setup/CalculatorTest2.java new file mode 100644 index 0000000..7097bc3 --- /dev/null +++ b/src/test/java/tdd/setup/CalculatorTest2.java @@ -0,0 +1,22 @@ +package tdd.setup; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; + +@DisplayName("Retro calculator2") +class CalculatorTest2 { + @Test + @DisplayName("should display negative result after adding two numbers") + void calculatorCanDosixPlusTen() { + Calculator calc = new Calculator(); + calc.pressDigitKey(6); + calc.pressOperationKey("-"); + calc.pressDigitKey(9); + calc.pressEquals(); + assertEquals("-3", calc.readScreen()); + + + + } +} diff --git a/src/test/java/tdd/setup/MultipleOperationTest.java b/src/test/java/tdd/setup/MultipleOperationTest.java new file mode 100644 index 0000000..2fdd238 --- /dev/null +++ b/src/test/java/tdd/setup/MultipleOperationTest.java @@ -0,0 +1,21 @@ +package tdd.setup; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; + +@DisplayName("Retro calculator") +class MultipleOperationTest { + @Test + @DisplayName("should display a result after multiple additions") + void calculatorCanDoMultipleAddition() { + Calculator calc = new Calculator(); + calc.pressDigitKey(1); + calc.pressOperationKey("+"); + calc.pressDigitKey(3); + calc.pressOperationKey("+"); + calc.pressDigitKey(5); + calc.pressEquals(); + assertEquals("9", calc.readScreen()); + } +} From ab94000357d08263b4b409f256b83e491f03ad23 Mon Sep 17 00:00:00 2001 From: FelixKopmann <50885447+FelixKopmann@users.noreply.github.com> Date: Tue, 27 Oct 2020 17:56:36 +0100 Subject: [PATCH 02/10] Delete CalculatorTest2.java --- src/test/java/tdd/setup/CalculatorTest2.java | 22 -------------------- 1 file changed, 22 deletions(-) delete mode 100644 src/test/java/tdd/setup/CalculatorTest2.java diff --git a/src/test/java/tdd/setup/CalculatorTest2.java b/src/test/java/tdd/setup/CalculatorTest2.java deleted file mode 100644 index 7097bc3..0000000 --- a/src/test/java/tdd/setup/CalculatorTest2.java +++ /dev/null @@ -1,22 +0,0 @@ -package tdd.setup; - -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - -@DisplayName("Retro calculator2") -class CalculatorTest2 { - @Test - @DisplayName("should display negative result after adding two numbers") - void calculatorCanDosixPlusTen() { - Calculator calc = new Calculator(); - calc.pressDigitKey(6); - calc.pressOperationKey("-"); - calc.pressDigitKey(9); - calc.pressEquals(); - assertEquals("-3", calc.readScreen()); - - - - } -} From 92474dd6f01865ca13f37ca206a8576ff1eaf32c Mon Sep 17 00:00:00 2001 From: FelixKopmann <50885447+FelixKopmann@users.noreply.github.com> Date: Tue, 27 Oct 2020 17:57:04 +0100 Subject: [PATCH 03/10] Delete MultipleOperationTest.java --- .../java/tdd/setup/MultipleOperationTest.java | 21 ------------------- 1 file changed, 21 deletions(-) delete mode 100644 src/test/java/tdd/setup/MultipleOperationTest.java diff --git a/src/test/java/tdd/setup/MultipleOperationTest.java b/src/test/java/tdd/setup/MultipleOperationTest.java deleted file mode 100644 index 2fdd238..0000000 --- a/src/test/java/tdd/setup/MultipleOperationTest.java +++ /dev/null @@ -1,21 +0,0 @@ -package tdd.setup; - -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - -@DisplayName("Retro calculator") -class MultipleOperationTest { - @Test - @DisplayName("should display a result after multiple additions") - void calculatorCanDoMultipleAddition() { - Calculator calc = new Calculator(); - calc.pressDigitKey(1); - calc.pressOperationKey("+"); - calc.pressDigitKey(3); - calc.pressOperationKey("+"); - calc.pressDigitKey(5); - calc.pressEquals(); - assertEquals("9", calc.readScreen()); - } -} From d2e7c35999a7454287b9acdaa37f96cf69c8dc85 Mon Sep 17 00:00:00 2001 From: FelixKopmann <50885447+FelixKopmann@users.noreply.github.com> Date: Tue, 27 Oct 2020 17:57:22 +0100 Subject: [PATCH 04/10] Delete CalculatorRoundingTest.java --- .../tdd/setup/CalculatorRoundingTest.java | 23 ------------------- 1 file changed, 23 deletions(-) delete mode 100644 src/test/java/tdd/setup/CalculatorRoundingTest.java diff --git a/src/test/java/tdd/setup/CalculatorRoundingTest.java b/src/test/java/tdd/setup/CalculatorRoundingTest.java deleted file mode 100644 index ca9ab09..0000000 --- a/src/test/java/tdd/setup/CalculatorRoundingTest.java +++ /dev/null @@ -1,23 +0,0 @@ -package tdd.setup; - -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - -@DisplayName("Retro calculator") -class CalculatorRoundingTest { - @Test - @DisplayName("should display a rounded number") - void calculatorCanDoTwoPlusTwo() { - Calculator calc = new Calculator(); - calc.pressDigitKey(1); - calc.pressDotKey(); - calc.pressDigitKey(5); - calc.pressOperationKey("+"); - calc.pressDigitKey(1); - calc.pressDotKey(); - calc.pressDigitKey(5); - calc.pressEquals(); - assertEquals("3", calc.readScreen()); - } -} From 6ebc1a671a1b6c59e4aea4a9cdf94633666c236a Mon Sep 17 00:00:00 2001 From: FelixKopmann <50885447+FelixKopmann@users.noreply.github.com> Date: Tue, 27 Oct 2020 18:04:24 +0100 Subject: [PATCH 05/10] Update Calculator.java --- src/main/java/tdd/setup/Calculator.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/tdd/setup/Calculator.java b/src/main/java/tdd/setup/Calculator.java index 7992c39..c095e80 100644 --- a/src/main/java/tdd/setup/Calculator.java +++ b/src/main/java/tdd/setup/Calculator.java @@ -14,8 +14,8 @@ public String readScreen() { } public void pressDigitKey(int digit) { if(digit > 9 || digit < 0) throw new IllegalArgumentException(); - - if(latestOperation.isEmpty() || screen.substring(screen.length()-1).equals(".")) { +//|| screen.substring(screen.length()-1).equals(".") + if(latestOperation.isEmpty() ) { screen = screen + digit; } else { latestValue = Double.parseDouble(screen); @@ -30,9 +30,9 @@ public void pressClearKey() { } public void pressOperationKey(String operation) { - if (!this.latestOperation.isEmpty()) { - pressEquals() ; - } + // if (!this.latestOperation.isEmpty()) { + // pressEquals() ; + // } latestOperation = operation; } From 5b0d5299f8204ff97f1f47eb92012e7a42a63220 Mon Sep 17 00:00:00 2001 From: FelixKopmann Date: Tue, 27 Oct 2020 18:49:13 +0100 Subject: [PATCH 06/10] commit1 --- src/test/java/tdd/setup/CalculatorTest2.java | 22 ++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 src/test/java/tdd/setup/CalculatorTest2.java diff --git a/src/test/java/tdd/setup/CalculatorTest2.java b/src/test/java/tdd/setup/CalculatorTest2.java new file mode 100644 index 0000000..7097bc3 --- /dev/null +++ b/src/test/java/tdd/setup/CalculatorTest2.java @@ -0,0 +1,22 @@ +package tdd.setup; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; + +@DisplayName("Retro calculator2") +class CalculatorTest2 { + @Test + @DisplayName("should display negative result after adding two numbers") + void calculatorCanDosixPlusTen() { + Calculator calc = new Calculator(); + calc.pressDigitKey(6); + calc.pressOperationKey("-"); + calc.pressDigitKey(9); + calc.pressEquals(); + assertEquals("-3", calc.readScreen()); + + + + } +} From bed7765848e4c78af326d61b87c5691ee8a6e135 Mon Sep 17 00:00:00 2001 From: FelixKopmann Date: Tue, 27 Oct 2020 19:19:16 +0100 Subject: [PATCH 07/10] commit2 --- .../java/tdd/setup/MultipleOperationTest.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 src/test/java/tdd/setup/MultipleOperationTest.java diff --git a/src/test/java/tdd/setup/MultipleOperationTest.java b/src/test/java/tdd/setup/MultipleOperationTest.java new file mode 100644 index 0000000..2fdd238 --- /dev/null +++ b/src/test/java/tdd/setup/MultipleOperationTest.java @@ -0,0 +1,21 @@ +package tdd.setup; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; + +@DisplayName("Retro calculator") +class MultipleOperationTest { + @Test + @DisplayName("should display a result after multiple additions") + void calculatorCanDoMultipleAddition() { + Calculator calc = new Calculator(); + calc.pressDigitKey(1); + calc.pressOperationKey("+"); + calc.pressDigitKey(3); + calc.pressOperationKey("+"); + calc.pressDigitKey(5); + calc.pressEquals(); + assertEquals("9", calc.readScreen()); + } +} From 578720904abe84938ed42936ef5b690071231dcb Mon Sep 17 00:00:00 2001 From: FelixKopmann Date: Tue, 27 Oct 2020 19:25:54 +0100 Subject: [PATCH 08/10] commit3 --- src/main/java/tdd/setup/Calculator.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/tdd/setup/Calculator.java b/src/main/java/tdd/setup/Calculator.java index c095e80..1505291 100644 --- a/src/main/java/tdd/setup/Calculator.java +++ b/src/main/java/tdd/setup/Calculator.java @@ -30,9 +30,9 @@ public void pressClearKey() { } public void pressOperationKey(String operation) { - // if (!this.latestOperation.isEmpty()) { - // pressEquals() ; - // } + if (!this.latestOperation.isEmpty()) { + pressEquals() ; + } latestOperation = operation; } From add7c05c18a4b048abd27ffdaea821cb6e1c9a91 Mon Sep 17 00:00:00 2001 From: FelixKopmann Date: Tue, 27 Oct 2020 19:31:32 +0100 Subject: [PATCH 09/10] commit4 --- .../tdd/setup/CalculatorRoundingTest.java | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 src/test/java/tdd/setup/CalculatorRoundingTest.java diff --git a/src/test/java/tdd/setup/CalculatorRoundingTest.java b/src/test/java/tdd/setup/CalculatorRoundingTest.java new file mode 100644 index 0000000..ca9ab09 --- /dev/null +++ b/src/test/java/tdd/setup/CalculatorRoundingTest.java @@ -0,0 +1,23 @@ +package tdd.setup; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; + +@DisplayName("Retro calculator") +class CalculatorRoundingTest { + @Test + @DisplayName("should display a rounded number") + void calculatorCanDoTwoPlusTwo() { + Calculator calc = new Calculator(); + calc.pressDigitKey(1); + calc.pressDotKey(); + calc.pressDigitKey(5); + calc.pressOperationKey("+"); + calc.pressDigitKey(1); + calc.pressDotKey(); + calc.pressDigitKey(5); + calc.pressEquals(); + assertEquals("3", calc.readScreen()); + } +} From fdb761cdb9850a968942e318f513df5337c21eb4 Mon Sep 17 00:00:00 2001 From: FelixKopmann Date: Tue, 27 Oct 2020 19:38:20 +0100 Subject: [PATCH 10/10] commit5 --- src/main/java/tdd/setup/Calculator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/tdd/setup/Calculator.java b/src/main/java/tdd/setup/Calculator.java index 1505291..249f64f 100644 --- a/src/main/java/tdd/setup/Calculator.java +++ b/src/main/java/tdd/setup/Calculator.java @@ -14,8 +14,8 @@ public String readScreen() { } public void pressDigitKey(int digit) { if(digit > 9 || digit < 0) throw new IllegalArgumentException(); -//|| screen.substring(screen.length()-1).equals(".") - if(latestOperation.isEmpty() ) { + + if(latestOperation.isEmpty() || screen.substring(screen.length()-1).equals(".")) { screen = screen + digit; } else { latestValue = Double.parseDouble(screen);