Merge conflict resolution

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

@@ -42,7 +42,7 @@ public class Casino {
     {
         while(running) {
 
-            Printer.pickGameMsg();
+            Printer.printMessage("Please choose a game to play!");
             Printer.printMessage(getGameListing());
 
             int command = console.getIntFromUser("Please choose a game to play by entering the number next to the game.");
@@ -53,6 +53,7 @@ public class Casino {
                     Game war = new War(10);
                     ((War) war).addPlayers(player);
                     ((War) war).addNpc();
+                    game = war;
                     war.startGame();
                     break;
 
@@ -60,6 +61,7 @@ public class Casino {
                     Game stud = new Stud(10);
                     ((Stud) stud).addPlayers(player);
                     ((Stud) stud).addNpc();
+                    game = stud;
                     stud.startGame();
                     break;
 
@@ -67,6 +69,7 @@ public class Casino {
                     int slotBet1= console.getIntFromUser("Enter the amount you want to bet on Slot");
                     Game slot= new SlotMachine(slotBet1);
                     slot.startGame();
+                    game = slot;
                     ((SlotMachine) slot).payout();
                     break;
 
@@ -76,6 +79,7 @@ public class Casino {
                     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();
@@ -84,7 +88,7 @@ public class Casino {
 
                 case 5:
                     running = false;
-                    Printer.closeGameMsg();
+                    Printer.printMessage("Thanks for the money chump!");
                     break;
 
                 default:
@@ -120,4 +124,12 @@ public class Casino {
     public void setPlayer(Player player) {
         this.player = player;
     }
+
+    public ArrayList<String> getGameLib() {
+        return gameLib;
+    }
+
+    public Game getGame() {
+        return game;
+    }
 }

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

@@ -4,6 +4,7 @@ import java.util.InputMismatchException;
 import java.util.Scanner;
 
 public class Console {
+
     private Scanner scanner = new Scanner(System.in);
 
     Console(){
@@ -23,7 +24,7 @@ public class Console {
             int num = scanner.nextInt();
             return num;
         }catch(InputMismatchException err){
-            Printer.pleaseEnterNum();
+            Printer.printMessage("Please enter a number.");
             scanner.next();
         }
         return -1;
@@ -42,4 +43,12 @@ public class Console {
         input.toLowerCase().trim();
         return input;
     }
+
+    public void setScanner(Scanner scanner) {
+        this.scanner = scanner;
+    }
+
+    public Scanner getScanner() {
+        return scanner;
+    }
 }

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

@@ -19,32 +19,4 @@ public class Printer {
 
         printMessage("Sorry, there is no game with that name, try one of: " + games);
     }
-
-    public static void showCard(Player player, Card card){
-        printMessage(player.getName() + " shows a " + card.getName());
-    }
-
-    public static void pickGameMsg(){
-        printMessage("Please choose a game to play!");
-    }
-
-    public static void closeGameMsg(){
-        printMessage("Thanks for your money chump!");
-    }
-
-    public static void pleaseEnterNum(){
-        printMessage("Please enter a number");
-    }
-    
-    public static void welcomeTo(String gameName){
-        printMessage("Welcome to " + gameName + "!");
-    }
-
-    public static void printWarTurnResult(String name, String cardName, int handSize){
-        printMessage(name + " has played " + cardName + " and has " + handSize + " cards left.");
-    }
-
-    public static void playedFaceDown(String name){
-        printMessage(name + " has played a card face down.");
-    }
 }

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

@@ -13,7 +13,7 @@ public class Stud extends CardGame implements Gamble, Game {
     
     public void playCard(Player player, Card card) {
         card.setVisibility(true);               //CARD isVISIBLE
-        Printer.showCard(player, card);         //PRINT card name to CONSOLE
+        Printer.printMessage(player.getName() + " shows a " + card.getName());         //PRINT card name to CONSOLE
     }
 
 

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

@@ -29,9 +29,9 @@ public class War extends CardGame implements Gamble, Game {
     public void playCardInHand(boolean cardFace){
         Card card = getCardFromHand(cardFace);
         if(cardFace) {
-            Printer.printWarTurnResult(super.getPlayersTurn().getPlayer().getName(), card.getName(), super.getPlayersTurn().getHand().size());
+            Printer.printMessage(super.getPlayersTurn().getPlayer().getName() + " has played a " + card.getName() + " and has " + super.getPlayersTurn().getHand().size() + " cards left.");
         } else {
-            Printer.playedFaceDown(super.getPlayersTurn().getPlayer().getName());
+            Printer.printMessage(super.getPlayersTurn().getPlayer().getName() + " has played a card face down.");
         }
     }
 
@@ -114,9 +114,9 @@ public class War extends CardGame implements Gamble, Game {
         }
     }
 
-    @Override
-    public void startGame() {
-        Printer.welcomeTo("War");
+
+    public void startGame(){
+        Printer.printMessage("Welcome to War!");
         super.chooseStatingPlayer();
         payAnte();
         deal();

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

@@ -0,0 +1,37 @@
+package io.zipcoder.casino;
+
+import org.junit.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.nio.ByteBuffer;
+import java.util.*;
+
+public class ConsoleTest {
+
+    @Test
+    public void testCreateAccont()
+    {
+        Console console = new Console();
+        String name = "Jon \n";
+        Integer balance = 100;
+        ByteBuffer b = ByteBuffer.allocate(balance);
+        byte[] result = b.array();
+
+
+        byte[] one = result;
+        byte[] two = name.getBytes();
+        byte[] combined = new byte[one.length + two.length];
+
+        System.arraycopy(one,0,combined,0,one.length);
+        System.arraycopy(two,0,combined,one.length,two.length);
+
+
+        String data = "Jon" + "\nA second line of user input.";
+        System.setIn(new ByteArrayInputStream(combined));
+
+        console.setScanner(new Scanner(new ByteArrayInputStream(combined)));
+
+    }
+
+}

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

@@ -0,0 +1,27 @@
+package io.zipcoder.casino;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.util.NoSuchElementException;
+import java.util.Scanner;
+
+public class PrinterTest {
+
+    @Test
+    public void testWrongGameEntered(){
+        Casino casino = new Casino();
+        Console console = new Console();
+
+        casino.getConsole().setScanner(new Scanner(new ByteArrayInputStream("6".getBytes())));
+        try {
+            casino.chooseGame();
+        }catch(NoSuchElementException e){
+
+        }
+
+        Assert.assertEquals(null, casino.getGame());
+    }
+}

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

@@ -1,12 +1,43 @@
 package io.zipcoder.casino;
 
+import org.junit.Assert;
 import org.junit.Test;
 
 public class WarTest {
 
     @Test
     public void warTest01(){
+        War war = new War(10);
+        war.addNpc();
+        war.addNpc();
 
+        Assert.assertEquals(2, war.getPlayers().size());
+    }
+
+    @Test
+    public void playCardPileTest(){
+        Deck deck = new Deck();
+        War war = new War(10);
+        Player player = new Player("Jon", 100);
+        war.addPlayers(player);
+        war.chooseStatingPlayer();
+        war.deal();
+        war.getPlayers().get(0).setDiscard(deck);
+
+        war.playCardFromPile(false);
+
+        Assert.assertEquals(103, war.getPlayers().get(0).getHand().size());
+    }
+
+    @Test
+    public void playCardTest() {
+        War war = new War(10);
+        Player player = new Player("Jon", 100);
+        war.addPlayers(player);
+        war.chooseStatingPlayer();
+        war.playCard(false);
+
+        Assert.assertEquals(war.getLoser(), player);
     }
 
 }