final version of highLow

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

@@ -17,6 +17,12 @@ public class Console {
         return scan.nextLine();
     }
 
+    public static int askForInteger(String thingToAsk) {
+        System.out.println(thingToAsk);
+        Scanner scan = new Scanner(System.in);
+        return Integer.valueOf(scan.nextLine());
+    }
+
     public static String output(String output) {
         System.out.println(output);
         return output;

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

@@ -1,140 +1,104 @@
 package io.zipcoder.casino;
 
-import com.google.common.annotations.VisibleForTesting;
-
 public class HighLow extends DiceGame{
     private Player player;
     private boolean isPlaying = true;
-    private int roll;
-    private int betAmount;
-    private String bet;
-    private String input;
-
-   // how do I get a player?
-    /*\
-        You can get a player through calling the constructor.
-        Pass the player through the constructor and set the field.
+    private int rolledDiceResult;
+    private int totalBet;
+    private String betCondition;
+    private int winnings;
 
-        new
-     */
-
-    public HighLow (Player player) {
+    public HighLow(Player player) {
         this.player = player;
     }
 
-    public void play() {
-        betAmount = getBetAmount();
-        makeBet();
-        roll = rollDice();
-        declareWinner();
-        askToContinue();
-        checkIfContinue(input);
-    }
-
-    public void declareWinner () {
-        switch(bet) {
-            case "h":
-                if (roll > 7) {
-                    winBet();
-                } else {
-                    loseBet();
-                };
-                break;
-            case "l":
-                if (roll < 7) {
-                    winBet();
-                } else {
-                    loseBet();
-                };
-                break;
-            case "7":
-                if (roll == 7) {
-                    win1to4();
+    private int askForWager() {
+        int wager = 0;
+        boolean flag = true;
+        Console.output("Current bankroll: " + this.player.getBankroll());
+        while (flag) {
+            try {
+                wager = Console.askForInteger("How much would you like to bet?");
+                if (wager <= 0 || wager > this.player.getBankroll()) {
+                    Console.output("Wrong input! Try again!");
                 } else {
-                    loseBet();
-                };
-                break;
+                    flag = false;
+                }
+            } catch(NumberFormatException e) {
+                Console.output("Wrong input! Try again!");
+            }
         }
+        this.player.subtractFromBankroll(wager);
+        return wager;
     }
 
-    public int getBetAmount () {
-        betAmount = Console.numberFromString(Console.askForInput("How much would you like to bet?"));
-        player.subtractFromBankroll(betAmount);
-        return betAmount;
-    }
-
-    public String makeBet () {
-        bet = Console.askForInput("What are you betting on?  (H / L / 7)");
-        if (!bet.equals("h") && !bet.equals("l") && !bet.equals("7")) {
-            Console.output("Wrong input. Please try again");
-            makeBet();
+    public String makeBet() {
+        betCondition = Console.askForInput("What are you betting on?  (H / L / 7)");
+        if (betCondition.toLowerCase().equals("h") ||
+            betCondition.toLowerCase().equals("l") ||
+            betCondition.toLowerCase().equals("7")) {
+                return betCondition;
         }
-        return bet;
+        Console.output("Wrong input. Please try again");
+        return makeBet();
     }
 
-    public int rollDice () {
+    public int rollDice() {
         Dice dice = new Dice(2);
-        roll = dice.getSum();
-        //Console.askForInput("Please press Enter to roll the dice!");
-        Console.output("You rolled " + roll);
-        return roll;
+        rolledDiceResult = dice.getSum();
+        Console.output("You rolled " + rolledDiceResult);
+        return rolledDiceResult;
     }
 
-    public String askToContinue() {
-        input = Console.askForInput("Would you like to continue?  (Y / N)");
-        if (!input.equals("y") && !input.equals("n")) {
-            Console.output("Wrong input. Please try again");
-            askToContinue();
+    public void declareWinner() {
+        if ((betCondition.toUpperCase().equals("H") && rolledDiceResult >  7) ||
+                (betCondition.toUpperCase().equals("L") && rolledDiceResult <  7) ||
+                (betCondition.toUpperCase().equals("7") && rolledDiceResult == 7)) {
+            winnings = rolledDiceResult == 7 ? this.totalBet * 4 : this.totalBet * 2;
+            winBet();
+        } else {
+            loseBet();
         }
-        return input;
     }
 
-    public void checkIfContinue (String state) {
-        //boolean output = false;
-        System.out.println(state);
-        switch (state) {
-            case "n":
-                //isPlaying = false;
-                endGame();
-                break;
-            case "y":
-                //isPlaying = true;
-                play();
-                break;
+    public boolean askToContinue() {
+        if (this.player.getBankroll() == 0) {
+            Console.output("You're bankrupt! Please come back after pay day!");
+            return false;
         }
-        //return output;
-    }
-
-    public void winBet () {
-        player.addToBankroll(betAmount);
-        Console.output("You won " + betAmount);
+        String input = Console.askForInput("Would you like to continue?  (Y / N)");
+        if (input.toLowerCase().equals("y")) {
+            return true;
+        } else if (input.toLowerCase().equals("n")) {
+            return false;
+        }
+        Console.output("Wrong input. Please try again");
+        return askToContinue();
     }
 
-    public void win1to4 () {
-        player.addToBankroll(betAmount*4);
-        Console.output("You won " + betAmount*4);
+    public void winBet() {
+        player.addToBankroll(winnings);
+        Console.output("You won " + winnings);
     }
 
-    public void loseBet () {
+    public void loseBet() {
         Console.output("You lost :(");
     }
 
-    /*
-    You don't need to make a main method inside this method.
-    Instead, make a method that INITIATES the start of the game.
-     */
-
     public void startGame() {
         Console.output("You're playing High-Low dice game");
-       // while (isPlaying) {
-            play();
-       // }
+        while (isPlaying) {
+            totalBet         = askForWager();
+            betCondition     = makeBet();
+            rolledDiceResult = rollDice();
+            declareWinner();
+            isPlaying        = askToContinue();
+        }
        // endGame();
     }
 
     public void endGame() {
-        Casino casino = new Casino();
-        //casino.doContinue();
+        //???
     }
 
     public static void main (String[] args) {

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

@@ -6,14 +6,14 @@ import org.junit.Test;
 public class HighLowTest {
 
     Player player = new Player("Eug");
-    HighLow highlow = new HighLow(player);
+    HighLow game = new HighLow(player);
 
-//      @Test
-//    public void playerContinueTest(){
-//        boolean expected = true;
-//        boolean actual = highlow.checkIfContinue("y");
-//        Assert.assertEquals(expected, actual);
-//    }
+    @Test
+    public void rollDice1(){
+        int expected = 6;
+        int actual = game.rollDice();
+        Assert.assertEquals(expected, actual, 6);
+    }
 
 
 }