Merge branch 'dev' into snarkyTable

merge

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

@@ -8,15 +8,12 @@ public class Casino {
 
     public void setaPlayer() {
         String name = aConsole.getStringInput("What is your name?");
-        name = name.substring(0, 1).toUpperCase() + name.substring(1);
-        int age = aConsole.getIntInput("What is your age?");
-        int chips = 0;
-        if (age > 20) {
-            chips = aConsole.getIntInput("How many chips would you like to purchase?");
+        aPlayer = new Player(name.substring(0, 1).toUpperCase() + name.substring(1),0,aConsole.getIntInput("What is your age?"));
+        if (aPlayer.getAge() > 20) {
+            aPlayer.setTotalChips(aConsole.getIntInput("How many chips would you like to purchase?"));
         } else {
             aConsole.println("You are not old enough to gamble, so we won't be able to let you purchase any chips.");
         }
-        aPlayer = new Player(name, chips, age);
     }
 
     public void run() {

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

@@ -55,6 +55,4 @@ public class Console {
         }
         return correct;
     }
-
-
 }

src/main/java/io/zipcoder/casino/Leviathan/Games/HigherCards.java

@@ -1,52 +1,32 @@
 package io.zipcoder.casino.Leviathan.Games;
-import io.zipcoder.casino.Leviathan.Games.GameUtilities.Deck;
-import io.zipcoder.casino.Leviathan.Games.GameUtilities.Rank;
+import io.zipcoder.casino.Leviathan.Games.GameUtilities.*;
 
-import io.zipcoder.casino.Leviathan.Games.GameUtilities.Card;
-import io.zipcoder.casino.Leviathan.Games.GameUtilities.Suit;
 import io.zipcoder.casino.Leviathan.Interfaces.*;
 import io.zipcoder.casino.Leviathan.*;
 
 public class  HigherCards extends CardGame implements Gambling{
+
     Console aConsole=new Console();
+    Deck deck = new Deck();
     Player aPlayer;
     boolean playAgain = true;
+    int wageAmount;
+    int bet;
+    int player,croupier;
+    public void setBet(int bet) {
+        this.bet = bet;
+    }
 
     public HigherCards(Player aPlayer){
         this.aPlayer = aPlayer;
     }
-
-     public void playGame() {
+    public void playGame() {
          aConsole.print("Welcome to HigherCards!\nWe both will draw a card, and the higher card wins the wager.\nThe House wins on ties\n");
          while (playAgain) {
+             deck.shuffle();
              int wageAmount = wageMoney();
-             Deck deck = new Deck();
-
-             Card acard = deck.draw();
-             Rank rank = acard.getRank();
-             int player = rank.getValue();
-             String playervalueString=rank.toString();
-             String playerFace=rank.getFaceValue();
-
-             Suit suit = acard.getSuit();
-             String suitSymbol=suit.getsuitSymbol();
-             String suitString = suit.toString();
-
-             aConsole.println("You got :%s of %s",playervalueString,suitString);
-             printCard(suitSymbol,playerFace);
-
-             Card acard2 = deck.draw();
-             Rank rank2 = acard2.getRank();
-             int croupier = rank2.getValue();
-             String playervalueString2=rank2.toString();
-             String playerFace2=rank2.getFaceValue();
-
-             Suit suit2 = acard2.getSuit();
-             String suitString2 = suit2.toString();
-             String suitSymbol2=suit2.getsuitSymbol();
-             aConsole.println("House got :%s of %s",playervalueString2,suitString2);
-             printCard(suitSymbol2,playerFace2);
-
+             playerDrawingCard();
+             houseDrawingCard();
              int totalChips = aPlayer.getTotalChips();
              findWinner(player, croupier, wageAmount);
              if (aPlayer.getTotalChips() > totalChips) {
@@ -60,11 +40,52 @@ public class  HigherCards extends CardGame implements Gambling{
                  String availableChips = aPlayer.getTotalChips().toString();
                  aConsole.println(availableChips);
              }
-             if((aPlayer.getTotalChips() == 0) || aConsole.yesOrNo("Would you like to play again?").equalsIgnoreCase("no")){
-                 playAgain= false;
-             }
+             repeat();
          }
      }
+     public void repeat()
+     {
+         if((aPlayer.getTotalChips() == 0) )
+         {
+             aConsole.println("You are out of chips. You may no longer play\n");
+             playAgain= false;
+         }
+         else if(aConsole.yesOrNo("Would you like to play again?").equalsIgnoreCase("no"))
+         {
+             playAgain = false;
+         }
+     }
+     public void playerDrawingCard()
+     {
+         Card acard = deck.draw();
+         Rank rank = acard.getRank();
+         player = rank.getValue();
+         String playervalueString=rank.toString();
+         String playerFace=rank.getFaceValue();
+
+         Suit suit = acard.getSuit();
+         String suitSymbol=suit.getsuitSymbol();
+         String suitString = suit.toString();
+
+         aConsole.println("You got :%s of %s",playervalueString,suitString);
+         printCard(suitSymbol,playerFace);
+     }
+     public void houseDrawingCard()
+     {
+         Card acard2 = deck.draw();
+         Rank rank2 = acard2.getRank();
+         croupier = rank2.getValue();
+         String playervalueString2=rank2.toString();
+         String playerFace2=rank2.getFaceValue();
+
+         Suit suit2 = acard2.getSuit();
+         String suitString2 = suit2.toString();
+         String suitSymbol2=suit2.getsuitSymbol();
+
+         aConsole.println("House got :%s of %s",playervalueString2,suitString2);
+         printCard(suitSymbol2,playerFace2);
+     }
+
     public void findWinner(int player,int croupier,int wageAmount)
     {
         if (player > croupier) {
@@ -82,17 +103,18 @@ public class  HigherCards extends CardGame implements Gambling{
     }
 
     public int wageMoney() {
-        int bet;
-
         do {
             bet = aConsole.getIntInput("How much would you like to bet? You can only bet what you currently have.\n" +
                     "Current chips= " + aPlayer.getTotalChips());
 
-        }while(bet > aPlayer.getTotalChips());
-
+        }while (badBet() == true);
         return bet;
     }
 
+    public boolean badBet(){
+        return (bet > aPlayer.getTotalChips() || bet < 0);
+    }
+
     public void printCard(String suitSymbol,String playerFace)
     {
         aConsole.println(" ---------");

src/main/java/io/zipcoder/casino/Leviathan/Games/HigherDice.java

@@ -8,33 +8,69 @@ import io.zipcoder.casino.Leviathan.Player;
 
 
 public class HigherDice extends DiceGame implements Gambling {
-    Console aConsole = new Console();
-    DrawSingleDie draw = new DrawSingleDie();
-    int bet;
-    Player aPlayer;
-    Die aDie = new Die();
-    boolean playAgain = true;
-
+    private Console aConsole = new Console();
+    private DrawSingleDie draw = new DrawSingleDie();
+    private int bet;
+    private Player aPlayer;
+    private Die aDie = new Die();
+    private boolean playAgain = true;
 
     public HigherDice(Player aPlayer) {
         this.aPlayer = aPlayer;
     }
 
+    public Console getaConsole() {
+        return aConsole;
+    }
+
+    public void setaConsole(Console aConsole) {
+        this.aConsole = aConsole;
+    }
+
+    public DrawSingleDie getDraw() {
+        return draw;
+    }
+
+    public void setDraw(DrawSingleDie draw) {
+        this.draw = draw;
+    }
+
+    public int getBet() {
+        return bet;
+    }
+
+    public void setBet(int bet) {
+        this.bet = bet;
+    }
+
+    public Player getaPlayer() {
+        return aPlayer;
+    }
+
+    public void setaPlayer(Player aPlayer) {
+        this.aPlayer = aPlayer;
+    }
+
+    public Die getaDie() {
+        return aDie;
+    }
+
+    public void setaDie(Die aDie) {
+        this.aDie = aDie;
+    }
+
+    public boolean isPlayAgain() {
+        return playAgain;
+    }
+
+    public void setPlayAgain(boolean playAgain) {
+        this.playAgain = playAgain;
+    }
 
     public void playGame() {
         aConsole.print("Welcome to HigherDice!\nWe will both roll a die, and the higher number wins the wager.\nThe House wins on ties\n");
-
-        while (playAgain == true) {
-
-            bet = wageMoney();
-            aConsole.getStringInput("Please roll your die");
-            aDie.rollADice();
-            int player = aDie.getValue();
-            aConsole.println("Your Roll:\n" + draw.drawSingleDie(player).toString());
-            aDie.rollADice();
-            int croupier = aDie.getValue();
-            aConsole.println("House Roll:\n" + draw.drawSingleDie(croupier).toString());
-            findWinner(player, croupier, bet);
+        while (playAgain) {
+            findWinner(wageMoney(), playerPhase(), housePhase());
             repeat();
         }
     }
@@ -48,31 +84,44 @@ public class HigherDice extends DiceGame implements Gambling {
         }
     }
 
-    public void findWinner(int player, int croupier, int wageAmount) {
+    public void findWinner(int wageAmount, int player, int croupier) {
 
         if (player > croupier) {
             aPlayer.setTotalChips(aPlayer.getTotalChips() + wageAmount);
             int[] change = {aPlayer.getTally()[0] + 1, aPlayer.getTally()[1]};
             aPlayer.setTally(change);
             aConsole.println("You win! Your current chip total is: " + aPlayer.getTotalChips());
-            aConsole.println("Your current Win/Loss Ratio is " + aPlayer.getTally()[0] + "-" + aPlayer.getTally()[1] + "\n");
         } else {
             aPlayer.setTotalChips(aPlayer.getTotalChips() - wageAmount);
             int[] change = {aPlayer.getTally()[0], aPlayer.getTally()[1] + 1};
             aPlayer.setTally(change);
             aConsole.println("You lose! Your current chip total is: " + aPlayer.getTotalChips());
-            aConsole.println("Your current Win/Loss Ratio is " + aPlayer.getTally()[0] + "-" + aPlayer.getTally()[1] + "\n");
-
         }
+        aConsole.println("Your current Win/Loss Ratio is " + aPlayer.getTally()[0] + "-" + aPlayer.getTally()[1] + "\n");
     }
 
     public int wageMoney() {
-
         do {
             bet = aConsole.getIntInput("How much would you like to bet? You can only bet what you currently have.\n" +
                     "Current chips= " + aPlayer.getTotalChips() + "\n");
-        } while (bet > aPlayer.getTotalChips() && bet < 0);
-
+        } while (badBet());
         return bet;
     }
+
+    public boolean badBet() {
+        return (bet > aPlayer.getTotalChips() || bet < 0);
+    }
+
+    private int playerPhase() {
+        aConsole.getStringInput("Please roll your die");
+        aDie.rollADice();
+        aConsole.println("Your Roll:\n" + draw.drawSingleDie(aDie.getValue()).toString());
+        return aDie.getValue();
+    }
+
+    private int housePhase() {
+        aDie.rollADice();
+        aConsole.println("House Roll:\n" + draw.drawSingleDie(aDie.getValue()).toString());
+        return aDie.getValue();
+    }
 }

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

@@ -5,8 +5,13 @@ import io.zipcoder.casino.Leviathan.Player;
 import org.junit.Assert;
 import org.junit.Test;
 
+import static org.junit.Assert.assertTrue;
+
 
 public class HigherCardsTest {
+    Player aplayer =new Player("Aleena",2000, 21);
+    HigherCards higherCards=new HigherCards(aplayer);
+
     @Test
     public void testFindAWinner()
     {
@@ -17,7 +22,14 @@ public class HigherCardsTest {
         higherCards.findWinner(10,2,500);
         int actual=aplayer.getTotalChips();
         Assert.assertEquals(actual,expected);
+    }
+    @Test
+    public void badBetTest() {
+        //Given
+        higherCards.setBet(-10);
+        //When
 
-
+        //Result
+        assertTrue(higherCards.badBet());
     }
 }

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

@@ -43,6 +43,28 @@ public class HigherDiceTest {
 
     }
 
+    @Test
+    public void badBetTest(){
+        //Given
+        test.setBet(-10);
+        //When
+
+        //Result
+        assertTrue(test.badBet());
+
+    }
+
+    @Test
+    public void repeatTest(){
+        //Given
+        aPlayer.setTotalChips(0);
+        //When
+        test.repeat();
+        //Result
+        assertFalse(test.isPlayAgain());
+
+    }
+
     /**
      * Tears down the test fixture.
      *

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

@@ -11,7 +11,7 @@ import io.zipcoder.casino.Leviathan.*;
      */
     public class TableTest {
         Player aPlayer = new Player("Chad", 500, 27);
-        Table table = new Table(aPlayer);
+        Table test = new Table(aPlayer);
         /**
          * Default constructor for test class DiceTest
          */