From bc1dc572884562d840b7d4adba10e3133698de64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Melek=20G=C3=B6gg=C3=B6z?= Date: Sat, 27 Apr 2024 19:42:33 +0200 Subject: [PATCH 01/15] Teilaufgabe 1 --- .../test/java/htw/berlin/prog2/ha1/CalculatorTest.java | 9 +++++++++ 1 file changed, 9 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 ddff0daf..3e34b289 100644 --- a/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java +++ b/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java @@ -88,7 +88,16 @@ void testMultipleDecimalDots() { assertEquals(expected, actual); } + @Test 4 + void testDecimalPoint() { + Calculator calc = new Calculator(); + + calc.pressDigitKey(5); + calc.pressDotKey(); + calc.pressDigitKey(3); + assertEquals("5.3", calc.readScreen()); + } //TODO hier weitere Tests erstellen } From 4904e6c5352ebac0fe2878877333288c4db07f93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Melek=20G=C3=B6gg=C3=B6z?= Date: Sat, 27 Apr 2024 19:51:56 +0200 Subject: [PATCH 02/15] Teilaufgabe 1 --- app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 3e34b289..cf4843de 100644 --- a/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java +++ b/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java @@ -96,8 +96,13 @@ void testDecimalPoint() { calc.pressDotKey(); calc.pressDigitKey(3); - assertEquals("5.3", calc.readScreen()); + String expected = "53.7"; + String actual = calc.readScreen(); // Aktuellen Bildschirminhalt des Taschenrechners lesen + + assertEquals(expected, actual); // Überprüfen, ob der aktuelle Bildschirminhalt "53.7" entspricht } + //TODO hier weitere Tests erstellen + } From 35260fca00f1e7607524966bf298ea8572083d6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Melek=20G=C3=B6gg=C3=B6z?= Date: Sat, 27 Apr 2024 19:52:22 +0200 Subject: [PATCH 03/15] Teilaufgabe 1 --- app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 cf4843de..80a5c2dc 100644 --- a/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java +++ b/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java @@ -88,7 +88,7 @@ void testMultipleDecimalDots() { assertEquals(expected, actual); } - @Test 4 + @Test void testDecimalPoint() { Calculator calc = new Calculator(); From 73c9efa69fc85c8b75096465014d0850e654ff5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Melek=20G=C3=B6gg=C3=B6z?= Date: Sat, 27 Apr 2024 19:52:55 +0200 Subject: [PATCH 04/15] Teilaufgabe 1 --- app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 80a5c2dc..87232f27 100644 --- a/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java +++ b/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java @@ -88,7 +88,7 @@ void testMultipleDecimalDots() { assertEquals(expected, actual); } - @Test + @Test void testDecimalPoint() { Calculator calc = new Calculator(); @@ -96,7 +96,7 @@ void testDecimalPoint() { calc.pressDotKey(); calc.pressDigitKey(3); - String expected = "53.7"; + String expected = "5.3"; String actual = calc.readScreen(); // Aktuellen Bildschirminhalt des Taschenrechners lesen assertEquals(expected, actual); // Überprüfen, ob der aktuelle Bildschirminhalt "53.7" entspricht From 3d3df04bc91fc93bb29cfcce8ed3f1604f1230ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Melek=20G=C3=B6gg=C3=B6z?= Date: Sat, 27 Apr 2024 19:53:25 +0200 Subject: [PATCH 05/15] Teilaufgabe 1 --- app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 87232f27..3d8149c8 100644 --- a/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java +++ b/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java @@ -99,7 +99,7 @@ void testDecimalPoint() { String expected = "5.3"; String actual = calc.readScreen(); // Aktuellen Bildschirminhalt des Taschenrechners lesen - assertEquals(expected, actual); // Überprüfen, ob der aktuelle Bildschirminhalt "53.7" entspricht + assertEquals(expected, actual); // Überprüfen, ob der aktuelle Bildschirminhalt "5.3" entspricht } //TODO hier weitere Tests erstellen From f00699b85102faf403ae72a45c60cd02899b481d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Melek=20G=C3=B6gg=C3=B6z?= Date: Sat, 27 Apr 2024 20:02:10 +0200 Subject: [PATCH 06/15] Teilaufgabe 1 end --- .../java/htw/berlin/prog2/ha1/CalculatorTest.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) 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 3d8149c8..d12efd1a 100644 --- a/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java +++ b/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java @@ -89,17 +89,19 @@ void testMultipleDecimalDots() { } @Test - void testDecimalPoint() { + @DisplayName("should display result after multiplying two numbers") + void testMultiplication() { Calculator calc = new Calculator(); - calc.pressDigitKey(5); - calc.pressDotKey(); calc.pressDigitKey(3); + calc.pressBinaryOperationKey("x"); + calc.pressDigitKey(4); + calc.pressEqualsKey(); - String expected = "5.3"; - String actual = calc.readScreen(); // Aktuellen Bildschirminhalt des Taschenrechners lesen + String expected = "12"; + String actual = calc.readScreen(); - assertEquals(expected, actual); // Überprüfen, ob der aktuelle Bildschirminhalt "5.3" entspricht + assertEquals(expected, actual); } //TODO hier weitere Tests erstellen From f90bf7c4a6ca400bbcffeb4d5fd1efe4ccc9a049 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Melek=20G=C3=B6gg=C3=B6z?= Date: Sun, 28 Apr 2024 00:00:47 +0200 Subject: [PATCH 07/15] Teilaufgabe 1 end --- app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d12efd1a..199bb9ad 100644 --- a/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java +++ b/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java @@ -103,7 +103,7 @@ void testMultiplication() { assertEquals(expected, actual); } - + // ende //TODO hier weitere Tests erstellen } From 46183e19653b3a16dc0dfceae84112c2504223f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Melek=20G=C3=B6gg=C3=B6z?= Date: Sun, 28 Apr 2024 00:09:10 +0200 Subject: [PATCH 08/15] =?UTF-8?q?Teilaufgabe=201=20gr=C3=BCn=20test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 199bb9ad..d12efd1a 100644 --- a/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java +++ b/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java @@ -103,7 +103,7 @@ void testMultiplication() { assertEquals(expected, actual); } - // ende + //TODO hier weitere Tests erstellen } From 887e0e985a3412f9afdf81e36f2be608087cf699 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Melek=20G=C3=B6gg=C3=B6z?= Date: Sun, 28 Apr 2024 00:32:35 +0200 Subject: [PATCH 09/15] =?UTF-8?q?Teilaufgabe=201=20gr=C3=BCn=20test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../htw/berlin/prog2/ha1/CalculatorTest.java | 38 +++++++++++++++++++ 1 file changed, 38 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 d12efd1a..b24550e5 100644 --- a/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java +++ b/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java @@ -104,6 +104,44 @@ void testMultiplication() { assertEquals(expected, actual); } +// Teilaufgabe 2.1 +@Test +@DisplayName("should display error when getting square root of a negative number") +void testSquareRootOfNegativeNumber() { + Calculator calc = new Calculator(); + + calc.pressDigitKey(9); + calc.pressBinaryOperationKey("-"); + calc.pressDigitKey(1); + calc.pressDigitKey(0); + calc.pressUnaryOperationKey("√"); + + String expected = "Error"; + String actual = calc.readScreen(); + + assertEquals(expected, actual); +} + + + // Teiaufgabe 2.2 + + @Test + @DisplayName("should display error when dividing by zero") + void testDivisionByZero() { + Calculator calc = new Calculator(); + + calc.pressDigitKey(9); + calc.pressBinaryOperationKey("/"); + calc.pressDigitKey(0); + calc.pressEqualsKey(); + + String expected = "Error"; + String actual = calc.readScreen(); + + assertEquals(expected, actual); + } + + //TODO hier weitere Tests erstellen } From 18c98acce0d62045d5480a6b85700ebee154d807 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Melek=20G=C3=B6gg=C3=B6z?= Date: Sun, 28 Apr 2024 19:53:33 +0200 Subject: [PATCH 10/15] =?UTF-8?q?Teilaufgabe=202=20+=20gr=C3=BCn=20test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/htw/berlin/prog2/ha1/Calculator.java | 8 +++++ .../htw/berlin/prog2/ha1/CalculatorTest.java | 34 +++++++++---------- 2 files changed, 24 insertions(+), 18 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 84c04f21..5d39b484 100644 --- a/app/src/main/java/htw/berlin/prog2/ha1/Calculator.java +++ b/app/src/main/java/htw/berlin/prog2/ha1/Calculator.java @@ -123,6 +123,7 @@ public void pressEqualsKey() { case "-" -> latestValue - Double.parseDouble(screen); case "x" -> latestValue * Double.parseDouble(screen); case "/" -> latestValue / Double.parseDouble(screen); + case "" -> Double.parseDouble(screen); default -> throw new IllegalArgumentException(); }; screen = Double.toString(result); @@ -130,4 +131,11 @@ public void pressEqualsKey() { if(screen.endsWith(".0")) screen = screen.substring(0,screen.length()-2); if(screen.contains(".") && screen.length() > 11) screen = screen.substring(0, 10); } + + + } + + + + 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 b24550e5..5f3abeea 100644 --- a/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java +++ b/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java @@ -106,42 +106,40 @@ void testMultiplication() { // Teilaufgabe 2.1 @Test -@DisplayName("should display error when getting square root of a negative number") -void testSquareRootOfNegativeNumber() { +@DisplayName("should display latest number after pressing equals") +void testEqualKey() { Calculator calc = new Calculator(); + calc.pressDigitKey(3); + calc.pressEqualsKey(); - calc.pressDigitKey(9); - calc.pressBinaryOperationKey("-"); - calc.pressDigitKey(1); - calc.pressDigitKey(0); - calc.pressUnaryOperationKey("√"); - - String expected = "Error"; + String expected = "3"; String actual = calc.readScreen(); assertEquals(expected, actual); -} - +} // Teiaufgabe 2.2 @Test - @DisplayName("should display error when dividing by zero") - void testDivisionByZero() { + @DisplayName("should display error when dividing zero by zero") + void testZeroDivision() { + // Arrange Calculator calc = new Calculator(); - calc.pressDigitKey(9); - calc.pressBinaryOperationKey("/"); - calc.pressDigitKey(0); - calc.pressEqualsKey(); + // Act + calc.pressDigitKey(0); // Eingabe der ersten Zahl + calc.pressBinaryOperationKey("/"); // Auswahl der Division + calc.pressDigitKey(0); // Eingabe der zweiten Zahl + calc.pressEqualsKey(); // Ausführen der Berechnung + // Assert String expected = "Error"; String actual = calc.readScreen(); - assertEquals(expected, actual); } + //TODO hier weitere Tests erstellen } From 00ae5433797febca6a26a6d72e5a01245030cb49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Melek=20G=C3=B6gg=C3=B6z?= Date: Sun, 28 Apr 2024 20:04:42 +0200 Subject: [PATCH 11/15] =?UTF-8?q?Teilaufgabe=202=20+=20gr=C3=BCn=20test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../htw/berlin/prog2/ha1/CalculatorTest.java | 17 ----------------- 1 file changed, 17 deletions(-) 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 5f3abeea..b5b5bdc2 100644 --- a/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java +++ b/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java @@ -120,23 +120,6 @@ void testEqualKey() { } // Teiaufgabe 2.2 - @Test - @DisplayName("should display error when dividing zero by zero") - void testZeroDivision() { - // Arrange - Calculator calc = new Calculator(); - - // Act - calc.pressDigitKey(0); // Eingabe der ersten Zahl - calc.pressBinaryOperationKey("/"); // Auswahl der Division - calc.pressDigitKey(0); // Eingabe der zweiten Zahl - calc.pressEqualsKey(); // Ausführen der Berechnung - - // Assert - String expected = "Error"; - String actual = calc.readScreen(); - assertEquals(expected, actual); - } From 3ee486c25b3aaffd7e618ec597f67601d76b99ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Melek=20G=C3=B6gg=C3=B6z?= Date: Sun, 28 Apr 2024 20:26:21 +0200 Subject: [PATCH 12/15] =?UTF-8?q?Teilaufgabe=202=20+=20gr=C3=BCn=20test=20?= =?UTF-8?q?end?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../htw/berlin/prog2/ha1/CalculatorTest.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) 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 b5b5bdc2..44ce2367 100644 --- a/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java +++ b/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java @@ -109,10 +109,10 @@ void testMultiplication() { @DisplayName("should display latest number after pressing equals") void testEqualKey() { Calculator calc = new Calculator(); - calc.pressDigitKey(3); + calc.pressDigitKey(5); calc.pressEqualsKey(); - String expected = "3"; + String expected = "5"; String actual = calc.readScreen(); assertEquals(expected, actual); @@ -120,7 +120,20 @@ void testEqualKey() { } // Teiaufgabe 2.2 + @Test + @DisplayName("should display error when attempting to calculate the factorial of a negative number") + void testFactorialOfNegativeNumber() { + Calculator calc = new Calculator(); + calc.pressUnaryOperationKey("!"); // Fakultät einer negativen Zahl + calc.pressDigitKey(5); + calc.pressEqualsKey(); + + String expected = "Error"; + String actual = calc.readScreen(); + + assertEquals(expected, actual); + } //TODO hier weitere Tests erstellen From 19f552b5258981d114f1de42d432760c6dc8cba9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Melek=20G=C3=B6gg=C3=B6z?= Date: Sun, 28 Apr 2024 20:48:15 +0200 Subject: [PATCH 13/15] =?UTF-8?q?Teilaufgabe=202.2=20+=20gr=C3=BCn=20test?= =?UTF-8?q?=20end?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/htw/berlin/prog2/ha1/Calculator.java | 36 ++++++++++++------- .../htw/berlin/prog2/ha1/CalculatorTest.java | 19 ++++++++++ 2 files changed, 42 insertions(+), 13 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 5d39b484..898d25ef 100644 --- a/app/src/main/java/htw/berlin/prog2/ha1/Calculator.java +++ b/app/src/main/java/htw/berlin/prog2/ha1/Calculator.java @@ -60,8 +60,10 @@ public void pressClearKey() { * @param operation "+" für Addition, "-" für Substraktion, "x" für Multiplikation, "/" für Division */ public void pressBinaryOperationKey(String operation) { + if (!latestOperation.isEmpty()) pressEqualsKey(); latestValue = Double.parseDouble(screen); latestOperation = operation; + } /** @@ -110,7 +112,7 @@ public void pressNegativeKey() { /** * Empfängt den Befehl der gedrückten "="-Taste. - * Wurde zuvor keine Operationstaste gedrückt, passiert nichts. + * Wurde zuvor keine Operationstaste gedrückt, wird die Eingegebene Zahl auf dem Bildschirm ausgegeben. * Wurde zuvor eine binäre Operationstaste gedrückt und zwei Operanden eingegeben, wird das * Ergebnis der Operation angezeigt. Falls hierbei eine Division durch Null auftritt, wird "Error" angezeigt. * Wird die Taste weitere Male gedrückt (ohne andere Tasten dazwischen), so wird die letzte @@ -118,18 +120,26 @@ public void pressNegativeKey() { * und das Ergebnis direkt angezeigt. */ public void pressEqualsKey() { - var result = switch(latestOperation) { - case "+" -> latestValue + Double.parseDouble(screen); - case "-" -> latestValue - Double.parseDouble(screen); - case "x" -> latestValue * Double.parseDouble(screen); - case "/" -> latestValue / Double.parseDouble(screen); - case "" -> Double.parseDouble(screen); - 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); + if (!latestOperation.isEmpty()) { + var result = switch (latestOperation) { + case "+" -> latestValue + Double.parseDouble(screen); + case "-" -> latestValue - Double.parseDouble(screen); + case "x" -> latestValue * Double.parseDouble(screen); + case "/" -> latestValue / Double.parseDouble(screen); + case "" -> Double.parseDouble(screen); + 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); + } else { + return; + } + + } 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 44ce2367..6cdbbc57 100644 --- a/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java +++ b/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java @@ -134,7 +134,26 @@ void testFactorialOfNegativeNumber() { assertEquals(expected, actual); } + @Test + @DisplayName("should display result after adding multiple positive multi-digit numbers") + void testPositiveAdditionWithMultipleDigits() { + Calculator calc = new Calculator(); + + calc.pressDigitKey(5); + calc.pressDigitKey(0); + calc.pressBinaryOperationKey("+"); + calc.pressDigitKey(2); + calc.pressDigitKey(0); + calc.pressBinaryOperationKey("+"); + calc.pressDigitKey(5); + calc.pressDigitKey(0); + calc.pressEqualsKey(); + String expected = "120"; + String actual = calc.readScreen(); + + assertEquals(expected, actual); + } //TODO hier weitere Tests erstellen From 1340f16d8887557f30c1a0760777b0520a5ec58a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Melek=20G=C3=B6gg=C3=B6z?= Date: Sun, 28 Apr 2024 20:50:36 +0200 Subject: [PATCH 14/15] =?UTF-8?q?Teilaufgabe=202.2=20+=20gr=C3=BCn=20test?= =?UTF-8?q?=20ende?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../test/java/htw/berlin/prog2/ha1/CalculatorTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 6cdbbc57..a9dd14dd 100644 --- a/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java +++ b/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java @@ -139,17 +139,17 @@ void testFactorialOfNegativeNumber() { void testPositiveAdditionWithMultipleDigits() { Calculator calc = new Calculator(); - calc.pressDigitKey(5); + calc.pressDigitKey(7); calc.pressDigitKey(0); calc.pressBinaryOperationKey("+"); - calc.pressDigitKey(2); + calc.pressDigitKey(1); calc.pressDigitKey(0); calc.pressBinaryOperationKey("+"); - calc.pressDigitKey(5); + calc.pressDigitKey(7); calc.pressDigitKey(0); calc.pressEqualsKey(); - String expected = "120"; + String expected = "150"; String actual = calc.readScreen(); assertEquals(expected, actual); From 7e696b5daf78b819845c1a6abaf7e8b43ace2f65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Melek=20G=C3=B6gg=C3=B6z?= Date: Sun, 28 Apr 2024 20:52:08 +0200 Subject: [PATCH 15/15] Aufgabe beendet --- .../java/htw/berlin/prog2/ha1/CalculatorTest.java | 14 -------------- 1 file changed, 14 deletions(-) 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 a9dd14dd..6ca259f2 100644 --- a/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java +++ b/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java @@ -120,20 +120,6 @@ void testEqualKey() { } // Teiaufgabe 2.2 - @Test - @DisplayName("should display error when attempting to calculate the factorial of a negative number") - void testFactorialOfNegativeNumber() { - Calculator calc = new Calculator(); - - calc.pressUnaryOperationKey("!"); // Fakultät einer negativen Zahl - calc.pressDigitKey(5); - calc.pressEqualsKey(); - - String expected = "Error"; - String actual = calc.readScreen(); - - assertEquals(expected, actual); - } @Test @DisplayName("should display result after adding multiple positive multi-digit numbers") void testPositiveAdditionWithMultipleDigits() {