Merge branch 'newstud' of nsatinover/ZCW-OOP-Casino into working

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

@@ -3,11 +3,7 @@ package io.zipcoder.casino;
 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 {
 
@@ -243,6 +239,8 @@ public class StudTest {
         Assert.assertEquals(expected, actual);
     }
 
+<<<<<<< HEAD
+=======
     @Test //Either payAnte or Test is broken, Ante is not deducted. Test set to pass
     public void payAnteTest(){
        stud.payAnte(stud.getPlayers());
@@ -251,6 +249,7 @@ public class StudTest {
        Assert.assertEquals(expect, actual);
     }
 
+>>>>>>> abcff63819ca0f646e4e501b1afae90ab549a292
     @Test
     public void playCardTest(){
         stud.playCard(cardPlayer1.getPlayer(), cardPlayer1.getHand().get(0));
@@ -272,6 +271,8 @@ public class StudTest {
 
         Assert.assertEquals(expected, actual);
     }
+<<<<<<< HEAD
+=======
 
 //    @Test
 //    public void testStartRound(){
@@ -297,83 +298,38 @@ public class StudTest {
 }
 /*
     CODE FOR TRASH PANDAS
+>>>>>>> abcff63819ca0f646e4e501b1afae90ab549a292
 
     @Test
-    public void flipCardTest(){
-        stud.deal();
+    public void tableTest(){
+        stud.changeTablePot(10);
         //WHEN @Before
-        boolean expected = false;
+        int expected = 10;
         //THEN
-        boolean actual = stud.flipCard();
+        int actual = stud.getTablePot();
 
         Assert.assertEquals(expected, actual);
     }
 
-    public CardPlayer determineWinner(ArrayList<CardPlayer> players){
-        int max = 0;
-        CardPlayer winner = null;
-
-        for(int i = 0; i < players.size(); i ++){
-            CardPlayer player = players.get(i);
-            int playerHandValue = handValue(player); // 'handValue' method sets 'max' value of this hand
-            if(playerHandValue > max){
-                max = playerHandValue;
-                winner = player;
-            }
-        }
-        System.out.println("The winner is " + winner.getPlayer().getName());
-        System.out.println(winner.getPlayer().getName() + "\'s hand was: " + winner.getHand().get(0).getName() +
-                " - " + winner.getHand().get(1).getName() + " - " + winner.getHand().get(2).getName() + "\n\n" );
-        return winner;
-    }
-
-        public CardPlayer determineWinner(){
-        int max = 0;
-        CardPlayer winner = null;
-
-        for(int i = 0; i < getPlayers().size(); i ++){
-            CardPlayer player = getPlayers().get(i);
-            int playerHandValue = handValue(player); // 'handValue' method sets 'max' value of this hand
-            if(playerHandValue > max){
-                max = playerHandValue;
-                winner = player;
-            }
-        }
-        System.out.println("The winner is " + winner.getPlayer().getName());
-        System.out.println(winner.getPlayer().getName() + "\'s hand was: " + winner.getHand().get(0).getName() +
-                " - " + winner.getHand().get(1).getName() + " - " + winner.getHand().get(2).getName() + "\n\n" );
-        return winner;
-    }
-
-        public void startRound() {
-        System.out.println("Welcome to Three Card Stud! Cards are dealt!");
-        flipCard();
-        gameRound();
-        flipCard();
-        gameRound2();
-        flipCard();
-        lastGameRound();
-        determineWinner(this.getPlayers()); //TEST ADDED ARGUMENT
-    }
+    @Test
+    public void setHandSizeTest(){
+        stud.setHandSize(5);
+        //WHEN @Before
+        int expected = 5;
+        //THEN
+        int actual = stud.getHandSize();
 
-    /*
-    public void payAnte() {
-        for(int i = 0; i < super.getPlayers().size(); i ++)
-        {
-            CardPlayer player = super.getPlayers().get(i);
-            player.getPlayer().changeBalance(-super.getAnte());
-        }
+        Assert.assertEquals(expected, actual);
     }
 
-     * PreCondition: Betting rounds already played
-     * Plays through round that include flipping last card face up
-     * PostCondtion: tablePot is now at max value
-     * DetermineWinner() expected to be called after this method
+    @Test
+    public void setPlayersTurnTest(){
+        stud.setPlayersTurn(cardPlayer1);
+        //WHEN @Before
+        CardPlayer expected = cardPlayer1;
+        //THEN
+        CardPlayer actual = stud.getPlayersTurn();
 
-public void lastGameRound(){
-    for (int j = 0; j < getPlayers().size(); j++) {
-        CardPlayer player = super.getPlayers().get(j);              //GET a player
-        playCard(player.getPlayer(), player.getHand().get(2));      //SHOW-PRINT players first CARD
+        Assert.assertEquals(expected, actual);
     }
 }
-*/