baumannsa84287/TriangleCheckerAssignment
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: baumannsa84287:f27258808d116c75f58d91a77f1b4d8fbf334717
Branches Tags
baumannsa84287:master
..
compare: baumannsa84287:f18a61ac5877a8b21c560d5bf6bea777b410abc3
Branches Tags
baumannsa84287:master

No commits in common. "f27258808d116c75f58d91a77f1b4d8fbf334717" and "f18a61ac5877a8b21c560d5bf6bea777b410abc3" have entirely different histories.
f27258808d ... f18a61ac58

2 changed files with 5 additions and 9 deletions
Show Stats Expand all files Collapse all files

6
src/TriangleChecker.java
View File

@ -48,11 +48,7 @@ public class TriangleChecker {
// Analyse der Dreiecksart // Analyse der Dreiecksart
public static TriangleType checkTriangle(float a, float b, float c) { public static TriangleType checkTriangle(float a, float b, float c) {
if ((a+b>c || b+c>a || a+c>b) && (a>0 && b>0 && c>0)) { if (a+b>c || b+c>a || a+c>b) {
if (a==b && b==c) {
return TriangleType.EQUILATERAL;
}
if (a == b || a == c || b == c) { if (a == b || a == c || b == c) {
return TriangleType.ISOSCELES; return TriangleType.ISOSCELES;

8
test/TriangleCheckerTest.java
View File

@ -7,15 +7,15 @@ public class TriangleCheckerTest {
public void testValidTriangle() { public void testValidTriangle() {
// Arrange // Arrange
float a = 0; float a = 2;
float b = 0; float b = 2;
float c = 2; float c = 4;
// Act // Act
TriangleChecker.TriangleType type = TriangleChecker.checkTriangle(a, b, c); TriangleChecker.TriangleType type = TriangleChecker.checkTriangle(a, b, c);
// Assert // Assert
assertEquals(TriangleChecker.TriangleType.NONE, type); assertEquals(TriangleChecker.TriangleType.ISOSCELES, type);
} }