Assignment TriangleChecker

.idea/libraries/jars.xml

@@ -0,0 +1,10 @@
+<component name="libraryTable">
+  <library name="jars">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/jars/junit-4.12.jar!/" />
+      <root url="jar://$PROJECT_DIR$/jars/hamcrest-core-1.3.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/TriangleCheckerAssignment.iml" filepath="$PROJECT_DIR$/TriangleCheckerAssignment.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

TriangleCheckerAssignment.iml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="jars" level="project" />
+  </component>
+</module>

src/TriangleChecker.java

@@ -47,8 +47,20 @@ public class TriangleChecker {
 
   // Analyse der Dreiecksart
   public static TriangleType checkTriangle(float a, float b, float c) {
+    if (checkTriangleType(a,b,c) ){
+      if(a==b && a==c){return TriangleType.EQUILATERAL;}
+      if(a==b||b==c||a==c){return TriangleType.ISOSCELES;}
+
+      return TriangleType.NORMAL;
+    }
     return TriangleType.NONE;
   }
 
 
+  public static boolean checkTriangleType(float a, float b, float c) {
+    if (a <= 0 || b <= 0 || c <= 0) {
+      return false;
+    }
+    return (a + b > c && b + c > a && a + c > b);
+  }
 }

test/TriangleCheckerTest.java

@@ -10,12 +10,22 @@ public class TriangleCheckerTest {
         float a = 2;
         float b = 3;
         float c = 4;
+        float d = 12;
+        float e = 32;
+        float f = 7;
+        float h = 11;
+        float g = 41;
+        float i = 4;
 
-        // Act
-        TriangleChecker.TriangleType type = TriangleChecker.checkTriangle(a, b, c);
 
         // Assert
-        assertEquals(TriangleChecker.TriangleType.NORMAL, type);
+        assertTrue(TriangleChecker.checkTriangleType(a, b, c));
+        assertFalse(TriangleChecker.checkTriangleType(a, d, c));
+        assertTrue(TriangleChecker.checkTriangleType(e, d, e));
+        assertFalse(TriangleChecker.checkTriangleType(a, f, h));
+        assertFalse(TriangleChecker.checkTriangleType(i, c, d));
+        assertFalse(TriangleChecker.checkTriangleType(g, i, d));
+
 
     }