Merge

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

@@ -27,11 +27,6 @@ public abstract class CardGame {
     // public abstract void deal();
     // public abstract void deal(ArrayList<CardPlayer> players); // NEEDED FOR STUD
 
-    public void shuffle(){
-
-        //shuffle the card stack
-
-    }
 
     public Deck getDeck() {
         return deck;

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

@@ -134,9 +134,6 @@ 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.");
             }
@@ -162,4 +159,12 @@ public class War extends CardGame implements Gamble, Game {
         }
         Printer.printMessage(super.getPlayersTurn().getPlayer().getName() + "has: " + super.getPlayersTurn().getHand().size() + " cards.");
     }
+
+    public void setScanner(Scanner scanner) {
+        this.console.setScanner(scanner);
+    }
+
+    public ArrayList<CardPlayer> getWarMembers() {
+        return warMembers;
+    }
 }

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

@@ -63,6 +63,5 @@ public class SlotTest {
         slotmachine.slotResult();
         int payout=slotmachine.getPayoutAmt();
         Assert.assertEquals(0,payout);
-
     }
 }

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

@@ -244,6 +244,7 @@ public class StudTest {
     @Test //Either payAnte or Test is broken, Ante is not deducted. Test set to pass
     public void payAnteTest(){
         stud.payAnte(players);
+        System.out.println(players.get(0).getPlayer().getCurrentBalance());
         //WHEN @Before
         int expected = 10;
         //THEN

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

@@ -3,6 +3,11 @@ package io.zipcoder.casino;
 import org.junit.Assert;
 import org.junit.Test;
 
+import java.io.ByteArrayInputStream;
+import java.util.ArrayList;
+import java.util.NoSuchElementException;
+import java.util.Scanner;
+
 public class WarTest {
 
     @Test
@@ -40,4 +45,116 @@ public class WarTest {
         Assert.assertEquals(war.getLoser(), player);
     }
 
+    @Test
+    public void warDealTest(){
+        War war = new War(10);
+        war.addPlayers(new Player("Jon", 100));
+        war.chooseStatingPlayer();
+        war.deal();
+
+        Assert.assertTrue(war.getPlayers().get(0).getHand().size() == 52);
+    }
+
+    @Test
+    public void warEachPlayerPlayCardTest(){
+        War war = new War(10);
+        war.addPlayers(new Player("Jon", 100), new Player("Jose", 200));
+
+        war.chooseStatingPlayer();
+        war.deal();
+        war.eachPlayerPlayCard();
+
+        int toalHand = 0;
+
+        for(CardPlayer player : war.getPlayers()){
+            toalHand += player.getHand().size();
+        }
+        Assert.assertTrue(toalHand == 50);
+    }
+
+    @Test
+    public void testWarStartGame(){
+        War war = new War(10);
+        Player player1 = new Player("Jose", 100);
+        Player player2 = new Player("Lauren", 200);
+        war.addPlayers(player1, player2);
+        war.chooseStatingPlayer();
+        war.deal();
+
+        String input = "flip \n";
+
+
+            war.setScanner(new Scanner(new ByteArrayInputStream(input.getBytes())));
+            try {
+                war.startGame();
+            } catch (NoSuchElementException e) {
+
+            }
+
+
+        Assert.assertTrue(war.getPlayersTurn() instanceof CardPlayer);
+    }
+
+    @Test
+    public void testWarQuit(){
+        War war = new War(10);
+        Player player1 = new Player("Jose", 100);
+        Player player2 = new Player("Lauren", 200);
+        war.addPlayers(player1, player2);
+        war.chooseStatingPlayer();
+        CardPlayer startPlayer = war.getPlayersTurn();
+        war.deal();
+
+        String input = "quit \n";
+
+
+        war.setScanner(new Scanner(new ByteArrayInputStream(input.getBytes())));
+        try {
+            war.startGame();
+        } catch (NoSuchElementException e) {
+
+        }
+
+
+       Assert.assertTrue(war.getPlayersTurn() == startPlayer);
+    }
+
+    @Test
+    public void testWarMethod(){
+        War war = new War(10);
+        Player player1 = new Player("Jose", 100);
+        Player player2 = new Player("Lauren", 200);
+        war.addPlayers(player1, player2);
+        war.chooseStatingPlayer();
+        CardPlayer startPlayer = war.getPlayersTurn();
+
+        ArrayList<Card> hand1 = new ArrayList<>();
+        hand1.add(new Card(Card.CardValue.FOUR, Card.Suit.HEARTS));
+        hand1.add(new Card(Card.CardValue.FOUR, Card.Suit.HEARTS));
+        hand1.add(new Card(Card.CardValue.THREE, Card.Suit.HEARTS));
+        hand1.add(new Card(Card.CardValue.TWO, Card.Suit.HEARTS));
+        hand1.add(new Card(Card.CardValue.ACE, Card.Suit.HEARTS));
+
+        ArrayList<Card> hand2 = new ArrayList<>();
+        hand2.add(new Card(Card.CardValue.FOUR, Card.Suit.HEARTS));
+        hand2.add(new Card(Card.CardValue.KING, Card.Suit.HEARTS));
+        hand2.add(new Card(Card.CardValue.JACK, Card.Suit.HEARTS));
+        hand2.add(new Card(Card.CardValue.QUEEN, Card.Suit.HEARTS));
+        hand2.add(new Card(Card.CardValue.KING, Card.Suit.HEARTS));
+
+        String input = "flip \n";
+
+        war.getPlayers().get(0).setHand(hand1);
+        war.getPlayers().get(1).setHand(hand2);
+
+        war.setScanner(new Scanner(new ByteArrayInputStream(input.getBytes())));
+        try {
+            war.startRound();
+        } catch (NoSuchElementException e) {
+
+        }
+
+        Assert.assertTrue(war.getPlayers().get(0).getHand().size() == 1);
+    }
+
 }