From 73650835d671cd1a3714cccf89bd870b5edb5a70 Mon Sep 17 00:00:00 2001 From: winkl Date: Thu, 16 Dec 2021 14:39:07 +0100 Subject: [PATCH] Normale Dreiecke und Gleichseitige Dreiecke --- src/TriangleChecker.java | 7 +++++++ test/TriangleCheckerTest.java | 17 ++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/TriangleChecker.java b/src/TriangleChecker.java index 14f4841..192ba63 100644 --- a/src/TriangleChecker.java +++ b/src/TriangleChecker.java @@ -47,6 +47,13 @@ public class TriangleChecker { // Analyse der Dreiecksart 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; + return TriangleType.NORMAL; + } + + return TriangleType.NONE; } diff --git a/test/TriangleCheckerTest.java b/test/TriangleCheckerTest.java index 5c9ff57..50d2ea2 100644 --- a/test/TriangleCheckerTest.java +++ b/test/TriangleCheckerTest.java @@ -16,7 +16,22 @@ public class TriangleCheckerTest { // Assert assertEquals(TriangleChecker.TriangleType.NORMAL, type); - } + @Test + public void testEqualTriangle(){ + // Arrange + float a = 3; + float b = 3; + float c = 3; + + // Act + TriangleChecker.TriangleType type = TriangleChecker.checkTriangle(a, b, c); + + // Assert + assertEquals(TriangleChecker.TriangleType.ISOSCELES, type); + } + + + }