Merge branch 'dev' into Table

merge

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/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());
     }
 }