spitzerma96060/Prog3A
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

5.11.24 TriangleCheckerTest + TriangleCheckerTest mit Anpassung für Gleischenkliges Dreieck

Browse Source
This commit is contained in:
marti 2024-11-05 16:59:48 +01:00
parent bfcccf814a
commit 4412fa436a
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Test/praktikum02/TriangleCheckerTest.java
View File

@ -15,6 +15,10 @@ class TriangleCheckerTest {
assertEquals(TriangleChecker.TriangleType.EQUILATERAL,TriangleChecker.checkTriangle(1, 1, 1)); assertEquals(TriangleChecker.TriangleType.EQUILATERAL,TriangleChecker.checkTriangle(1, 1, 1));
} }
@Test @Test
void checkIsocelesTriangle(){
assertEquals(TriangleChecker.TriangleType.ISOSCELES,TriangleChecker.checkTriangle(5, 5, 1));
}
@Test
void checkNegativ() { void checkNegativ() {
assertEquals(TriangleChecker.TriangleType.NONE, TriangleChecker.checkTriangle(-1, 3, 5)); assertEquals(TriangleChecker.TriangleType.NONE, TriangleChecker.checkTriangle(-1, 3, 5));
assertEquals(TriangleChecker.TriangleType.NONE, TriangleChecker.checkTriangle(3, 0, 5)); assertEquals(TriangleChecker.TriangleType.NONE, TriangleChecker.checkTriangle(3, 0, 5));

13
src/praktikum02/TriangleChecker.java
View File

@ -49,14 +49,21 @@ public class TriangleChecker {
// Analyse der Dreiecksart // Analyse der Dreiecksart
public static TriangleType checkTriangle(float a, float b, float c) { public static TriangleType checkTriangle(float a, float b, float c) {
if (a + b <= c || a + c <= b || b + c <= a) {
return TriangleType.NONE;
}
if (a <= 0 || b <= 0 || c <= 0) {
return TriangleType.NONE;
}
if (a == b && b == c) { if (a == b && b == c) {
return TriangleType.EQUILATERAL; return TriangleType.EQUILATERAL;
} }
else { if (a == b || b == c || a == c) {
return TriangleType.ISOSCELES;
}
return TriangleType.NORMAL; return TriangleType.NORMAL;
} }
} }
}