fdai6545
/
CIiP-WiSe-2021-Projektarbeit-Mensch_Aerger_Dich_Nicht
forked from FelixKrull/CIiP-WiSe-2021-Projektarbeit-Mensch_Aerger_Dich_Nicht
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Final Refactoring

develop^2
Jonas Wagner 3 years ago
parent
3a46b47c63
commit
ffb7feeb2e
4 changed files with 30 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      src/main/java/Gameboard.java
  2. 1
      src/main/java/Player.java
  3. 30
      src/test/java/GameTest.java
  4. 19
      src/test/java/GameboardTest.java

12
src/main/java/Gameboard.java
View File

@ -183,15 +183,3 @@ public class Gameboard {
return res; return res;
} }
} }
/*
0-39 Spielfelder
Rot Ziel: 40,41,42,43
Blau Ziel: 44,45,46,47
Gelb Ziel: 48,49,50,51
Grün Ziel: 52.53.54.55
Rot Daneben: 56,57,58,59
Blau Daneben: 60,61,62,63
Gelb Daneben: 64.65.66.67
Grün Daneben: 68.69,70,71
*/

1
src/main/java/Player.java
View File

@ -70,7 +70,6 @@ public class Player {
*/ */
public int choose(ArrayList<Integer> usableFigures) { public int choose(ArrayList<Integer> usableFigures) {
StringBuilder out = new StringBuilder("["); StringBuilder out = new StringBuilder("[");
Iterator<Integer> it = usableFigures.iterator();
for(int i = 0; i<usableFigures.size(); i++) { for(int i = 0; i<usableFigures.size(); i++) {
out.append(usableFigures.get(i) + 1); out.append(usableFigures.get(i) + 1);
if(i < usableFigures.size()-1) { if(i < usableFigures.size()-1) {

30
src/test/java/GameTest.java
View File

@ -76,13 +76,13 @@ public class GameTest {
1, 1,
true true
), ),
Arguments.of("Figures on Field - d: 6 - c: 1",
Arguments.of("Figures in Base + One in Finish (movable) - d: 5 - c: 1",
Arrays.asList(42, -1, -1, -1), Arrays.asList(42, -1, -1, -1),
5, 5,
1, 1,
false false
), ),
Arguments.of("Figures on Field - d: 6 - c: 1",
Arguments.of("Figures in Base + Two in Finish - d: 5 - c: 1",
Arrays.asList(42, 43, -1, -1), Arrays.asList(42, 43, -1, -1),
5, 5,
1, 1,
@ -130,53 +130,59 @@ public class GameTest {
static Stream<Arguments> usableFiguresData () { static Stream<Arguments> usableFiguresData () {
return Stream.of( return Stream.of(
Arguments.of( //Würfel 1-6 - Keine Figur im Ziel - Alle Figuren auf dem Spielfeld - StartFeld frei - Keine Figur vor Ziel
Arguments.of(
"Alle Figuren", "Alle Figuren",
1, 1,
Arrays.asList(10, 25, 2, 17), Arrays.asList(10, 25, 2, 17),
new ArrayList<>(Arrays.asList(0, 1, 2, 3)) new ArrayList<>(Arrays.asList(0, 1, 2, 3))
), ),
Arguments.of( //Würfel 6 - Keine Figur im Ziel - 1 Figur auf dem Spielfeld - StartFeld frei - Keine Figur vor Ziel
"Figuren die nicht am Spielfeld stehen",
Arguments.of(
"Nur Figuren aus der Base",
6, 6,
Arrays.asList(10, -1, -1, -1), Arrays.asList(10, -1, -1, -1),
new ArrayList<>(Arrays.asList(1, 2, 3)) new ArrayList<>(Arrays.asList(1, 2, 3))
), ),
Arguments.of( //Würfel 6 - Keine Figur im Ziel - 1 Figur auf dem Spielfeld - StartFeld besetzt - Keine Figur vor Ziel
Arguments.of(
"Figur die das Startfeld besetzt", "Figur die das Startfeld besetzt",
6, 6,
Arrays.asList(10, 0, -1, -1), Arrays.asList(10, 0, -1, -1),
new ArrayList<>(List.of(1)) new ArrayList<>(List.of(1))
), ),
Arguments.of( //Würfel 5 - Keine Figur im Ziel - 1 Figur auf dem Spielfeld - StartFeld besetzt - Figur vor Ziel
Arguments.of(
"Figur vor dem Ziel - kann man benutzen", "Figur vor dem Ziel - kann man benutzen",
5, 5,
Arrays.asList(10, 37, -1, -1), Arrays.asList(10, 37, -1, -1),
new ArrayList<>(Arrays.asList(0,1)) new ArrayList<>(Arrays.asList(0,1))
), ),
Arguments.of( //Würfel 5 - Keine Figur im Ziel - 1 Figur auf dem Spielfeld - StartFeld besetzt - Figur vor Ziel
Arguments.of(
"Figur vor dem Ziel - kann man nicht benutzen", "Figur vor dem Ziel - kann man nicht benutzen",
5, 5,
Arrays.asList(10, 39, -1, -1), Arrays.asList(10, 39, -1, -1),
new ArrayList<>(List.of(0)) new ArrayList<>(List.of(0))
), ),
Arguments.of( //Würfel 5 - Figur im Ziel - 1 Figur auf dem Spielfeld - StartFeld besetzt - Figur vor Ziel
Arguments.of(
"Nur Figuren die auf ein freies Feld kommen", "Nur Figuren die auf ein freies Feld kommen",
2, 2,
Arrays.asList(10, 12, -1, -1), Arrays.asList(10, 12, -1, -1),
new ArrayList<>(List.of(1)) new ArrayList<>(List.of(1))
), ),
Arguments.of( //Würfel 6 - 1 Figur auf dem Spielfeld - StartFeld besetzt
Arguments.of(
"Figur auf Startfeld", "Figur auf Startfeld",
6, 6,
Arrays.asList(-1, -1, -1, 0), Arrays.asList(-1, -1, -1, 0),
new ArrayList<>(List.of(3)) new ArrayList<>(List.of(3))
), ),
Arguments.of( //Würfel 6 - 1 Figur auf dem Spielfeld - StartFeld besetzt
"Figur auf Startfeld",
Arguments.of(
"Im Ziel überworfen nur andere Figuren möglich",
5, 5,
Arrays.asList(-1, 41, -1, 0), Arrays.asList(-1, 41, -1, 0),
new ArrayList<>(List.of(3)) new ArrayList<>(List.of(3))
),
Arguments.of(
"Im Haus bewegen",
2,
Arrays.asList(-1, 41, -1, 0),
new ArrayList<>(List.of(1, 3))
) )
); );
} }

19
src/test/java/GameboardTest.java
View File

@ -8,7 +8,6 @@ import org.junit.jupiter.params.provider.MethodSource;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection;
import java.util.Iterator; import java.util.Iterator;
import java.util.stream.Stream; import java.util.stream.Stream;
@ -44,7 +43,7 @@ public class GameboardTest {
void checkGameboardFieldType(String testname, int Pos, int expectedResult) { void checkGameboardFieldType(String testname, int Pos, int expectedResult) {
gb.initGameboard(); gb.initGameboard();
int currentType = gb.board[Pos]; int currentType = gb.board[Pos];
assertThat(currentType).describedAs("Field Type").isEqualTo(expectedResult);
assertThat(currentType).describedAs(testname).isEqualTo(expectedResult);
} }
static Stream<Arguments> FieldStream () { static Stream<Arguments> FieldStream () {
@ -92,9 +91,12 @@ public class GameboardTest {
" "," "," "," "," "," "," "," "," "," ", " "," "," "," "," "," "," "," "," "," ",
" "," "," "," "," "," "," "," "," "," ", " "," "," "," "," "," "," "," "," "," ",
" "," "," "," "," "," "," "," "," "," ", " "," "," "," "," "," "," "," "," "," ",
" "," "," "," "," "," ","\u001b[31;1m1\u001b[0m", "\u001b[31;1m2\u001b[0m","\u001b[31;1m3\u001b[0m","\u001b[31;1m4\u001b[0m",
"\u001b[34;1m1\u001b[0m","\u001b[34;1m2\u001b[0m","\u001b[34;1m3\u001b[0m","\u001b[34;1m4\u001b[0m","\u001b[33;1m1\u001b[0m","\u001b[33;1m2\u001b[0m","\u001b[33;1m3\u001b[0m","\u001b[33;1m4\u001b[0m","\u001b[32;1m1\u001b[0m","\u001b[32;1m2\u001b[0m",
"\u001b[32;1m3\u001b[0m","\u001b[32;1m4\u001b[0m"}
" "," "," "," "," "," ","\u001b[31;1m1\u001b[0m",
"\u001b[31;1m2\u001b[0m","\u001b[31;1m3\u001b[0m","\u001b[31;1m4\u001b[0m",
"\u001b[34;1m1\u001b[0m","\u001b[34;1m2\u001b[0m","\u001b[34;1m3\u001b[0m",
"\u001b[34;1m4\u001b[0m","\u001b[33;1m1\u001b[0m","\u001b[33;1m2\u001b[0m",
"\u001b[33;1m3\u001b[0m","\u001b[33;1m4\u001b[0m","\u001b[32;1m1\u001b[0m",
"\u001b[32;1m2\u001b[0m", "\u001b[32;1m3\u001b[0m","\u001b[32;1m4\u001b[0m"}
), ),
Arguments.of( Arguments.of(
"Figures on Board", "Figures on Board",
@ -117,9 +119,10 @@ public class GameboardTest {
" "," "," "," ", " "," "," "," ",
" "," "," "," ", " "," "," "," ",
" "," "," "," ", " "," "," "," ",
"\u001b[34;1m1\u001b[0m","\u001b[34;1m2\u001b[0m","\u001b[34;1m3\u001b[0m","\u001b[34;1m4\u001b[0m",
" "," "," ","\u001b[33;1m4\u001b[0m",
"\u001b[32;1m1\u001b[0m","\u001b[32;1m2\u001b[0m","\u001b[32;1m3\u001b[0m","\u001b[32;1m4\u001b[0m"}
"\u001b[34;1m1\u001b[0m","\u001b[34;1m2\u001b[0m","\u001b[34;1m3\u001b[0m",
"\u001b[34;1m4\u001b[0m", " "," "," ","\u001b[33;1m4\u001b[0m",
"\u001b[32;1m1\u001b[0m","\u001b[32;1m2\u001b[0m","\u001b[32;1m3\u001b[0m",
"\u001b[32;1m4\u001b[0m"}
) )
); );
} }

Write Preview
Loading…
Cancel
Save