Merge branch 'working' of https://git.zipcode.rocks/jonathan-hinds/ZCW-OOP-Casino into working

.gitignore

@@ -10,7 +10,6 @@ local.properties
 .loadpath
 .recommenders
 .DS_Store
- f4be1dfe4483806d9dd9cf3b6546e184f84a5f1a
 
 # External tool builders
 .externalToolBuilders/

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

@@ -2,7 +2,6 @@ package io.zipcoder.casino;
 
 
 import java.util.ArrayList;
-import java.util.InputMismatchException;
 
 public class Casino {
     public boolean running = true;

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

@@ -3,7 +3,7 @@ package io.zipcoder.casino;
 import java.util.Random;
 
 public class SlotMachine implements Game, Gamble {
-    private int betAmount;
+    protected int betAmount;
     private int payoutAmt=0;
     String word="";
     String outputword="";
@@ -22,7 +22,10 @@ public class SlotMachine implements Game, Gamble {
 
     @Override
     public void bet(int betAmount) {
+
+        this.betAmount= betAmount;
         player.changeBalance(-betAmount);
+
     }
 
     public void payout(){
@@ -47,6 +50,11 @@ public class SlotMachine implements Game, Gamble {
     public void generateWords() {
         Random rand = new Random();
 
+        generateWords(rand);
+
+    }
+
+    protected void generateWords(Random rand) {
         for (int i = 1; i <= 3; i++) {
             int randnum = rand.nextInt(6);
 
@@ -79,7 +87,9 @@ public class SlotMachine implements Game, Gamble {
                 word3 = word;
             }
         }
+
         outputword= "[ " + word1+ " ]" + "   " + "[ " + word2 + " ]" + "   "+ "[ " + word3 + " ]" + "\n" ;
+
     }
 
     public void slotResult()
@@ -122,6 +132,7 @@ public class SlotMachine implements Game, Gamble {
     }
 
     public int getPayoutAmt() {
+
         return payoutAmt;
     }
 
@@ -130,6 +141,7 @@ public class SlotMachine implements Game, Gamble {
     }
 
     public void setWord1(String word1) {
+
         this.word1 = word1;
     }
 

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

@@ -1,21 +1,21 @@
 package io.zipcoder.casino;
 
 
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.Assert;
+import java.util.Random;
 
-import java.io.ByteArrayInputStream;
-import java.util.NoSuchElementException;
-import java.util.Scanner;
 
 
 public class SlotTest {
+    private int betAmount = 10;
+    private SlotMachine slotmachine = new SlotMachine(betAmount);
 
     Player player = new Player("Bob", 400);
 
     @Test
     public void testSlotResult1(){
-        int betAmount=10;
         String word1="MOUSE";
         String word2="MOUSE";
         String word3="MOUSE";
@@ -33,7 +33,6 @@ public class SlotTest {
 
     @Test
     public void testSlotResult2(){
-        int betAmount=10;
         String word1="MOUSE";
         String word2="MOUSE";
         String word3="CAT";
@@ -41,7 +40,6 @@ public class SlotTest {
 
         //given
         SlotMachine slotmachine = new SlotMachine(betAmount, player);
-
         slotmachine.setWord1(word1);
         slotmachine.setWord2(word2);
         slotmachine.setWord3(word3);
@@ -120,4 +118,35 @@ public class SlotTest {
 
 
     }
+
+    @Test
+    public void testSetBetAmount(){
+        int betAmount=10;
+        SlotMachine slotmachine = new SlotMachine(betAmount);
+
+        int newBet = 40;
+
+        slotmachine.bet(newBet);
+
+        int actual = slotmachine.betAmount;
+
+        Assert.assertEquals(newBet, actual);
+
+    }
+
+    @Test
+    public void testGenerateWords2(){
+        Random random = new Random(1);
+
+
+        String expectedWord1 = "SQUIRREL";
+        String expectedWord2 = "FISH";
+        String expectedWord3 = "CAT";
+
+        slotmachine.generateWords(random);
+
+        Assert.assertEquals(expectedWord1, slotmachine.word1);
+
+    }
+
 }

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(){
@@ -292,83 +293,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);
     }
 }
-*/