diff --git a/src/TriangleChecker.java b/src/TriangleChecker.java index 192ba63..8939dd1 100644 --- a/src/TriangleChecker.java +++ b/src/TriangleChecker.java @@ -49,11 +49,13 @@ public class TriangleChecker { public static TriangleType checkTriangle(float a, float b, float c) { if( (a+b>c) && (c+b>a) && (a+c>b)) { - if(a==b && b==c && a==c) return TriangleType.ISOSCELES; + if(a==b || b==c|| a==c) { + if (a == b && b == c && a == c) return TriangleType.EQUILATERAL; + return TriangleType.ISOSCELES; + } return TriangleType.NORMAL; } - return TriangleType.NONE; } diff --git a/test/TriangleCheckerTest.java b/test/TriangleCheckerTest.java index 50d2ea2..776699c 100644 --- a/test/TriangleCheckerTest.java +++ b/test/TriangleCheckerTest.java @@ -18,6 +18,20 @@ public class TriangleCheckerTest { assertEquals(TriangleChecker.TriangleType.NORMAL, type); } + @Test + public void testIsoTriangle(){ + // Arrange + float a = 3; + float b = 3; + float c = 2; + + // Act + TriangleChecker.TriangleType type = TriangleChecker.checkTriangle(a, b, c); + + // Assert + assertEquals(TriangleChecker.TriangleType.ISOSCELES, type); + } + @Test public void testEqualTriangle(){ // Arrange @@ -29,9 +43,7 @@ public class TriangleCheckerTest { TriangleChecker.TriangleType type = TriangleChecker.checkTriangle(a, b, c); // Assert - assertEquals(TriangleChecker.TriangleType.ISOSCELES, type); + assertEquals(TriangleChecker.TriangleType.EQUILATERAL, type); } - - }