From f3b27c5a7a8b496932997801cfd2f6a8b67c79f7 Mon Sep 17 00:00:00 2001 From: Tim Lachmann Date: Tue, 29 Oct 2024 15:42:27 +0100 Subject: [PATCH] all checks okay --- src/Praktikum02/TriangleChecker.java | 3 +++ test/Praktikum02/TriangleCheckerTest.java | 31 +++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/src/Praktikum02/TriangleChecker.java b/src/Praktikum02/TriangleChecker.java index 8602ebf..c29f546 100644 --- a/src/Praktikum02/TriangleChecker.java +++ b/src/Praktikum02/TriangleChecker.java @@ -51,6 +51,9 @@ public class TriangleChecker { public static TriangleType checkTriangle(float a, float b, float c) { if(a + b > c && a + c > b && b + c > a){ + if (a == b && b == c){ + return TriangleType.EQUILATERAL; + } if (a == b || b == c || a == c){ return TriangleType.ISOSCELES; } diff --git a/test/Praktikum02/TriangleCheckerTest.java b/test/Praktikum02/TriangleCheckerTest.java index 57059ec..f618d5e 100644 --- a/test/Praktikum02/TriangleCheckerTest.java +++ b/test/Praktikum02/TriangleCheckerTest.java @@ -20,4 +20,35 @@ class TriangleCheckerTest { void checkTriangleISOSCELES(){ assertEquals(TriangleChecker.TriangleType.ISOSCELES,TriangleChecker.checkTriangle(6,6, 2)); } + + @Test + void checkTriangleEQUILATERAL(){ + assertEquals(TriangleChecker.TriangleType.EQUILATERAL,TriangleChecker.checkTriangle(6,6, 6)); + } + + @Test + void checkTriangleANegativ(){ + assertEquals(TriangleChecker.TriangleType.NONE,TriangleChecker.checkTriangle(-6,6, 6)); + } + @Test + void checkTriangleBNegativ(){ + assertEquals(TriangleChecker.TriangleType.NONE,TriangleChecker.checkTriangle(6,-6, 6)); + } + @Test + void checkTriangleCNegativ(){ + assertEquals(TriangleChecker.TriangleType.NONE,TriangleChecker.checkTriangle(6,6, -6)); + } + + @Test + void checkTriangleAToLong(){ + assertEquals(TriangleChecker.TriangleType.NONE,TriangleChecker.checkTriangle(36,6, 6)); + } + @Test + void checkTriangleBToLong(){ + assertEquals(TriangleChecker.TriangleType.NONE,TriangleChecker.checkTriangle(6,46, 6)); + } + @Test + void checkTriangleCToLong(){ + assertEquals(TriangleChecker.TriangleType.NONE,TriangleChecker.checkTriangle(6,6, 56)); + } } \ No newline at end of file