diff --git a/src/main/java/solitaer/CardDeck.java b/src/main/java/solitaer/CardDeck.java index f5036df..41a6518 100644 --- a/src/main/java/solitaer/CardDeck.java +++ b/src/main/java/solitaer/CardDeck.java @@ -7,20 +7,20 @@ public class CardDeck { private ArrayList deck = new ArrayList(); public CardDeck() { - for (int j = 0; j < 4; j++) { - for (int i = 1; i <= 13; i++) { - switch (j) { + for (int symboleZähler = 0; symboleZähler < 4; symboleZähler++) { + for (int nrZähler = 1; nrZähler <= 13; nrZähler++) { + switch (symboleZähler) { case 0: - deck.add(new Card(i, Symbol.Herz, false)); + deck.add(new Card(nrZähler, Symbol.Herz, false)); break; case 1: - deck.add(new Card(i, Symbol.Karo, false)); + deck.add(new Card(nrZähler, Symbol.Karo, false)); break; case 2: - deck.add(new Card(i, Symbol.Kreuz, false)); + deck.add(new Card(nrZähler, Symbol.Kreuz, false)); break; case 3: - deck.add(new Card(i, Symbol.Pik, false)); + deck.add(new Card(nrZähler, Symbol.Pik, false)); break; } diff --git a/src/test/java/solitaer/CardDeckTest.java b/src/test/java/solitaer/CardDeckTest.java index daa7371..48776f9 100644 --- a/src/test/java/solitaer/CardDeckTest.java +++ b/src/test/java/solitaer/CardDeckTest.java @@ -24,12 +24,13 @@ class CardDeckTest { @ParameterizedTest @MethodSource("testSymbole") + //Jedes Symbol muss einmal vorhand sein void testCardDeckSymbole(String msg, Symbol _sym) { boolean result = false; - for(int i = 0; i