Compare commits
2 Commits
f18a61ac58
...
f27258808d
Author | SHA1 | Date | |
---|---|---|---|
f27258808d | |||
bf3372930f |
@ -48,7 +48,11 @@ 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 || b+c>a || a+c>b) {
|
if ((a+b>c || b+c>a || a+c>b) && (a>0 && b>0 && c>0)) {
|
||||||
|
|
||||||
|
if (a==b && b==c) {
|
||||||
|
return TriangleType.EQUILATERAL;
|
||||||
|
}
|
||||||
|
|
||||||
if (a == b || a == c || b == c) {
|
if (a == b || a == c || b == c) {
|
||||||
return TriangleType.ISOSCELES;
|
return TriangleType.ISOSCELES;
|
||||||
|
@ -7,15 +7,15 @@ public class TriangleCheckerTest {
|
|||||||
public void testValidTriangle() {
|
public void testValidTriangle() {
|
||||||
|
|
||||||
// Arrange
|
// Arrange
|
||||||
float a = 2;
|
float a = 0;
|
||||||
float b = 2;
|
float b = 0;
|
||||||
float c = 4;
|
float c = 2;
|
||||||
|
|
||||||
// Act
|
// Act
|
||||||
TriangleChecker.TriangleType type = TriangleChecker.checkTriangle(a, b, c);
|
TriangleChecker.TriangleType type = TriangleChecker.checkTriangle(a, b, c);
|
||||||
|
|
||||||
// Assert
|
// Assert
|
||||||
assertEquals(TriangleChecker.TriangleType.ISOSCELES, type);
|
assertEquals(TriangleChecker.TriangleType.NONE, type);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user