From 4412fa436a9f63d276e44c7ee23d735a9cb32ef3 Mon Sep 17 00:00:00 2001 From: marti Date: Tue, 5 Nov 2024 16:59:48 +0100 Subject: [PATCH] =?UTF-8?q?5.11.24=20TriangleCheckerTest=20+=20TriangleChe?= =?UTF-8?q?ckerTest=20mit=20Anpassung=20f=C3=BCr=20Gleischenkliges=20Dreie?= =?UTF-8?q?ck?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Test/praktikum02/TriangleCheckerTest.java | 4 ++++ src/praktikum02/TriangleChecker.java | 19 +++++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/Test/praktikum02/TriangleCheckerTest.java b/Test/praktikum02/TriangleCheckerTest.java index 5922e86..0bd5514 100644 --- a/Test/praktikum02/TriangleCheckerTest.java +++ b/Test/praktikum02/TriangleCheckerTest.java @@ -15,6 +15,10 @@ class TriangleCheckerTest { assertEquals(TriangleChecker.TriangleType.EQUILATERAL,TriangleChecker.checkTriangle(1, 1, 1)); } @Test + void checkIsocelesTriangle(){ + assertEquals(TriangleChecker.TriangleType.ISOSCELES,TriangleChecker.checkTriangle(5, 5, 1)); + } + @Test void checkNegativ() { assertEquals(TriangleChecker.TriangleType.NONE, TriangleChecker.checkTriangle(-1, 3, 5)); assertEquals(TriangleChecker.TriangleType.NONE, TriangleChecker.checkTriangle(3, 0, 5)); diff --git a/src/praktikum02/TriangleChecker.java b/src/praktikum02/TriangleChecker.java index e6f323a..4681cb5 100644 --- a/src/praktikum02/TriangleChecker.java +++ b/src/praktikum02/TriangleChecker.java @@ -49,14 +49,21 @@ public class TriangleChecker { // Analyse der Dreiecksart public static TriangleType checkTriangle(float a, float b, float c) { - if(a==b && b==c){ + if (a + b <= c || a + c <= b || b + c <= a) { + return TriangleType.NONE; + } + if (a <= 0 || b <= 0 || c <= 0) { + return TriangleType.NONE; + } + if (a == b && b == c) { return TriangleType.EQUILATERAL; } - else { - return TriangleType.NORMAL; + if (a == b || b == c || a == c) { + return TriangleType.ISOSCELES; } - + return TriangleType.NORMAL; } - - } + + +