From 452155c5fc276284fe288615f8fba52801dad369 Mon Sep 17 00:00:00 2001 From: kim-se-jin <> Date: Tue, 18 Jun 2024 11:49:38 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84=20?= =?UTF-8?q?=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 22 +++++++- src/main/java/Application.java | 59 +++++++++++++++++++ src/main/java/Domain/Dealer.java | 17 ++++++ src/main/java/Domain/Participant.java | 72 ++++++++++++++++++++++++ src/main/java/Domain/Shape.java | 14 +++++ src/main/java/Domain/TrumpCard.java | 33 +++++++++++ src/main/java/Service/BlackJackCard.java | 34 +++++++++++ src/main/java/view/outputView.java | 55 ++++++++++++++++++ src/test/java/PlayerTest.java | 39 +++++++++++++ src/test/java/TrumpCardTest.java | 24 ++++++++ 10 files changed, 368 insertions(+), 1 deletion(-) create mode 100644 src/main/java/Application.java create mode 100644 src/main/java/Domain/Dealer.java create mode 100644 src/main/java/Domain/Participant.java create mode 100644 src/main/java/Domain/Shape.java create mode 100644 src/main/java/Domain/TrumpCard.java create mode 100644 src/main/java/Service/BlackJackCard.java create mode 100644 src/main/java/view/outputView.java create mode 100644 src/test/java/PlayerTest.java create mode 100644 src/test/java/TrumpCardTest.java diff --git a/README.md b/README.md index 03ba7ed3..bfca715b 100644 --- a/README.md +++ b/README.md @@ -1 +1,21 @@ -# java-blackjack \ No newline at end of file +# java-blackjack + +#플레이어 + +#딜러 + +#트럼프카드 +- randomNumber의 범위는 0~52 + - Domain.Shape 가 걸림 + +- 1~13 * 4 +- setTwoCard( + - return 카드 2장 +- ) + +#Game +1. 게임을 시작 +2. 플레이어 입력 +3. 카드 배분 + 4. Domain.TrumpCard 2번 호출 + diff --git a/src/main/java/Application.java b/src/main/java/Application.java new file mode 100644 index 00000000..77efb259 --- /dev/null +++ b/src/main/java/Application.java @@ -0,0 +1,59 @@ +import Domain.Player; +import Service.BlackJackGame; +import view.inputView; +import view.outputView; + +import java.io.OutputStream; + +public class Application { + public static void main(String[] args) { + outputView.outputPlayerNames(); + String[] playerNames = inputView.inputPlayerNames(); + + outputView.outputPlayerInfo(playerNames); + BlackJackGame game = new BlackJackGame(); + game.registerParticipant(playerNames); + game.registerDealer(); + // <-- 등록 + + for(Player player : game.playerList){ + outputView.outputBettingPrice(player.getName()); + player.bettingPrice = inputView.inputPlayerBettingPrice(); + } + + // 카드 OPEN --> + outputView.outputParticipantCardInfo(game.dealer); + game.playerList.forEach(outputView::outputParticipantCardInfo); + // <-- 카드 OPEN + + // 플레이어 MORE 카드 --> + for(Player player : game.playerList){ + while(!player.isBurst()){ + outputView.outputMoreCard(player.getName()); + + if(inputView.inputIsMoreCard()){ + game.participantAddCard(player); + outputView.outputParticipantCardInfo(player); + continue; + } + break; + } + } + // <-- 플레이어 MORE 카드 + + while (game.checkDealerScore()){ + game.participantAddCard(game.dealer); + outputView.outputDealerCard(); + } + + // 딜러 hidden card 오픈 + game.dealerCardOpen(); + + outputView.outputParticipantResult(game.dealer); + game.playerList.forEach(outputView::outputParticipantResult); + +// game.calculrateGame(); + game.calcurateBettingPrice(); + outputView.outputBettingResult(game.dealer, game.playerList); + } +} diff --git a/src/main/java/Domain/Dealer.java b/src/main/java/Domain/Dealer.java new file mode 100644 index 00000000..cbbe77bc --- /dev/null +++ b/src/main/java/Domain/Dealer.java @@ -0,0 +1,17 @@ +package Domain; + +import java.util.List; + +public class Dealer extends Participant{ + + public int dealerWinCount = 0 ; + public int dealerLoseCount = 0 ; + public Dealer(String name, List ParticipantCardList) { + super(name, ParticipantCardList); + } + boolean firstOpen = true ; + + public String firstOpenCard(){ + return getOneCardName(ParticipantCardList.get(0)); + } +} diff --git a/src/main/java/Domain/Participant.java b/src/main/java/Domain/Participant.java new file mode 100644 index 00000000..e660fbbc --- /dev/null +++ b/src/main/java/Domain/Participant.java @@ -0,0 +1,72 @@ +package Domain; + +import java.util.ArrayList; +import java.util.List; + +public class Participant { + + private String name; + List ParticipantCardList = new ArrayList<>(); + public int winningPrice = 0 ; + public boolean isBlackJack = false ; + public Participant(String name, List ParticipantCardList) { + this.name = name; + this.ParticipantCardList = ParticipantCardList; + } + + public void addParticipantCardList(TrumpCard trumpCard) { + this.ParticipantCardList.add(trumpCard); + } + + public int getParticipantScore() { + int score = ParticipantCardList.stream().map(TrumpCard::getCardScore).mapToInt(i->i).sum(); + if (aceCount()){ + return checkAce(score); + } + return score; + } + + public boolean aceCount(){ + return ParticipantCardList.stream().anyMatch(a -> a.getCardNumber() == 1); + } + + public int checkAce(int score){ + // if ParticipantCardList.cardNumber == 0 이 있다면 + if (score <= 11){ + return score - 1 + 11 ; + } + return score ; + } + + public String getCardName(){ + String cardInfos = ""; + for(TrumpCard trumpCard : ParticipantCardList){ + if (!trumpCard.isHiddenCard) { + cardInfos += getOneCardName(trumpCard); + cardInfos += ", "; + } + } + return cardInfos ; + } + + public String getOneCardName(TrumpCard trumpCard){ + String[] cardInfo = {"0", "A", "2", "3", "4", "5", "6", "7", "8", "9", "10", "J", "Q", "K"}; + return cardInfo[trumpCard.cardNumber] + trumpCard.cardShape; + } + + public String getName() { + return this.name; + } + + public boolean isBurst(){ + if(getParticipantScore() >= 21){ + return true; + } + return false; + } + + public List getParticipantCardList() { + return ParticipantCardList; + } +} + diff --git a/src/main/java/Domain/Shape.java b/src/main/java/Domain/Shape.java new file mode 100644 index 00000000..709d7b25 --- /dev/null +++ b/src/main/java/Domain/Shape.java @@ -0,0 +1,14 @@ +package Domain; + +public enum Shape { + 스페이드, + 하트, + 클로버, + 다이아몬드 +} + +//1~13 +//14~26 +//27~39 +//40~52 + diff --git a/src/main/java/Domain/TrumpCard.java b/src/main/java/Domain/TrumpCard.java new file mode 100644 index 00000000..bc5b76f8 --- /dev/null +++ b/src/main/java/Domain/TrumpCard.java @@ -0,0 +1,33 @@ +package Domain; + +public class TrumpCard { + public Shape cardShape ; + public int cardNumber ; + public boolean isHiddenCard ; + + // 카드 주기 + public TrumpCard(int randomNumber) { + this.cardShape = makeRandomShape(randomNumber); + this.cardNumber = makeRandomNumber(randomNumber); + } + + public Shape makeRandomShape(int randomNumber){ + return Shape.values()[(int)randomNumber/13] ; + } + + public int makeRandomNumber(int randomNumber){ + return (randomNumber%13)+1 ; + } + + public int getCardNumber(){ + return this.cardNumber; + } + + public int getCardScore(){ + if(this.cardNumber >= 11){ + return 10; + } + + return this.cardNumber; + } +} \ No newline at end of file diff --git a/src/main/java/Service/BlackJackCard.java b/src/main/java/Service/BlackJackCard.java new file mode 100644 index 00000000..e7d5b15f --- /dev/null +++ b/src/main/java/Service/BlackJackCard.java @@ -0,0 +1,34 @@ +package Service; + +import Domain.Participant; +import Domain.TrumpCard; + +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + +public class BlackJackCard { + + public List makeTwoCard(){ + List trumpCards = new ArrayList<>(); + for (int i = 0; i < 2; i++){ + trumpCards.add(makeCardList(generateRandomNumber())); + } + return trumpCards; + } + + public TrumpCard makeCardList(int randomNumber){ + List cardList = new ArrayList<>(); + return new TrumpCard(randomNumber); + } + + public int generateRandomNumber(){ + Random random = new Random(); + return random.nextInt(52); + } + + public TrumpCard makeOneCard(){ + return new TrumpCard(generateRandomNumber()); + } + +} diff --git a/src/main/java/view/outputView.java b/src/main/java/view/outputView.java new file mode 100644 index 00000000..d09840df --- /dev/null +++ b/src/main/java/view/outputView.java @@ -0,0 +1,55 @@ +package view; + +import Domain.Dealer; +import Domain.Participant; +import Domain.Player; +import Domain.TrumpCard; + +import java.util.Arrays; +import java.util.List; + +public class outputView { + public static void outputPlayerNames() { + System.out.println("게임에 참여할 사람의 이름을 입력하세요.(쉼표 기준으로 분리)"); + } + + public static void outputPlayerInfo(String[] playerNames) { + for(int i=0; i playerlist){ + System.out.println("\n## 최종 승패"); + System.out.println("딜러: " + dealer.dealerWinCount+"승 " + dealer.dealerLoseCount + "패" ); + playerlist.forEach(player -> System.out.println(player.getName() + ": " + player.playerResult)); + } + + public static void outputBettingResult(Dealer dealer, List playerlist){ + System.out.println("\n## 최종 수익"); + System.out.println("딜러: " + dealer.winningPrice ); + playerlist.forEach(player -> System.out.println(player.getName() + ": " + player.winningPrice)); + } + + public static void outputBettingPrice(String name) { + System.out.println(name+"의 배팅 금액은?"); + } +} diff --git a/src/test/java/PlayerTest.java b/src/test/java/PlayerTest.java new file mode 100644 index 00000000..a83fc48b --- /dev/null +++ b/src/test/java/PlayerTest.java @@ -0,0 +1,39 @@ +import Domain.Player; +import Domain.TrumpCard; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import java.util.ArrayList; +import java.util.List; + +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; + +class PlayerTest { + @DisplayName("플레이어 생성 확인") + @Test + void makePlayer(){ + TrumpCard testCard1 = new TrumpCard(0); + TrumpCard testCard2 = new TrumpCard(0); + + Player player = new Player("poni", List.of(testCard1, testCard2)); + +// assertThat(player.getPlayerScore()).isEqualTo(2); + } + + @DisplayName("플레이어 카드 추가 확인") + @Test + void checkAddCard(){ + TrumpCard testCard1 = new TrumpCard(0); + TrumpCard testCard2 = new TrumpCard(0); + ArrayList cardList = new ArrayList<>(); + cardList.add(testCard1); + cardList.add(testCard2); + + Player player = new Player("poni", cardList); + player.addParticipantCardList(new TrumpCard(0)); + + assertThat(player.getParticipantScore()).isEqualTo(13); + } + + +} \ No newline at end of file diff --git a/src/test/java/TrumpCardTest.java b/src/test/java/TrumpCardTest.java new file mode 100644 index 00000000..2b606993 --- /dev/null +++ b/src/test/java/TrumpCardTest.java @@ -0,0 +1,24 @@ +import Domain.Shape; +import Domain.TrumpCard; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; + +class TrumpCardTest { + + @DisplayName("카드 한 장을 생성한다 - 모양 확인") + @Test + void checkShape(){ + TrumpCard testCard = new TrumpCard(0); + assertThat(testCard.cardShape).isEqualTo(Shape.스페이드); + } + + @DisplayName("카드 한 장을 생성한다 - 숫자 확인") + @Test + void checkNumber(){ + TrumpCard testCard = new TrumpCard(0); + assertThat(testCard.cardNumber).isEqualTo(1); + } + +} \ No newline at end of file From 850986012ac62dec3e8557e3c777f4c4ab179b65 Mon Sep 17 00:00:00 2001 From: kim-se-jin <> Date: Tue, 18 Jun 2024 13:07:11 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84=20?= =?UTF-8?q?=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/Domain/Player.java | 70 ++++++++++++++++++ src/main/java/Service/BlackJackGame.java | 76 ++++++++++++++++++++ src/main/java/view/inputView.java | 26 +++++++ src/test/java/Service/BlackJackGameTest.java | 45 ++++++++++++ src/test/java/study/LambdaTest.java | 49 +++++++++++++ 5 files changed, 266 insertions(+) create mode 100644 src/main/java/Domain/Player.java create mode 100644 src/main/java/Service/BlackJackGame.java create mode 100644 src/main/java/view/inputView.java create mode 100644 src/test/java/Service/BlackJackGameTest.java create mode 100644 src/test/java/study/LambdaTest.java diff --git a/src/main/java/Domain/Player.java b/src/main/java/Domain/Player.java new file mode 100644 index 00000000..0a972a69 --- /dev/null +++ b/src/main/java/Domain/Player.java @@ -0,0 +1,70 @@ +package Domain; + +import java.util.List; + +public class Player extends Participant{ + + public String playerResult = ""; + public int bettingPrice = 0 ; + public Player(String name, List ParticipantCardList) { + super(name, ParticipantCardList); + } + + public boolean isPlayerWin(int dealerScore){ + int myScore = getParticipantScore(); + if(myScore > 21){ + return false; + } + + if(dealerScore > 21){ + return true; + } + + return dealerScore < myScore; + } + + public float isPlayerWin_2(int dealerScore, boolean isDealerBlackJack, boolean isPlayerBlackJack){ + int myScore = getParticipantScore(); + if(myScore > 21){ + return -1; + } + + if(dealerScore > 21){ + return 1; + } + + if(isDealerBlackJack && isPlayerBlackJack){ + return 1 ; + } + + if(isPlayerBlackJack){ + return 1.5f ; + } + + if(dealerScore < myScore){ + return 1 ; + } + + if(dealerScore == myScore){ // 동점인 경우, 수익 0 + return 0 ; + } + + return -1; + } + + public String firstOpenCard(){ + String cardInfos = ""; + for(TrumpCard trumpCard : ParticipantCardList){ + cardInfos += getOneCardName(trumpCard); + cardInfos += ", "; + } + return cardInfos ; + } + + public int getBettingPrice() { + return bettingPrice; + } + public void setPlayerResult(){ + playerResult = "승"; + } +} \ No newline at end of file diff --git a/src/main/java/Service/BlackJackGame.java b/src/main/java/Service/BlackJackGame.java new file mode 100644 index 00000000..49b2dc02 --- /dev/null +++ b/src/main/java/Service/BlackJackGame.java @@ -0,0 +1,76 @@ +package Service; + +import Domain.Dealer; +import Domain.Participant; +import Domain.Player; +import Domain.TrumpCard; + +import javax.net.ssl.CertPathTrustManagerParameters; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + +public class BlackJackGame { + + public List playerList = new ArrayList<>(); + BlackJackCard blackJackCard = new BlackJackCard(); + public Dealer dealer; + + public void registerParticipant(String[] playerNames) { + for (String playerName : playerNames) { + Player player = new Player(playerName, blackJackCard.makeTwoCard()); + player.isBlackJack = checkBlackJack(player); + this.playerList.add(player); + } + } + + public void registerDealer() { + this.dealer = new Dealer("딜러", blackJackCard.makeTwoCard()); + this.dealer.getParticipantCardList().get(0).isHiddenCard = true; + this.dealer.isBlackJack = checkBlackJack(this.dealer); + } + + public boolean checkBlackJack(Participant participant) { + return participant.getParticipantScore() == 21; + } + + public boolean checkDealerScore() { + return dealer.getParticipantScore() <= 16; + } + + public void calculrateGame() { + int dealerScore = dealer.getParticipantScore(); + for (Player player : playerList) { + boolean isPlayerWin = player.isPlayerWin(dealerScore); + if (isPlayerWin) { + player.playerResult = "승"; + dealer.dealerLoseCount += 1; + } else { + player.playerResult = "패"; + dealer.dealerWinCount += 1; + } + } +// playerList.stream() +// .filter(a -> a.isPlayerWin(dealerScore)) +// .forEach(Player::setPlayerResult); + } + + public void participantAddCard(Participant participant) { + participant.addParticipantCardList(blackJackCard.makeOneCard()); + } + + public void dealerCardOpen(){ + dealer.getParticipantCardList().get(0).isHiddenCard = false; + } + + public void calcurateBettingPrice() { + int dealerScore = dealer.getParticipantScore(); + float bettingValue = 1 ; + + for (Player player : playerList) { + bettingValue = player.isPlayerWin_2(dealerScore, dealer.isBlackJack, player.isBlackJack); + player.winningPrice += (int)(player.bettingPrice * bettingValue); + dealer.winningPrice += (int)(player.bettingPrice* bettingValue * -1); + } + } +} \ No newline at end of file diff --git a/src/main/java/view/inputView.java b/src/main/java/view/inputView.java new file mode 100644 index 00000000..f9e74048 --- /dev/null +++ b/src/main/java/view/inputView.java @@ -0,0 +1,26 @@ +package view; + +import java.util.Scanner; + +public class inputView { + public static String[] inputPlayerNames() { + Scanner scanner = new Scanner(System.in); + String playerNames = scanner.nextLine(); + return playerNames.split(","); + } + + public static int inputPlayerBettingPrice() { + Scanner scanner = new Scanner(System.in); + return scanner.nextInt(); + } + + + public static boolean inputIsMoreCard() { + Scanner scanner = new Scanner(System.in); + String answer = scanner.nextLine(); + if (answer.equals("y")){ + return true; + } + return false; + } +} diff --git a/src/test/java/Service/BlackJackGameTest.java b/src/test/java/Service/BlackJackGameTest.java new file mode 100644 index 00000000..4a99d9eb --- /dev/null +++ b/src/test/java/Service/BlackJackGameTest.java @@ -0,0 +1,45 @@ +package Service; + +import Domain.Dealer; +import Domain.Player; +import Domain.TrumpCard; +import org.junit.jupiter.api.Test; + +import java.util.ArrayList; +import java.util.List; + +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; +import static org.junit.jupiter.api.Assertions.*; + +class BlackJackGameTest { + + @Test + void calcurateBettingPrice() { + BlackJackGame blackJackGame = new BlackJackGame(); + List trumpCardList = new ArrayList<>(); + trumpCardList.add(new TrumpCard(0)); + trumpCardList.add(new TrumpCard(1)); + + blackJackGame.dealer = new Dealer("딜러", trumpCardList); +// blackJackGame.dealer.isBlackJack = true ; + blackJackGame.playerList = makePlayer(); + + blackJackGame.calcurateBettingPrice(); + assertThat(blackJackGame.dealer.winningPrice).isEqualTo(0); + } + + List makePlayer(){ + List trumpCardList = new ArrayList<>(); + trumpCardList.add(new TrumpCard(0)); + trumpCardList.add(new TrumpCard(1)); + + Player player1 = new Player("a", trumpCardList); + player1.bettingPrice = 2 ; +// player1.isBlackJack = true ; + + List playerList = new ArrayList<>(); + playerList.add(player1); + + return playerList; + } +} \ No newline at end of file diff --git a/src/test/java/study/LambdaTest.java b/src/test/java/study/LambdaTest.java new file mode 100644 index 00000000..3ea98c14 --- /dev/null +++ b/src/test/java/study/LambdaTest.java @@ -0,0 +1,49 @@ +package study; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import java.util.List; +import java.util.function.Predicate; + +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; + +class LambdaTest { + private List numbers; + + @BeforeEach + void setUp() { + numbers = List.of(1, 2, 3, 4, 5, 6); + } + + @Test + void sumAll() { + final int result = sumAll(numbers, number -> true); + assertThat(result).isEqualTo(21); + } + + @Test + void sumAllEven() { + final int result = sumAll(numbers, number-> number % 2 == 0); + assertThat(result).isEqualTo(12); + } + + @Test + void sumAllOverThree() { + final int result = sumAll(numbers, number-> number > 3); + assertThat(result).isEqualTo(15); + } + + private int sumAll(List numbers, Predicate conditional) { + return numbers.stream() + .filter(conditional) + .reduce(0, Integer::sum); +// int total = 0; +// for (int number : numbers) { +// if(conditional.test(number)){ +// total += number; +// } +// } +// return total; + } +} \ No newline at end of file From d1bcaf4f96ecef417c23710c5e0cd9a5f34ff055 Mon Sep 17 00:00:00 2001 From: kim-se-jin <> Date: Tue, 18 Jun 2024 13:11:00 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84=20?= =?UTF-8?q?=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/Domain/Dealer.java | 4 ---- src/main/java/Domain/Player.java | 12 ------------ src/main/java/Service/BlackJackGame.java | 4 ---- src/main/java/view/inputView.java | 5 +---- src/test/java/Service/BlackJackGameTest.java | 1 - 5 files changed, 1 insertion(+), 25 deletions(-) diff --git a/src/main/java/Domain/Dealer.java b/src/main/java/Domain/Dealer.java index cbbe77bc..cb869258 100644 --- a/src/main/java/Domain/Dealer.java +++ b/src/main/java/Domain/Dealer.java @@ -10,8 +10,4 @@ public Dealer(String name, List ParticipantCardList) { super(name, ParticipantCardList); } boolean firstOpen = true ; - - public String firstOpenCard(){ - return getOneCardName(ParticipantCardList.get(0)); - } } diff --git a/src/main/java/Domain/Player.java b/src/main/java/Domain/Player.java index 0a972a69..beb91e40 100644 --- a/src/main/java/Domain/Player.java +++ b/src/main/java/Domain/Player.java @@ -52,18 +52,6 @@ public float isPlayerWin_2(int dealerScore, boolean isDealerBlackJack, boolean i return -1; } - public String firstOpenCard(){ - String cardInfos = ""; - for(TrumpCard trumpCard : ParticipantCardList){ - cardInfos += getOneCardName(trumpCard); - cardInfos += ", "; - } - return cardInfos ; - } - - public int getBettingPrice() { - return bettingPrice; - } public void setPlayerResult(){ playerResult = "승"; } diff --git a/src/main/java/Service/BlackJackGame.java b/src/main/java/Service/BlackJackGame.java index 49b2dc02..a78e22ba 100644 --- a/src/main/java/Service/BlackJackGame.java +++ b/src/main/java/Service/BlackJackGame.java @@ -3,12 +3,8 @@ import Domain.Dealer; import Domain.Participant; import Domain.Player; -import Domain.TrumpCard; - -import javax.net.ssl.CertPathTrustManagerParameters; import java.util.ArrayList; import java.util.List; -import java.util.Random; public class BlackJackGame { diff --git a/src/main/java/view/inputView.java b/src/main/java/view/inputView.java index f9e74048..080ee156 100644 --- a/src/main/java/view/inputView.java +++ b/src/main/java/view/inputView.java @@ -18,9 +18,6 @@ public static int inputPlayerBettingPrice() { public static boolean inputIsMoreCard() { Scanner scanner = new Scanner(System.in); String answer = scanner.nextLine(); - if (answer.equals("y")){ - return true; - } - return false; + return answer.equals("y"); } } diff --git a/src/test/java/Service/BlackJackGameTest.java b/src/test/java/Service/BlackJackGameTest.java index 4a99d9eb..43393d5c 100644 --- a/src/test/java/Service/BlackJackGameTest.java +++ b/src/test/java/Service/BlackJackGameTest.java @@ -9,7 +9,6 @@ import java.util.List; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; -import static org.junit.jupiter.api.Assertions.*; class BlackJackGameTest {