pre merge with sim

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

@@ -75,11 +75,11 @@ public class Casino {
 
                 case 1:
                     Game yahtzee = new Yahtzee(player);
+                    game = yahtzee;
                     ((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();
@@ -132,4 +132,7 @@ public class Casino {
     public Game getGame() {
         return game;
     }
+    public boolean isRunning() {
+        return running;
+    }
 }

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

@@ -131,6 +131,9 @@ public class War extends CardGame implements Gamble, Game {
                 Printer.printMessage(winner.getPlayer().getName() + " has been rewarded " + tableCards.size() + " cards.");
                 winner.addDiscard(tableCards);
                 tableCards = new ArrayList<Card>();
+            }else if(input.equals("quit")){
+                Printer.printMessage("Thanks for playing chump!");
+                console.getScanner().close();
             } else {
                 Printer.printMessage("Sorry, I don't understand that command.");
             }

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

@@ -1,11 +0,0 @@
-package io.zipcoder.casino;
-
-public class test {
-    public static void main(String[] args){
-        Player player = new Player("NickTest", 100);
-        Game stud = new Stud(10);
-        ((Stud) stud).addPlayers(player);
-        ((Stud) stud).addNpc();
-        stud.startGame();
-    }
-}

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

@@ -4,7 +4,57 @@ package io.zipcoder.casino;
 import org.junit.Assert;
 import org.junit.Test;
 
+import java.io.ByteArrayInputStream;
+import java.util.NoSuchElementException;
+import java.util.Scanner;
+
 public class CasinoTest {
 
+    @Test
+    public void testYahtzee(){
+        String test = "1";
+
+        Casino casino = new Casino();
+        Console console = new Console();
+
+        casino.getConsole().setScanner(new Scanner(new ByteArrayInputStream(test.getBytes())));
+        try {
+            casino.chooseGame();
+        }catch(NoSuchElementException e){
+
+        }
+
+        Assert.assertTrue(casino.getGame() instanceof Yahtzee);
+    }
+
+    @Test
+    public void testGetStudPlayer(){
+
+        int num = 0;
+        String test = "2";
+        Casino casino = new Casino();
+        Stud stud = new Stud(10);
+
+        casino.getConsole().setScanner(new Scanner(new ByteArrayInputStream(test.getBytes())));
+        try {
+            num = casino.getStudPlayers();
+        }catch(NoSuchElementException e){
+
+        }
+        System.out.println(num);
+        Assert.assertTrue(num == 2);
+    }
+
+    @Test
+    public void testWar(){
+        Casino casino = new Casino();
+        String input = "jon \n 100 \n 2 \n flip";
+
+        casino.getConsole().setScanner(new Scanner(new ByteArrayInputStream(input.getBytes())));
+        try {
+            casino.getConsole().createAccount();
+        }catch(NoSuchElementException e){
 
+        }
+    }
 }

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

@@ -4,7 +4,10 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
+import java.io.ByteArrayInputStream;
 import java.util.ArrayList;
+import java.util.NoSuchElementException;
+import java.util.Scanner;
 
 public class StudTest {