stud at 45%

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

@@ -18,12 +18,12 @@ public class Stud extends CardGame implements Game {
      * Determine what player wins by looping through player array and then
      * passing each hand to the 'handValue' method
      */
-    public CardPlayer determineWinner(){
+    public CardPlayer determineWinner(ArrayList<CardPlayer> players){
         int max = 0;
         CardPlayer winner = null;
 
-        for(int i = 0; i < getPlayers().size(); i ++){
-            CardPlayer player = getPlayers().get(i);
+        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;
@@ -64,7 +64,7 @@ public class Stud extends CardGame implements Game {
      * @param card1
      * @return
      */
-    private int threeOfAKindHandValue(int card1){
+    public int threeOfAKindHandValue(int card1){
         int handValue;
         handValue = card1 * 1000000;
         return handValue;
@@ -77,7 +77,7 @@ public class Stud extends CardGame implements Game {
      * @param card3
      * @return
      */
-    private int onePairHandValue(int card1, int card2, int card3){
+    public int onePairHandValue(int card1, int card2, int card3){
         int handValue = 0;
 
         if (card1 == card2){
@@ -100,8 +100,8 @@ public class Stud extends CardGame implements Game {
      * @param card3
      * @return
      */
-    private int highCardHandValue(int card1, int card2, int card3){
-        int handValue;
+    public int highCardHandValue(int card1, int card2, int card3){
+        int handValue = 0;
         // Card1 is Highest
         if (card1 > card2 && card1 > card3 && card2 > card3) {
             handValue = (card1 * 100) + (card2 * 10) + card3;
@@ -117,26 +117,16 @@ public class Stud extends CardGame implements Game {
             handValue = (card2 * 100) + (card3 * 10) + card1;
         }
         // Card3 is Highest
-        else if (card3 > card1 && card3 > card2 && card1 > card3) {
-            handValue = (card3 * 100) + (card1 * 10) + card3;
+        else if (card3 > card1 && card3 > card2 && card1 > card2) {
+            handValue = (card3 * 100) + (card1 * 10) + card2;
         }
-        else if (card3 > card1 && card3 > card2 && card3 > card1) {
-            handValue = (card3 * 100) + (card3 * 10) + card1;
-        }
-        else {
-            handValue = 0;
+        else if (card3 > card1 && card3 > card2 && card2 > card1) {
+            handValue = (card3 * 100) + (card2 * 10) + card1;
         }
+        else {}
         return handValue;
     }
 
-
-    public void payout(){
-        if(super.getWinner() != null){
-            super.getWinner().changeBalance(super.getTablePot());
-        }
-        System.out.println(getWinner().getName() + " won: " + super.getTablePot());
-    }
-
     public void payAnte() {
         for(int i = 0; i < super.getPlayers().size(); i ++)
         {
@@ -164,7 +154,7 @@ public class Stud extends CardGame implements Game {
         gameRound2();
         flipCard();
         lastGameRound();
-        determineWinner();
+        determineWinner(this.getPlayers()); //TEST ADDED ARGUMENT
     }
 
 
@@ -237,5 +227,6 @@ public class Stud extends CardGame implements Game {
     }
 
     public void quit() {}
+    // public void payout(){ }
 }
 

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

@@ -1,18 +1,226 @@
 package io.zipcoder.casino;
 
+import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
 
+import java.util.ArrayList;
+
 public class StudTest {
-    public static void main(String[] args){
-        Casino casino = new Casino();
-        //get a player
-        casino.setPlayer(casino.getConsole().createAccount());
-        //player picks game
-        casino.chooseGame();
+
+    Stud stud = new Stud(10);
+    ArrayList<CardPlayer> players = new ArrayList<>();
+    CardPlayer cardPlayer1;
+    CardPlayer cardPlayer2;
+
+    @Before
+    public void setup(){
+        ArrayList<Card> cardsTest1 = new ArrayList<>();
+        Player player1 = new Player("Player1", 10);
+        this.cardPlayer1 = new CardPlayer(player1);
+        Card cardSix = new Card(Card.CardValue.SIX, Card.Suit.HEARTS);   //SIX   - 600
+        Card cardFive = new Card(Card.CardValue.FIVE, Card.Suit.HEARTS); //FIVE  -  50
+        Card cardFour = new Card(Card.CardValue.FOUR, Card.Suit.HEARTS); //FOUR  -   4
+        cardsTest1.add(cardSix); cardsTest1.add(cardFive); cardsTest1.add(cardFour);
+        this.cardPlayer1.setHand(cardsTest1);
+
+        ArrayList<Card> cardsTest2 = new ArrayList<>();
+        Player player2 = new Player("Player2", 10);
+        this.cardPlayer2 = new CardPlayer(player2);
+        Card cardSeven = new Card(Card.CardValue.SEVEN, Card.Suit.HEARTS);
+        Card cardEight = new Card(Card.CardValue.EIGHT, Card.Suit.HEARTS);
+        Card cardNine = new Card(Card.CardValue.NINE, Card.Suit.HEARTS);
+        cardsTest2.add(cardSeven); cardsTest2.add(cardEight); cardsTest2.add(cardNine);
+        this.cardPlayer2.setHand(cardsTest2);
+
+        players.add(this.cardPlayer1);
+        players.add(this.cardPlayer2);
+
+    }
+
+    @Test
+    public void highCardHandValueTest(){
+        //WHEN
+        int card1 = 14; //ACE   - 1400
+        int card2 = 13; //KING  -  130
+        int card3 = 12; //QUEEN -   12
+        //THEN
+        int expected = 1542;
+        int actual = stud.highCardHandValue(card1, card2, card3);
+
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void highCardHandValueTest2(){
+        //WHEN
+        int card2 = 11; //JACK  -    110
+        int card1 =  9; //NINE   -    09
+        int card3 = 12; //QUEEN -   1200
+        //THEN
+        int expected = 1319;
+        int actual = stud.highCardHandValue(card1, card2, card3);
+
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void highCardHandValueTest3(){
+        //WHEN
+        int card1 = 11; //JACK  -    110
+        int card2 =  9; //NINE   -    09
+        int card3 = 12; //QUEEN -   1200
+        //THEN
+        int expected = 1319;
+        int actual = stud.highCardHandValue(card2, card3, card1);
+
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void onePairHandValueTest(){     // card1 == card2
+        //WHEN
+        int card1 = 10; //TEN  - 100000
+        int card2 = 10; //TEN  -      0
+        int card3 = 02; //TWO  -      2
+        //THEN
+        int expected = 100002;
+        int actual = stud.onePairHandValue(card1, card2, card3);
+
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void onePairHandValueTest2() {     // card1 == card3
+        //WHEN
+        int card1 = 10; //TEN  - 100000
+        int card2 = 02; //TWO  -      2
+        int card3 = 10; //TEN  -      0
+        //THEN
+        int expected = 100002;
+        int actual = stud.onePairHandValue(card1, card2, card3);
+
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void onePairHandValueTest3() {     // card2 == card3
+        //WHEN
+        int card1 = 02; //TWO  -      2
+        int card2 = 10; //TEN  - 100000
+        int card3 = 10; //TEN  -      0
+        //THEN
+        int expected = 100002;
+        int actual = stud.onePairHandValue(card1, card2, card3);
+
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void threeOfAKindHandValueTest(){
+        //WHEN
+        int card1 = 3; //THREE  - 3000000
+        //THEN
+        int expected = 3000000;
+        int actual = stud.threeOfAKindHandValue(card1);
+
+        Assert.assertEquals(expected, actual);
     }
 
     @Test
-    public void thismethod(){
+    public void handValueTest(){
+        //WHEN
+            //SIX   - 600
+            //FIVE  -  50
+            //FOUR  -   4
 
+        //THEN
+        int expected = 654;
+        int actual = stud.handValue(cardPlayer1);
+
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void handValueTest2(){
+        //WHEN
+        ArrayList<Card> cardsTest = new ArrayList<>();
+        Player player1 = new Player("Test", 10);
+        this.cardPlayer1 = new CardPlayer(player1);
+        Card cardSix = new Card(Card.CardValue.SIX, Card.Suit.HEARTS);
+        Card cardFive = new Card(Card.CardValue.SIX, Card.Suit.HEARTS);
+        Card cardFour = new Card(Card.CardValue.SIX, Card.Suit.HEARTS);
+        cardsTest.add(cardSix); cardsTest.add(cardFive); cardsTest.add(cardFour);
+        this.cardPlayer1.setHand(cardsTest);
+        //THEN
+        int expected = 6000000;
+        int actual = stud.handValue(this.cardPlayer1);
+
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void handValueTest3(){
+        //WHEN
+        ArrayList<Card> cardsTest = new ArrayList<>();
+        Player player1 = new Player("Test", 10);
+        this.cardPlayer1 = new CardPlayer(player1);
+        Card cardSix = new Card(Card.CardValue.SIX, Card.Suit.HEARTS);
+        Card cardFive = new Card(Card.CardValue.SIX, Card.Suit.HEARTS);
+        Card cardFour = new Card(Card.CardValue.SEVEN, Card.Suit.HEARTS);
+        cardsTest.add(cardSix); cardsTest.add(cardFive); cardsTest.add(cardFour);
+        this.cardPlayer1.setHand(cardsTest);
+        //THEN
+        int expected = 60007;
+        int actual = stud.handValue(this.cardPlayer1);
+
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void determineWinnerTEST(){
+
+
+        String expected = "Player2";
+        String actual = stud.determineWinner(players).getPlayer().getName();
+
+        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;
+    }
+ */