From 5490e387f02bba69d594c8a1dfbc096f45c91e0c Mon Sep 17 00:00:00 2001
From: romano <luca.romano@student.reutlingen-university.de>
Date: Thu, 24 Mar 2022 12:00:52 +0100
Subject: [PATCH] Tests added
---
bin/main/io/fp/Primzahlen/App.class | Bin 501 -> 507 bytes
bin/main/io/fp/Primzahlen/Level.class | Bin 1173 -> 1177 bytes
bin/main/io/fp/Primzahlen/PrimGame.class | Bin 0 -> 2930 bytes
bin/main/io/fp/Primzahlen/Spiel.class | Bin 2685 -> 0 bytes
src/main/java/io/fp/Primzahlen/App.java | 2 +-
src/main/java/io/fp/Primzahlen/Level.java | 2 +-
.../Primzahlen/{Spiel.java => PrimGame.java} | 34 +++++++++-----
src/test/java/io/fp/Primzahlen/AppTest.java | 43 ++++++++++++++++++
8 files changed, 68 insertions(+), 13 deletions(-)
create mode 100644 bin/main/io/fp/Primzahlen/PrimGame.class
delete mode 100644 bin/main/io/fp/Primzahlen/Spiel.class
rename src/main/java/io/fp/Primzahlen/{Spiel.java => PrimGame.java} (68%)
create mode 100644 src/test/java/io/fp/Primzahlen/AppTest.java
diff --git a/bin/main/io/fp/Primzahlen/App.class b/bin/main/io/fp/Primzahlen/App.class
index 46163e2065dcee532bbde75316c95280be6444e3..cf12f8e583d0b810d596a93bddae476df48257ab 100644
GIT binary patch
delta 68
ycmey${F`~gF)7K+eEqZn{eYs(+^WQkoYXup(>*aab>dxHX=xvv(vyuC4+8*^!5Rbr
delta 62
ycmey({FQmaF>$fXeEqZn{eYs(+^WQkoYXx1;DXH5oQV%?B_w>X%T2amJPZK)!57y6
diff --git a/bin/main/io/fp/Primzahlen/Level.class b/bin/main/io/fp/Primzahlen/Level.class
index b9cdb456784f36a40b40ab646961db5895aaace6..ccce9f70572e33f64e6db19a846c3603951d0ced 100644
GIT binary patch
delta 50
zcmbQrIg@jO4KIh2tGlP4pKA~!gM`mS0WmRaMg|^FzYy0TUso4T#}HRW2Ihbu|BZzz
FEC4Jv3!nf1
delta 46
zcmbQqIhAvQ4G+7kr=Odnvj-!CgwI3)F=1;)1~y;MkPufNAS2k>BiuD;W2p)Y0QM3J
AZvX%Q
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
GIT binary patch
literal 2930
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
XTY{Jn-;$53II{LZSihiE1lRr#0I^|J
literal 0
HcmV?d00001
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
GIT binary patch
literal 0
HcmV?d00001
literal 2685
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
diff --git a/src/main/java/io/fp/Primzahlen/App.java b/src/main/java/io/fp/Primzahlen/App.java
index 7c78d68..3a4f5ce 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 c057bde..bd7df2e 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 663b571..1cd93ff 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 0000000..8aaf3b0
--- /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);
+ }
+
+}
--
GitLab