From 561383c4d2a1eb0edaa8f0341539b0a199e90fdc Mon Sep 17 00:00:00 2001 From: erens Date: Sun, 24 Oct 2021 22:52:02 +0200 Subject: [PATCH 1/5] =?UTF-8?q?1.=20Commit=20gr=C3=BCner=20Test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../htw/berlin/prog2/ha1/CalculatorTest.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java b/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java index addc5f26..7beb5ea3 100644 --- a/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java +++ b/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java @@ -41,5 +41,21 @@ void testSquareRoot() { } //TODO hier weitere Tests erstellen + @Test + @DisplayName("should display result after multiplying two positive digit numbers") + void testPositivMultiplikation() { + Calculator calc = new Calculator(); + + calc.pressDigitKey(1); + calc.pressDigitKey(2); + calc.pressBinaryOperationKey("x"); + calc.pressDigitKey(3); + calc.pressEqualsKey(); + + String expected = "36"; + String actual = calc.readScreen(); + + assertEquals(expected, actual); + } } From 82ddaf7b7c8b18170757e7085b7eefe38b9f76ce Mon Sep 17 00:00:00 2001 From: erens Date: Tue, 26 Oct 2021 13:42:21 +0200 Subject: [PATCH 2/5] 2. Commit: 1. roter Test --- .../htw/berlin/prog2/ha1/CalculatorTest.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java b/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java index 7beb5ea3..b1581acd 100644 --- a/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java +++ b/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java @@ -55,6 +55,22 @@ void testPositivMultiplikation() { String expected = "36"; String actual = calc.readScreen(); + assertEquals(expected, actual); + } + @Test + @DisplayName("should display result after dividing one positive multi-digit number with zero") + void testDivideZero() { + Calculator calc = new Calculator(); + + calc.pressDigitKey(1); + calc.pressDigitKey(0); + calc.pressBinaryOperationKey("/"); + calc.pressDigitKey(0); + calc.pressEqualsKey(); + + String expected = "Error"; + String actual = calc.readScreen(); + assertEquals(expected, actual); } } From 342aa4d1d97c29dc72f925afabe3e5bca60fafc4 Mon Sep 17 00:00:00 2001 From: erens Date: Tue, 26 Oct 2021 14:13:36 +0200 Subject: [PATCH 3/5] 3. Commit: 1. roter Test Fix --- app/src/main/java/htw/berlin/prog2/ha1/Calculator.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/main/java/htw/berlin/prog2/ha1/Calculator.java b/app/src/main/java/htw/berlin/prog2/ha1/Calculator.java index aaef8862..e66f1386 100644 --- a/app/src/main/java/htw/berlin/prog2/ha1/Calculator.java +++ b/app/src/main/java/htw/berlin/prog2/ha1/Calculator.java @@ -125,6 +125,9 @@ public void pressEqualsKey() { default -> throw new IllegalArgumentException(); }; screen = Double.toString(result); + if(screen.equals("Infinity")) { + screen = "Error"; + } if(screen.endsWith(".0")) screen = screen.substring(0,screen.length()-2); if(screen.contains(".") && screen.length() > 11) screen = screen.substring(0, 10); } From b4c19af777dd1075bd29fdf2d1b3d2e49bb00701 Mon Sep 17 00:00:00 2001 From: erens Date: Tue, 26 Oct 2021 14:21:58 +0200 Subject: [PATCH 4/5] 4. Commit: 2. roter Test --- .../java/htw/berlin/prog2/ha1/CalculatorTest.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java b/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java index b1581acd..5bbf0ecc 100644 --- a/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java +++ b/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java @@ -71,6 +71,19 @@ void testDivideZero() { String expected = "Error"; String actual = calc.readScreen(); + assertEquals(expected, actual); + } + @Test + @DisplayName("should display result of pressing negative key before pressing digit key") + void testNegativeKey() { + Calculator calc = new Calculator(); + + calc.pressNegativeKey(); + calc.pressDigitKey(3); + + String expected = "-3"; + String actual = calc.readScreen(); + assertEquals(expected, actual); } } From e7daea3f3633af1755388732ed7a0f6a0dce9457 Mon Sep 17 00:00:00 2001 From: erens Date: Sat, 30 Oct 2021 14:22:40 +0200 Subject: [PATCH 5/5] 5. Commit: 2. roter Test Fix (Nachgebessert) --- app/src/main/java/htw/berlin/prog2/ha1/Calculator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/htw/berlin/prog2/ha1/Calculator.java b/app/src/main/java/htw/berlin/prog2/ha1/Calculator.java index e66f1386..e1aef384 100644 --- a/app/src/main/java/htw/berlin/prog2/ha1/Calculator.java +++ b/app/src/main/java/htw/berlin/prog2/ha1/Calculator.java @@ -30,8 +30,8 @@ public String readScreen() { */ public void pressDigitKey(int digit) { if(digit > 9 || digit < 0) throw new IllegalArgumentException(); - - if(screen.equals("0") || latestValue == Double.parseDouble(screen)) screen = ""; + if(screen.equals("-0")) screen = "-"; + else if(screen.equals("0") || latestValue == Double.parseDouble(screen)) screen = ""; screen = screen + digit; }