altering sysout to separate console

src/main/java/io/zipcoder/casino/CardGame/BlackJack/BlackJack.java

@@ -13,11 +13,10 @@ import java.util.Scanner;
 
 public class BlackJack extends CardGame implements Gamble {
 
-    Casino_test instance = Casino_test.getInstance();
-    Player player = instance.getPlayer();
+    private BlackJackPlayer blackJackPlayer;
+    // Player player;
     private ArrayList<BlackJackPlayer> blackJackPlayers = new ArrayList<>();
     private final int minBet = 50;
-   // private BlackJackGameplay gamePlay = new BlackJackGameplay();
     private Deck deck = new Deck();
     private boolean justDealt = false;
     private BlackJackPlayer dealer = new BlackJackPlayer(new Dealer());
@@ -26,7 +25,7 @@ public class BlackJack extends CardGame implements Gamble {
     public BlackJack() {}
 
     public BlackJack(Player player) {
-        BlackJackPlayer blackJackPlayer = new BlackJackPlayer(player);
+        this.blackJackPlayer = new BlackJackPlayer(player);
         blackJackPlayers.add(dealer);
         this.blackJackPlayers.add(blackJackPlayer);
         this.thePlayer = blackJackPlayers.get(1);
@@ -39,12 +38,7 @@ public class BlackJack extends CardGame implements Gamble {
         player.addToHand(card);
         countPlayerHand(player);
 
-        if (player == blackJackPlayers.get(1)) {
-            System.out.println("\n~~~~~~~~~~~~~~~~~~~\n\nYou Hit: " + card.toString());
-        } else if (player == this.dealer) {
-            System.out.println("\n~~~~~~~~~~~~~~~~~~~\n\nDealer Hit: " + card.toString());
-        }
-
+        Console_BlackJack.hitCard(player, card);
     }
 
     public void split(BlackJackPlayer player) {

src/main/java/io/zipcoder/casino/CardGame/BlackJack/Console_BlackJack.java

@@ -8,72 +8,75 @@ import java.util.ArrayList;
 
 public class Console_BlackJack {
 
-    private static String tie = "\n\n~~~~~~~~~~~~~~~~~~~\n\nTie, no one wins";
-    private static String win = "\n\n~~~~~~~~~~~~~~~~~~~\n\nYou win!";
-    private static String lose = "\n\n~~~~~~~~~~~~~~~~~~~\n\nYou lose!";
-
-    public static void printResult(BlackJackPlayer blackJackPlayer, BlackJackPlayer dealer, char result) {
-        String playerResult = "";
-        switch (result) {
-            case 'T':
-                playerResult = tie;
-                break;
-            case 'W':
-                playerResult = win;
-            case 'L':
-                playerResult = lose;
-        }
-        System.out.println("\n~~~~~~~~~~~~~~~~~~~\n\nYour Hand Value: " + blackJackPlayer.getHandValue() + "\n\nDealer's Hand Value: " + dealer.getHandValue() + playerResult);
+    public static void inputError() {
+        System.out.println("That's not a valid option, please try again.");
+    }
+
+    public static void finalGoodbye() {
+        System.out.println("Thanks for coming to Thunder Theta, good bye!");
     }
 
+    public static void blackJackWelcome(Player player){
+        System.out.println("\nHi " + player.getName() + "! Welcome to BlackJack!\n\nThe minimum bet is $50.");
+    }
 
     public static String inGameMenu(BlackJack blackJack, BlackJackPlayer blackJackPlayer, BlackJackPlayer dealer) {
         String response = Console.getStringInput("\n~~~~~~~~~~~~~~~~~~~\n\nDealer's Current Hand: \n\nMYSTERY-CARD || " + formatHand(dealer.getDealerHand()) + "\n\nDealer's Hand Value: ??" +
                 "\n\n~~~~~~~~~~~~~~~~~~~\n\nYour Current Hand: \n\n" + formatHand(blackJackPlayer.getPlayerHand()) + "\n\nYour Hand Value: " + formatHandValue(blackJack.countPlayerHand(blackJackPlayer)) +
-                "\n\n~~~~~~~~~~~~~~~~~~~\n\nYOUR TURN" + "\n\n~~~~~~~~~~~~~~~~~~~\n\nWhat do you want to do?\n<< Hit - Stand - Double Down - Split - Quit >>").toUpperCase();
+                "\n\n~~~~~~~~~~~~~~~~~~~\n\nYOUR TURN" + "\n\n~~~~~~~~~~~~~~~~~~~\n\nWhat do you want to do?\n\n<< Hit - Stand - Double Down - Split - Quit >>").toUpperCase();
         return response;
     }
 
-    public static void handVSHand(BlackJack blackJack, BlackJackPlayer blackJackPlayer) {
+    public static void endGame(BlackJack blackJack, BlackJackPlayer blackJackPlayer, char result) {
         String name = blackJackPlayer.getPlayer().getName();
-        System.out.println("\n~~~~~~~~~~~~~~~~~~~\n\nDealer's Current Hand: \n\nMYSTERY-CARD || " + formatHand(blackJack.getDealer().getDealerHand()) + "\n\nDealer's Hand Value: ??");
-        System.out.println("\n~~~~~~~~~~~~~~~~~~~\n\n" + name + "'s Current Hand: \n\n" + formatHand(blackJackPlayer.getPlayerHand()) + "\n\n" + name + "'s Hand Value: " + formatHandValue(blackJack.countPlayerHand(blackJackPlayer)));
+        System.out.println("\n~~~~~~~~~~~~~~~~~~~\n\nDETERMINING WINNER...");
+        System.out.println("\n~~~~~~~~~~~~~~~~~~~\n\nDealer's Hand Value: " + formatHandValue(blackJack.countPlayerHand(blackJack.getDealer())));
+        System.out.println("\nYour Hand Value: " + formatHandValue(blackJack.countPlayerHand(blackJackPlayer)));
+        winOrLose(blackJackPlayer, result);
     }
 
-    public static void endOfGame(BlackJack blackJack, BlackJackPlayer blackJackPlayer, char result) {
-        String name = blackJackPlayer.getPlayer().getName();
-        System.out.println("\n~~~~~~~~~~~~~~~~~~~\n\nDETERMINING WINNER...");
-        System.out.println("\nDealer's Hand Value: " + formatHandValue(blackJack.countPlayerHand(blackJack.getDealer())));
-        System.out.println("\n" + name + "'s Hand Value: " + formatHandValue(blackJack.countPlayerHand(blackJackPlayer)));
-        switch (result) {
-            case '+':
-                System.out.println("\nYou Won: $" + blackJackPlayer.getBetPot() + "\nCurrent Wallet: $" + blackJackPlayer.getPlayer().getWallet());
-                break;
-            case '-':
-                System.out.println("\nYou Lost: $" + blackJackPlayer.getBetPot() + "\nCurrent Wallet: $" + blackJackPlayer.getPlayer().getWallet());
-                break;
-            default:
-                System.out.println("\nTie Game.\n\nCurrent Wallet: $" + blackJackPlayer.getPlayer().getWallet());
-                break;
+    public static void winOrLose(BlackJackPlayer blackJackPlayer, char result) {
+            switch (result) {
+                case '+':
+                    System.out.println("\nYou Won: $" + blackJackPlayer.getBetPot() + "\nCurrent Wallet: $" + blackJackPlayer.getPlayer().getWallet());
+                    break;
+                case '-':
+                    System.out.println("\nYou Lost: $" + blackJackPlayer.getBetPot() + "\nCurrent Wallet: $" + blackJackPlayer.getPlayer().getWallet());
+                    break;
+                default:
+                    System.out.println("\nTie Game.\n\nCurrent Wallet: $" + blackJackPlayer.getPlayer().getWallet());
+                    break;}
+    }
+
+    public static void hitCard(BlackJackPlayer blackJackPlayer, Card card){
+        if (blackJackPlayer.getPlayer().getName().equals("Dealer")) {
+            System.out.println("\n~~~~~~~~~~~~~~~~~~~\n\nDealer Hit: " + card.toString());
+            System.out.println("\n~~~~~~~~~~~~~~~~~~~\n\nDealer's Current Hand: \n\nMYSTERY-CARD || " + formatHand(blackJackPlayer.getDealerHand()) + "\n\nDealer's Hand Value: ??");
+        } else {
+            System.out.println("\n~~~~~~~~~~~~~~~~~~~\n\nYou Hit: " + card.toString());
+            // System.out.println("\n~~~~~~~~~~~~~~~~~~~\n\nYour Current Hand: \n\n" + formatHand(blackJackPlayer.getPlayerHand()) + "\n\nYour Hand Value: " + formatHandValue(blackJack.countPlayerHand(blackJackPlayer)));
         }
     }
 
-    public static void winMoney(BlackJack blackJack, BlackJackPlayer blackJackPlayer) {
+    public static void standingStill() {
+        System.out.println("\n~~~~~~~~~~~~~~~~~~~\n\nStanding still!");
+    }
 
-        System.out.println("\n~~~~~~~~~~~~~~~~~~~\n\nDETERMINING WINNER...");
-        System.out.println("\nYou Won: $" + blackJackPlayer.getBetPot() + "\nCurrent Wallet: $" + blackJackPlayer.getPlayer().getWallet());
+    public static void dealerTurn() {
+        System.out.println("\n~~~~~~~~~~~~~~~~~~~\n\nDEALER'S TURN");
     }
 
-    public static void loseMoney(BlackJack blackJack, BlackJackPlayer blackJackPlayer) {
-        handVSHand(blackJack, blackJackPlayer);
-        System.out.println("\n~~~~~~~~~~~~~~~~~~~\n\nDETERMINING WINNER...");
-        System.out.println("\nYou Lost: $" + blackJackPlayer.getBetPot() + "\nCurrent Wallet: $" + blackJackPlayer.getPlayer().getWallet());
+    public static void initiateGame(BlackJackPlayer blackJackPlayer) {
+        System.out.println("\n~~~~~~~~~~~~~~~~~~~\n\nYOUR BET: " + blackJackPlayer.getBetPot());
+        System.out.println("\n~~~~~~~~~~~~~~~~~~~\n\nGAME START - DEALING CARDS");
     }
 
-    public static void tieGame(BlackJack blackJack, BlackJackPlayer blackJackPlayer) {
-        handVSHand(blackJack, blackJackPlayer);
-        System.out.println("\n~~~~~~~~~~~~~~~~~~~\n\nDETERMINING WINNER...");
-        System.out.println("\nTie Game.\n\nCurrent Wallet: $" + blackJackPlayer.getPlayer().getWallet());
+    public static String askPlayAgain() {
+        return Console.getStringInput("\n~~~~~~~~~~~~~~~~~~~\n\nWould you like to play again?\n\n<< Yes - No >>").toUpperCase();
+    }
+
+    public static void goodByeMessage() {
+        System.out.println("\n~~~~~~~~~~~~~~~~~~~\n\nThanks for playing! Now returning to the Casino Lobby.");
     }
 
     public static String formatHand(ArrayList<Card> array) {

src/main/java/io/zipcoder/casino/Casino_test.java

@@ -1,37 +1,29 @@
 package io.zipcoder.casino;
 
-// BlackJack
-// Solitaire
-// Craps
-// Roulette?
-// Slot Machine?
-
-// Jackpot option? Low chance but player wins $1mil
-//
-
 import io.zipcoder.casino.CardGame.BlackJack.BlackJack;
 import io.zipcoder.casino.CardGame.BlackJack.BlackJackGameplay;
+import io.zipcoder.casino.CardGame.BlackJack.Console_BlackJack;
 import io.zipcoder.casino.DiceGame.Craps.Craps;
-import io.zipcoder.casino.CardGame.Solitaire.Solitaire;
-import io.zipcoder.casino.Interfaces.Game;
-
-import java.util.Scanner;
 
 public final class Casino_test {
 
-    private final static Casino_test instance = new Casino_test();
+//    private final static Casino_test instance = new Casino_test();
 
     private Player player;
+    private BlackJack blackJack;
+    private BlackJackGameplay gamePlay;
 
-    private final String casinoName = "Thunder Theta";
+    private String casinoName;
 
-    private Casino_test() {
+    public Casino_test(Player player) {
+        this.casinoName = "Thunder Theta";
+        this.player = player;
+        this.blackJack = new BlackJack(player);
+        this.gamePlay = new BlackJackGameplay(blackJack);
     }
 
     public void chooseGame() {
-        Scanner scanner = new Scanner(System.in);
-        System.out.println("\n\nWhat game would you like to play?\n<< BlackJack - Solitaire - Craps - Leave >>");
-        String userInput = scanner.nextLine();
+        String userInput = Console.getStringInput("\nWhat game would you like to play?\n\n<< BlackJack - Solitaire - Craps - Leave >>");
         String input = userInput.toUpperCase();
 
         boolean flag = true;
@@ -41,11 +33,9 @@ public final class Casino_test {
                 case "SOLITAIRE":
                     break;
                 case "BLACKJACK":
-                    BlackJack blackJack = new BlackJack(player);
-                    BlackJackGameplay gamePlay = new BlackJackGameplay(blackJack);
-                    System.out.println("\nHi " + player.getName() + "! Welcome to BlackJack!\n\nThe minimum bet is $50.\n");
-                    flag = false;
+                    Console_BlackJack.blackJackWelcome(player);
                     gamePlay.start(player);
+                    flag = false;
                     break;
                 case "CRAPS":
                     Craps craps = new Craps(player);
@@ -53,12 +43,12 @@ public final class Casino_test {
                     craps.gamePlay();
                     break;
                 case "LEAVE":
-                    System.out.println("Thanks for coming to Thunder Theta, good bye!");
+                    Console_BlackJack.finalGoodbye();
                     flag = false;
                     break;
                 default:
-                    System.out.println("I don't know what that game is. Please try again.");
-                    instance.chooseGame();
+                    Console_BlackJack.inputError();
+                    this.chooseGame();
                     break;
             }
         }
@@ -72,52 +62,8 @@ public final class Casino_test {
         return this.player;
     }
 
-    public static Casino_test getInstance() {
-        return instance;
-    }
-
     public String getCasinoName() {
         return this.casinoName;
     }
-
-    public static void main(String[] args) {
-        Scanner scanner = new Scanner(System.in);
-        Casino_test instance = Casino_test.getInstance();
-        System.out.println("Welcome to " + instance.getCasinoName() + "! What is your name?");
-        String playerName = scanner.nextLine();
-        Player player = new Player(playerName);
-        instance.setPlayer(player);
-        instance.chooseGame();
-    }
-
-//    private int money;
-//    private String casinoName;
-//    private Game game;
-//    private Player player;
-//    private String currentGame;
-//
-//    public void selectGame(int gameNum) {
-//
-//        switch (gameNum) {
-//            case 1:
-//                Game blackJack = new BlackJack(player);
-//                break;
-//            case 2:
-//                Game solitaire = new Solitaire(player);
-//                break;
-//            case 3:
-//                Game craps = new Craps(player);
-//                break;
-//            case 4:
-//                leaveCasino();
-//                break;
-//            default:
-//                System.out.println("Input unknown, please pick again.");
-//                break;
-//        }
-//    }
-//
-//    public void leaveCasino() {
-//    }
-
 }
+

src/main/java/io/zipcoder/casino/Main.java

@@ -0,0 +1,10 @@
+package io.zipcoder.casino;
+
+public class Main {
+    public static void main(String[] args) {
+        String playerName = Console.getStringInput("\n\nWelcome to the Casino Lobby! What is your name?");
+        Player player = new Player(playerName);
+        Casino_test casino = new Casino_test(player);
+        casino.chooseGame();
+    }
+}

src/test/java/io/zipcoder/casino/CardGame/BlackJack/BlackJackTest.java

@@ -9,7 +9,6 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import java.util.ArrayList;
-import java.util.Scanner;
 
 public class BlackJackTest {
 
@@ -243,11 +242,10 @@ public class BlackJackTest {
 //    public void testAskForBet(){
 //        gamePlay.askForBet(testPlayer);
 //
-//        int expected = 100;
+//        int expected = 50;
 //        int actual = testPlayer.getBetPot();
 //
 //        Assert.assertEquals(expected, actual);
-//
 //    }
 
     @Test
@@ -303,14 +301,76 @@ public class BlackJackTest {
     }
 
     @Test
-    public void testIfPlayerActive() {
-        testHand.add(deck.draw());
-        testHand.add(deck.draw());
-        testHand.add(deck.draw());
-        System.out.println(testPlayer.getPlayerHand());
+    public void testTwoStands_PlayerWin(){
+        testPlayer.setHandValue(20);
+        blackJack.getDealer().setHandValue(17);
+        testPlayer.setBetPot(50);
+        gamePlay.twoStands(testPlayer);
 
-        gamePlay.setActivePlayer(testPlayer);
-        gamePlay.ifPlayerActive(testPlayer);
+        int expected = 550;
+        int actual = testPlayer.getPlayer().getWallet();
 
+        Assert.assertEquals(expected, actual);
     }
+
+    @Test
+    public void testTwoStands_PlayerLoss(){
+        testPlayer.setHandValue(17);
+        blackJack.getDealer().setHandValue(20);
+        testPlayer.setBetPot(50);
+        gamePlay.twoStands(testPlayer);
+
+        int expected = 450;
+        int actual = testPlayer.getPlayer().getWallet();
+
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testDealerTurn(){
+        blackJack.getDealer().setHandValue(20);
+        gamePlay.dealerTurn();
+
+        int expected = 1;
+        int actual = gamePlay.getStands();
+
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testDealerTurn2(){
+        gamePlay.dealerTurn();
+        gamePlay.dealerTurn();
+
+        int expected = 2;
+        int actual = gamePlay.getStands();
+
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testDealerTurn_Turn(){
+        gamePlay.setTurnNumber(5);
+
+        gamePlay.dealerTurn();
+
+        int expected = 6;
+        int actual = gamePlay.getTurnNumber();
+
+        Assert.assertEquals(expected, actual);
+    }
+
+
+//    @Test
+//    public void testDealerTurn_Turn(){
+//        gamePlay.setTurnNumber(5);
+//
+//        gamePlay.dealerTurn();
+//
+//        int expected = 6;
+//        int actual = gamePlay.getTurnNumber();
+//
+//        Assert.assertEquals(expected, actual);
+//    }
+
 }