From 0131b39fa34d6ca2c3eaca515e87fd4af227c1e4 Mon Sep 17 00:00:00 2001 From: "Prof. Dr. Arif Wider" <71143553+ProfWider@users.noreply.github.com> Date: Sun, 10 Apr 2022 18:23:14 +0200 Subject: [PATCH 01/16] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ca0f7ebb..7fc4c028 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Hausaufgabe 1 -Deadline für Abgabe per Pull Request: 24.10.2021 23:59 Uhr bzw. 27.10.2021 23:59 Uhr je nach dem in welcher Übungsgruppe Sie eingeschrieben sind. +Deadline für Abgabe per Pull Request: 21.04.2022 23:59 Uhr. Außerdem ist zusätzlich eine persönliche Abnahme in der von Ihnen belegten Übungsgruppe notwendig, um zu bestehen. Bei unentschuldigtem Fehlen in der auf die Deadline folgenden Übung, wird die Hausaufgabe als nicht bestanden bewertet. ## Aufgabenstellung From e2da2ecf8be5ad37a07b37762a25536351a413b7 Mon Sep 17 00:00:00 2001 From: "Prof. Dr. Arif Wider" <71143553+ProfWider@users.noreply.github.com> Date: Sun, 10 Apr 2022 18:24:22 +0200 Subject: [PATCH 02/16] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7fc4c028..f176df13 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Deadline für Abgabe per Pull Request: 21.04.2022 23:59 Uhr. Außerdem ist zusä ## Aufgabenstellung -- Forken Sie dieses Repository (github.com/prog2-ws21/ha1) in Ihren eigenen GitHub Account. +- Forken Sie dieses Repository (github.com/prog2-ss22/ha1) in Ihren eigenen GitHub Account. - Analysieren Sie das Verhalten der Klasse `Calculator` und finden Sie ein paar Abweichungen im Vergleich zu `www.online-calculator.com` und/oder zu dem im JavaDoc beschriebenen Verhalten. - Teilaufgabe 1: Schreiben Sie einen neuen zusätzlichen Test, der eine bisher nicht getestete Funktionalität abdeckt, die bereits funktioniert und der daher direkt grün wird. - Teilaufgabe 2: Schreiben Sie zwei weitere zusätzliche Tests, die zwei unterschiedliche Fehlerkategorien aufdecken (d.h. deren Fehlerursachen in unterschiedlichen Methoden liegen) und somit fehlschlagen. From 0be040823912996a6d047acb49f9d359692aebff Mon Sep 17 00:00:00 2001 From: Elsar Chabaev Date: Tue, 12 Apr 2022 13:00:45 +0200 Subject: [PATCH 03/16] test1 --- app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java | 2 ++ 1 file changed, 2 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..335d48ac 100644 --- a/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java +++ b/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java @@ -8,6 +8,8 @@ @DisplayName("Retro calculator") class CalculatorTest { + //test + @Test @DisplayName("should display result after adding two positive multi-digit numbers") void testPositiveAddition() { From 7f88b55bcc9565e6905760a3c7f171575ec5129c Mon Sep 17 00:00:00 2001 From: Elsar Chabaev Date: Tue, 12 Apr 2022 13:04:38 +0200 Subject: [PATCH 04/16] test --- 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 335d48ac..540d030c 100644 --- a/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java +++ b/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java @@ -8,7 +8,7 @@ @DisplayName("Retro calculator") class CalculatorTest { - //test + //test neu @Test @DisplayName("should display result after adding two positive multi-digit numbers") From 1196b65769b8ce8fd385f8f8934db15ab940853f Mon Sep 17 00:00:00 2001 From: Elsar Chabaev Date: Wed, 20 Apr 2022 16:51:46 +0200 Subject: [PATCH 05/16] test2 --- app/src/main/java/htw/berlin/prog2/ha1/Calculator.java | 1 - app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) 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..bc9c703f 100644 --- a/app/src/main/java/htw/berlin/prog2/ha1/Calculator.java +++ b/app/src/main/java/htw/berlin/prog2/ha1/Calculator.java @@ -13,7 +13,6 @@ public class Calculator { private double latestValue; private String latestOperation = ""; - /** * @return den aktuellen Bildschirminhalt als String */ 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 540d030c..04e60423 100644 --- a/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java +++ b/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java @@ -42,6 +42,8 @@ void testSquareRoot() { assertEquals(expected, actual); } + + //TODO hier weitere Tests erstellen } From 38150d9c6f2a8f6cd6eb401254fee52f07facd68 Mon Sep 17 00:00:00 2001 From: Elsar Chabaev Date: Wed, 20 Apr 2022 16:56:27 +0200 Subject: [PATCH 06/16] test3 --- app/src/main/java/htw/berlin/prog2/ha1/Calculator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 bc9c703f..8f73924b 100644 --- a/app/src/main/java/htw/berlin/prog2/ha1/Calculator.java +++ b/app/src/main/java/htw/berlin/prog2/ha1/Calculator.java @@ -6,7 +6,7 @@ * und dessen Bildschirm bis zu zehn Ziffern plus einem Dezimaltrennzeichen darstellen kann. * Enthält mit Absicht noch diverse Bugs oder unvollständige Funktionen. */ -public class Calculator { +public class Calculator { private String screen = "0"; From 3f7f10a8049a65634cd1cc5ca4acf3bba89d9583 Mon Sep 17 00:00:00 2001 From: Elsar Chabaev Date: Wed, 20 Apr 2022 22:29:06 +0200 Subject: [PATCH 07/16] Teilaufgabe 1: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ein Test, der eine bereits existierende Funktionalität prüft. Der Test prüft, ob eine Subtraktion, bei der gilt Minuent>Subtrahend, das richtige Ergebnis angezeigt wird. --- .../java/htw/berlin/prog2/ha1/Calculator.java | 2 +- .../htw/berlin/prog2/ha1/CalculatorTest.java | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) 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 8f73924b..bc9c703f 100644 --- a/app/src/main/java/htw/berlin/prog2/ha1/Calculator.java +++ b/app/src/main/java/htw/berlin/prog2/ha1/Calculator.java @@ -6,7 +6,7 @@ * und dessen Bildschirm bis zu zehn Ziffern plus einem Dezimaltrennzeichen darstellen kann. * Enthält mit Absicht noch diverse Bugs oder unvollständige Funktionen. */ -public class Calculator { +public class Calculator { private String screen = "0"; 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 04e60423..33039db9 100644 --- a/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java +++ b/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java @@ -42,6 +42,23 @@ void testSquareRoot() { assertEquals(expected, actual); } + @Test + @DisplayName("should display the difference of a subtraction with positiv result (minuend > subtrahend)") + + void testPositiveSubtraction() { + Calculator calc = new Calculator(); + + calc.pressDigitKey(9); + calc.pressBinaryOperationKey("-"); + calc.pressDigitKey(2); + calc.pressEqualsKey(); + + String expected = "7"; + String actual = calc.readScreen(); + + assertEquals(expected, actual); + } + //TODO hier weitere Tests erstellen From 23bb84f572fb1a24b2e5ed113adf8ba4dd56eba8 Mon Sep 17 00:00:00 2001 From: Elsar Chabaev Date: Wed, 20 Apr 2022 22:36:01 +0200 Subject: [PATCH 08/16] Teilaufgabe 1: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ein Test, der eine bereits existierende Funktionalität prüft. Der Test prüft, ob eine Subtraktion, bei der gilt Minuent>Subtrahend, das richtige Ergebnis angezeigt wird. --- app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java | 1 + 1 file changed, 1 insertion(+) 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 33039db9..2350a366 100644 --- a/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java +++ b/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java @@ -60,6 +60,7 @@ void testPositiveSubtraction() { } + //TODO hier weitere Tests erstellen } From be5ce58395e288d8ffc5bdc37dd34ae5b8097d7a Mon Sep 17 00:00:00 2001 From: Elsar Chabaev Date: Wed, 20 Apr 2022 22:39:11 +0200 Subject: [PATCH 09/16] 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 2350a366..a32517da 100644 --- a/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java +++ b/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java @@ -60,7 +60,7 @@ void testPositiveSubtraction() { } - + //TODO hier weitere Tests erstellen } From f303b3d200e867c0a81b1d59e9639de867555e98 Mon Sep 17 00:00:00 2001 From: Elsar Chabaev Date: Wed, 20 Apr 2022 22:52:20 +0200 Subject: [PATCH 10/16] Commit kommt nicht an --- app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java | 1 + 1 file changed, 1 insertion(+) 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 a32517da..218ada31 100644 --- a/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java +++ b/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java @@ -62,6 +62,7 @@ void testPositiveSubtraction() { + //TODO hier weitere Tests erstellen } From a6a39d8b7ec45ee6d80233423767ba4cdf834041 Mon Sep 17 00:00:00 2001 From: Elsar Chabaev Date: Wed, 20 Apr 2022 23:08:39 +0200 Subject: [PATCH 11/16] commits kommen nicht an - test --- app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java | 1 + 1 file changed, 1 insertion(+) 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 218ada31..b08549f8 100644 --- a/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java +++ b/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java @@ -63,6 +63,7 @@ void testPositiveSubtraction() { + //TODO hier weitere Tests erstellen } From 0513eee5dc62c794c878a57012ec800824d077b1 Mon Sep 17 00:00:00 2001 From: Elsar Chabaev Date: Thu, 21 Apr 2022 01:02:21 +0200 Subject: [PATCH 12/16] Teilaufgabe 1 - Zweistellige positive Zahl soll ohne Angabe des Gleichzeichens, die Prozentangabe als Ergebnis anzeigen. --- .../java/htw/berlin/prog2/ha1/CalculatorTest.java | 12 +++++++++++- 1 file changed, 11 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 b08549f8..b542d4ba 100644 --- a/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java +++ b/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java @@ -59,10 +59,20 @@ void testPositiveSubtraction() { assertEquals(expected, actual); } + @Test + @DisplayName("should transform a positiv binary number as %, without pressing the equals key") + void testAsPercent() { + Calculator calc = new Calculator(); + calc.pressDigitKey(1); + calc.pressDigitKey(0); + calc.pressUnaryOperationKey("%"); + String expected = "0.1"; + String actual = calc.readScreen(); - + assertEquals(expected, actual); + } //TODO hier weitere Tests erstellen } From b0a3fe9dad5f324314723d538b4347f1045338b4 Mon Sep 17 00:00:00 2001 From: Elsar Chabaev Date: Thu, 21 Apr 2022 01:20:24 +0200 Subject: [PATCH 13/16] Teilaufgabe 1 - Resultat einer Subtraktion zweier positiver und einstelliger Ganzzahlen --- .../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 b542d4ba..57cb2c9a 100644 --- a/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java +++ b/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java @@ -43,17 +43,17 @@ void testSquareRoot() { } @Test - @DisplayName("should display the difference of a subtraction with positiv result (minuend > subtrahend)") + @DisplayName("should display the difference of two positive single digits ") void testPositiveSubtraction() { Calculator calc = new Calculator(); - calc.pressDigitKey(9); + calc.pressDigitKey(3); calc.pressBinaryOperationKey("-"); - calc.pressDigitKey(2); + calc.pressDigitKey(8); calc.pressEqualsKey(); - String expected = "7"; + String expected = "-5"; String actual = calc.readScreen(); assertEquals(expected, actual); From 0738e738d775b37079a97e1792b1cc853fa6be9f Mon Sep 17 00:00:00 2001 From: Elsar Chabaev Date: Thu, 21 Apr 2022 01:58:18 +0200 Subject: [PATCH 14/16] Erster roter Test (nur der fehlschlagende Test) --- .../java/htw/berlin/prog2/ha1/Calculator.java | 2 -- .../htw/berlin/prog2/ha1/CalculatorTest.java | 16 ++++++++++++++++ 2 files changed, 16 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 bc9c703f..c7bead4f 100644 --- a/app/src/main/java/htw/berlin/prog2/ha1/Calculator.java +++ b/app/src/main/java/htw/berlin/prog2/ha1/Calculator.java @@ -9,9 +9,7 @@ public class Calculator { private String screen = "0"; - private double latestValue; - private String latestOperation = ""; /** * @return den aktuellen Bildschirminhalt als String 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 57cb2c9a..ad025708 100644 --- a/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java +++ b/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java @@ -74,6 +74,22 @@ void testAsPercent() { assertEquals(expected, actual); } + @Test + @DisplayName("should display \"Error\" after dividing a single digit by zero") + void testDivideByZero() { + Calculator calc = new Calculator(); + + calc.pressDigitKey(2); + calc.pressBinaryOperationKey("/"); + calc.pressDigitKey(0); + calc.pressEqualsKey(); + + String expected = "Error"; + String actual = calc.readScreen(); + + assertEquals(expected, actual); + } + //TODO hier weitere Tests erstellen } From a04dd00379b91e02bfeb830a4b2c1020c6fbdb45 Mon Sep 17 00:00:00 2001 From: Elsar Chabaev Date: Thu, 21 Apr 2022 04:47:30 +0200 Subject: [PATCH 15/16] =?UTF-8?q?Erster=20roter=20Test=20-=20Implementieru?= =?UTF-8?q?ng:=20switch/case=20pr=C3=BCft=20bei=20Division,=20ob=20der=20D?= =?UTF-8?q?ivisor=200=20ist,=20falls=20ja,=20wird=20Screen=20auf=20Error?= =?UTF-8?q?=20gesetzt.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/htw/berlin/prog2/ha1/Calculator.java | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 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 c7bead4f..2e8d8f04 100644 --- a/app/src/main/java/htw/berlin/prog2/ha1/Calculator.java +++ b/app/src/main/java/htw/berlin/prog2/ha1/Calculator.java @@ -11,6 +11,7 @@ public class Calculator { private String screen = "0"; private double latestValue; private String latestOperation = ""; + private double result; /** * @return den aktuellen Bildschirminhalt als String */ @@ -114,15 +115,21 @@ 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); - default -> throw new IllegalArgumentException(); - }; - screen = Double.toString(result); + + switch (latestOperation) { + case "+": result = latestValue + Double.parseDouble(screen); break; + case "-": result = latestValue - Double.parseDouble(screen);break; + case "x": result = latestValue * Double.parseDouble(screen);break; + case "/": + if (readScreen().equals("0")) screen = "Error"; + else result = latestValue / Double.parseDouble(screen); break; + + default: throw new IllegalArgumentException(); + } + if (!screen.equals("Error")) {screen = Double.toString(result);} if(screen.endsWith(".0")) screen = screen.substring(0,screen.length()-2); if(screen.contains(".") && screen.length() > 11) screen = screen.substring(0, 10); + } + } From 6c32ae08675df35087f8c03d424e7d88082980e4 Mon Sep 17 00:00:00 2001 From: Elsar Chabaev Date: Sun, 24 Apr 2022 23:03:21 +0200 Subject: [PATCH 16/16] Zweiter roter Test - testet ob drei positive Zahlen auf einander addiert werden --- .../java/htw/berlin/prog2/ha1/Calculator.java | 15 +++++-- .../htw/berlin/prog2/ha1/CalculatorTest.java | 43 ++++++++++--------- 2 files changed, 34 insertions(+), 24 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 2e8d8f04..8365aa01 100644 --- a/app/src/main/java/htw/berlin/prog2/ha1/Calculator.java +++ b/app/src/main/java/htw/berlin/prog2/ha1/Calculator.java @@ -29,9 +29,17 @@ 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") || latestValue == Double.parseDouble(screen)) {screen = "";} screen = screen + digit; + + if(!latestOperation.equals("")) calcResult(); + latestOperation =""; + + + + // if (latestValue != 0){ pressEqualsKey();} + } /** @@ -58,7 +66,7 @@ public void pressClearKey() { * @param operation "+" für Addition, "-" für Substraktion, "x" für Multiplikation, "/" für Division */ public void pressBinaryOperationKey(String operation) { - latestValue = Double.parseDouble(screen); + latestValue = Double.parseDouble(readScreen()); latestOperation = operation; } @@ -114,7 +122,7 @@ public void pressNegativeKey() { * Operation (ggf. inklusive letztem Operand) erneut auf den aktuellen Bildschirminhalt angewandt * und das Ergebnis direkt angezeigt. */ - public void pressEqualsKey() { + public void calcResult() { switch (latestOperation) { case "+": result = latestValue + Double.parseDouble(screen); break; @@ -132,4 +140,5 @@ public void pressEqualsKey() { } + public double pressEqualsKey(){return result;} } 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 ad025708..381c85f1 100644 --- a/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java +++ b/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java @@ -8,26 +8,6 @@ @DisplayName("Retro calculator") class CalculatorTest { - //test neu - - @Test - @DisplayName("should display result after adding two positive multi-digit numbers") - void testPositiveAddition() { - Calculator calc = new Calculator(); - - calc.pressDigitKey(2); - calc.pressDigitKey(0); - calc.pressBinaryOperationKey("+"); - calc.pressDigitKey(2); - calc.pressDigitKey(0); - calc.pressEqualsKey(); - - String expected = "40"; - String actual = calc.readScreen(); - - assertEquals(expected, actual); - } - @Test @DisplayName("should display result after getting the square root of two") void testSquareRoot() { @@ -82,7 +62,7 @@ void testDivideByZero() { calc.pressDigitKey(2); calc.pressBinaryOperationKey("/"); calc.pressDigitKey(0); - calc.pressEqualsKey(); + // calc.pressEqualsKey(); String expected = "Error"; String actual = calc.readScreen(); @@ -90,6 +70,27 @@ void testDivideByZero() { assertEquals(expected, actual); } + @Test + @DisplayName("should display the result of a multiple addition of three positive single digit numbers") + + void testMultipleAddition() { + + Calculator calc = new Calculator(); + + calc.pressDigitKey(2); + calc.pressBinaryOperationKey("+"); + calc.pressDigitKey(3); + calc.pressBinaryOperationKey("+"); + calc.pressDigitKey(5); + // calc.pressEqualsKey(); //wir brauchen pressEqualskey() in pressDigit() - falls (latest value != "") pressEqualsKey + + String expected = "10"; + String actual = calc.readScreen(); + + assertEquals(expected, actual); + + } + //TODO hier weitere Tests erstellen }