From 509efc71262d042c984a7d57d4d437b95cefa377 Mon Sep 17 00:00:00 2001 From: phamquochuy2905 <72949558+phamquochuy2905@users.noreply.github.com> Date: Thu, 29 Oct 2020 15:20:27 +0100 Subject: [PATCH 01/14] Update CalculatorTest.java MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit neuer grüner Test --- 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..fd5c21f 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 + // neuer grüner Test + void calculatorCanDoTwoMinusTwo() { + Calculator calc = new Calculator(); + calc.pressDigitKey(2); + calc.pressOperationKey("-"); + calc.pressDigitKey(2); + calc.pressEquals(); + assertEquals("0", calc.readScreen()); } From 792fffcf547a1972d76856263208bd9d84b06c30 Mon Sep 17 00:00:00 2001 From: phamquochuy2905 <72949558+phamquochuy2905@users.noreply.github.com> Date: Thu, 29 Oct 2020 15:23:47 +0100 Subject: [PATCH 02/14] neuer roter Test neuer roter Test --- 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 fd5c21f..9ebc7bd 100644 --- a/src/test/java/tdd/setup/CalculatorTest.java +++ b/src/test/java/tdd/setup/CalculatorTest.java @@ -26,4 +26,14 @@ void calculatorCanDoTwoMinusTwo() { calc.pressDigitKey(2); calc.pressEquals(); assertEquals("0", calc.readScreen()); + } + @Test + // neuer roter Test + void calculatorPercentage() { + Calculator calc = new Calculator(); + calc.pressDigitKey(5); + calc.pressDigitKey(0); + calc.pressOperationKey("%"); + assertEquals("0.5", calc.readScreen()); + } } From e2a57587265c491fcd2743133eb74d2bcd95c440 Mon Sep 17 00:00:00 2001 From: phamquochuy2905 <72949558+phamquochuy2905@users.noreply.github.com> Date: Thu, 29 Oct 2020 15:25:23 +0100 Subject: [PATCH 03/14] Bugfix zum 1.Test Bugfix zum 1.Test --- src/main/java/tdd/setup/Calculator.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/tdd/setup/Calculator.java b/src/main/java/tdd/setup/Calculator.java index 171f6d6..271a0db 100644 --- a/src/main/java/tdd/setup/Calculator.java +++ b/src/main/java/tdd/setup/Calculator.java @@ -30,7 +30,15 @@ public void pressClearKey() { } public void pressOperationKey(String operation) { - latestOperation = operation; + //Bugfix zum 1.Test + if(operation != "%") { + latestOperation = operation; + } + else { var result = Double.parseDouble(screen) / 100; + screen = Double.toString(result); + if(screen.endsWith(".0")) + screen = screen.substring(0, screen.length()-1); + } } public void pressDotKey() { From 279406f36d7358edabcbd2b0bd6c41b78e3bc2fc Mon Sep 17 00:00:00 2001 From: phamquochuy2905 <72949558+phamquochuy2905@users.noreply.github.com> Date: Thu, 29 Oct 2020 15:26:29 +0100 Subject: [PATCH 04/14] 2.Roter Test 2.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 9ebc7bd..3b6aaf2 100644 --- a/src/test/java/tdd/setup/CalculatorTest.java +++ b/src/test/java/tdd/setup/CalculatorTest.java @@ -36,4 +36,13 @@ void calculatorPercentage() { calc.pressOperationKey("%"); assertEquals("0.5", calc.readScreen()); } + + @Test + // 2.roter Test + void NumberStartsWith0() { + Calculator calc = new Calculator(); + calc.pressDigitKey(2); + calc.pressDigitKey(0); + assertEquals("20", calc.readScreen()); + } } From 113f9de08505451c6d10abc5411ff76f845ec22c Mon Sep 17 00:00:00 2001 From: phamquochuy2905 <72949558+phamquochuy2905@users.noreply.github.com> Date: Thu, 29 Oct 2020 15:27:46 +0100 Subject: [PATCH 05/14] Bugfix zum 2.Test Bugfix zum 2.Test --- src/main/java/tdd/setup/Calculator.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/tdd/setup/Calculator.java b/src/main/java/tdd/setup/Calculator.java index 271a0db..9c7bcc6 100644 --- a/src/main/java/tdd/setup/Calculator.java +++ b/src/main/java/tdd/setup/Calculator.java @@ -13,6 +13,10 @@ public String readScreen() { return screen; } public void pressDigitKey(int digit) { + + //Bugfix zum 2.Test + if(digit != 0 && screen.startsWith("0")) screen = ""; + if(digit > 9 || digit < 0) throw new IllegalArgumentException(); if(latestOperation.isEmpty()) { From 47237d20ee1518b3c63bc51f84aafd237335367d Mon Sep 17 00:00:00 2001 From: phamquochuy2905 <72949558+phamquochuy2905@users.noreply.github.com> Date: Fri, 30 Oct 2020 14:54:30 +0100 Subject: [PATCH 06/14] 3.roter Test 3.roter Test --- 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 3b6aaf2..6ce9a60 100644 --- a/src/test/java/tdd/setup/CalculatorTest.java +++ b/src/test/java/tdd/setup/CalculatorTest.java @@ -45,4 +45,17 @@ void NumberStartsWith0() { calc.pressDigitKey(0); assertEquals("20", calc.readScreen()); } + + @Test + // 3.roter Test + void DotTest() { + Calculator calc = new Calculator(); + calc.pressDotKey(); + calc.pressDigitKey(5); + calc.pressOperationKey("x"); + calc.pressDotKey(); + calc.pressDigitKey(2); + calc.pressEquals(); + assertEquals("0.1", calc.readScreen()); + } } From 42aa913cbc5afc161f8e57e99fe264c455a12e63 Mon Sep 17 00:00:00 2001 From: phamquochuy2905 <72949558+phamquochuy2905@users.noreply.github.com> Date: Fri, 30 Oct 2020 15:15:00 +0100 Subject: [PATCH 07/14] Bugfix zum 3.Test --- src/main/java/tdd/setup/Calculator.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/tdd/setup/Calculator.java b/src/main/java/tdd/setup/Calculator.java index 9c7bcc6..4d58a99 100644 --- a/src/main/java/tdd/setup/Calculator.java +++ b/src/main/java/tdd/setup/Calculator.java @@ -24,6 +24,12 @@ public void pressDigitKey(int digit) { } else { latestValue = Double.parseDouble(screen); screen = Integer.toString(digit); + //Bugfix zum 3.Test + if(!screen.contains(".")){ + screen = Integer.toString(digit); + } else { + screen = "0" + "." + digit; + } } } @@ -47,6 +53,8 @@ public void pressOperationKey(String operation) { public void pressDotKey() { if(!screen.endsWith(".")) screen = screen + "."; + //Bugfix zum 3.Test + if(!screen.contains(".")) screen = screen + "."; } public void pressNegative() { From 9e23709d84b498ba061338edbece1cbe68567169 Mon Sep 17 00:00:00 2001 From: phamquochuy2905 <72949558+phamquochuy2905@users.noreply.github.com> Date: Fri, 30 Oct 2020 15:40:15 +0100 Subject: [PATCH 08/14] 3.Fix --- src/main/java/tdd/setup/Calculator.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/tdd/setup/Calculator.java b/src/main/java/tdd/setup/Calculator.java index 4d58a99..e6c7a64 100644 --- a/src/main/java/tdd/setup/Calculator.java +++ b/src/main/java/tdd/setup/Calculator.java @@ -23,7 +23,6 @@ public void pressDigitKey(int digit) { screen = screen + digit; } else { latestValue = Double.parseDouble(screen); - screen = Integer.toString(digit); //Bugfix zum 3.Test if(!screen.contains(".")){ screen = Integer.toString(digit); @@ -52,7 +51,6 @@ public void pressOperationKey(String operation) { } public void pressDotKey() { - if(!screen.endsWith(".")) screen = screen + "."; //Bugfix zum 3.Test if(!screen.contains(".")) screen = screen + "."; } From 3b4f2c356c33eaafc9491e01886d2ff06ce9d6c9 Mon Sep 17 00:00:00 2001 From: phamquochuy2905 <72949558+phamquochuy2905@users.noreply.github.com> Date: Sat, 31 Oct 2020 13:38:03 +0100 Subject: [PATCH 09/14] 3.Fix 31.10.2020 --- src/main/java/tdd/setup/Calculator.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/tdd/setup/Calculator.java b/src/main/java/tdd/setup/Calculator.java index e6c7a64..12eb9d9 100644 --- a/src/main/java/tdd/setup/Calculator.java +++ b/src/main/java/tdd/setup/Calculator.java @@ -14,16 +14,15 @@ public String readScreen() { } public void pressDigitKey(int digit) { - //Bugfix zum 2.Test - if(digit != 0 && screen.startsWith("0")) screen = ""; - if(digit > 9 || digit < 0) throw new IllegalArgumentException(); if(latestOperation.isEmpty()) { screen = screen + digit; } else { latestValue = Double.parseDouble(screen); + //Bugfix zum 3.Test + if(!screen.contains(".")){ screen = Integer.toString(digit); } else { From 21359c05937b99829ad76a1d4bfaeb03f3f97612 Mon Sep 17 00:00:00 2001 From: phamquochuy2905 <72949558+phamquochuy2905@users.noreply.github.com> Date: Sat, 31 Oct 2020 13:52:22 +0100 Subject: [PATCH 10/14] Fix 3.Fix --- src/main/java/tdd/setup/Calculator.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/tdd/setup/Calculator.java b/src/main/java/tdd/setup/Calculator.java index 12eb9d9..854de0e 100644 --- a/src/main/java/tdd/setup/Calculator.java +++ b/src/main/java/tdd/setup/Calculator.java @@ -18,15 +18,13 @@ public void pressDigitKey(int digit) { if(latestOperation.isEmpty()) { screen = screen + digit; + } else { latestValue = Double.parseDouble(screen); - - //Bugfix zum 3.Test - if(!screen.contains(".")){ - screen = Integer.toString(digit); - } else { - screen = "0" + "." + digit; + screen = Integer.toString(digit); + } else { + screen = "0" + "." + digit; } } } From 8c1130fe65d7f39e7676b9568e2577f8f43357e4 Mon Sep 17 00:00:00 2001 From: phamquochuy2905 <72949558+phamquochuy2905@users.noreply.github.com> Date: Sat, 31 Oct 2020 14:09:02 +0100 Subject: [PATCH 11/14] Dot Roter Test --- src/test/java/tdd/setup/CalculatorTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/test/java/tdd/setup/CalculatorTest.java b/src/test/java/tdd/setup/CalculatorTest.java index 6ce9a60..b79cf41 100644 --- a/src/test/java/tdd/setup/CalculatorTest.java +++ b/src/test/java/tdd/setup/CalculatorTest.java @@ -48,7 +48,7 @@ void NumberStartsWith0() { @Test // 3.roter Test - void DotTest() { + void Dot() { Calculator calc = new Calculator(); calc.pressDotKey(); calc.pressDigitKey(5); @@ -57,5 +57,6 @@ void DotTest() { calc.pressDigitKey(2); calc.pressEquals(); assertEquals("0.1", calc.readScreen()); - } + } + } From 8cf6e383651b8b205128720df1c9788c4fc5ecb0 Mon Sep 17 00:00:00 2001 From: phamquochuy2905 <72949558+phamquochuy2905@users.noreply.github.com> Date: Sat, 31 Oct 2020 14:11:07 +0100 Subject: [PATCH 12/14] Bugfix zum Dot Roten Test --- src/main/java/tdd/setup/Calculator.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/tdd/setup/Calculator.java b/src/main/java/tdd/setup/Calculator.java index 854de0e..4046eb3 100644 --- a/src/main/java/tdd/setup/Calculator.java +++ b/src/main/java/tdd/setup/Calculator.java @@ -18,8 +18,8 @@ public void pressDigitKey(int digit) { if(latestOperation.isEmpty()) { screen = screen + digit; - - } else { + //Bugfix zum Dot Roten Test + } else { latestValue = Double.parseDouble(screen); if(!screen.contains(".")){ screen = Integer.toString(digit); @@ -27,6 +27,7 @@ public void pressDigitKey(int digit) { screen = "0" + "." + digit; } } + } public void pressClearKey() { @@ -48,7 +49,7 @@ public void pressOperationKey(String operation) { } public void pressDotKey() { - //Bugfix zum 3.Test + //Bugfix zum Dot Roten Test if(!screen.contains(".")) screen = screen + "."; } From d17052f4138317c3142f013505b18de7a91d75d9 Mon Sep 17 00:00:00 2001 From: phamquochuy2905 <72949558+phamquochuy2905@users.noreply.github.com> Date: Sat, 31 Oct 2020 15:25:56 +0100 Subject: [PATCH 13/14] Dot Test Rot --- src/test/java/tdd/setup/CalculatorTest.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/test/java/tdd/setup/CalculatorTest.java b/src/test/java/tdd/setup/CalculatorTest.java index b79cf41..e9d5cfc 100644 --- a/src/test/java/tdd/setup/CalculatorTest.java +++ b/src/test/java/tdd/setup/CalculatorTest.java @@ -50,13 +50,11 @@ void NumberStartsWith0() { // 3.roter Test void Dot() { Calculator calc = new Calculator(); - calc.pressDotKey(); calc.pressDigitKey(5); - calc.pressOperationKey("x"); calc.pressDotKey(); - calc.pressDigitKey(2); - calc.pressEquals(); - assertEquals("0.1", calc.readScreen()); + calc.pressDigitKey(5); + assertEquals("5.5", calc.readScreen()); + } } From 790b7dfd4e930044ad3c903cfa8b71aa1a32264a Mon Sep 17 00:00:00 2001 From: phamquochuy2905 <72949558+phamquochuy2905@users.noreply.github.com> Date: Sat, 31 Oct 2020 15:30:19 +0100 Subject: [PATCH 14/14] 3.Fix --- src/main/java/tdd/setup/Calculator.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/main/java/tdd/setup/Calculator.java b/src/main/java/tdd/setup/Calculator.java index 4046eb3..a80c64b 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; @@ -14,20 +14,18 @@ public String readScreen() { } public void pressDigitKey(int digit) { + //Bugfix zum 2.Test + if (digit != 0 && screen.startsWith("0")) screen = ""; + if(digit > 9 || digit < 0) throw new IllegalArgumentException(); if(latestOperation.isEmpty()) { screen = screen + digit; - //Bugfix zum Dot Roten Test - } else { + } + else { latestValue = Double.parseDouble(screen); - if(!screen.contains(".")){ - screen = Integer.toString(digit); - } else { - screen = "0" + "." + digit; - } + screen = Integer.toString(digit); } - } public void pressClearKey() { @@ -50,7 +48,7 @@ public void pressOperationKey(String operation) { public void pressDotKey() { //Bugfix zum Dot Roten Test - if(!screen.contains(".")) screen = screen + "."; + if(!screen.endsWith(".")) screen = screen + "."; } public void pressNegative() {