From 37ece7ec9fa5fae9724acd6f51b99b7c44741c2d Mon Sep 17 00:00:00 2001 From: neumeiermo84285 Date: Tue, 14 Dec 2021 15:34:04 +0100 Subject: [PATCH] Test2 gleichschenklig finished --- .../TriangleChecker.class | Bin 2007 -> 2061 bytes .../TriangleCheckerTest.class | Bin 1242 -> 1440 bytes src/TriangleChecker.java | 8 +++----- test/TriangleCheckerTest.java | 18 ++++++++++++++++++ 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/out/production/TriangleCheckerAssignment/TriangleChecker.class b/out/production/TriangleCheckerAssignment/TriangleChecker.class index d21dd020e100ef2579491fcfa19a856b1c0ec0b8..1d5532d15c9dd12dd38e5d6d0d1f1406ef9fdf5f 100644 GIT binary patch delta 514 zcmX|;?Mebc7=_Qex!Z1rCLvf5r7P72nPf##5|}{{7;KqT+IRM0+2?O>pdecOQ5O+v zU{KHnbOYT+R}h_9qg|Le@9dfLKC|=Xz4PgxKW`rZrg2l#Z)Lx>V5O~OYB6PLNMhZC zjh6>`MM~u8i9+HFxXo8cH3}E<92I9##wN9=X}}h?S!vk8E?07P#62(N?V`KCEL?H8 zIgViu`<&Zg;s6Euy3mb795J^Koj9hFG04mlsut)l5D{tIGe?h$v!@RKPy;cuf%r4) zCXw!Z3qob0=oe^uMVA0efmy^Uqja8W!~q;o3Ix1YqA{_-WIG_^zzBcFfe~lVI4~|o zr*Q_0fF=7|3APKUcUCgztQ}Aju-1^@s6 delta 441 zcmX|7$x6dO82*y!BsvCKiUg_%3Q92)ThM@74U&LY5g~=vU2EO97Z5z_DM#;~JhN>qQg#LlA4F? za!?q@gi-sJBcXOyL;@waWNKaC%$`x>Nahia$xx`GW|)!FVU9P4!cDpxMW{spYWeuEtR;_M-}>h E0cz7W4FCWD diff --git a/out/test/TriangleCheckerAssignment/TriangleCheckerTest.class b/out/test/TriangleCheckerAssignment/TriangleCheckerTest.class index 1aae9868855df3c6cf9aef7360ede3c77f2c84da..80938f4c59ee0fe11f30b9d67ae769747a9ef8b7 100644 GIT binary patch delta 597 zcmbVI%TB^j5Iwyu)K(CXhZHrK@Uq|w#TViuYK)O;VjyaH&U)ibXZ%Rn5(2uesPFitw{&Vh64 zbaYhQJLPjM-Mzf&%C37M&XQ#a!hsMJeqqL0_f2FfHhW$LXs9wq{5*sj=2$71=d0lC zKvWgmwbgvvn`)2)u!1Rp2`pfd(;=j=#7tlW3DlXXT-3la`x;h=@w6H~^J>8SsMfB$ zEpn`ZNg}40O%pXkjsjK6{$@kXT%f5+&9Kxoq-Np|&9y+Yu6b_Gwfw_RH!3p!aI-#S zrh|Jr@UD{`*AJsk^r%oQ^kD^*G?@SZ delta 381 zcmb7xo^cm$825icPAkKCCl(ZH%y_1Vn5t0+Yf`E+(V_Dy2#;>qvDl_pJ z6Ytzc6*X1@bxtLk2jsJAko@={=L50|$&rxkgyiH8@*p6uEpzkMDy+Y6R>=H)v!rj(+X!R6E}eLc HlX>n1_I@Eo 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); + + + } + + }