Merge branch 'master' of demetrm/Casino into master

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

@@ -2,15 +2,57 @@ package io.zipcoder.casino.CardGame;
 
 public class Card {
 
-    private String suit;
-    private String color;
-    private String face;
+    private Suit suit;
+    private boolean isBlack;
+    private Face face;
     private boolean covered;
 
+    public Card(Suit suit, Face face){
+        this.suit = suit;
+        this.face = face;
+    }
+
+    public Suit getSuit() {
+        return suit;
+    }
+
+    public void setSuit(Suit suit) {
+        this.suit = suit;
+    }
+
+    public boolean isBlack() {
+        return isBlack;
+    }
+
+    public void setBlack(boolean black) {
+        isBlack = black;
+    }
+
+    public Face getFace() {
+        return face;
+    }
+
+    public void setFace(Face face) {
+        this.face = face;
+    }
+
+    public boolean isCovered() {
+        return covered;
+    }
+
+    public void setCovered(boolean covered) {
+        this.covered = covered;
+    }
+
     public Card drawCard() {
         return null;
     }
 
     public void shuffleDeck() {
     }
+
+    @Override
+    public String toString(){
+        return suit + "-" + face;
+    }
 }

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

@@ -1,10 +1,33 @@
 package io.zipcoder.casino.CardGame;
 
+import java.util.Collections;
+import java.util.Stack;
+
 public class Deck {
 
-        private Card[] deckOfCards = new Card[52];
-        // needs 1-13 of each suit
-        // assign each index to a specific card,
-        // e.g. 0-12 = spades; 13-25 = clubs; 26-38 = hearts; 39-51 = diamonds
+    public Stack<Card> deckOfCards = new Stack<Card>();
+
+    public void shuffle(){
+        Collections.shuffle(deckOfCards);
+    }
+
+    public Card draw(){
+       return deckOfCards.pop();
+    }
+
+    public Card flip(){
+        return deckOfCards.peek();
+    }
+
+    // needs 1-13 of each suit
+    // assign each index to a specific card,
+    // e.g. 0-12 = spades; 13-25 = clubs; 26-38 = hearts; 39-51 = diamonds
 
+    public Deck() {
+        for (Suit suit : Suit.values()) {
+            for (Face face : Face.values()) {
+                deckOfCards.push(new Card(suit, face));
+            }
+        }
+    }
 }

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

@@ -0,0 +1,24 @@
+package io.zipcoder.casino.CardGame;
+
+public enum Face {
+
+    ACE(1),
+    TWO(2),
+    THREE(3),
+    FOUR(4),
+    FIVE(5),
+    SIX(6),
+    SEVEN(7),
+    EIGHT(8),
+    NINE(9),
+    TEN(10),
+    JACK(11),
+    QUEEN(12),
+    KING(13);
+
+    private int value;
+
+    private Face(int value) {
+        this.value = value;
+    }
+}

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

@@ -3,32 +3,32 @@ package io.zipcoder.casino.CardGame.Solitaire;
 import io.zipcoder.casino.CardGame.Card;
 import io.zipcoder.casino.CardGame.CardGame;
 import io.zipcoder.casino.Player;
-
-public class Solitaire extends CardGame {
-
-    private Player player;
-    private Tableau tableau;
-    private Foundation foundation;
-    private java.util.Stack wastepile;
-
-
-    public Solitaire(Player player) {
-        this.player = player;
-    }
-
-    public void moveable() {
-    }
-
-    public void receivable() {
-    }
-
-    public Card draw() {
-        return null;
-    }
-
-    public void flip() {
-        // shoulder technically be card.setCovered(false); or something like that
-        boolean covered = false;
-    }
-
-}
+//
+//public class Solitaire extends CardGame {
+//
+//    private Player player;
+//    private Tableau tableau;
+//    private Foundation foundation;
+//    private java.util.Stack wastepile;
+//
+//
+//    public Solitaire(Player player) {
+//        this.player = player;
+//    }
+//
+//    public void moveable() {
+//    }
+//
+//    public void receivable() {
+//    }
+//
+//    public Card draw() {
+//        return null;
+//    }
+//
+//    public void flip() {
+//        // shoulder technically be card.setCovered(false); or something like that
+//        boolean covered = false;
+//    }
+//
+//}

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

@@ -0,0 +1,11 @@
+package io.zipcoder.casino.CardGame;
+
+public enum Suit {
+    HEARTS,
+    SPADES,
+    DIAMONDS,
+    CLUBS;
+
+    private Suit() {
+    }
+}

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

@@ -7,42 +7,42 @@ package io.zipcoder.casino;
 // Slot Machine?
 
 // Jackpot option? Low chance but player wins $1mil
-
-import io.zipcoder.casino.CardGame.BlackJack.BlackJack;
-import io.zipcoder.casino.DiceGame.Craps.Craps;
-import io.zipcoder.casino.CardGame.Solitaire.Solitaire;
-import io.zipcoder.casino.Interfaces.Game;
-
-public class Casino {
-
-    private int money;
-    private String casinoName;
-    private Game game;
-    private Player player;
-    private String currentGame;
-
-    public void selectGame(int gameNum) {
-
-        switch (gameNum) {
-            case 1:
-                Game blackJack = new BlackJack(player);
-                break;
-            case 2:
-                Game solitaire = new Solitaire(player);
-                break;
-            case 3:
-                Game craps = new Craps(player);
-                break;
-            case 4:
-                leaveCasino();
-                break;
-            default:
-                System.out.println("Input unknown, please pick again.");
-                break;
-        }
-    }
-
-    public void leaveCasino() {
-    }
-
-}
+//
+//import io.zipcoder.casino.CardGame.BlackJack.BlackJack;
+//import io.zipcoder.casino.DiceGame.Craps.Craps;
+//import io.zipcoder.casino.CardGame.Solitaire.Solitaire;
+//import io.zipcoder.casino.Interfaces.Game;
+//
+//public class Casino {
+//
+//    private int money;
+//    private String casinoName;
+//    private Game game;
+//    private Player player;
+//    private String currentGame;
+//
+//    public void selectGame(int gameNum) {
+//
+//        switch (gameNum) {
+//            case 1:
+//                Game blackJack = new BlackJack(player);
+//                break;
+//            case 2:
+//                Game solitaire = new Solitaire(player);
+//                break;
+//            case 3:
+//                Game craps = new Craps(player);
+//                break;
+//            case 4:
+//                leaveCasino();
+//                break;
+//            default:
+//                System.out.println("Input unknown, please pick again.");
+//                break;
+//        }
+//    }
+//
+//    public void leaveCasino() {
+//    }
+//
+//}

src/test/java/io/zipcoder/casino/CardGame/DeckTest.java

@@ -0,0 +1,47 @@
+package io.zipcoder.casino.CardGame;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class DeckTest {
+
+    Deck deck = new Deck();
+
+    @Test
+    public void testDeck() {
+        String actual = deck.deckOfCards.get(0).toString();
+        String expected = "HEARTS-ACE";
+
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testShuffle() {
+        deck.shuffle();
+        String actual = deck.deckOfCards.get(0).toString();
+        String expected = "HEARTS-ACE";
+
+        Assert.assertNotEquals(expected, actual);
+
+        String actual1 = deck.deckOfCards.get(1).toString();
+        String expected1 = "HEARTS-TWO";
+
+        Assert.assertNotEquals(expected1, actual1);
+    }
+
+    @Test
+    public void testDeck3() {
+        Deck deck2 = new Deck();
+        for (Card c : deck2.deckOfCards) {
+            System.out.println(c.toString());
+        }
+
+        deck2.shuffle();
+        System.out.println("*******");
+        for (Card c : deck2.deckOfCards) {
+            System.out.println(c.toString());
+        }
+    }
+}