diff --git a/bin/main/io/fp/Primzahlen/App.class b/bin/main/io/fp/Primzahlen/App.class index 46163e2065dcee532bbde75316c95280be6444e3..cf12f8e583d0b810d596a93bddae476df48257ab 100644 Binary files a/bin/main/io/fp/Primzahlen/App.class and b/bin/main/io/fp/Primzahlen/App.class differ diff --git a/bin/main/io/fp/Primzahlen/Level.class b/bin/main/io/fp/Primzahlen/Level.class index b9cdb456784f36a40b40ab646961db5895aaace6..ccce9f70572e33f64e6db19a846c3603951d0ced 100644 Binary files a/bin/main/io/fp/Primzahlen/Level.class and b/bin/main/io/fp/Primzahlen/Level.class differ diff --git a/bin/main/io/fp/Primzahlen/PrimGame.class b/bin/main/io/fp/Primzahlen/PrimGame.class new file mode 100644 index 0000000000000000000000000000000000000000..82269670c1d0b9f76b499e482ace5cee66f6d79b Binary files /dev/null and b/bin/main/io/fp/Primzahlen/PrimGame.class differ diff --git a/bin/main/io/fp/Primzahlen/Spiel.class b/bin/main/io/fp/Primzahlen/Spiel.class deleted file mode 100644 index 46ef2df63ec5c9117ce07a66640ce16ab15f4daf..0000000000000000000000000000000000000000 Binary files a/bin/main/io/fp/Primzahlen/Spiel.class and /dev/null differ diff --git a/src/main/java/io/fp/Primzahlen/App.java b/src/main/java/io/fp/Primzahlen/App.java index 7c78d688f0e43c9dd04d23d6a69caa36f7df1408..3a4f5cee1c4e8a66577cf481f0922aa7f6a717c3 100644 --- a/src/main/java/io/fp/Primzahlen/App.java +++ b/src/main/java/io/fp/Primzahlen/App.java @@ -2,7 +2,7 @@ package io.fp.Primzahlen; public class App { public static void main(String[] args) { - Spiel spiel = new Spiel(); + PrimGame spiel = new PrimGame(); spiel.play(); } } diff --git a/src/main/java/io/fp/Primzahlen/Level.java b/src/main/java/io/fp/Primzahlen/Level.java index c057bdefc30c1a7c7effe31d238aea242252008a..bd7df2ee3c2e80ee8bc5f22dc31be2a23e88e5e6 100644 --- a/src/main/java/io/fp/Primzahlen/Level.java +++ b/src/main/java/io/fp/Primzahlen/Level.java @@ -1,7 +1,7 @@ package io.fp.Primzahlen; public enum Level { - EINFACH,MITTEL, SCHWER; + BEGINNER, INTERMEDIATE, PRO; public Level getNextLevel() { return values()[(ordinal() +1) % values().length]; diff --git a/src/main/java/io/fp/Primzahlen/Spiel.java b/src/main/java/io/fp/Primzahlen/PrimGame.java similarity index 68% rename from src/main/java/io/fp/Primzahlen/Spiel.java rename to src/main/java/io/fp/Primzahlen/PrimGame.java index 663b5714a43cac46be61e592ddcf285b46a616ca..1cd93ff993806fca18e215e0dc2e412ed945a20b 100644 --- a/src/main/java/io/fp/Primzahlen/Spiel.java +++ b/src/main/java/io/fp/Primzahlen/PrimGame.java @@ -3,12 +3,24 @@ package io.fp.Primzahlen; import java.util.Random; import java.util.Scanner; -public class Spiel { +public class PrimGame { private Level level; - private int zahl; + private int number; - public Spiel() { - this.level = Level.EINFACH; + public PrimGame() { + this.level = Level.BEGINNER; + } + + public int getNumber() { + return number; + } + + public Level getLevel() { + return level; + } + + public void levelUp(){ + level = level.getNextLevel(); } public boolean checkIfPrim(int anwser) { @@ -24,17 +36,17 @@ public class Spiel { int i = 0; Random rand = new Random(); switch (level) { - case EINFACH: + case BEGINNER: i = rand.nextInt(100 - 1 + 1) + 1; break; - case MITTEL: + case INTERMEDIATE: i = rand.nextInt(800 - 100 + 1) + 100; break; - case SCHWER: + case PRO: i = rand.nextInt(1000 - 800 + 1) + 800; break; } - zahl = i; + number = i; } public void play() { @@ -42,14 +54,14 @@ public class Spiel { try (Scanner scanner = new Scanner(System.in)) { for (int i = 0; i < 15; i++) { if (i == 5 || i == 10) { - level = level.getNextLevel(); + levelUp(); System.out.println("You reached the Level: " + level.toString()); } generateNumber(); - System.out.println("Is " + zahl + " a prime number? (true/false)"); + System.out.println("Is " + number + " a prime number? (true/false)"); String answer = scanner.nextLine(); - if (checkIfPrim(zahl) == Boolean.parseBoolean(answer)) { + if (checkIfPrim(number) == Boolean.parseBoolean(answer)) { System.out.println("You right!"); count++; } diff --git a/src/test/java/io/fp/Primzahlen/AppTest.java b/src/test/java/io/fp/Primzahlen/AppTest.java new file mode 100644 index 0000000000000000000000000000000000000000..8aaf3b0e0454d3680e6ba04de68121ebbc9e9ec2 --- /dev/null +++ b/src/test/java/io/fp/Primzahlen/AppTest.java @@ -0,0 +1,43 @@ +/* + * This Java source file was generated by the Gradle 'init' task. + */ +package io.fp.Primzahlen; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +class AppTest { + PrimGame game; + + @BeforeEach + void setUp(){ + game = new PrimGame(); + } + @Test void testifCorrect() { + assertEquals(true, game.checkIfPrim(11)); + } + + @Test void testifCorrectforBeginner() { + int[] prim = new int[] {2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47 , 53, 59, 61, 67, 71, 73, 79, 83, 89, 97}; + + for(int i : prim){ + assertEquals(true, game.checkIfPrim(i)); + } + + } + + @Test void testLevel() { + game.generateNumber(); + assertTrue(game.getNumber()<100); + game.levelUp(); + game.generateNumber(); + assertTrue(game.getNumber()<800&& game.getNumber()>100); + game.levelUp(); + game.generateNumber(); + assertTrue(game.getNumber()<1000 && game.getNumber()>800); + } + +}