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

Compare commits

base: kimta84420:ef5d2b1376dc42169d94a42310949e2d046b4662
Branches Tags
kimta84420:master
..
compare: kimta84420:6ec752ee68e99d315169aa7b09074ae270447b0a
Branches Tags
kimta84420:master

No commits in common. "ef5d2b1376dc42169d94a42310949e2d046b4662" and "6ec752ee68e99d315169aa7b09074ae270447b0a" have entirely different histories.
ef5d2b1376 ... 6ec752ee68

11 changed files with 3 additions and 68 deletions
Show Stats Expand all files Collapse all files

10
.idea/libraries/jars.xml generated
View File

@ -1,10 +0,0 @@
<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>

6
.idea/misc.xml generated
View File

@ -1,6 +0,0 @@
<?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>

8
.idea/modules.xml generated
View File

@ -1,8 +0,0 @@
<?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>

6
.idea/vcs.xml generated
View File

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

13
TriangleCheckerAssignment.iml
View File

@ -1,13 +0,0 @@
<?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>

BIN
out/production/TriangleCheckerAssignment/TriangleChecker$1.class
View File

Binary file not shown.

BIN
out/production/TriangleCheckerAssignment/TriangleChecker$TriangleType.class
View File

Binary file not shown.

BIN
out/production/TriangleCheckerAssignment/TriangleChecker.class
View File

Binary file not shown.

BIN
out/test/TriangleCheckerAssignment/TriangleCheckerTest.class
View File

Binary file not shown.

12
src/TriangleChecker.java
View File

@ -47,20 +47,8 @@ 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);
}
}

16
test/TriangleCheckerTest.java
View File

@ -10,22 +10,12 @@ 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
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));
assertEquals(TriangleChecker.TriangleType.NORMAL, type);
}