From 8ece15b4c41883af37986a3d8d71f32fef32282b Mon Sep 17 00:00:00 2001 From: Sibahe27 Date: Sun, 3 Nov 2024 10:53:31 +0100 Subject: [PATCH 1/5] =?UTF-8?q?gr=C3=BCner=20Test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../htw/berlin/prog2/ha1/CalculatorTest.java | 22 ++++++++++++++++++- 1 file changed, 21 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 ddff0da..1d8d369 100644 --- a/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java +++ b/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java @@ -90,5 +90,25 @@ void testMultipleDecimalDots() { //TODO hier weitere Tests erstellen -} + // Aufgabe1 + @Test + @DisplayName("should display result after minus two positive multi-digit numbers") + void testPositiveMinus() { + Calculator calc = new Calculator(); + calc.pressDigitKey(3); + calc.pressDigitKey(0); + calc.pressBinaryOperationKey("-"); + calc.pressDigitKey(1); + calc.pressDigitKey(0); + calc.pressEqualsKey(); + + String expected = "20"; + String actual = calc.readScreen(); + + assertEquals(expected, actual); + } + + + +} From 6e1e2fc175f2e068ffb271005dc841e67807463c Mon Sep 17 00:00:00 2001 From: Sibahe27 Date: Sun, 3 Nov 2024 12:32:55 +0100 Subject: [PATCH 2/5] erster roter Test --- .../java/htw/berlin/prog2/ha1/CalculatorTest.java | 11 +++++++++++ 1 file changed, 11 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 1d8d369..1113637 100644 --- a/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java +++ b/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java @@ -109,6 +109,17 @@ void testPositiveMinus() { assertEquals(expected, actual); } + //Aufgabe2 + @Test + @DisplayName("should display Error when trying to calculate 1/0") + void testInvertofZero(){ + Calculator calculator = new Calculator(); + calculator.pressDigitKey(0); + calculator.pressUnaryOperationKey("1/x"); + String expected = "Error"; + String actual = calculator.readScreen(); + assertEquals(expected, actual); + } } From 7d0dee3eb7ebf12a76fafd3f7b1c22edd68975e6 Mon Sep 17 00:00:00 2001 From: Sibahe27 Date: Sun, 3 Nov 2024 12:51:41 +0100 Subject: [PATCH 3/5] =?UTF-8?q?F=C3=BCr=20den=20Fix=20zu=20erstem=20roten?= =?UTF-8?q?=20Test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/htw/berlin/prog2/ha1/Calculator.java | 4 ++-- app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java | 2 +- 2 files changed, 3 insertions(+), 3 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 84c04f2..243b110 100644 --- a/app/src/main/java/htw/berlin/prog2/ha1/Calculator.java +++ b/app/src/main/java/htw/berlin/prog2/ha1/Calculator.java @@ -83,7 +83,7 @@ public void pressUnaryOperationKey(String operation) { screen = Double.toString(result); if(screen.equals("NaN")) screen = "Error"; if(screen.contains(".") && screen.length() > 11) screen = screen.substring(0, 10); - + if(screen.equals("Infinity")) screen = "Error"; } /** @@ -130,4 +130,4 @@ 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); } -} +} \ No newline at end of file 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 1113637..cce8858 100644 --- a/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java +++ b/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java @@ -109,7 +109,7 @@ void testPositiveMinus() { assertEquals(expected, actual); } - //Aufgabe2 + //Aufgabe2 roter Test @Test @DisplayName("should display Error when trying to calculate 1/0") void testInvertofZero(){ From 1251a267c1e89ce4ae6b0fa4ce517faa6f7ddff4 Mon Sep 17 00:00:00 2001 From: Sibahe27 Date: Sun, 3 Nov 2024 12:55:31 +0100 Subject: [PATCH 4/5] zweiter roter Test --- .../java/htw/berlin/prog2/ha1/CalculatorTest.java | 14 ++++++++++++++ 1 file changed, 14 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 cce8858..317f998 100644 --- a/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java +++ b/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java @@ -122,4 +122,18 @@ void testInvertofZero(){ } + // zweiter roter Test + @Test + @DisplayName("schould display result when calculate Binary plus Unary ") + void testResultCalculateOfBinaryplusUnary(){ + Calculator calculator = new Calculator(); + calculator.pressDigitKey(5); + calculator.pressBinaryOperationKey("+"); + calculator.pressDigitKey(4); + calculator.pressUnaryOperationKey("√"); + calculator.pressEqualsKey(); + String expected = "7"; + String actual = calculator.readScreen(); + assertEquals(expected, actual); + } } From 2d2892603fcde02701df4b43fcc8cf32bed9bfa2 Mon Sep 17 00:00:00 2001 From: Sibahe27 Date: Sun, 3 Nov 2024 12:57:03 +0100 Subject: [PATCH 5/5] =?UTF-8?q?F=C3=BCr=20den=20Fix=20zu=20zweitem=20roten?= =?UTF-8?q?=20Test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/htw/berlin/prog2/ha1/Calculator.java | 4 ++-- app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java | 2 +- 2 files changed, 3 insertions(+), 3 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 243b110..14a9790 100644 --- a/app/src/main/java/htw/berlin/prog2/ha1/Calculator.java +++ b/app/src/main/java/htw/berlin/prog2/ha1/Calculator.java @@ -72,8 +72,8 @@ public void pressBinaryOperationKey(String operation) { * @param operation "√" für Quadratwurzel, "%" für Prozent, "1/x" für Inversion */ public void pressUnaryOperationKey(String operation) { - latestValue = Double.parseDouble(screen); - latestOperation = operation; + //latestValue = Double.parseDouble(screen); + //latestOperation = operation; var result = switch(operation) { case "√" -> Math.sqrt(Double.parseDouble(screen)); case "%" -> Double.parseDouble(screen) / 100; 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 317f998..287d04c 100644 --- a/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java +++ b/app/src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java @@ -122,7 +122,7 @@ void testInvertofZero(){ } - // zweiter roter Test + // zweiter roter Test. @Test @DisplayName("schould display result when calculate Binary plus Unary ") void testResultCalculateOfBinaryplusUnary(){