conflicts resolved

.gitignore

@@ -10,7 +10,7 @@ local.properties
 .loadpath
 .recommenders
 .DS_Store
-
+ f4be1dfe4483806d9dd9cf3b6546e184f84a5f1a
 
 # External tool builders
 .externalToolBuilders/

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

@@ -33,14 +33,6 @@ public abstract class CardGame {
 
     }
 
-    public void faceDown(Card card){
-        card.setVisibility(false);
-    }
-
-    public void faceUp(Card card){
-        card.setVisibility(true);
-    }
-
     public Deck getDeck() {
         return deck;
     }
@@ -56,9 +48,6 @@ public abstract class CardGame {
         }
     }
 
-    public void setDeck(Deck deck) {
-        this.deck = deck;
-    }
 
     public int getAnte(){
         return ante;
@@ -125,10 +114,6 @@ public abstract class CardGame {
         }
     }
 
-    public void printTurn(){
-        System.out.println("it is now " + playersTurn.getPlayer().getName() + "'s turn");
-    }
-
     public Player getLoser() {
         return loser;
     }

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

@@ -42,7 +42,7 @@ public class Casino {
     {
         while(running) {
 
-            Printer.pickGameMsg();
+            Printer.printMessage("Please choose a game to play!");
             Printer.printMessage(getGameListing());
 
             int command = console.getIntFromUser("Please choose a game to play by entering the number next to the game.");
@@ -53,6 +53,7 @@ public class Casino {
                     Game war = new War(10);
                     ((War) war).addPlayers(player);
                     ((War) war).addNpc();
+                    game = war;
                     war.startGame();
                     break;
 
@@ -60,6 +61,7 @@ public class Casino {
                     Game stud = new Stud(10);
                     ((Stud) stud).addPlayers(player);
                     ((Stud) stud).addNpc();
+                    game = stud;
                     stud.startGame();
                     break;
 
@@ -67,17 +69,26 @@ public class Casino {
                     int slotBet1= console.getIntFromUser("Enter the amount you want to bet on Slot");
                     Game slot= new SlotMachine(slotBet1);
                     slot.startGame();
+                    game = slot;
                     ((SlotMachine) slot).payout();
                     break;
 
                 case 1:
                     Game yahtzee = new Yahtzee(player);
-                    yahtzee.startGame();
+                    ((Yahtzee) yahtzee).startGame();
+                    int betAmount = console.getIntFromUser("How much would you like to bet on this game?");
+                    ((Yahtzee) yahtzee).setBid(betAmount);
+                    ((Yahtzee) yahtzee).bet(betAmount);
+                    game = yahtzee;
+                    yahtzee.startRound();
+                    Printer.printMessage("You scored " + ((Yahtzee) yahtzee).getDicePlayer().getScoreSheet().getTotalScore() + " points.");
+                    ((Yahtzee) yahtzee).payout();
+                    Printer.printMessage(((Yahtzee) yahtzee).getDicePlayer().balanceAtEnd() + "\n");
                     break;
 
                 case 5:
                     running = false;
-                    Printer.closeGameMsg();
+                    Printer.printMessage("Thanks for the money chump!");
                     break;
 
                 default:
@@ -113,4 +124,12 @@ public class Casino {
     public void setPlayer(Player player) {
         this.player = player;
     }
+
+    public ArrayList<String> getGameLib() {
+        return gameLib;
+    }
+
+    public Game getGame() {
+        return game;
+    }
 }

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

@@ -4,6 +4,7 @@ import java.util.InputMismatchException;
 import java.util.Scanner;
 
 public class Console {
+
     private Scanner scanner = new Scanner(System.in);
 
     Console(){
@@ -23,7 +24,7 @@ public class Console {
             int num = scanner.nextInt();
             return num;
         }catch(InputMismatchException err){
-            Printer.pleaseEnterNum();
+            Printer.printMessage("Please enter a number.");
             scanner.next();
         }
         return -1;
@@ -42,4 +43,12 @@ public class Console {
         input.toLowerCase().trim();
         return input;
     }
+
+    public void setScanner(Scanner scanner) {
+        this.scanner = scanner;
+    }
+
+    public Scanner getScanner() {
+        return scanner;
+    }
 }

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

@@ -19,19 +19,22 @@ public class DicePlayer {
         return cup;
     }
 
-    public void printCup() {
+    public String cupToString() {
+
+        String cupString = "";
+
         for(Dice d : cup) {
-            System.out.print(d.getValue() + " ");
+            cupString += (d.getValue() + " ");
         }
-        System.out.println();
+        return cupString;
     }
 
     public Player getPlayer() {
         return player;
     }
 
-    public void printBalanceAtEnd() {
-        System.out.println("Your total balance is now: $" + getPlayer().getCurrentBalance());
+    public String balanceAtEnd() {
+        return "Your total balance is now: $" + getPlayer().getCurrentBalance();
     }
 }
 

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

@@ -1,7 +1,6 @@
 package io.zipcoder.casino;
 
 public interface Game {
-     void quit();
      void startGame();
      void startRound();
 }

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

@@ -4,6 +4,10 @@ import java.util.ArrayList;
 
 public class Printer {
 
+    public static void printMessage(String string) {
+        System.out.println(string);
+    }
+
     public static void noMatchingGameName(ArrayList<String> gameNames){
 
         String games = "";
@@ -15,50 +19,4 @@ public class Printer {
 
         printMessage("Sorry, there is no game with that name, try one of: " + games);
     }
-
-    public static void getBet(String phrase){
-        printMessage("What is the " + phrase + " at the table you're looking for?");
-    }
-
-    public static void unacceptableMaxBet(int minBet){
-        printMessage("Your bet must be above " + minBet);
-    }
-
-    public static void unacceptableMinBet(){
-        printMessage("Your bet must be above $0");
-    }
-
-    public static void studHandsDealt(){
-        printMessage("Each player Dealt 3 cards");
-    }
-
-    public static void showCard(Player player, Card card){
-        printMessage(player.getName() + " shows a " + card.getName());
-    }
-
-    public static void pickGameMsg(){
-        printMessage("Please choose a game to play!");
-    }
-
-    public static void closeGameMsg(){
-        printMessage("Thanks for your money chump!");
-    }
-
-    public static void printMessage(String string) {
-        System.out.println(string);
-    }
-
-    public static void pleaseEnterNum(){
-        printMessage("Please enter a number");
-    }
-    
-    public static void welcomeTo(String gameName){
-        printMessage("Welcome to " + gameName + "!");
-    }
-    
-    public static void wrongCommand(){
-        printMessage("Sorry, there is no game with that name.");
-    }
-
-
 }

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

@@ -2,6 +2,8 @@
 
 package io.zipcoder.casino;
 
+import com.sun.tools.javac.code.Attribute;
+
 import java.util.*;
 
 public class ScoreSheet {
@@ -19,96 +21,52 @@ public class ScoreSheet {
     public int getTotalScore() {
 
         int totalScore = 0;
-        totalScore = (totalScore + getScore(ScoreSheet.ROW.ACES) + getScore(ScoreSheet.ROW.TWOS) + getScore(ScoreSheet.ROW.THREES) + getScore(ScoreSheet.ROW.FOURS) + getScore(ScoreSheet.ROW.FIVES) + getScore(ScoreSheet.ROW.SIXES));
-        if (totalScore >= 63) {
+        int upperScore = 0;
+        int lowerScore = 0;
+        try {
+            upperScore = getScore(ScoreSheet.ROW.ACES) + getScore(ScoreSheet.ROW.TWOS) + getScore(ScoreSheet.ROW.THREES) + getScore(ScoreSheet.ROW.FOURS) + getScore(ScoreSheet.ROW.FIVES) + getScore(ScoreSheet.ROW.SIXES);
+        } catch (NullPointerException e){
+            upperScore = 0;
+        }
+        try {
+            lowerScore = getScore(ScoreSheet.ROW.THREEOFAKIND) + getScore(ScoreSheet.ROW.FOUROFAKIND) + getScore(ScoreSheet.ROW.FULLHOUSE) + getScore(ScoreSheet.ROW.SMALLSTRAIGHT) + getScore(ScoreSheet.ROW.LARGESTRAIGHT) + getScore(ScoreSheet.ROW.YAHTZEE) + getScore(ScoreSheet.ROW.CHANCE);
+        } catch (NullPointerException e){
+            lowerScore = 0;
+        }
+        if (upperScore >= 63) {
             totalScore += 35;
         }
-        totalScore = (totalScore + getScore(ScoreSheet.ROW.THREEOFAKIND) + getScore(ScoreSheet.ROW.FOUROFAKIND) + getScore(ScoreSheet.ROW.FULLHOUSE) + getScore(ScoreSheet.ROW.SMALLSTRAIGHT) + getScore(ScoreSheet.ROW.LARGESTRAIGHT) + getScore(ScoreSheet.ROW.YAHTZEE) + getScore(ScoreSheet.ROW.CHANCE));
-
+        totalScore = totalScore + upperScore + lowerScore;
         return totalScore;
     }
 
-
-    public void printScoreCard(){
-        System.out.print(String.format("%-35s","1. Aces: Totals all Ones"));
-        if(getScore(ScoreSheet.ROW.ACES) != null) {
-            System.out.println("** " + getScore(ScoreSheet.ROW.ACES) + " **");
-        } else {
-            System.out.println("** open **");
-        }
-        System.out.print(String.format("%-35s","2. Twos: Totals all Twos"));
-        if(getScore(ScoreSheet.ROW.TWOS) != null) {
-            System.out.println("** " + getScore(ScoreSheet.ROW.TWOS) + " **");
-        } else {
-            System.out.println("** open **");
-        }
-        System.out.print(String.format("%-35s", "3. Threes: Totals all Threes"));
-        if(getScore(ScoreSheet.ROW.THREES) != null) {
-            System.out.println("** " + getScore(ScoreSheet.ROW.THREES) + " **");
-        } else {
-            System.out.println("** open **");
-        }
-        System.out.print(String.format("%-35s", "4. Fours: Totals all Fours"));
-        if(getScore(ScoreSheet.ROW.FOURS) != null) {
-            System.out.println("** " + getScore(ScoreSheet.ROW.FOURS) + " **");
+    public String rowToString(ROW row, String description) {
+        String rowInfo = String.format("%-35s",description);
+        if(getScore(row) != null) {
+            rowInfo += "** " + getScore(row) + " **\n";
         } else {
-            System.out.println("** open **");
+            rowInfo += "** open **\n";
         }
-        System.out.print(String.format("%-35s", "5. Fives: Totals all Fives"));
-        if(getScore(ScoreSheet.ROW.FIVES) != null) {
-            System.out.println("** " + getScore(ScoreSheet.ROW.FIVES) + " **");
-        } else {
-            System.out.println("** open **");
-        }
-        System.out.print(String.format("%-35s", "6. Sixes: Totals all Sixes"));
-        if(getScore(ScoreSheet.ROW.SIXES) != null) {
-            System.out.println("** " + getScore(ScoreSheet.ROW.SIXES) + " **");
-        } else {
-            System.out.println("** open **");
-        }
-        System.out.print(String.format("%-35s", "7. 3 of a Kind"));
-        if(getScore(ScoreSheet.ROW.THREEOFAKIND) != null) {
-            System.out.println("** " + getScore(ScoreSheet.ROW.THREEOFAKIND) + " **");
-        } else {
-            System.out.println("** open **");
-        }
-        System.out.print(String.format("%-35s", "8. 4 of a Kind"));
-        if(getScore(ScoreSheet.ROW.FOUROFAKIND) != null) {
-            System.out.println("** " + getScore(ScoreSheet.ROW.FOUROFAKIND) + " **");
-        } else {
-            System.out.println("** open **");
-        }
-        System.out.print(String.format("%-35s", "9. Full House"));
-        if(getScore(ScoreSheet.ROW.FULLHOUSE) != null) {
-            System.out.println("** " + getScore(ScoreSheet.ROW.FULLHOUSE) + " **");
-        } else {
-            System.out.println("** open **");
-        }
-        System.out.print(String.format("%-35s","10. Small Straight: Sequence of 4"));
-        if(getScore(ScoreSheet.ROW.SMALLSTRAIGHT) != null) {
-            System.out.println("** " + getScore(ScoreSheet.ROW.SMALLSTRAIGHT) + " **");
-        } else {
-            System.out.println("** open **");
-        }
-        System.out.print(String.format("%-35s","11. Large Striaght: Sequence of 5"));
-        if(getScore(ScoreSheet.ROW.LARGESTRAIGHT) != null) {
-            System.out.println("** " + getScore(ScoreSheet.ROW.LARGESTRAIGHT) + " **");
-        } else {
-            System.out.println("** open **");
-        }
-        System.out.print(String.format("%-35s","12. Yahtzee: 5 of a Kind "));
-        if(getScore(ScoreSheet.ROW.YAHTZEE) != null) {
-            System.out.println("** " + getScore(ScoreSheet.ROW.YAHTZEE) + " **");
-        } else {
-            System.out.println("** open **");
-        }
-        System.out.print(String.format("%-35s", "13. Chance: Sum of Dice"));
-        if(getScore(ScoreSheet.ROW.CHANCE) != null) {
-            System.out.println("** " + getScore(ScoreSheet.ROW.CHANCE) + " **");
-        } else {
-            System.out.println("** open **");
-        }
-        System.out.println();
+        return rowInfo;
+    }
+
+    public String scoreCardToString(){
+        String scoreCard = rowToString(ScoreSheet.ROW.ACES, "1. Aces: Totals all Ones") +
+        rowToString(ScoreSheet.ROW.TWOS, "2. Twos: Totals all Twos") +
+        rowToString(ScoreSheet.ROW.THREES, "3. Threes: Totals all Threes") +
+        rowToString(ScoreSheet.ROW.FOURS, "4. Fours: Totals all Fours") +
+        rowToString(ScoreSheet.ROW.FIVES, "5. Fives: Totals all Fives") +
+        rowToString(ScoreSheet.ROW.SIXES, "6. Sixes: Totals all Sixes") +
+        rowToString(ScoreSheet.ROW.THREEOFAKIND, "7. 3 of a Kind") +
+        rowToString(ScoreSheet.ROW.FOUROFAKIND, "8. 4 of a Kind") +
+        rowToString(ScoreSheet.ROW.FULLHOUSE, "9. Full House") +
+        rowToString(ScoreSheet.ROW.SMALLSTRAIGHT, "10. Small Straight: Sequence of 4") +
+        rowToString(ScoreSheet.ROW.LARGESTRAIGHT, "11. Large Striaght: Sequence of 5") +
+        rowToString(ScoreSheet.ROW.YAHTZEE, "12. Yahtzee: 5 of a Kind") +
+        rowToString(ScoreSheet.ROW.CHANCE,  "13. Chance: Sum of Dice");
+
+        return scoreCard;
+
     }
 
     public void setRow(ROW row, Dice[] cup){
@@ -139,46 +97,22 @@ public class ScoreSheet {
                     scores.put(ROW.SIXES, scoreNumbers(numbers, 6));
                     break;
                 case THREEOFAKIND:
-                    if (checkOfaKind(numbers, 3)) {
-                        scores.put(ROW.THREEOFAKIND, scoreTotalDice(numbers));
-                    } else {
-                        scores.put(ROW.THREEOFAKIND, 0);
-                    }
+                    scoreRow(checkOfaKind(numbers,3), ROW.THREEOFAKIND, scoreTotalDice(numbers));
                     break;
                 case FOUROFAKIND:
-                    if (checkOfaKind(numbers, 4)) {
-                        scores.put(ROW.FOUROFAKIND, scoreTotalDice(numbers));
-                    } else {
-                        scores.put(ROW.FOUROFAKIND, 0);
-                    }
+                    scoreRow(checkOfaKind(numbers, 4), ROW.FOUROFAKIND, scoreTotalDice(numbers));
                     break;
                 case FULLHOUSE:
-                    if (checkOfaKind(numbers, 5) || checkFullHouse(numbers)) {
-                        scores.put(ROW.FULLHOUSE, 25);
-                    } else {
-                        scores.put(ROW.FULLHOUSE, 0);
-                    }
+                    scoreRow(checkOfaKind(numbers, 5), ROW.FULLHOUSE, 25);
                     break;
                 case SMALLSTRAIGHT:
-                    if (checkSmallStraight(numbers)) {
-                        scores.put(ROW.SMALLSTRAIGHT, 30);
-                    } else {
-                        scores.put(ROW.SMALLSTRAIGHT, 0);
-                    }
+                    scoreRow(checkSmallStraight(numbers), ROW.SMALLSTRAIGHT, 30);
                     break;
                 case LARGESTRAIGHT:
-                    if (checkLargeStraight(numbers)) {
-                        scores.put(ROW.LARGESTRAIGHT, 40);
-                    } else {
-                        scores.put(ROW.LARGESTRAIGHT, 0);
-                    }
+                    scoreRow(checkLargeStraight(numbers), ROW.LARGESTRAIGHT, 40);
                     break;
                 case YAHTZEE:
-                    if (checkOfaKind(numbers, 5)) {
-                        scores.put(ROW.YAHTZEE, 50);
-                    } else {
-                        scores.put(ROW.YAHTZEE, 0);
-                    }
+                    scoreRow(checkOfaKind(numbers, 5), ROW.YAHTZEE, 50);
                     break;
                 case CHANCE:
                     scores.put(ROW.CHANCE, scoreTotalDice(numbers));
@@ -186,14 +120,28 @@ public class ScoreSheet {
             }
         }
 
+        public void scoreRow(boolean check, ROW row, int score) {
+            if (check) {
+                scores.put(row, score);
+            } else {
+                scores.put(row, 0);
+            }
+        }
 
 
     public boolean checkFullHouse(ArrayList<Integer> numbers) {
 
-        boolean check2 = checkOfaKind(numbers, 2);
-        boolean check3 = checkOfaKind(numbers, 3);
+        boolean fullHouse = false;
+        boolean checkYahtzee = checkOfaKind(numbers, 5);
+        if(checkYahtzee) {
+            return true;
+        } else {
+            boolean check2 = checkOfaKind(numbers, 2);
+            boolean check3 = checkOfaKind(numbers, 3);
+            fullHouse = (check2 && check3);
+        }
 
-        return (check2 && check3);
+        return fullHouse;
     }
 
     public boolean checkSmallStraight(ArrayList<Integer> numbers) {
@@ -275,6 +223,6 @@ public class ScoreSheet {
     }
 
     public Integer getScore(ROW row) {
-        return this.scores.get(row);
+        return scores.get(row);
     }
 }

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

@@ -13,7 +13,6 @@ public class SlotMachine implements Game, Gamble {
         this.betAmount = betAmount;
     }
 
-    // implemented from gamble
     @Override
     public void bet(int betAmount) {
         this.betAmount= betAmount;
@@ -22,27 +21,18 @@ public class SlotMachine implements Game, Gamble {
 
     @Override
     public void payout(){
-        System.out.println("Your payout amount for slot machine is: $" +payout +"\n");
-
-    }
-
-
-    // implementd from game
-
-    @Override
-    public void quit() {
-
+        Printer.printMessage("Your payout amount for slot machine is: $" + payout + "\n");
     }
 
     @Override
     public void startGame() {
-        System.out.println("You are all set to play a new slot game..zrrr..!"+"\n");
+        Printer.printMessage("You are all set to play a new slot game..zrrr..! \n");
         try {
             Thread.sleep(3000);
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
-        System.out.println("Your slot is in progress"+"\n");
+        Printer.printMessage("Your slot is in progress"+"\n");
 
         try {
             Thread.sleep(3000);
@@ -111,8 +101,6 @@ public class SlotMachine implements Game, Gamble {
                 }
             }
             outputword= "[ " + word1+ " ]" + "   " + "[ " + word2 + " ]" + "   "+ "[ " + word3 + " ]" + "\n" ;
-            //System.out.println(outputword);
-
 
             if(((!word1.equals(word2)) )&& ((!word1.equals(word3))) && ((!word2.equals(word3)))){
 
@@ -133,35 +121,18 @@ public class SlotMachine implements Game, Gamble {
                 payout=betAmount*3;
             }
 
-            System.out.println(( outputword + "\n" ));
+            Printer.printMessage(( outputword + "\n" ));
 
         try {
             Thread.sleep(2000);
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
-
-
-
-        }
-
-
-
-
-
+    }
 
     @Override
     public void startRound() {
 
     }
-
-   /* public  void main(String[] args) {
-
-
-        //System.out.println("Enter the amount of money you wan to enter into the slot machine");
-        //Scanner scanner = new Scanner(System.in);
-
-
-    }*/
 }
 

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

@@ -11,16 +11,17 @@ public class Stud extends CardGame implements Game {
     public Stud(int ante) {
         super(ante);
     }
+    
+    public void playCard(Player player, Card card) {
+        card.setVisibility(true);               //CARD isVISIBLE
+        Printer.printMessage(player.getName() + " shows a " + card.getName());         //PRINT card name to CONSOLE
+    }
 
 
     public boolean getIsDealt(){
         return isDealt;
     }
 
-    public void playCard(Player player, Card card) {
-        card.setVisibility(true);               //CARD isVISIBLE
-        Printer.showCard(player, card);         //PRINT card name to CONSOLE
-    }
 
     /**
      * Determine what player wins by looping through player array and then

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

@@ -12,54 +12,49 @@ public class War extends CardGame implements Gamble, Game {
     private ArrayList<Card> tableCards = new ArrayList<Card>();
     private ArrayList<CardPlayer> warMembers = new ArrayList<CardPlayer>();
     private Console console = new Console();
-    private boolean war = false;
-
-    War(int ante) {
-        super(ante);
-    }
 
+    War(int ante) { super(ante); }
 
-    /**
-     * Specific to war methods
-     */
     public void playCard(boolean cardFace){
-        //if the player has cards in their hand
         if(super.getPlayersTurn().getHand().size() > 0) {
-            //pull out a card to play
-            Card card = super.getPlayersTurn().getHand().get(0);
-            //play the card face up, on the table
-            card.setVisibility(cardFace);
-            tableCards.add(card);
-            //store the last played card in the players wrapper class
-            super.getPlayersTurn().setPlayedCard(card);
-            //remove this card from their hand
-            super.getPlayersTurn().getHand().remove(card);
-            //print the card that was played
-            if(cardFace == true) {
-                System.out.println(super.getPlayersTurn().getPlayer().getName() + " has played " + card.getName() + " and has " + super.getPlayersTurn().getHand().size() + " cards left.");
-            } else {
-                System.out.println(super.getPlayersTurn().getPlayer().getName() + " has played a card face down.");
-            }
-        //if the player has not cards in their hand but has cards in their discard, pickup their discard and play a card
+            playCardInHand(cardFace);
         } else if(super.getPlayersTurn().getHand().size() == 0 && super.getPlayersTurn().getDiscard().size() > 0) {
-            System.out.println(super.getPlayersTurn().getPlayer().getName() + " ran out of cards and picked up their discard pile.");
-            super.getPlayersTurn().getHand().addAll(super.getPlayersTurn().getDiscard());
-            super.getPlayersTurn().setDiscard(new ArrayList<Card>());
-            playCard(true);
-        //if the person has no cards in their hand, and no cards in discard they lose.
+            playCardFromPile(cardFace);
         } else if(super.getPlayersTurn().getHand().size() == 0 && super.getPlayersTurn().getDiscard().size() == 0){
             super.setLoser(super.getPlayersTurn().getPlayer());
-            System.out.println(super.getPlayersTurn().getPlayer().getName() + " has lost the match!");
+            Printer.printMessage(super.getPlayersTurn().getPlayer().getName() + " has lost the match!");
         }
     }
 
-    public CardPlayer warMethod(){
-        System.out.println("War!");
+    public void playCardInHand(boolean cardFace){
+        Card card = getCardFromHand(cardFace);
+        if(cardFace) {
+            Printer.printMessage(super.getPlayersTurn().getPlayer().getName() + " has played a " + card.getName() + " and has " + super.getPlayersTurn().getHand().size() + " cards left.");
+        } else {
+            Printer.printMessage(super.getPlayersTurn().getPlayer().getName() + " has played a card face down.");
+        }
+    }
 
+    public Card getCardFromHand(boolean cardFace){
+        Card card = super.getPlayersTurn().getHand().get(0);
+        card.setVisibility(cardFace);
+        tableCards.add(card);
+        super.getPlayersTurn().setPlayedCard(card);
+        super.getPlayersTurn().getHand().remove(card);
+        return card;
+    }
+
+    public void playCardFromPile(boolean cardFace){
+        Printer.printMessage(super.getPlayersTurn().getPlayer().getName() + " ran out of cards and picked up their discard pile.");
+        super.getPlayersTurn().getHand().addAll(super.getPlayersTurn().getDiscard());
+        super.getPlayersTurn().setDiscard(new ArrayList<Card>());
+        playCard(cardFace);
+    }
+
+    public CardPlayer warMethod(){
+        Printer.printMessage("War!");
         int max = 0;
         CardPlayer winner = null;
-
-        //each player plays 3 cards
         for(int i = 0; i < warMembers.size(); i ++){
             for(int m = 0; m < 2; m ++){
                 playCard(false);
@@ -67,36 +62,31 @@ public class War extends CardGame implements Gamble, Game {
             playCard(true);
             super.chooseNextTurn();
         }
-
-        //find the player with the highest value
         winner = determineWinner(warMembers);
         warMembers = new ArrayList<>();
         return winner;
     }
 
     public CardPlayer determineWinner(ArrayList<CardPlayer> playerList){
-
         int max = 0;
         CardPlayer winner = null;
         boolean war = false;
-
-        //loop through and get the max card value
         for(int i = 0; i < playerList.size(); i ++){
             CardPlayer player = playerList.get(i);
-            //if the players card is greater than the current max
             if(player.getPlayedCard().getCardValue() > max)
             {
-                //set their value as max
                 max = player.getPlayedCard().getCardValue();
-                //make them the winner
                 winner = player;
-                //set war to false
                 war = false;
             }  else if (player.getPlayedCard().getCardValue() == max){
                 warMembers.add(player);
                 war = true;
             }
         }
+        return checkWar(war, winner);
+    }
+
+    public CardPlayer checkWar(boolean war, CardPlayer winner){
         if(war)
         {
             warMembers.add(winner);
@@ -104,25 +94,16 @@ public class War extends CardGame implements Gamble, Game {
             return winner;
         } else if(!war)
         {
-            System.out.println("The winner is " + winner.getPlayer().getName());
+            Printer.printMessage("The winner is " + winner.getPlayer().getName());
             return winner;
         }
         return null;
     }
 
-    /**
-     * Below 3 Implemented from Gamble
-     */
-    public void bet(int betAmount) {
-        super.changeTablePot(betAmount);
-    }
-
+    public void bet(int betAmount) { super.changeTablePot(betAmount); }
 
     public void payout() {
-        if(super.getWinner() != null)
-        {
-            super.getWinner().changeBalance(super.getTablePot());
-        }
+        if(super.getWinner() != null) { super.getWinner().changeBalance(super.getTablePot()); }
     }
 
     public void payAnte() {
@@ -133,16 +114,8 @@ public class War extends CardGame implements Gamble, Game {
         }
     }
 
-    /**
-     * Below 3 Implemented from Game
-     */
-
-    public void quit() {
-
-    }
-
-    public void startGame() {
-        Printer.welcomeTo("War");
+    public void startGame(){
+        Printer.printMessage("Welcome to War!");
         super.chooseStatingPlayer();
         payAnte();
         deal();
@@ -151,51 +124,36 @@ public class War extends CardGame implements Gamble, Game {
 
     public void startRound() {
         while(super.getLoser() == null) {
-
             String input = console.getCMDFromUser("Type 'FLIP' to play the card at the top of your pile");
             if (input.equals("flip")) {
-                //each player
-                for (CardPlayer player : super.getPlayers()) {
-                    //plays a card, then
-                    playCard(true);
-                    //the turn updates to be the next players.
-                    super.chooseNextTurn();
-                }
-                //determine the winner once all players play a card
+                eachPlayerPlayCard();
                 CardPlayer winner = determineWinner(super.getPlayers());
-                System.out.println(winner.getPlayer().getName() + " has been rewarded " + tableCards.size() + " cards.");
-                //add all the table cards to the players discard
+                Printer.printMessage(winner.getPlayer().getName() + " has been rewarded " + tableCards.size() + " cards.");
                 winner.addDiscard(tableCards);
-                //clear the table cards pile
                 tableCards = new ArrayList<Card>();
-                //if the user does not type play
             } else {
-                //display a message
-                System.out.println("Sorry, I don't understand that command.");
+                Printer.printMessage("Sorry, I don't understand that command.");
             }
         }
+    }
 
+    public void eachPlayerPlayCard(){
+        for (CardPlayer player : super.getPlayers()) {
+            playCard(true);
+            super.chooseNextTurn();
+        }
     }
 
     public void deal() {
-        //while there are cards in the deck
         while(super.getDeck().size() != 0){
-            //for each player playing the game
             for(int i = 0; i < super.getPlayers().size(); i ++)
             {
-                //grab the card from the top (last added) to the deck
                 Card card = super.getDeck().get(super.getDeck().size() - 1);
-                //get the player whos hand we are adding the card to
                 CardPlayer player = super.getPlayers().get(i);
-                //add the card to their hand
                 player.getHand().add(card);
-                //remove the card from the deck
                 super.getDeck().remove(card);
             }
         }
-
-        System.out.println(super.getPlayersTurn().getPlayer().getName() +
-                "has: " + super.getPlayersTurn().getHand().size() + " cards.");
-
+        Printer.printMessage(super.getPlayersTurn().getPlayer().getName() + "has: " + super.getPlayersTurn().getHand().size() + " cards.");
     }
-}
+}

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

@@ -6,11 +6,13 @@ import java.util.Scanner;
 public class Yahtzee extends DiceGame implements Game, Gamble {
 
     DicePlayer dicePlayer;
-    private Scanner scanner = new Scanner(System.in);
+    Console console = new Console();
     int betAmount = 0;
+    int totalScore = 0;
 
     public Yahtzee(Player player) {
         this.dicePlayer = new DicePlayer(player);
+        this.totalScore = this.dicePlayer.getScoreSheet().getTotalScore();
     }
 
     public int getBid() {
@@ -21,7 +23,7 @@ public class Yahtzee extends DiceGame implements Game, Gamble {
         this.betAmount = bid;
     }
 
-    public void createGame() {
+    public void startGame() {
         Dice dice1 = new Dice();
         Dice dice2 = new Dice();
         Dice dice3 = new Dice();
@@ -33,72 +35,55 @@ public class Yahtzee extends DiceGame implements Game, Gamble {
         dicePlayer.getCup()[2] = dice3;
         dicePlayer.getCup()[3] = dice4;
         dicePlayer.getCup()[4] = dice5;
-    }
-
-    public void startGame() {
-        createGame();
-
-        System.out.println("How much would you like to bet on this game?");
-        int betAmount = scanner.nextInt();
-        setBid(betAmount);
-        bet(betAmount);
-
-        startRound();
-        System.out.println("You scored " + dicePlayer.getScoreSheet().getTotalScore() + " points.");
-        payout();
-        dicePlayer.printBalanceAtEnd();
-        System.out.println();
 
     }
 
+    @Override
     public void startRound() {
-
         for (int i = 0; i < ScoreSheet.getSize(); i++) {
-            for (Dice d : dicePlayer.getCup()) {
-                d.roll();
-            }
-            System.out.println("\nYou rolled:");
-            dicePlayer.printCup();
-            System.out.println();
+            rollAll();
+            for(int j = 0; j < 2; j++) {
+                int rollChoice = console.getIntFromUser("Would you like to:\n1. Roll all dice again.\n2. Roll some dice again.\n3. Stop rolling and score.\nNumber of Selection: ");
+                String diceToRoll = "";
+                if(rollChoice == 2) {
+                    diceToRoll = console.getLineFromUser("Which numbers would you like to reroll? List the numbers separated by spaces.");
+                }
+                rollOptions(rollChoice, diceToRoll); }
 
-            roundRoutine();
-            recordingScore();
-        }
+            boolean validEntry = false;
+            ScoreSheet.ROW row = ScoreSheet.ROW.CHANCE;
+            while (!validEntry) {
+                Printer.printMessage(dicePlayer.getScoreSheet().scoreCardToString());
 
-    }
+                int rowChoice = console.getIntFromUser("Which row would you like to apply your turn to on the scoresheet?.\n" +
+                        "Remember you can only use each row once!");
 
-    public void roundRoutine() {
+                row = selectingRow(rowChoice);
+                validEntry = checkEmptyRow(row);
+            }
+            dicePlayer.getScoreSheet().setRow(row, dicePlayer.getCup());
+            Printer.printMessage("\n" + dicePlayer.getScoreSheet().scoreCardToString());
+        }
 
-        giveOptions();
-        giveOptions();
+    }
 
+    public void rollAll() {
+        for (Dice d : dicePlayer.getCup()) {
+            d.roll();
+        }
+        Printer.printMessage("\nYou rolled:\n" + dicePlayer.cupToString() + "\n");
     }
 
-    public void giveOptions() {
-        int choice = 0;
-        System.out.print("Would you like to:\n1. Roll all dice again.\n2. Roll some dice again.\n3. Stop rolling and score.\nNumber of Selection: ");
 
-        Scanner in = new Scanner(System.in);
-        choice = in.nextInt();
+    public void rollOptions(int choice, String diceToRoll) {
 
         switch (choice) {
             case 1:
-                for (Dice d : dicePlayer.getCup()) {
-                    d.roll();
-                }
-                System.out.println("\nYou rolled:");
-                dicePlayer.printCup();
-                System.out.println();
+                rollAll();
                 break;
 
             case 2:
-                System.out.println("Which numbers would you like to reroll? List the numbers separated by spaces.");
-                Scanner in2 = new Scanner(System.in);
-                String diceToRoll = in2.nextLine();
                 reRoll(diceToRoll);
-                System.out.println("\nYou rolled:");
-                dicePlayer.printCup();
-                System.out.println();
                 break;
 
             case 3:
@@ -122,24 +107,14 @@ public class Yahtzee extends DiceGame implements Game, Gamble {
                 }
             }
         }
+        Printer.printMessage("\nYou rolled:\n" + dicePlayer.cupToString() + "\n");
+
     }
 
-    public void recordingScore() {
+    public ScoreSheet.ROW selectingRow(int choice) {
 
-        boolean validEntry = true;
-        int choice = 13;
         ScoreSheet.ROW row = ScoreSheet.ROW.CHANCE;
 
-        while (validEntry) {
-            dicePlayer.getScoreSheet().printScoreCard();
-            System.out.println();
-            System.out.println("Which row would you like to apply your turn to on the scoresheet?.\n" +
-                    "Remember you can only use each row once!");
-            System.out.print("Row:");
-
-            Scanner scanner2 = new Scanner(System.in);
-            choice = scanner2.nextInt();
-
             switch (choice) {
                 case 1:
                     row = ScoreSheet.ROW.ACES;
@@ -181,17 +156,21 @@ public class Yahtzee extends DiceGame implements Game, Gamble {
                     row = ScoreSheet.ROW.CHANCE;
                     break;
             }
+
+            return row;
+
+        }
+
+        public boolean checkEmptyRow(ScoreSheet.ROW row) {
             if (dicePlayer.getScoreSheet().getScore(row) == null) {
-                validEntry = false;
+                return true;
             } else {
-                System.out.println("Error, you have already filled that row");
+                Printer.printMessage("Error, you have already filled that row");
+                return false;
             }
         }
 
-        dicePlayer.getScoreSheet().setRow(row, dicePlayer.getCup());
-        System.out.println();
-        dicePlayer.getScoreSheet().printScoreCard();
-    }
+
 
     @Override
     public void bet(int betAmount) {
@@ -200,33 +179,27 @@ public class Yahtzee extends DiceGame implements Game, Gamble {
 
     @Override
     public void payout() {
-        int score = dicePlayer.getScoreSheet().getTotalScore();
+        int score = getTotalScore();
         int payOut = 0;
         if (score == 1575) {
             payOut = getBid() * 100;
-        } else if (score > 1000) {
-            payOut = getBid() * 20;
         } else if (score > 500) {
             payOut = getBid() * 10;
-        } else if (score > 400) {
-            payOut = getBid() * 5;
-        } else if (score > 300) {
-            payOut = getBid() * 3;
         } else if (score > 200) {
             payOut = getBid() * 2;
         } else {
             payOut = 0;
         }
         dicePlayer.getPlayer().changeBalance(payOut);
-        System.out.println("You won $" + payOut);
+        Printer.printMessage("You won $" + payOut);
     }
 
-    @Override
-    public void quit() {
-
-    }
 
     public DicePlayer getDicePlayer() {
         return dicePlayer;
     }
+
+    public int getTotalScore() {
+        return totalScore;
+    }
 }

src/test/java/io/zipcoder/casino/CasinoTest.java

@@ -1,5 +1,10 @@
 package io.zipcoder.casino;
 
 
+import org.junit.Assert;
+import org.junit.Test;
+
 public class CasinoTest {
+
+
 }

src/test/java/io/zipcoder/casino/ConsoleTest.java

@@ -0,0 +1,37 @@
+package io.zipcoder.casino;
+
+import org.junit.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.nio.ByteBuffer;
+import java.util.*;
+
+public class ConsoleTest {
+
+    @Test
+    public void testCreateAccont()
+    {
+        Console console = new Console();
+        String name = "Jon \n";
+        Integer balance = 100;
+        ByteBuffer b = ByteBuffer.allocate(balance);
+        byte[] result = b.array();
+
+
+        byte[] one = result;
+        byte[] two = name.getBytes();
+        byte[] combined = new byte[one.length + two.length];
+
+        System.arraycopy(one,0,combined,0,one.length);
+        System.arraycopy(two,0,combined,one.length,two.length);
+
+
+        String data = "Jon" + "\nA second line of user input.";
+        System.setIn(new ByteArrayInputStream(combined));
+
+        console.setScanner(new Scanner(new ByteArrayInputStream(combined)));
+
+    }
+
+}

src/test/java/io/zipcoder/casino/DiceTest.java

@@ -24,10 +24,4 @@ public class DiceTest {
 
         Assert.assertEquals(expected,x);
     }
-
-    @Test
-    public void test()
-    {
-
-    }
 }

src/test/java/io/zipcoder/casino/PlayerTest.java

@@ -0,0 +1,31 @@
+package io.zipcoder.casino;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class PlayerTest {
+
+    @Test
+    public void testInitialBalance() {
+        //When
+        Player player = new Player("Bob", 500);
+        int expected = 500;
+        int actual = player.getInitialBalance();
+
+        //Then
+        Assert.assertEquals(expected, actual);
+
+    }
+
+    @Test
+    public void testGetName() {
+        //When
+        Player player = new Player("Bob", 500);
+        String expected = "Bob";
+        String actual = player.getName();
+
+        //Then
+        Assert.assertEquals(expected, actual);
+
+    }
+}

src/test/java/io/zipcoder/casino/PrinterTest.java

@@ -0,0 +1,27 @@
+package io.zipcoder.casino;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.util.NoSuchElementException;
+import java.util.Scanner;
+
+public class PrinterTest {
+
+    @Test
+    public void testWrongGameEntered(){
+        Casino casino = new Casino();
+        Console console = new Console();
+
+        casino.getConsole().setScanner(new Scanner(new ByteArrayInputStream("6".getBytes())));
+        try {
+            casino.chooseGame();
+        }catch(NoSuchElementException e){
+
+        }
+
+        Assert.assertEquals(null, casino.getGame());
+    }
+}

src/test/java/io/zipcoder/casino/ScoreSheetTest.java

@@ -9,10 +9,18 @@ import java.util.Collections;
 
 public class ScoreSheetTest {
 
+    ScoreSheet scoreSheet = new ScoreSheet();
+    Dice dice1 = new Dice();
+    Dice dice2 = new Dice();
+    Dice dice3 = new Dice();
+    Dice dice4 = new Dice();
+    Dice dice5 = new Dice();
+    Dice[] cup = new Dice[5];
+
+
     @Test
     public void testCheckThreeOfAKindFalse() {
         //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
         ArrayList<Integer> test = new ArrayList<>();
         test.add(5);
         test.add(3);
@@ -28,7 +36,6 @@ public class ScoreSheetTest {
     @Test
     public void testCheckThreeOfAKindTrue() {
         //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
         ArrayList<Integer> test = new ArrayList<>();
         test.add(2);
         test.add(3);
@@ -44,7 +51,6 @@ public class ScoreSheetTest {
     @Test
     public void testCheckFourOfAKindFalse() {
         //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
         ArrayList<Integer> test = new ArrayList<>();
         test.add(5);
         test.add(3);
@@ -60,7 +66,6 @@ public class ScoreSheetTest {
     @Test
     public void testCheckFourOfAKindTrue() {
         //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
         ArrayList<Integer> test = new ArrayList<>();
         test.add(2);
         test.add(3);
@@ -76,7 +81,6 @@ public class ScoreSheetTest {
     @Test
     public void testCheckYahtzeeFalse() {
         //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
         ArrayList<Integer> test = new ArrayList<>();
         test.add(5);
         test.add(3);
@@ -92,7 +96,6 @@ public class ScoreSheetTest {
     @Test
     public void testCheckYahtzeeTrue() {
         //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
         ArrayList<Integer> test = new ArrayList<>();
         test.add(2);
         test.add(2);
@@ -108,7 +111,6 @@ public class ScoreSheetTest {
     @Test
     public void testCheckFullHouseFalse() {
         //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
         ArrayList<Integer> test = new ArrayList<>();
         test.add(5);
         test.add(3);
@@ -124,7 +126,6 @@ public class ScoreSheetTest {
     @Test
     public void testCheckFullHouseTrue() {
         //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
         ArrayList<Integer> test = new ArrayList<>();
         test.add(2);
         test.add(3);
@@ -140,7 +141,6 @@ public class ScoreSheetTest {
     @Test
     public void testCheckLargeStraightFalse() {
         //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
         ArrayList<Integer> test = new ArrayList<>();
         test.add(5);
         test.add(3);
@@ -157,7 +157,6 @@ public class ScoreSheetTest {
     @Test
     public void testCheckLargeStraightTrue() {
         //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
         ArrayList<Integer> test = new ArrayList<>();
         test.add(2);
         test.add(3);
@@ -174,7 +173,6 @@ public class ScoreSheetTest {
     @Test
     public void testCheckSmallStraightFalse() {
         //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
         ArrayList<Integer> test = new ArrayList<>();
         test.add(5);
         test.add(3);
@@ -191,7 +189,6 @@ public class ScoreSheetTest {
     @Test
     public void testCheckSmallStraightTrue1() {
         //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
         ArrayList<Integer> test = new ArrayList<>();
         test.add(5);
         test.add(3);
@@ -208,7 +205,6 @@ public class ScoreSheetTest {
     @Test
     public void testCheckSmallStraightTrue2() {
         //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
         ArrayList<Integer> test = new ArrayList<>();
         test.add(1);
         test.add(3);
@@ -225,7 +221,6 @@ public class ScoreSheetTest {
     @Test
     public void testCheckSmallStraightTrue3() {
         //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
         ArrayList<Integer> test = new ArrayList<>();
         test.add(1);
         test.add(3);
@@ -242,7 +237,6 @@ public class ScoreSheetTest {
     @Test
     public void testScoreNumbers() {
         //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
         ArrayList<Integer> test = new ArrayList<>();
         test.add(2);
         test.add(3);
@@ -262,7 +256,6 @@ public class ScoreSheetTest {
     @Test
     public void testScoreTotalDice() {
         //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
         ArrayList<Integer> test = new ArrayList<>();
         test.add(2);
         test.add(3);
@@ -282,13 +275,6 @@ public class ScoreSheetTest {
     @Test
     public void testSetRowCHANCE() {
         //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
-        Dice dice1 = new Dice();
-        Dice dice2 = new Dice();
-        Dice dice3 = new Dice();
-        Dice dice4 = new Dice();
-        Dice dice5 = new Dice();
-        Dice[] cup = new Dice[5];
         cup[0] = dice1;
         cup[1] = dice2;
         cup[2] = dice3;
@@ -299,363 +285,319 @@ public class ScoreSheetTest {
         }
         int expected = dice1.getValue() + dice2.getValue() + dice3.getValue() + dice4.getValue() + dice5.getValue();
 
-        //When
-
-        scoreSheet.setRow(ScoreSheet.ROW.CHANCE, cup);
-        int actual = scoreSheet.getScore(ScoreSheet.ROW.CHANCE);
+            //When
+            scoreSheet.setRow(ScoreSheet.ROW.CHANCE, cup);
+            int actual = scoreSheet.getScore(ScoreSheet.ROW.CHANCE);
 
-        //Then
-        Assert.assertEquals(expected, actual);
+            //Then
+            Assert.assertEquals(expected, actual);
 
-    }
-
-    @Test
-    public void testSetRowACES() {
-        //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
-        Dice dice1 = new Dice();
-        Dice dice2 = new Dice();
-        Dice dice3 = new Dice();
-        Dice dice4 = new Dice();
-        Dice dice5 = new Dice();
-        Dice[] cup = new Dice[5];
-        cup[0] = dice1;
-        cup[1] = dice2;
-        cup[2] = dice3;
-        cup[3] = dice4;
-        cup[4] = dice5;
-        for (Dice d : cup) {
-            d.roll();
         }
 
-        //When
-        scoreSheet.setRow(ScoreSheet.ROW.ACES, cup);
+        @Test
+        public void testSetRowACES () {
+            //Given
+            cup[0] = dice1;
+            cup[1] = dice2;
+            cup[2] = dice3;
+            cup[3] = dice4;
+            cup[4] = dice5;
+            for (Dice d : cup) {
+                d.roll();
+            }
 
+            //When
+            scoreSheet.setRow(ScoreSheet.ROW.ACES, cup);
 
-        //Then
-        Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.ACES) != null));
 
-    }
+            //Then
+            Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.ACES) != null));
 
-    @Test
-    public void testSetRowTWOS() {
-        //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
-        Dice dice1 = new Dice();
-        Dice dice2 = new Dice();
-        Dice dice3 = new Dice();
-        Dice dice4 = new Dice();
-        Dice dice5 = new Dice();
-        Dice[] cup = new Dice[5];
-        cup[0] = dice1;
-        cup[1] = dice2;
-        cup[2] = dice3;
-        cup[3] = dice4;
-        cup[4] = dice5;
-        for (Dice d : cup) {
-            d.roll();
         }
 
-        //When
-        scoreSheet.setRow(ScoreSheet.ROW.TWOS, cup);
+        @Test
+        public void testSetRowTWOS () {
+            //Given
+            cup[0] = dice1;
+            cup[1] = dice2;
+            cup[2] = dice3;
+            cup[3] = dice4;
+            cup[4] = dice5;
+            for (Dice d : cup) {
+                d.roll();
+            }
 
+            //When
+            scoreSheet.setRow(ScoreSheet.ROW.TWOS, cup);
 
-        //Then
-        Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.TWOS) != null));
 
-    }
+            //Then
+            Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.TWOS) != null));
 
-    @Test
-    public void testSetRowTHREES() {
-        //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
-        Dice dice1 = new Dice();
-        Dice dice2 = new Dice();
-        Dice dice3 = new Dice();
-        Dice dice4 = new Dice();
-        Dice dice5 = new Dice();
-        Dice[] cup = new Dice[5];
-        cup[0] = dice1;
-        cup[1] = dice2;
-        cup[2] = dice3;
-        cup[3] = dice4;
-        cup[4] = dice5;
-        for (Dice d : cup) {
-            d.roll();
         }
 
-        //When
-        scoreSheet.setRow(ScoreSheet.ROW.THREES, cup);
+        @Test
+        public void testSetRowTHREES () {
+            //Given
+            cup[0] = dice1;
+            cup[1] = dice2;
+            cup[2] = dice3;
+            cup[3] = dice4;
+            cup[4] = dice5;
+            for (Dice d : cup) {
+                d.roll();
+            }
 
+            //When
+            scoreSheet.setRow(ScoreSheet.ROW.THREES, cup);
 
-        //Then
-        Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.THREES) != null));
 
-    }
+            //Then
+            Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.THREES) != null));
 
-    @Test
-    public void testSetRowFOURS() {
-        //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
-        Dice dice1 = new Dice();
-        Dice dice2 = new Dice();
-        Dice dice3 = new Dice();
-        Dice dice4 = new Dice();
-        Dice dice5 = new Dice();
-        Dice[] cup = new Dice[5];
-        cup[0] = dice1;
-        cup[1] = dice2;
-        cup[2] = dice3;
-        cup[3] = dice4;
-        cup[4] = dice5;
-        for (Dice d : cup) {
-            d.roll();
         }
 
-        //When
-        scoreSheet.setRow(ScoreSheet.ROW.FOURS, cup);
+        @Test
+        public void testSetRowFOURS () {
+            //Given
+            cup[0] = dice1;
+            cup[1] = dice2;
+            cup[2] = dice3;
+            cup[3] = dice4;
+            cup[4] = dice5;
+            for (Dice d : cup) {
+                d.roll();
+            }
 
+            //When
+            scoreSheet.setRow(ScoreSheet.ROW.FOURS, cup);
 
-        //Then
-        Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.FOURS) != null));
 
-    }
+            //Then
+            Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.FOURS) != null));
 
-    @Test
-    public void testSetRowFIVES() {
-        //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
-        Dice dice1 = new Dice();
-        Dice dice2 = new Dice();
-        Dice dice3 = new Dice();
-        Dice dice4 = new Dice();
-        Dice dice5 = new Dice();
-        Dice[] cup = new Dice[5];
-        cup[0] = dice1;
-        cup[1] = dice2;
-        cup[2] = dice3;
-        cup[3] = dice4;
-        cup[4] = dice5;
-        for (Dice d : cup) {
-            d.roll();
         }
 
-        //When
-        scoreSheet.setRow(ScoreSheet.ROW.FIVES, cup);
+        @Test
+        public void testSetRowFIVES () {
+            //Given
+            cup[0] = dice1;
+            cup[1] = dice2;
+            cup[2] = dice3;
+            cup[3] = dice4;
+            cup[4] = dice5;
+            for (Dice d : cup) {
+                d.roll();
+            }
 
+            //When
+            scoreSheet.setRow(ScoreSheet.ROW.FIVES, cup);
 
-        //Then
-        Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.FIVES) != null));
 
-    }
+            //Then
+            Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.FIVES) != null));
 
-    @Test
-    public void testSetRowSIXES() {
-        //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
-        Dice dice1 = new Dice();
-        Dice dice2 = new Dice();
-        Dice dice3 = new Dice();
-        Dice dice4 = new Dice();
-        Dice dice5 = new Dice();
-        Dice[] cup = new Dice[5];
-        cup[0] = dice1;
-        cup[1] = dice2;
-        cup[2] = dice3;
-        cup[3] = dice4;
-        cup[4] = dice5;
-        for (Dice d : cup) {
-            d.roll();
         }
 
-        //When
-        scoreSheet.setRow(ScoreSheet.ROW.SIXES, cup);
+        @Test
+        public void testSetRowSIXES () {
+            //Given
+            cup[0] = dice1;
+            cup[1] = dice2;
+            cup[2] = dice3;
+            cup[3] = dice4;
+            cup[4] = dice5;
+            for (Dice d : cup) {
+                d.roll();
+            }
 
+            //When
+            scoreSheet.setRow(ScoreSheet.ROW.SIXES, cup);
 
-        //Then
-        Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.SIXES) != null));
 
-    }
+            //Then
+            Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.SIXES) != null));
 
-    @Test
-    public void testSetRowThreeOfAKind() {
-        //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
-        Dice dice1 = new Dice();
-        Dice dice2 = new Dice();
-        Dice dice3 = new Dice();
-        Dice dice4 = new Dice();
-        Dice dice5 = new Dice();
-        Dice[] cup = new Dice[5];
-        cup[0] = dice1;
-        cup[1] = dice2;
-        cup[2] = dice3;
-        cup[3] = dice4;
-        cup[4] = dice5;
-        for (Dice d : cup) {
-            d.roll();
         }
 
-        //When
-        scoreSheet.setRow(ScoreSheet.ROW.THREEOFAKIND, cup);
-
-
-        //Then
-        Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.THREEOFAKIND) != null));
-
-    }
-
-    @Test
-    public void testSetRowFourOfAKind() {
-        //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
-        Dice dice1 = new Dice();
-        Dice dice2 = new Dice();
-        Dice dice3 = new Dice();
-        Dice dice4 = new Dice();
-        Dice dice5 = new Dice();
-        Dice[] cup = new Dice[5];
-        cup[0] = dice1;
-        cup[1] = dice2;
-        cup[2] = dice3;
-        cup[3] = dice4;
-        cup[4] = dice5;
-        for (Dice d : cup) {
-            d.roll();
-        }
+        @Test
+        public void testSetRowThreeOfAKind () {
+            //Given
+            cup[0] = dice1;
+            cup[1] = dice2;
+            cup[2] = dice3;
+            cup[3] = dice4;
+            cup[4] = dice5;
+            for (Dice d : cup) {
+                d.roll();
+            }
 
-        //When
-        scoreSheet.setRow(ScoreSheet.ROW.FOUROFAKIND, cup);
+            //When
+            scoreSheet.setRow(ScoreSheet.ROW.THREEOFAKIND, cup);
 
 
-        //Then
-        Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.FOUROFAKIND) != null));
+            //Then
+            Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.THREEOFAKIND) != null));
 
-    }
-
-    @Test
-    public void testSetRowFullHouse() {
-        //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
-        Dice dice1 = new Dice();
-        Dice dice2 = new Dice();
-        Dice dice3 = new Dice();
-        Dice dice4 = new Dice();
-        Dice dice5 = new Dice();
-        Dice[] cup = new Dice[5];
-        cup[0] = dice1;
-        cup[1] = dice2;
-        cup[2] = dice3;
-        cup[3] = dice4;
-        cup[4] = dice5;
-        for (Dice d : cup) {
-            d.roll();
-        }
-
-        //When
-        scoreSheet.setRow(ScoreSheet.ROW.FULLHOUSE, cup);
-
-
-        //Then
-        Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.FULLHOUSE) != null));
-
-    }
-
-    @Test
-    public void testSetRowSmallStraight() {
-        //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
-        Dice dice1 = new Dice();
-        Dice dice2 = new Dice();
-        Dice dice3 = new Dice();
-        Dice dice4 = new Dice();
-        Dice dice5 = new Dice();
-        Dice[] cup = new Dice[5];
-        cup[0] = dice1;
-        cup[1] = dice2;
-        cup[2] = dice3;
-        cup[3] = dice4;
-        cup[4] = dice5;
-        for (Dice d : cup) {
-            d.roll();
         }
 
-        //When
-        scoreSheet.setRow(ScoreSheet.ROW.SMALLSTRAIGHT, cup);
+        @Test
+        public void testSetRowFourOfAKind () {
+            //Given
+            cup[0] = dice1;
+            cup[1] = dice2;
+            cup[2] = dice3;
+            cup[3] = dice4;
+            cup[4] = dice5;
+            for (Dice d : cup) {
+                d.roll();
+            }
 
+            //When
+            scoreSheet.setRow(ScoreSheet.ROW.FOUROFAKIND, cup);
 
-        //Then
-        Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.SMALLSTRAIGHT) != null));
 
-    }
+            //Then
+            Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.FOUROFAKIND) != null));
 
-    @Test
-    public void testSetRowLargeStraight() {
-        //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
-        Dice dice1 = new Dice();
-        Dice dice2 = new Dice();
-        Dice dice3 = new Dice();
-        Dice dice4 = new Dice();
-        Dice dice5 = new Dice();
-        Dice[] cup = new Dice[5];
-        cup[0] = dice1;
-        cup[1] = dice2;
-        cup[2] = dice3;
-        cup[3] = dice4;
-        cup[4] = dice5;
-        for (Dice d : cup) {
-            d.roll();
         }
 
-        //When
-        scoreSheet.setRow(ScoreSheet.ROW.LARGESTRAIGHT, cup);
+        @Test
+        public void testSetRowFullHouse () {
+            //Given
+            cup[0] = dice1;
+            cup[1] = dice2;
+            cup[2] = dice3;
+            cup[3] = dice4;
+            cup[4] = dice5;
+            for (Dice d : cup) {
+                d.roll();
+
+            }
+                //When
+                scoreSheet.setRow(ScoreSheet.ROW.FULLHOUSE, cup);
+
+
+                //Then
+                Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.FULLHOUSE) != null));
+
+            }
+
+            @Test
+            public void testSetRowSmallStraight () {
+                //Given
+                cup[0] = dice1;
+                cup[1] = dice2;
+                cup[2] = dice3;
+                cup[3] = dice4;
+                cup[4] = dice5;
+                for (Dice d : cup) {
+                    d.roll();
+                }
+
+                //When
+                scoreSheet.setRow(ScoreSheet.ROW.SMALLSTRAIGHT, cup);
+
+
+                //Then
+                Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.SMALLSTRAIGHT) != null));
+
+            }
+
+            @Test
+            public void testSetRowLargeStraight () {
+                //Given
+                cup[0] = dice1;
+                cup[1] = dice2;
+                cup[2] = dice3;
+                cup[3] = dice4;
+                cup[4] = dice5;
+                for (Dice d : cup) {
+                    d.roll();
+                }
+
+                //When
+                scoreSheet.setRow(ScoreSheet.ROW.LARGESTRAIGHT, cup);
+
+
+                //Then
+                Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.LARGESTRAIGHT) != null));
+
+            }
+
+            @Test
+            public void testSetRowYahtzee () {
+                //Given
+                cup[0] = dice1;
+                cup[1] = dice2;
+                cup[2] = dice3;
+                cup[3] = dice4;
+                cup[4] = dice5;
+                for (Dice d : cup) {
+                    d.roll();
+                }
+
+                //When
+                scoreSheet.setRow(ScoreSheet.ROW.YAHTZEE, cup);
+
+
+                //Then
+                Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.YAHTZEE) != null));
+
+            }
+
+            @Test
+            public void testGetSize () {
+                //Given
+                int expected = 13;
+
+                //When
+                int actual = ScoreSheet.getSize();
+
+                //Then
+                Assert.assertEquals(expected, actual);
+
+            }
+
+            @Test
+            public void testScoreCardToString () {
+                //Given
+                String expected = "1. Aces: Totals all Ones           ** open **\n" +
+                        "2. Twos: Totals all Twos           ** open **\n" +
+                        "3. Threes: Totals all Threes       ** open **\n" +
+                        "4. Fours: Totals all Fours         ** open **\n" +
+                        "5. Fives: Totals all Fives         ** open **\n" +
+                        "6. Sixes: Totals all Sixes         ** open **\n" +
+                        "7. 3 of a Kind                     ** open **\n" +
+                        "8. 4 of a Kind                     ** open **\n" +
+                        "9. Full House                      ** open **\n" +
+                        "10. Small Straight: Sequence of 4  ** open **\n" +
+                        "11. Large Striaght: Sequence of 5  ** open **\n" +
+                        "12. Yahtzee: 5 of a Kind           ** open **\n" +
+                        "13. Chance: Sum of Dice            ** open **\n";
 
-
-        //Then
-        Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.LARGESTRAIGHT) != null));
-
-    }
+                //When
+                String actual = scoreSheet.scoreCardToString();
+
+                //Then
+                Assert.assertEquals(expected, actual);
+
+            }
 
     @Test
-    public void testSetRowYahtzee() {
+    public void testTotalScore () {
         //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
-        Dice dice1 = new Dice();
-        Dice dice2 = new Dice();
-        Dice dice3 = new Dice();
-        Dice dice4 = new Dice();
-        Dice dice5 = new Dice();
-        Dice[] cup = new Dice[5];
-        cup[0] = dice1;
-        cup[1] = dice2;
-        cup[2] = dice3;
-        cup[3] = dice4;
-        cup[4] = dice5;
-        for (Dice d : cup) {
-            d.roll();
-        }
+        int expected = 0;
 
         //When
-        scoreSheet.setRow(ScoreSheet.ROW.YAHTZEE, cup);
-
+        int actual = scoreSheet.getTotalScore();
 
         //Then
-        Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.YAHTZEE) != null));
+        Assert.assertEquals(expected, actual);
 
     }
 
-    @Test
-    public void testGetSize() {
-        //Given
-        int expected = 13;
-
-        //When
-        int actual = ScoreSheet.getSize();
-
-        //Then
-        Assert.assertEquals(expected, actual);
 
-    }
 
 }
+

src/test/java/io/zipcoder/casino/WarTest.java

@@ -1,12 +1,43 @@
 package io.zipcoder.casino;
 
+import org.junit.Assert;
 import org.junit.Test;
 
 public class WarTest {
 
     @Test
     public void warTest01(){
+        War war = new War(10);
+        war.addNpc();
+        war.addNpc();
 
+        Assert.assertEquals(2, war.getPlayers().size());
+    }
+
+    @Test
+    public void playCardPileTest(){
+        Deck deck = new Deck();
+        War war = new War(10);
+        Player player = new Player("Jon", 100);
+        war.addPlayers(player);
+        war.chooseStatingPlayer();
+        war.deal();
+        war.getPlayers().get(0).setDiscard(deck);
+
+        war.playCardFromPile(false);
+
+        Assert.assertEquals(103, war.getPlayers().get(0).getHand().size());
+    }
+
+    @Test
+    public void playCardTest() {
+        War war = new War(10);
+        Player player = new Player("Jon", 100);
+        war.addPlayers(player);
+        war.chooseStatingPlayer();
+        war.playCard(false);
+
+        Assert.assertEquals(war.getLoser(), player);
     }
 
 }

src/test/java/io/zipcoder/casino/YahtzeeTest.java

@@ -35,7 +35,7 @@ public class YahtzeeTest {
     @Test
     public void testCreateGame() {
         //When
-        yahtzee.createGame();
+        yahtzee.startGame();
         int expected = 5;
         int actual = yahtzee.getDicePlayer().getCup().length;
 
@@ -45,5 +45,241 @@ public class YahtzeeTest {
 
     }
 
+    @Test
+    public void testRollOptionsNoRoll() {
+        //When
+        yahtzee.startGame();
+        String expected = yahtzee.getDicePlayer().cupToString();
+        yahtzee.rollOptions(3, "");
+        String actual = yahtzee.getDicePlayer().cupToString();
+
+        //Then
+        Assert.assertEquals(expected, actual);
+
+
+    }
+
+    @Test
+    public void testRollOptionsRollAll() {
+        //When
+        yahtzee.startGame();
+        String expected = yahtzee.getDicePlayer().cupToString();
+        yahtzee.rollOptions(1, "");
+        String actual = yahtzee.getDicePlayer().cupToString();
+
+        //Then
+        Assert.assertNotEquals(expected, actual);
+
+
+    }
+
+    @Test
+    public void testReRoll() {
+        //When
+        yahtzee.startGame();
+        int diceOneValue = yahtzee.getDicePlayer().getCup()[0].getValue();
+        int diceTwoValue = yahtzee.getDicePlayer().getCup()[1].getValue();
+        yahtzee.rollOptions(2, Integer.toString(diceTwoValue));
+        int actual = yahtzee.getDicePlayer().getCup()[0].getValue();
+
+        //Then
+        Assert.assertNotEquals(diceOneValue, actual);
+
+
+    }
+
+    @Test
+    public void testEmptyRowTrue() {
+        //When
+        yahtzee.startGame();
+
+        //Then
+        Assert.assertTrue(yahtzee.checkEmptyRow(ScoreSheet.ROW.CHANCE));
+
+
+    }
+
+    @Test
+    public void testEmptyRowFalse() {
+        //When
+        yahtzee.startGame();
+        yahtzee.rollAll();
+        yahtzee.getDicePlayer().getScoreSheet().setRow(ScoreSheet.ROW.CHANCE, yahtzee.getDicePlayer().getCup());
+
+        //Then
+        Assert.assertFalse(yahtzee.checkEmptyRow(ScoreSheet.ROW.CHANCE));
+
+
+    }
+
+    @Test
+    public void testPayout() {
+        //When
+        int expected = yahtzee.getDicePlayer().getPlayer().getCurrentBalance();
+        yahtzee.payout();
+        int actual = yahtzee.getDicePlayer().getPlayer().getCurrentBalance();
+
+        //Then
+        Assert.assertEquals(expected, actual);
+
+    }
+
+
+    @Test
+    public void testSelectingRow1() {
+        //When
+        ScoreSheet.ROW expected = ScoreSheet.ROW.ACES;
+        ScoreSheet.ROW actual = yahtzee.selectingRow(1);
+
+        //Then
+        Assert.assertEquals(expected, actual);
+
+    }
+
+    @Test
+    public void testSelectingRow2() {
+        //When
+        ScoreSheet.ROW expected = ScoreSheet.ROW.TWOS;
+        ScoreSheet.ROW actual = yahtzee.selectingRow(2);
+
+        //Then
+        Assert.assertEquals(expected, actual);
+
+    }
+
+    @Test
+    public void testSelectingRow3() {
+        //When
+        ScoreSheet.ROW expected = ScoreSheet.ROW.THREES;
+        ScoreSheet.ROW actual = yahtzee.selectingRow(3);
+
+        //Then
+        Assert.assertEquals(expected, actual);
+
+    }
+
+    @Test
+    public void testSelectingRow4() {
+        //When
+        ScoreSheet.ROW expected = ScoreSheet.ROW.FOURS;
+        ScoreSheet.ROW actual = yahtzee.selectingRow(4);
+
+        //Then
+        Assert.assertEquals(expected, actual);
+
+    }
+
+    @Test
+    public void testSelectingRow5() {
+        //When
+        ScoreSheet.ROW expected = ScoreSheet.ROW.FIVES;
+        ScoreSheet.ROW actual = yahtzee.selectingRow(5);
+
+        //Then
+        Assert.assertEquals(expected, actual);
+
+    }
+
+    @Test
+    public void testSelectingRow6() {
+        //When
+        ScoreSheet.ROW expected = ScoreSheet.ROW.SIXES;
+        ScoreSheet.ROW actual = yahtzee.selectingRow(6);
+
+        //Then
+        Assert.assertEquals(expected, actual);
+
+    }
+
+    @Test
+    public void testSelectingRow7() {
+        //When
+        ScoreSheet.ROW expected = ScoreSheet.ROW.THREEOFAKIND;
+        ScoreSheet.ROW actual = yahtzee.selectingRow(7);
+
+        //Then
+        Assert.assertEquals(expected, actual);
+
+    }
+
+    @Test
+    public void testSelectingRow8() {
+        //When
+        ScoreSheet.ROW expected = ScoreSheet.ROW.FOUROFAKIND;
+        ScoreSheet.ROW actual = yahtzee.selectingRow(8);
+
+        //Then
+        Assert.assertEquals(expected, actual);
+
+    }
+
+    @Test
+    public void testSelectingRow9() {
+        //When
+        ScoreSheet.ROW expected = ScoreSheet.ROW.FULLHOUSE;
+        ScoreSheet.ROW actual = yahtzee.selectingRow(9);
+
+        //Then
+        Assert.assertEquals(expected, actual);
+
+    }
+
+    @Test
+    public void testSelectingRow10() {
+        //When
+        ScoreSheet.ROW expected = ScoreSheet.ROW.SMALLSTRAIGHT;
+        ScoreSheet.ROW actual = yahtzee.selectingRow(10);
+
+        //Then
+        Assert.assertEquals(expected, actual);
+
+    }
+
+    @Test
+    public void testSelectingRow11() {
+        //When
+        ScoreSheet.ROW expected = ScoreSheet.ROW.LARGESTRAIGHT;
+        ScoreSheet.ROW actual = yahtzee.selectingRow(11);
+
+        //Then
+        Assert.assertEquals(expected, actual);
+
+    }
+
+    @Test
+    public void testSelectingRow12() {
+        //When
+        ScoreSheet.ROW expected = ScoreSheet.ROW.YAHTZEE;
+        ScoreSheet.ROW actual = yahtzee.selectingRow(12);
+
+        //Then
+        Assert.assertEquals(expected, actual);
+
+    }
+
+    @Test
+    public void testSelectingRow13() {
+        //When
+        ScoreSheet.ROW expected = ScoreSheet.ROW.CHANCE;
+        ScoreSheet.ROW actual = yahtzee.selectingRow(13);
+
+        //Then
+        Assert.assertEquals(expected, actual);
+
+    }
+
+    @Test
+    public void testFinalScore() {
+        //Given
+        String expected = "Your total balance is now: $" + yahtzee.getDicePlayer().getPlayer().getCurrentBalance();;
+
+        //When
+        String actual = yahtzee.getDicePlayer().balanceAtEnd();
+
+        //Then
+        Assert.assertEquals(expected, actual);
+
+    }
+
 
 }