From fea640248fe2db3d3352633bd01bb1ade4342c0a Mon Sep 17 00:00:00 2001 From: jannisfingerhut Date: Fri, 10 Feb 2023 23:44:18 +0100 Subject: [PATCH] #37 Korrektur --- LernProgramm/testProgramm.java | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/LernProgramm/testProgramm.java b/LernProgramm/testProgramm.java index 45c826f..20e7bc1 100644 --- a/LernProgramm/testProgramm.java +++ b/LernProgramm/testProgramm.java @@ -15,13 +15,13 @@ class testProgramm { // Die annderen testen die Funktionenn in der ausgelagerten Klasse zur besseren // Übersicht - // Testest +// Testest @Test void test() { assertTrue(true); } - // PrimZahlen +// PrimZahlen @Test public void testPrimBis100() { ByteArrayOutputStream out = new ByteArrayOutputStream(); @@ -32,13 +32,12 @@ class testProgramm { assertEquals("2 3 5 7 11 13 17 19 23 29 31 37 41 43 47 53 59 61 67 71 73 79 83 89 97 ", out.toString()); } - // Binärrechner +// Binärrechner @Test public void testAddition() { int result = FunktionenAusgelagert.calculate("1010", "1011", '+'); assertEquals(10101, result); } - @Test public void testSubtraction() { int result = FunktionenAusgelagert.calculate("1010", "1011", '-'); @@ -47,7 +46,6 @@ class testProgramm { assertTrue(true); } } - @Test public void testMultiplication() { int result = FunktionenAusgelagert.calculate("1010", "1011", '*'); @@ -56,48 +54,44 @@ class testProgramm { assertTrue(true); } } - @Test public void testDivision() { int result = FunktionenAusgelagert.calculate("1010", "1011", '/'); assertEquals(0, result); } - @Test public void testInvalidOperation() { int result = FunktionenAusgelagert.calculate("1010", "1011", '%'); assertEquals(0, result); } - - // Taschenrechner + + +// Taschenrechner @Test public void testAddition1() { double result = 2 + 3.5; assertEquals(5.5, result, 0); } - @Test public void testSubtraction1() { double result = 5 - 3.5; assertEquals(1.5, result, 0); } - @Test public void testMultiplication1() { double result = 5 * 3.5; assertEquals(17.5, result, 0); } - - @Test + @Test public void testDivision1() { double result = 15 / 10; assertEquals(1, result, 0); } - // Fakultaet +// Fakultaet @Test - public void testFakultaetWithPositiveNumber() { + public void testFakultaetmitPositerZahl() { String input = "5\n"; ByteArrayInputStream in = new ByteArrayInputStream(input.getBytes()); System.setIn(in); @@ -109,9 +103,8 @@ class testProgramm { assertEquals("120\n", out.toString()); } - - @Test - public void testFakultaetWithZero() { + @Test + public void testFakultaetMItNull() { String input = "0\n"; ByteArrayInputStream in = new ByteArrayInputStream(input.getBytes()); System.setIn(in);