diff --git a/out/production/TriangleCheckerAssignment/TriangleChecker.class b/out/production/TriangleCheckerAssignment/TriangleChecker.class index d21dd02..1d5532d 100644 Binary files a/out/production/TriangleCheckerAssignment/TriangleChecker.class and b/out/production/TriangleCheckerAssignment/TriangleChecker.class differ diff --git a/out/test/TriangleCheckerAssignment/TriangleCheckerTest.class b/out/test/TriangleCheckerAssignment/TriangleCheckerTest.class index 1aae986..80938f4 100644 Binary files a/out/test/TriangleCheckerAssignment/TriangleCheckerTest.class and b/out/test/TriangleCheckerAssignment/TriangleCheckerTest.class differ diff --git a/src/TriangleChecker.java b/src/TriangleChecker.java index ca28825..2d196cc 100644 --- a/src/TriangleChecker.java +++ b/src/TriangleChecker.java @@ -49,17 +49,15 @@ public class TriangleChecker { public static TriangleType checkTriangle(float a, float b, float c) { if(a >= (b+c) || c >= (b+a) || b >= (a+c) || a<=0 || b<=0 || c<=0){ - return TriangleType.NONE; } - if(a == b && b==c) { return TriangleType.EQUILATERAL; } + if(a == b || a == c || b == c){ + return TriangleType.ISOSCELES; + } return TriangleType.NORMAL; - - } - } \ No newline at end of file diff --git a/test/TriangleCheckerTest.java b/test/TriangleCheckerTest.java index e7761d0..1184592 100644 --- a/test/TriangleCheckerTest.java +++ b/test/TriangleCheckerTest.java @@ -54,4 +54,22 @@ public class TriangleCheckerTest { } + @Test + public void testISOSCELESTriangle() { + + // Arrange + float a = 3; + float b = 2; + float c = 2; + + // Act + TriangleChecker.TriangleType type = TriangleChecker.checkTriangle(a, b, c); + + // Assert + assertEquals(TriangleChecker.TriangleType.ISOSCELES, type); + + + } + + }