diff --git a/10_Blackjack/java/src/Blackjack.java b/10_Blackjack/java/src/Blackjack.java index 47cb802b..a8699640 100644 --- a/10_Blackjack/java/src/Blackjack.java +++ b/10_Blackjack/java/src/Blackjack.java @@ -27,7 +27,7 @@ public class Blackjack { nPlayers = promptInt("NUMBER OF PLAYERS"); } - Deck deck = new Deck(4); // TODO figure out how many decks the BASIC version uses + Deck deck = new Deck(); System.out.println("RESHUFFLING"); deck.shuffle(); diff --git a/10_Blackjack/java/src/Deck.java b/10_Blackjack/java/src/Deck.java index 7ed290bc..c8b81004 100644 --- a/10_Blackjack/java/src/Deck.java +++ b/10_Blackjack/java/src/Deck.java @@ -13,13 +13,11 @@ public class Deck { * * @param nDecks */ - public Deck(int nDecks) { + public Deck() { cards = new LinkedList<>(); - for(int deckIndex = 0; deckIndex < nDecks; deckIndex++) { - for(Card.Suit suit : Card.Suit.values()) { - for(int value = 1; value < 14; value++) { - cards.add(new Card(value, suit)); - } + for(Card.Suit suit : Card.Suit.values()) { + for(int value = 1; value < 14; value++) { + cards.add(new Card(value, suit)); } } } diff --git a/10_Blackjack/java/test/DeckTest.java b/10_Blackjack/java/test/DeckTest.java index 0ded8403..58ec0a63 100644 --- a/10_Blackjack/java/test/DeckTest.java +++ b/10_Blackjack/java/test/DeckTest.java @@ -5,9 +5,9 @@ import org.junit.jupiter.api.Test; public class DeckTest { @Test - void testInitOne() { + void testInit() { // When - Deck deck = new Deck(1); + Deck deck = new Deck(); // Then long nCards = deck.size(); @@ -28,13 +28,4 @@ public class DeckTest { } - @Test - void testInitTwo() { - // When - Deck deck = new Deck(2); - - // Then - assertEquals(104, deck.size()); - } - }