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

Check now working for all kinds of triangles.

Browse Source 
Including Tests for all Checks.
This commit is contained in:
Frederik Hagen 2021-12-21 14:41:48 +01:00
parent 6ec752ee68
commit cb1c503016
7 changed files with 156 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

6
.idea/misc.xml generated Normal file
View File

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

8
.idea/modules.xml generated Normal file
View File

@ -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>

6
.idea/vcs.xml generated Normal file
View File

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

13
TriangleCheckerAssignment.iml Normal file
View File

@ -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>

24
src/TriangleChecker.java
View File

@ -1,3 +1,4 @@
import java.util.Arrays;
import java.util.Scanner;
public class TriangleChecker {
@ -47,8 +48,29 @@ public class TriangleChecker {
// Analyse der Dreiecksart
public static TriangleType checkTriangle(float a, float b, float c) {
//find Hypotenuse
float[] tmp = {a, b, c};
Arrays.sort(tmp);
float hypo = tmp[2];
float a1 = tmp[0];
float b1 = tmp[1];
//normal
if (a1 + b1 > hypo) {
//gleichseitig
if (a1 + b1 + hypo == 3 * a1)
return TriangleType.EQUILATERAL;
//gleichschenklig
if (a1 == b1 || b1 == hypo || a1 == hypo)
return TriangleType.ISOSCELES;
return TriangleType.NORMAL;
}
return TriangleType.NONE;
}
}

45
test/TriangleCheckerTest.java
View File

@ -1,4 +1,7 @@
import org.junit.Test;
import java.util.Arrays;
import static org.junit.Assert.*;
public class TriangleCheckerTest {
@ -18,5 +21,47 @@ public class TriangleCheckerTest {
assertEquals(TriangleChecker.TriangleType.NORMAL, type);
}
@Test
public void testEquilateralTriangle() {
// Arrange
float a = 2;
float b = 2;
float c = 2;
// Act
TriangleChecker.TriangleType type = TriangleChecker.checkTriangle(a, b, c);
// Assert
assertEquals(TriangleChecker.TriangleType.EQUILATERAL, type);
}
@Test
public void testIsocelesTriangle() {
// Arrange
float a = 2;
float b = 2;
float c = 3;
// Act
TriangleChecker.TriangleType type = TriangleChecker.checkTriangle(a, b, c);
// Assert
assertEquals(TriangleChecker.TriangleType.ISOSCELES, type);
}
@Test
public void testNoTriangle() {
// Arrange
float a = 2;
float b = 2;
float c = 4;
// Act
TriangleChecker.TriangleType type = TriangleChecker.checkTriangle(a, b, c);
// Assert
assertEquals(TriangleChecker.TriangleType.NONE, type);
}
}