Version 3 der Triangle Checker Aufgabe

This commit is contained in:
Marie Trexler 2021-12-21 13:48:47 +01:00
parent 8a66a6eed0
commit 3a0ebd83e7
2 changed files with 33 additions and 17 deletions

View File

@ -47,7 +47,7 @@ public class TriangleChecker {
// Analyse der Dreiecksart
public static TriangleType checkTriangle(float a, float b, float c) {
if(a<=0 || b<=0 || c<=0 || a+b<c|| a+c<b || b+c<a){
if(a<=0 || b<=0 || c<=0 || a+b<=c|| a+c<=b || b+c<=a){
return TriangleType.NONE;
}
if(a==b && a==c){

View File

@ -97,22 +97,6 @@ public class TriangleCheckerTest {
}
@Test
public void testValidIsoscelesTriangle() {
// Arrange
float a = 3;
float b = 3;
float c = 4;
// Act
TriangleChecker.TriangleType type = TriangleChecker.checkTriangle(a, b, c);
// Assert
assertEquals(TriangleChecker.TriangleType.ISOSCELES, type);
}
@Test
public void testValidNoTriangle5() {
@ -129,5 +113,37 @@ public class TriangleCheckerTest {
}
@Test
public void testValidNoTriangle6() {
// Arrange
float a = 3;
float b = 5;
float c = 8;
// Act
TriangleChecker.TriangleType type = TriangleChecker.checkTriangle(a, b, c);
// Assert
assertEquals(TriangleChecker.TriangleType.NONE, type);
}
@Test
public void testValidIsoscelesTriangle() {
// Arrange
float a = 3;
float b = 3;
float c = 4;
// Act
TriangleChecker.TriangleType type = TriangleChecker.checkTriangle(a, b, c);
// Assert
assertEquals(TriangleChecker.TriangleType.ISOSCELES, type);
}
}