highlow tests

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

@@ -1,7 +1,7 @@
 package io.zipcoder.casino;
 
 
-
+/*
 public class GameFactory{
     public GameFactory(){
 
@@ -20,4 +20,4 @@ public class GameFactory{
     public static void createHighLow(Game game){
         game = HighLow.startGame();
     }
-}
+} */

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

@@ -14,37 +14,62 @@ public class HighLow extends DiceGame{
 
     private int askForWager() {
         int wager = 0;
-        boolean flag = true;
+        String input;
         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 {
-                    flag = false;
-                }
-            } catch(NumberFormatException e) {
-                Console.output("Wrong input! Try again!");
+        boolean state = true;
+        do {
+            input = Console.askForInput("How much would you like to bet?");
+            if (checkIfInteger(input) && checkBankroll(Integer.parseInt(input))) {
+                wager = Console.numberFromString(input);
+                state = false;
             }
-        }
-        this.player.subtractFromBankroll(wager);
+        } while (state);
+        bet(wager);
         return wager;
     }
 
-    public void bet(int bet) {
+    public boolean checkBankroll(int wager) {
+        boolean state;
+        if (wager <= 0 || wager > this.player.getBankroll()) {
+            Console.output("Wrong input! Try again!");
+            state = false;
+        } else {
+            state = true;
+        }
+        return state;
+    }
 
+    public boolean checkIfInteger(String input) {
+        boolean state;
+        if (!input.matches("\\d+")) {
+            Console.output("Wrong input! Try again!");
+            state = false;
+        } else {
+            state = true;
+        }
+        return state;
+    }
+
+    public void bet(int bet) {
+            this.player.subtractFromBankroll(bet);
     }
 
-    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;
+    public String checkInput(String input, String[] values) {
+        for (String currentValue : values) {
+            if (currentValue.toLowerCase().equals(input.toLowerCase())) {
+                return currentValue.toLowerCase();
+            }
         }
         Console.output("Wrong input. Please try again");
-        return makeBet();
+        return null;
+    }
+
+    public void makeBet() {
+        do {
+            String input = Console.askForInput("What are you betting on?  (H / L / 7)");
+            String[] values = {"h", "l", "7"};
+            betCondition = checkInput(input, values);
+        } while (betCondition == null);
     }
 
     public int rollDice() {
@@ -66,18 +91,24 @@ public class HighLow extends DiceGame{
     }
 
     public boolean askToContinue() {
-        if (this.player.getBankroll() == 0) {
-            Console.output("You're bankrupt! Please come back after pay day!");
+        if (!checkBankrupt()) {
             return false;
         }
-        String input = Console.askForInput("Would you like to continue?  (Y / N)");
-        if (input.toLowerCase().equals("y")) {
-            return true;
-        } else if (input.toLowerCase().equals("n")) {
+        String input;
+        do {
+            input = Console.askForInput("Would you like to continue?  (Y / N)");
+            String[] values = {"Y", "N"};
+            input = checkInput(input, values);
+        } while (input == null);
+        return input.equals("y");
+    }
+
+    public boolean checkBankrupt() {
+        if (this.player.getBankroll() == 0) {
+            Console.output("You're bankrupt! Please come back after pay day!");
             return false;
         }
-        Console.output("Wrong input. Please try again");
-        return askToContinue();
+        return true;
     }
 
     public void winBet(int winnings) {
@@ -93,7 +124,7 @@ public class HighLow extends DiceGame{
         Console.output("You're playing High-Low dice game");
         while (isPlaying) {
             totalBet         = askForWager();
-            betCondition     = makeBet();
+            makeBet();
             rolledDiceResult = rollDice();
             declareWinner();
             isPlaying        = askToContinue();

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

@@ -18,28 +18,105 @@ public class HighLowTest {
     }
 
     @Test
-    public void askForWager() {
-        int expected = 10;
-
-        int wager = 0;
-        boolean flag = true;
-        Console.output("Current bankroll: " + this.player.getBankroll());
-        while (flag) {
-            try {
-                wager = 10;
-                if (wager <= 0 || wager > this.player.getBankroll()) {
-                    Console.output("Wrong input! Try again!");
-                } else {
-                    flag = false;
-                }
-            } catch(NumberFormatException e) {
-                Console.output("Wrong input! Try again!");
-            }
-        }
-        this.player.subtractFromBankroll(wager);
-        int actual = wager;
+    public void checkInput1() {
+        String expected = null;
+        String[] values = {"fghA", "fgh","dsf"};
+        String actual = game.checkInput("zsdfe", values);
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void checkInput2() {
+        String expected = "7";
+        String[] values = {"7", "6","7"};
+        String actual = game.checkInput("7", values);
+        assertEquals(expected, actual);
+    }
 
+    @Test
+    public void checkInput3() {
+        String expected = "h";
+        String[] values = {"b", "h","f"};
+        String actual = game.checkInput("H", values);
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void checkInput4() {
+        String expected = "fgha";
+        String[] values = {"fghA", "fgh","dsf"};
+        String actual = game.checkInput("FGhA", values);
         assertEquals(expected, actual);
     }
 
+    @Test
+    public void checkBankrupt1() {
+        boolean expected = true;
+        boolean actual = game.checkBankrupt();
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void checkBankrupt2() {
+        game.bet(500);
+        boolean expected = true;
+        boolean actual = game.checkBankrupt();
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void checkBankrupt3() {
+        game.bet(500);
+        game.bet(500);
+        //boolean expected = false;
+        boolean actual = game.checkBankrupt();
+        assertEquals(false, actual);
+    }
+
+    @Test
+    public void checkBankrupt4() {
+        game.bet(1000);
+        boolean actual = game.checkBankrupt();
+        assertEquals(false, actual);
+    }
+
+    @Test
+    public void checkBankrupt5() {
+        player.subtractFromBankroll(1000);
+        boolean actual = game.checkBankrupt();
+        assertEquals(false, actual);
+    }
+
+    @Test
+    public void checkBankroll1() {
+        boolean actual = game.checkBankroll(-900);
+        assertEquals(false, actual);
+    }
+
+    @Test
+    public void checkBankroll2() {
+        boolean actual = game.checkBankroll(1100);
+        assertEquals(false, actual);
+    }
+
+    @Test
+    public void checkBankroll3() {
+        boolean actual = game.checkBankroll(900);
+        assertEquals(true, actual);
+    }
+
+    @Test
+    public void checkIfInteger1() {
+        boolean actual = game.checkIfInteger("90324");
+        assertEquals(true, actual);
+    }
+
+    @Test
+    public void checkIfInteger2() {
+        boolean actual = game.checkIfInteger("90dfg24");
+        assertEquals(false, actual);
+    }
+
+
+
 }