enhuberfe85917/TriangleCheckerAssignment
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

TriangleCheckerAssignment final changes -no private repository

Browse Source
This commit is contained in:
Felix Enhuber 2021-12-23 21:45:05 +01:00
parent 6ec752ee68
commit 26ba7b4638
2 changed files with 52 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/TriangleChecker.java
View File

@ -47,8 +47,23 @@ 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 (checkTriangleShape(a, b, c)) {
if (a == b && a == c) return TriangleType.EQUILATERAL;
if (a == b || a == c || b == c)
return TriangleType.ISOSCELES;
return TriangleType.NORMAL;
}
return TriangleType.NONE; return TriangleType.NONE;
} }
public static boolean checkTriangleShape(float a, float b, float c) {
if (a <= 0 || b <= 0 || c <= 0)
return false;
return a + b > c && a + c > b && b + c > a;
}
} }

32
test/TriangleCheckerTest.java
View File

@ -10,12 +10,40 @@ public class TriangleCheckerTest {
float a = 2; float a = 2;
float b = 3; float b = 3;
float c = 4; float c = 4;
float d = 32;
float e = 8;
float f = 0;
float g = 6;
float h = 9;
float i = 28;
// Act // Act
TriangleChecker.TriangleType type = TriangleChecker.checkTriangle(a, b, c); TriangleChecker.TriangleType normal = TriangleChecker.TriangleType.NORMAL;
TriangleChecker.TriangleType none = TriangleChecker.TriangleType.NONE;
TriangleChecker.TriangleType isoceles = TriangleChecker.TriangleType.ISOSCELES;
TriangleChecker.TriangleType equilateral = TriangleChecker.TriangleType.EQUILATERAL;
assertTrue(TriangleChecker.checkTriangleShape(a, b, c));
assertFalse(TriangleChecker.checkTriangleShape(a, d, c));
assertFalse(TriangleChecker.checkTriangleShape(e, d, e));
assertFalse(TriangleChecker.checkTriangleShape(a, f, h));
assertFalse(TriangleChecker.checkTriangleShape(i, c, d));
assertTrue(TriangleChecker.checkTriangleShape(g, i, d));
// Assert // Assert
assertEquals(TriangleChecker.TriangleType.NORMAL, type); assertEquals(normal, testTriangle(a, b, c));
assertEquals(none, testTriangle(a, b, d));
assertEquals(none, testTriangle(a, f, d));
assertEquals(none, testTriangle(f, f, d));
assertEquals(none, testTriangle(c, c, d));
assertEquals(equilateral, testTriangle(a, a, a));
assertEquals(isoceles, testTriangle(a, d, d));
}
public TriangleChecker.TriangleType testTriangle(float side1, float side2, float side3) {
return TriangleChecker.checkTriangle(side1, side2, side3);
} }