Merge branch 'master' of nsatinover/ZCW-OOP-Casino into master

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

@@ -1,13 +1,104 @@
 package io.zipcoder.casino;
 
 public class Card {
-    private String suit;
+    private Suit suit;
+    private CardValue cardValue;
     private boolean isVisible;
-    private int value;
     private String name;
 
+    public Card (CardValue cardValue, Suit suit)
+    {
+        this.cardValue = cardValue;
+        this.suit = suit;
+        this.isVisible = false;
+        this.name = cardValue + " of " + suit;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public boolean isVisible() {
+        return isVisible;
+    }
+
+    public void setVisible(boolean visible) {
+        isVisible = visible;
+    }
+
     public void setVisibility(boolean visibility){
         isVisible = visibility;
     }
 
+    public Suit getSuit()
+    {
+        return suit;
+    }
+
+    public void setSuit(Suit suit)
+    {
+        this.suit = suit;
+    }
+
+    public CardValue getCardValue()
+    {
+        return cardValue;
+    }
+
+    public void setCardValue(CardValue cardValue)
+    {
+        this.cardValue = cardValue;
+    }
+
+    public enum CardValue
+    {
+        TWO(2),
+        THREE(3),
+        FOUR(4),
+        FIVE(5),
+        SIX(6),
+        SEVEN(7),
+        EIGHT(8),
+        NINE(9),
+        TEN(10),
+        JACK(11),
+        QUEEN(12),
+        KING(13),
+        ACE(14);
+
+        private int cardValue;
+
+        CardValue (int cardValue)
+        {
+            this.cardValue = cardValue;
+        }
+
+        public int getCardValue() {
+            return cardValue;
+        }
+    }
+
+    public enum Suit
+    {
+        HEARTS("HEARTS"),
+        SPADES("SPADES"),
+        CLUBS("CLUBS"),
+        DIAMONDS("DIAMONDS");
+
+        private String suitValue;
+
+        Suit (String suitValue)
+        {
+            this.suitValue = suitValue;
+        }
+
+        public String getSuitValue(){
+            return suitValue;
+        }
+
+    }
 }

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

@@ -4,5 +4,52 @@ import java.util.ArrayList;
 import java.util.Collections;
 
 public class Deck {
-    ArrayList<Card> cards = new ArrayList<Card>();
+    ArrayList<Card> deck;
+
+    /**
+     * Deck constructor will create an array of all 52 @Card 's
+     * Then, they are shuffled
+     */
+    public Deck(){
+        this.deck = new ArrayList<>();
+
+        for (int i = 0; i < 13; i++){
+            Card.CardValue value = Card.CardValue.values()[i];
+
+            for (int j = 0; j < 4; j++){
+                Card card = new Card(value, Card.Suit.values()[j]);
+                this.deck.add(card);
+            }
+        }
+
+        Collections.shuffle(deck);
+    }
+
+    /**
+     * Will retrieve a card at requested index, but will NOT REMOVE
+     * Likely just for testing
+     * @param index
+     * @return
+     */
+    public Card getCard(int index){
+        return this.deck.get(index);
+    }
+
+    /**
+     * Will retrieve AND REMOVE card from ZERO INDEX
+     * @return
+     */
+    public Card pullCard(){
+        Card tempCard = this.deck.remove(0);
+        return tempCard;
+    }
+
+    /**
+     * Used to retrieve the array with instantiated deck shuffled
+     * Will RETURN DECK
+     * @return
+     */
+    public ArrayList<Card> getDeck() {
+        return this.deck;
+    }
 }

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

@@ -0,0 +1,20 @@
+package io.zipcoder.casino;
+
+import org.junit.Test;
+
+public class CardTest {
+
+    @Test
+    public void createCard(){
+        Card card = new Card(Card.CardValue.TWO, Card.Suit.CLUBS);
+        System.out.println(card.getName());
+    }
+
+    @Test
+    public void createCard2(){
+        Card card = new Card(Card.CardValue.TWO, Card.Suit.CLUBS);
+        Card card1 = new Card(Card.CardValue.QUEEN, Card.Suit.HEARTS);
+        System.out.println(card.getName());
+        System.out.println(card1.getName());
+    }
+}

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

@@ -0,0 +1,32 @@
+package io.zipcoder.casino;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class DeckTest {
+
+    @Test
+    public void testDeck(){
+        //GIVEN
+        Deck deck = new Deck();
+        //WHEN
+        for (int i = 0; i < 52; i++){
+            System.out.println(deck.getCard(i).getName());
+        }
+
+        //THEN
+    }
+
+    @Test
+    public void pullCard(){
+        //GIVEN
+        Deck deck = new Deck();
+        //WHEN
+        String expected = deck.getCard(0).getName();
+        //THEN
+        Card testCard = deck.pullCard();
+        String actual = testCard.getName();
+
+        Assert.assertEquals(expected, actual);
+    }
+}