[김성현] 연료 주입 및 블랙잭(1단계)

src/main/java/blackjack/controller/GameController.java

@@ -12,6 +12,7 @@ public class GameController {
 
     public void start() {
         final CardPack cardPack = new CardPack();
+        cardPack.shuffle();
         final GamePlayers gamePlayers = new GamePlayers(getConsoleNames());
 
         initializeGame(gamePlayers, cardPack);

src/main/java/blackjack/domain/card/Card.java

@@ -1,5 +1,7 @@
 package blackjack.domain.card;
 
+import java.util.Objects;
+
 public class Card {
 
     private final CardSymbol cardSymbol;
@@ -17,4 +19,21 @@ public CardSymbol getCardSymbol() {
     public CardType getCardType() {
         return cardType;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        Card card = (Card) o;
+        return cardSymbol == card.cardSymbol && cardType == card.cardType;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(cardSymbol, cardType);
+    }
 }

src/main/java/blackjack/domain/card/CardPack.java

@@ -8,28 +8,33 @@
 public class CardPack {
 
     private static final int FRONT = 0;
+    private static final List<Card> cardPack = create();
 
-    private final List<Card> cardPack;
+    private List<Card> cards;
 
     public CardPack() {
-        this.cardPack = create();
+        this.cards = new ArrayList<>(cardPack);
     }
 
-    private List<Card> create() {
+    private static List<Card> create() {
         final List<Card> cards = new ArrayList<>();
         for (final CardSymbol symbol : CardSymbol.values()) {
             Arrays.stream(CardType.values())
                 .forEach(type -> cards.add(new Card(symbol, type)));
         }
-        Collections.shuffle(cards);
         return new ArrayList<>(cards);
     }
 
-    public List<Card> getCardPack() {
-        return Collections.unmodifiableList(cardPack);
+    public void shuffle() {
+        Collections.shuffle(cards);
+        this.cards = new ArrayList<>(cards);
+    }
+
+    public List<Card> getCards() {
+        return new ArrayList<>(cards);
     }
 
     public Card pick() {
-        return cardPack.remove(FRONT);
+        return cards.remove(FRONT);
     }
 }

src/main/java/blackjack/domain/gameplayer/Dealer.java

@@ -34,7 +34,7 @@ public String getGameResult(List<GamePlayer> players) {
 
     private int findWinCount(int dealerScore, List<GamePlayer> players) {
         return (int) players.stream()
-            .filter(player -> player.isContinue() && player.getScore() < dealerScore)
+            .filter(player -> !player.isContinue() || player.getScore() < dealerScore)
             .count();
     }
 }

src/test/java/blackjack/domain/card/CardPackTest.java

@@ -15,7 +15,7 @@ class CardPackTest {
         CardPack cardPack = new CardPack();
 
         //when
-        List<Card> cards = cardPack.getCardPack();
+        List<Card> cards = cardPack.getCards();
 
         //then
         assertThat(cards.size()).isEqualTo(52);
@@ -30,22 +30,35 @@ class CardPackTest {
         cardPack.pick();
 
         //then
-        assertThat(cardPack.getCardPack().size()).isEqualTo(51);
+        assertThat(cardPack.getCards().size()).isEqualTo(51);
     }
 
     @Test
-    public void 카드가_정상적으로_셔플되어진다() {
+    public void 카드팩_생성초기_카드팩은_셔플되어지지_않은_상태다() {
         //given
         CardPack cardPack = new CardPack();
+        List<Card> originCards = cardPack.getCards();
 
         //when
-        List<Card> originCards = new ArrayList<>();
+        final List<Card> cards = new ArrayList<>();
         for (final CardSymbol symbol : CardSymbol.values()) {
             Arrays.stream(CardType.values())
-                .forEach(type -> originCards.add(new Card(symbol, type)));
+                .forEach(type -> cards.add(new Card(symbol, type)));
         }
 
-        List<Card> shuffleCards = cardPack.getCardPack();
+        //then
+        assertThat(originCards).containsExactly(cards.toArray(new Card[0]));
+    }
+
+    @Test
+    public void 카드가_정상적으로_셔플되어진다() {
+        //given
+        CardPack cardPack = new CardPack();
+
+        //when
+        List<Card> originCards = cardPack.getCards();
+        cardPack.shuffle();
+        List<Card> shuffleCards = cardPack.getCards();
 
         //then
         assertThat(originCards).doesNotContainSequence(shuffleCards.toArray(new Card[0]));

src/test/java/rentcar/domain/RentCompanyTest.java

@@ -1,5 +1,7 @@
 package rentcar.domain;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import java.util.ArrayList;
 import java.util.List;
 import org.assertj.core.api.Assertions;
@@ -19,8 +21,10 @@ class RentCompanyTest {
 
         Report report = rentCompany.generateChargeQuantityByName();
 
-        Assertions.assertThat(report.getReport().get("Avante")).isEqualTo(20);
-        Assertions.assertThat(report.getReport().get("K5")).isEqualTo(20);
-        Assertions.assertThat(report.getReport().get("Sonata")).isEqualTo(15);
+        org.junit.jupiter.api.Assertions.assertAll(
+            () -> assertThat(report.getReport().get("Avante")).isEqualTo(20),
+            () -> assertThat(report.getReport().get("K5")).isEqualTo(20),
+            () -> assertThat(report.getReport().get("Sonata")).isEqualTo(15)
+        );
     }
 }