Browse Source

#37 Korrektur

remotes/origin/JaFi
jannisfingerhut 2 years ago
parent
commit
fea640248f
  1. 13
      LernProgramm/testProgramm.java

13
LernProgramm/testProgramm.java

@ -38,7 +38,6 @@ class testProgramm {
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,19 +54,18 @@ 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
@Test
public void testAddition1() {
@ -76,19 +73,16 @@ class testProgramm {
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
public void testDivision1() {
double result = 15 / 10;
@ -97,7 +91,7 @@ class testProgramm {
// 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() {
public void testFakultaetMItNull() {
String input = "0\n";
ByteArrayInputStream in = new ByteArrayInputStream(input.getBytes());
System.setIn(in);

Loading…
Cancel
Save