Merge branch 'working' of katelynne/Casino into master

yay!

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

@@ -2,6 +2,9 @@ package io.zipcoder.casino.CardGame;
 
 import java.util.Objects;
 
+import static io.zipcoder.casino.CardGame.Face.getFaceByValue;
+import static io.zipcoder.casino.CardGame.Suit.getSuitByValue;
+
 public class Card {
 
     private Suit suit;
@@ -15,8 +18,15 @@ public class Card {
         setBlack();
     }
 
-    public static Card toCard(String face, String suit){
-        return new Card(Suit.valueOf(suit.toUpperCase()), Face.valueOf(face.toUpperCase()));
+//    public static Card toCard(String suit, String face){
+//        return new Card(Suit.valueOf(suit.toUpperCase()), Face.valueOf(face.toUpperCase()));
+//    }
+
+    public static Card toCard(char face, char suit){
+//        char s = suit.charAt(0);
+//        char f = face.charAt(0);
+//        return new Card(getSuitByValue(s), getFaceByValue(f));
+        return new Card(getSuitByValue(suit), getFaceByValue(face));
     }
 
     public Suit getSuit() {

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

@@ -2,26 +2,28 @@ package io.zipcoder.casino.CardGame;
 
 public enum Face {
 
-    ACE(1, 11),
-    TWO(2),
-    THREE(3),
-    FOUR(4),
-    FIVE(5),
-    SIX(6),
-    SEVEN(7),
-    EIGHT(8),
-    NINE(9),
-    TEN(10),
-    JACK(11, 10),
-    QUEEN(12, 10),
-    KING(13, 10);
+    ACE(1, 11,'A'),
+    TWO(2,2,'2'),
+    THREE(3,3,'3'),
+    FOUR(4,4,'4'),
+    FIVE(5,5,'5'),
+    SIX(6,6,'6'),
+    SEVEN(7,7,'7'),
+    EIGHT(8,8,'8'),
+    NINE(9,9,'9'),
+    TEN(10,10,'T'),
+    JACK(11, 10,'J'),
+    QUEEN(12, 10,'Q'),
+    KING(13, 10,'K');
 
     private int primaryValue;
     private int secondaryValue;
+    private char tertiaryValue;
 
-    Face(int primaryValue, int secondaryValue) {
+    Face(int primaryValue, int secondaryValue, char tertiaryValue) {
         this.primaryValue = primaryValue;
         this.secondaryValue = secondaryValue;
+        this.tertiaryValue = tertiaryValue;
     }
 
     Face(int primaryValue) {
@@ -37,4 +39,13 @@ public enum Face {
         return secondaryValue;
     }
 
+    public char getTertiaryValue() { return tertiaryValue; }
+
+    public static Face getFaceByValue(char tertiaryValue){
+        Face[] faces = Face.values();
+        for (Face face : faces)
+            if (face.tertiaryValue == tertiaryValue)
+                return face;
+        return null;
+    }
 }

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

@@ -9,16 +9,13 @@ import java.util.Stack;
 
 public class Foundation {
 
-    public Stack<Card> tempStack = new Stack<>();
-    public Stack<Card> clubStack = new Stack<>();
-    public Stack<Card> diamondStack = new Stack<>();
-    public Stack<Card> heartStack = new Stack<>();
-    public Stack<Card> spadeStack = new Stack<>();
-
+    public static Stack<Card> clubStack = new Stack<>();
+    public static Stack<Card> diamondStack = new Stack<>();
+    public static Stack<Card> heartStack = new Stack<>();
+    public static Stack<Card> spadeStack = new Stack<>();
 
     public Foundation() {
 
-        this.tempStack = new Stack<>();
     }
 
     Tableau tab = new Tableau();
@@ -26,7 +23,7 @@ public class Foundation {
     Card card;
 
 
-    public void whichSuit(Stack<Card> tempStackCard) {
+    public static void whichSuit(Stack<Card> tempStackCard) {
 
         if (tempStackCard.peek().getSuit() == Suit.CLUBS) {
             //Checks if the Clubs Foundation is Empty
@@ -78,8 +75,12 @@ public class Foundation {
                 spadeStack.push(tempStackCard.peek());
             }
         }
-
     }
 
-
+    public static Boolean allFoundsFull() {
+        if (clubStack.size() == 13 && spadeStack.size() == 13
+                && heartStack.size() == 13  && diamondStack.size() == 13)
+            return true;
+        else return false;
+    }
 }

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

@@ -3,21 +3,32 @@ package io.zipcoder.casino.CardGame.Solitaire;
 import io.zipcoder.casino.CardGame.Card;
 import io.zipcoder.casino.CardGame.CardGame;
 import io.zipcoder.casino.CardGame.Deck;
+import io.zipcoder.casino.Console;
 import io.zipcoder.casino.Player;
 
+import java.util.Scanner;
 import java.util.Stack;
 
-import static io.zipcoder.casino.CardGame.Solitaire.Tableau.tempStack;
+import static io.zipcoder.casino.CardGame.Card.toCard;
+import static io.zipcoder.casino.CardGame.Solitaire.Foundation.allFoundsFull;
+import static io.zipcoder.casino.CardGame.Solitaire.Foundation.whichSuit;
 
 public class Solitaire extends CardGame {
+
+    public static void main(String[] args){
+        Solitaire s = new Solitaire(new Player("Bill"));
+        s.start();
+    }
+
+    Scanner in = new Scanner(System.in);
     //clean up.
 
     //create setting for 3 card draw. which will affect the draw method.
     private Player player;
     public Tableau tab1, tab2, tab3, tab4, tab5, tab6, tab7;
-    private Foundation foundation;
     public Stack<Card> wastePile;
     public Tableau[] arrayTabs;
+    public static Stack<Card> tempStack = new Stack<>();
 
     public Solitaire(Player player) {
         this.player = player;
@@ -30,6 +41,7 @@ public class Solitaire extends CardGame {
         tab6 = new Tableau();
         tab7 = new Tableau();
         arrayTabs = new Tableau[]{tab1, tab2, tab3, tab4, tab5, tab6, tab7};
+        start();
     }
 
     public static Deck solitaireDeck = new Deck();
@@ -49,12 +61,58 @@ public class Solitaire extends CardGame {
         wastePile.push(solitaireDeck.draw());
     }
 
-    public Stack<Card> pullFromWaste(){
+    public Stack<Card> pickUp(){
         tempStack.push(wastePile.pop());
         return tempStack;
     }
 
-    public Stack<Card> pull(Card c){
+    public void dropToTab(char key){
+        switch (key){
+            case '1':
+                tab1.place();
+                break;
+            case '2':
+                tab2.place();
+                break;
+            case '3':
+                tab3.place();
+                break;
+            case '4':
+                tab4.place();
+                break;
+            case '5':
+                tab5.place();
+                break;
+            case '6':
+                tab6.place();
+                break;
+            case '7':
+                tab7.place();
+                break;
+            case '8':
+                whichSuit(tempStack);
+                break;
+            case '9':
+                whichSuit(tempStack);
+                break;
+            case '0':
+                whichSuit(tempStack);
+                break;
+            case '-':
+                whichSuit(tempStack);
+                break;
+            case 'E': //develop way to replace original stack on pile. don't change coverage until placed. same with pulled from stack.
+                break;
+            default:
+                System.out.println("Not a valid entry. Try again or press \'E\'");
+                dropToTab(in.next().charAt(0));
+        }
+    }
+
+    public Stack<Card> pull(String cardCode){
+        char f = cardCode.charAt(0);
+        char s = cardCode.charAt(1);
+        Card c = toCard(f,s);
         return findTab(c).pull(c);
     }
 
@@ -66,15 +124,48 @@ public class Solitaire extends CardGame {
     }
 
     public void start(){
-
+        System.out.println("Welcome");
+        resetDeck();
+        wastePile.removeAllElements();
+        deal();
+        print();
+        takeATurn();
     }
 
     public void end() {
+        System.out.println("Congratulations!");
+        System.out.println("Enter \'N\' to play again or press \'Q\' to quit");
+        String command = in.next().toUpperCase();
+        while (!command.equals("Q") || !command.equals("N")){
+            if (command.equals("Q")) end();
+            else if (command.equals("N")) start();
+            else System.out.println("Invalid. Enter \'N\' to play again or press \'Q\' to quit");
+        }
+    }
 
+    public String getInput(){
+        return in.next();
     }
 
     public void takeATurn() {
+        Console.println("Let's play");
+        while (!getInput().equals("QUIT") || !allFoundsFull()) {
+            if (Console.getInputString("Enter draw to draw a card").equals("DRAW")) {
+                drawCard();
+                print();
+                continue;
+            } else if (Console.getInputString("Enter draw to draw a card").equals("P")) {
+                pickUp();
+                dropToTab(getInput().charAt(0));
+                print();
+            } else if (Console.getInputString("Enter draw to draw a card").length() == 2) {
+                pull(String.valueOf(getInput()));
+                dropToTab(getInput().charAt(0));
+                print();
+            }
+        }
 
+        if (allFoundsFull()) end();
     }
 
     public void addPlayer(Player player) {
@@ -99,9 +190,14 @@ public class Solitaire extends CardGame {
         solitaireDeck = new Deck();
     }
 
-    public void flip() {
-        // shoulder technically be card.setCovered(false); or something like that
-        boolean covered = false;
+    public void print(){
+        int i = 0;
+        for (Tableau tab : arrayTabs) {
+            System.out.println("tab " + i); i++;
+            tab.stack.forEach(e -> System.out.println(e + " " + e.isCovered()));
+        }
+        if (wastePile.size() > 0) System.out.println("Top of Pile " + wastePile.peek());
     }
 
+
 }

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

@@ -4,12 +4,14 @@ import io.zipcoder.casino.CardGame.Card;
 
 import java.util.Stack;
 
+import static io.zipcoder.casino.CardGame.Solitaire.Solitaire.tempStack;
+
 public class Tableau {
     //consider making an undo method.
     //or better yet, create method that lets you know where you can place. highlighted card in the UI.
 
     public Stack<Card> stack;
-    public static Stack<Card> tempStack = new Stack<>();
+
 
     public Tableau(){
         this.stack = new Stack<>();

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

@@ -1,12 +1,26 @@
 package io.zipcoder.casino.CardGame;
 
 public enum Suit {
-    HEARTS,
-    SPADES,
-    DIAMONDS,
-    CLUBS;
+    HEARTS('H'),
+    SPADES('S'),
+    DIAMONDS('D'),
+    CLUBS('C');
 
-    private Suit() {
+    private char primaryValue;
+
+    private Suit(char primaryValue) {
+        this.primaryValue = primaryValue;
+    }
+
+    public char getPrimaryValue(){
+        return primaryValue;
     }
 
+    public static Suit getSuitByValue(char primaryValue){
+        Suit[] suits = Suit.values();
+        for (Suit suit : suits)
+            if (suit.primaryValue == primaryValue)
+                return suit;
+        return null;
+    }
 }

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

@@ -1,10 +1,76 @@
 package io.zipcoder.casino;
 
+import io.zipcoder.casino.DiceGame.Craps.Craps;
+
+import java.io.InputStream;
+import java.io.PrintStream;
 import java.util.Scanner;
 
 public class Console {
 
-    public static String getStringInput(String prompt) {
+    private static Scanner input = new Scanner(System.in);
+    private static PrintStream output;
+
+//    public Console(InputStream in, PrintStream out) {
+//        this.input = new Scanner(in);
+//        this.output = out;
+//    }
+
+
+    public static void getBetPrompt() {
+
+    }
+
+    public static int crapsBetPrompt() {
+        System.out.println("What would you like to bet?");
+        int amount = input.nextInt();
+        return amount;
+    }
+
+    public static void tooLowBet(){
+        System.out.println("Sorry but you must increase your bet to be above the minimum");
+    }
+
+    public static void rtrPrompt(){
+        System.out.println("Are you ready to roll?  yes or no");
+    }
+
+    public static void printPointer(){
+
+    }
+
+    public static void println(String prompt, Object... args) {
+        output.format(prompt + "\n", args);
+    }
+
+    public static String getString(String prompt, Object... args) {
+        println(prompt, args);
+        return input.nextLine();
+    }
+
+    public static String getInputString(String prompt, Object... args) {
+        println(prompt, args);
+        return input.nextLine();
+    }
+
+    public static Double getInputDouble(String prompt, Object... args) {
+        String stringInput = getInputString(prompt, args);
+        do {
+            try {
+                Double doubleInput = Double.parseDouble(stringInput);
+                return doubleInput;
+            } catch (Exception e) {
+                println("%s is invalid. Please enter a number here", stringInput);
+            }
+        } while (true);
+    }
+
+    public static Integer getInputInteger(String prompt, Object... args) {
+        return getInputDouble(prompt, args).intValue();
+    }
+
+
+    public static String getStringInput(String prompt, Object... args) {
         Scanner scanner = new Scanner(System.in);
         System.out.println(prompt);
         return scanner.nextLine();

src/main/java/io/zipcoder/casino/DiceGame/Craps/Craps.java

@@ -1,6 +1,7 @@
 package io.zipcoder.casino.DiceGame.Craps;
 
 import io.zipcoder.casino.CardGame.Solitaire.Tableau;
+import io.zipcoder.casino.Console;
 import io.zipcoder.casino.DiceGame.Dice;
 import io.zipcoder.casino.DiceGame.DiceGame;
 import io.zipcoder.casino.Interfaces.Gamble;
@@ -21,6 +22,8 @@ public class Craps extends DiceGame implements Gamble {
     private Player player;
     private Dice dice;
     private int pointer;
+    private int result;
+    private int totalWin;
 
 
 
@@ -30,24 +33,25 @@ public class Craps extends DiceGame implements Gamble {
         this.crapsPlayer = new CrapsPlayers(player);
         this.minBet = 10;
         this.dice = new Dice();
+        //this.result = 0;
         scanner = new Scanner(System.in);
     }
 
-    public void gamePlay(){
+    public void gamePlay() {
+        crapsPlayer.setWallet(crapsPlayer.getWallet());
         System.out.println("What would you like to bet? Min bet is: $" + minBet);
         int amount = scanner.nextInt();
-        //add a try catch
-        if (amount<minBet){
-            System.out.println("Sorry but the minimum bet is $"+minBet);
+        if (amount < minBet) {
+            System.out.println("Sorry but the minimum bet is $" + minBet);
             gamePlay();
         }
         crapsPlayer.setInitialBet(amount);
         System.out.println("Are you ready to roll?  yes or no");
         String response = scanner.next();
-        if(response.equalsIgnoreCase("yes")) {
-        } else if(response.equalsIgnoreCase("no")) {
+        if (response.equalsIgnoreCase("yes")) {
+        } else if (response.equalsIgnoreCase("no")) {
             gamePlay();
-        } else{
+        } else {
             System.out.println("no valid");
         }
         firstRoll();
@@ -58,7 +62,7 @@ public class Craps extends DiceGame implements Gamble {
         int sum = rollDice(2);
         System.out.println("Total = " + sum);
         System.out.println("______________");
-        rollNumber++;
+        setResult(sum);
         return sum;
     }
 
@@ -74,18 +78,19 @@ public class Craps extends DiceGame implements Gamble {
     }
 
     public void remainingRolls() {
+        System.out.println("The pointer is: " + pointer);
         System.out.println("Are you ready to roll?  yes or no");
         String response = scanner.next();
-        if(response.equalsIgnoreCase("yes")) {
-        } else if(response.equalsIgnoreCase("no")) {
+        if (response.equalsIgnoreCase("yes")) {
+        } else if (response.equalsIgnoreCase("no")) {
             System.out.println("would you like to exit?");
             String response2 = scanner.next();
-            if(response2.equalsIgnoreCase("yes")){
+            if (response2.equalsIgnoreCase("yes")) {
                 exitTable(crapsPlayer);
-            } else if(response2.equalsIgnoreCase("no")){
+            } else if (response2.equalsIgnoreCase("no")) {
                 gamePlay();
             }
-        } else{
+        } else {
             System.out.println("not valid");
         }
         int result = rollDice();
@@ -97,6 +102,7 @@ public class Craps extends DiceGame implements Gamble {
             remainingRolls();
     }
 
+
     public int betAmount(int amount, Player player) {
         return amount;
     }
@@ -106,23 +112,27 @@ public class Craps extends DiceGame implements Gamble {
         return betAmount(amount, crapsPlayers.getPlayer());
     }
 
-    public void win(CrapsPlayers crapsPlayers){
-       crapsPlayers.setWallet(crapsPlayers.getWallet() + crapsPlayers.getInitialBet() * 2);
+    public void win(CrapsPlayers crapsPlayers) {
         System.out.println("Congrats! You won: $" + crapsPlayers.getInitialBet());
+        totalWin = crapsPlayers.getInitialBet();
+        crapsPlayers.setWallet(crapsPlayers.getWallet() + totalWin);
+        displayWallet();
         playAgain();
     }
 
     public void lose(CrapsPlayers crapsPlayers) {
         System.out.println("I'm so sorry, you lose!");
-      playAgain();
+        crapsPlayers.setWallet(crapsPlayers.getWallet() - crapsPlayers.getInitialBet());
+        displayWallet();
+        playAgain();
     }
 
-    public void playAgain(){
+    public void playAgain() {
         System.out.println("Would you like to play again?");
         String response = scanner.next();
-        if(response.equalsIgnoreCase("yes")) {
+        if (response.equalsIgnoreCase("yes")) {
             start();
-        } else if(response.equalsIgnoreCase("no")) {
+        } else if (response.equalsIgnoreCase("no")) {
             end();
         } else {
             System.out.println("Sorry I didn't quite get that, try again!");
@@ -141,15 +151,15 @@ public class Craps extends DiceGame implements Gamble {
     public void end() {
         System.out.println("Would you like to leave the table?");
         String response = scanner.next();
-        if(response.equalsIgnoreCase("yes")) {
+        if (response.equalsIgnoreCase("yes")) {
             exitTable(crapsPlayer);
-        } else if(response.equalsIgnoreCase("no")) {
+        } else if (response.equalsIgnoreCase("no")) {
             start();
         }
 
     }
 
-    public void exitTable(CrapsPlayers crapsPlayer){
+    public void exitTable(CrapsPlayers crapsPlayer) {
         removePlayer(player);
     }
 
@@ -165,16 +175,30 @@ public class Craps extends DiceGame implements Gamble {
         this.pointer = pointer;
     }
 
+    public int getRollResult() {
+        return result;
+    }
+
+    public void setResult(int result) {
+        this.result = result;
+    }
+
     public void addPlayer(Player player) {
         CrapsPlayers crappyPlayer = new CrapsPlayers(player);
         this.crapsPlayer = crappyPlayer;
     }
 
     public void removePlayer(Player player) {
-            if (crapsPlayer.getPlayer() == player) {
-                this.crapsPlayer = null;
-            }
-
+        if (crapsPlayer.getPlayer() == player) {
+            this.crapsPlayer = null;
         }
+    }
 
-    }
+    public CrapsPlayers getCrapsPlayer() {
+        return crapsPlayer;
+    }
+
+    public void displayWallet(){
+        System.out.println("You have: $" + crapsPlayer.getWallet());
+    }
+}

src/main/java/io/zipcoder/casino/DiceGame/Craps/CrapsPlayers.java

@@ -15,6 +15,7 @@ public class CrapsPlayers {
             this.initialBet = 0;
             this.rollValue = 0;
             this.betPot = 0;
+            this.wallet = 500;
         }
 
         public Player getPlayer() {

src/main/java/io/zipcoder/casino/DiceGame/Craps/DiceDisplay.java

@@ -0,0 +1,4 @@
+package io.zipcoder.casino.DiceGame.Craps;
+
+public enum DiceDisplay {
+}

src/main/java/io/zipcoder/casino/DiceGame/Dice.java

@@ -13,7 +13,7 @@ public class Dice {
 //        this.dice = new ArrayList<Dice>(numOfDice);
 //    }
 
-    public int rollDie() {
+    public static int rollDie() {
         return (int) Math.floor((Math.random() * 6) + 1);
     }
 

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

@@ -12,5 +12,7 @@ public class Test {
         Craps game1 = new Craps(Crappy);
 
         game1.gamePlay();
+
+
     }
 }

src/test/java/io/zipcoder/casino/CardGame/Solitaire/FoundationTest.java

@@ -7,6 +7,8 @@ import io.zipcoder.casino.CardGame.Suit;
 import org.junit.Assert;
 import org.junit.Test;
 
+import static io.zipcoder.casino.CardGame.Solitaire.Solitaire.tempStack;
+
 public class FoundationTest {
 
 
@@ -21,9 +23,9 @@ public class FoundationTest {
 
 
         Card chosen = deck.deckOfCards.pop();
-        foundation.tempStack.push(chosen);
+        tempStack.push(chosen);
         foundation.clubStack.push(card);
-        foundation.whichSuit(foundation.tempStack);
+        foundation.whichSuit(tempStack);
         //WHEN
 
         Card expected = new Card(Suit.CLUBS, Face.KING);
@@ -45,9 +47,9 @@ public class FoundationTest {
                 Face.QUEEN);
 
 
-        foundation.tempStack.push(tempCard);
+        tempStack.push(tempCard);
         foundation.diamondStack.push(cardOnFoundation);
-        foundation.whichSuit(foundation.tempStack);
+        foundation.whichSuit(tempStack);
         //WHEN
 
         Card expected = new Card(Suit.DIAMONDS, Face.KING);
@@ -66,9 +68,9 @@ public class FoundationTest {
                 Face.QUEEN);
 
 
-        foundation.tempStack.push(tempCard);
+        tempStack.push(tempCard);
         foundation.heartStack.push(cardOnFoundation);
-        foundation.whichSuit(foundation.tempStack);
+        foundation.whichSuit(tempStack);
         //WHEN
 
         Card expected = new Card(Suit.HEARTS, Face.KING);
@@ -86,9 +88,9 @@ public class FoundationTest {
                 Face.QUEEN);
 
 
-        foundation.tempStack.push(tempCard);
+        tempStack.push(tempCard);
         foundation.spadeStack.push(cardOnFoundation);
-        foundation.whichSuit(foundation.tempStack);
+        foundation.whichSuit(tempStack);
         //WHEN
 
         Card expected = new Card(Suit.SPADES, Face.KING);
@@ -106,9 +108,9 @@ public class FoundationTest {
                 Face.TEN);
 
 
-        foundation.tempStack.push(tempCard);
+        tempStack.push(tempCard);
         foundation.spadeStack.push(cardOnFoundation);
-        foundation.whichSuit(foundation.tempStack);
+        foundation.whichSuit(tempStack);
         //WHEN
 
         Card expected = new Card(Suit.SPADES, Face.KING);
@@ -126,9 +128,9 @@ public class FoundationTest {
         Foundation foundation1 = new Foundation();
 
 
-        foundation1.tempStack.push(tempCard);
+        tempStack.push(tempCard);
 
-        foundation1.whichSuit(foundation1.tempStack);
+        foundation1.whichSuit(tempStack);
         //WHEN
 
         Card expected = new Card(Suit.CLUBS, Face.ACE);
@@ -146,9 +148,9 @@ public class FoundationTest {
         Foundation foundation1 = new Foundation();
 
 
-        foundation1.tempStack.push(tempCard);
+        tempStack.push(tempCard);
 
-        foundation1.whichSuit(foundation1.tempStack);
+        foundation1.whichSuit(tempStack);
         //WHEN
 
         Card expected = new Card(Suit.DIAMONDS, Face.ACE);
@@ -166,9 +168,9 @@ public class FoundationTest {
         Foundation foundation1 = new Foundation();
 
 
-        foundation1.tempStack.push(tempCard);
+        tempStack.push(tempCard);
 
-        foundation1.whichSuit(foundation1.tempStack);
+        foundation1.whichSuit(tempStack);
         //WHEN
 
         Card expected = new Card(Suit.HEARTS, Face.ACE);
@@ -188,9 +190,9 @@ public class FoundationTest {
         Foundation foundation1 = new Foundation();
 
 
-        foundation1.tempStack.push(tempCard);
+        tempStack.push(tempCard);
 
-        foundation1.whichSuit(foundation1.tempStack);
+        foundation1.whichSuit(tempStack);
         //WHEN
 
         Card expected = new Card(Suit.SPADES, Face.ACE);

src/test/java/io/zipcoder/casino/CardGame/Solitaire/SolitaireTest.java

@@ -10,30 +10,30 @@ import static io.zipcoder.casino.CardGame.Card.toCard;
 public class SolitaireTest {
     Solitaire s = new Solitaire(new Player("Murphy"));
 
-    @Test
-    public void testfind() {
-        s.resetDeck();
-        s.tab1.add(toCard("Ace", "Hearts"));
-        s.tab2.add(toCard("five", "diamonds"));
-
-        System.out.println(s.findTab(toCard("Ace", "Hearts")).stack.peek());
-    }
-
-    @Test
-    public void testPull() {
-        s.resetDeck();
-        s.tab1.add(toCard("Ace", "Hearts"));
-        s.tab2.add(toCard("five", "diamonds"));
-
-        Integer preSize = s.tab1.size();
-        s.pull(toCard("Ace", "Hearts")); //main method tested
-        Integer postSize = s.tab1.size();
-
-        Integer actual = preSize - postSize;
-        Integer expected = 1;
-
-        Assert.assertEquals(expected, actual);
-    }
+//    @Test
+//    public void testfind() {
+//        s.resetDeck();
+//        s.tab1.add(toCard("Ace", "Hearts"));
+//        s.tab2.add(toCard("five", "diamonds"));
+//
+//        System.out.println(s.findTab(toCard("Ace", "Hearts")).stack.peek());
+//    }
+//
+//    @Test
+//    public void testPull() {
+//        s.resetDeck();
+//        s.tab1.add(toCard("Ace", "Hearts"));
+//        s.tab2.add(toCard("five", "diamonds"));
+//
+//        Integer preSize = s.tab1.size();
+//        s.pull(toCard("Ace", "Hearts")); //main method tested
+//        Integer postSize = s.tab1.size();
+//
+//        Integer actual = preSize - postSize;
+//        Integer expected = 1;
+//
+//        Assert.assertEquals(expected, actual);
+//    }
 
     @Test
     public void drawCard() {
@@ -46,7 +46,7 @@ public class SolitaireTest {
     public void pullFromWaste() {
         s.resetDeck();
         s.drawCard();
-        Card c = s.pullFromWaste().pop();
+        Card c = s.pickUp().pop();
         String actual = c.toString();
         String expected = "CLUBS-KING";
 
@@ -91,4 +91,9 @@ public class SolitaireTest {
         Assert.assertFalse(s.arrayTabs[5].stack.peek().isCovered());
         Assert.assertFalse(s.arrayTabs[6].stack.peek().isCovered());
     }
+
+    @Test
+    public void testStartGame() {
+        s.start();
+    }
 }

src/test/java/io/zipcoder/casino/CardGame/Solitaire/TableauTest.java

@@ -6,7 +6,7 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import static io.zipcoder.casino.CardGame.Card.toCard;
-import static io.zipcoder.casino.CardGame.Solitaire.Tableau.tempStack;
+import static io.zipcoder.casino.CardGame.Solitaire.Solitaire.tempStack;
 
 public class TableauTest {
 
@@ -36,7 +36,7 @@ public class TableauTest {
         stack1.add(testDeck.draw());
         stack1.add(testDeck.draw());
 
-        stack1.pull(toCard("Queen","Clubs"));
+        stack1.pull(toCard('Q', 'C'));
         Integer actual = tempStack.size();
         Integer expected = 3;
 
@@ -52,8 +52,8 @@ public class TableauTest {
         stack1.add(testDeck.draw());
         stack1.add(testDeck.draw());
 
-        stack2.add(toCard("King","Hearts"));
-        stack1.pull(toCard("Queen","Clubs"));
+        stack2.add(toCard('K', 'H'));
+        stack1.pull(toCard('Q', 'C'));
         stack2.place();
         Integer actual = stack2.size();
         Integer expected = 4;
@@ -70,8 +70,8 @@ public class TableauTest {
         stack1.add(testDeck.draw());
         stack1.add(testDeck.draw());
 
-        stack2.add(toCard("King","Hearts"));
-        stack1.pull(toCard("JACK","Clubs"));
+        stack2.add(toCard('K', 'H'));
+        stack1.pull(toCard('J', 'C'));
         stack2.place();
         Integer actual = stack2.size();
         Integer expected = 1;
@@ -85,7 +85,7 @@ public class TableauTest {
         stack1.add(testDeck.draw());
 
 
-        stack1.pull(toCard("KING","Clubs"));
+        stack1.pull(toCard('K', 'C'));
         stack2.place();
         Integer actual = stack2.size();
         Integer expected = 1;
@@ -107,9 +107,9 @@ public class TableauTest {
         for(Card c : stack1.stack) System.out.println("Stack 1 " + c.toString() + " " + c.isCovered());
         System.out.println("*******");
 
-        stack2.add(toCard("Queen","Hearts"));
+        stack2.add(toCard('Q', 'H'));
 
-        stack1.pull(toCard("Jack","Clubs"));
+        stack1.pull(toCard('J', 'C'));
         stack2.place();
 
 //        for(Card c : stack2.stack) System.out.println("Stack 2 " + c.toString() + " " + c.isCovered());
@@ -134,9 +134,9 @@ public class TableauTest {
         for(Card c : stack1.stack) System.out.println("Stack 1 " + c.toString() + " " + c.isCovered());
         System.out.println("\n** Before **** After **\n");
 
-        stack2.add(toCard("King","Hearts"));
+        stack2.add(toCard('K', 'H'));
 
-        stack1.pull(toCard("Queen","Clubs"));
+        stack1.pull(toCard('Q', 'C'));
         stack2.place();
 
 //        for(Card c : stack1.stack) System.out.println("Stack 1 " + c.toString() + " " + c.isCovered());

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

@@ -19,53 +19,99 @@ public class CrapsTest {
     }
 
     @Test
-    public void testGamePlay(){
-        game1.gamePlay();
+    public void testGamePlay(){ //*************
+        //game1.gamePlay();
     }
 
     @Test
-    public void testFirstRoll(){
+    public void testFirstRollPointer(){
+        // making sure that in first roll that result is pointer
+        game1.rollDice();
+        game1.setPointer(8);
+        int expected = 8;
+        int actual = game1.getPointer();
+
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testFirstRoll_Result(){
+        // making sure that in first roll that result is pointer
+        game1.firstRoll();
+        game1.setResult(5);
+        int expected = 5;
+        int actual = game1.getPointer();
+
+        Assert.assertEquals(expected, actual);
+    }
 
 
+    @Test
+    public void testFirstRoll_Win() {
+        // making sure that in first roll if 7 player wins
+        game1.firstRoll();
+        game1.setResult(7);
+        
+        int expected = 510;
+        int actual = Crappy.getWallet();
+        Assert.assertEquals(expected, actual);
+
     }
 
+
     @Test
     public void testRemainingRolls(){
+        // making sure that if remaining = pointer player wins
+        game1.setPointer(8);
+        //game1.remainingRolls();
+        game1.setResult(4);
+
 
     }
 
     @Test
-    public void testWin(){
+    public void testRemainingRolls_(){
+        // making sure that if remaining = !pointer keep rolling dice
+
 
     }
 
     @Test
-    public void testLose(){
+    public void testWin(){
+
 
     }
 
     @Test
-    public void testEnd(){
+    public void testLose(){
 
     }
 
     @Test
-    public void testGetPointer(){
+    public void testEnd(){ //**********************
+        String responce = "no";
 
     }
 
     @Test
-    public void testSetPointer(){
+    public void testAddPlayer(){
+        String expected = "Crappy";
+        String actual = Crappy.getName();
 
+        Assert.assertEquals(expected, actual);
     }
 
     @Test
-    public void testAddPlayer(){
+    public void testAddPlayer_(){
+        Player expected = Crappy;
+        Player actual = game1.getCrapsPlayer().getPlayer();
 
+        Assert.assertEquals(expected, actual);
     }
 
     @Test
-    public void testRemovePlayer(){
+    public void testRemovePlayer(){ //***************
+        game1.removePlayer(Crappy);
 
     }