feature branch synched with team branch

pom.xml

@@ -7,6 +7,18 @@
     <groupId>io.zipcoder</groupId>
     <artifactId>casino</artifactId>
     <version>1.0-SNAPSHOT</version>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
     <dependencies>
         <dependency>

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

@@ -1,17 +0,0 @@
-package io.zipcoder.casino;
-
-import java.util.ArrayList;
-
-public class BlackJackPlayer extends Player {
-    public BlackJackPlayer(Wallet wallet, double bet) {
-        super(wallet, bet);
-    }
-
-    // private ArrayList  hand;
-
-
-
-
-}
-
-

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

@@ -0,0 +1,29 @@
+package io.zipcoder.casino;
+
+public class Card {
+    private Suit suit;
+    private Rank rank;
+
+    public Card(Suit suit,Rank rank)
+    {
+        this.suit = suit;
+        this.rank = rank;
+    }
+
+    public Card() {
+
+    }
+
+    public Suit getSuit() {
+        return suit;
+    }
+
+    public Rank getRank() {
+        return rank;
+    }
+
+    public int getValue()
+    {
+    return rank.getPrimaryValue();
+    }
+}

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

@@ -0,0 +1,26 @@
+package io.zipcoder.casino;
+
+import java.util.ArrayList;
+
+public class Dealer {
+    private double wallet;
+    private ArrayList<String> hand;
+    private double Bet;
+
+    public Dealer(double wallet, ArrayList<String>hand, double Bet)
+    {
+        this.wallet=wallet;
+        this.hand=hand;
+    }
+
+    public void Deal()
+    {
+
+    }
+
+    public void TakeBet()
+    {
+
+    }
+
+}

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

@@ -0,0 +1,34 @@
+package io.zipcoder.casino;
+
+import java.util.ArrayList;
+import java.util.Stack;
+
+
+public class Deck extends Card
+{
+    private ArrayList<Card> CardDeck;
+
+    public Deck(ArrayList<Card> CardDeck)
+    {
+        super();
+        this.CardDeck = CardDeck;
+    }
+
+    Stack<Card> tabledeck = new Stack<>();
+
+    public void PopulateDeck()
+    {
+        Deck newdeck = new Deck();
+
+        for(int i=0;i<=3;i++)
+        {
+            for(int j=0;j<13);
+            { newdeck.add()
+
+            }
+        }
+
+    }
+
+
+}

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

@@ -1,39 +0,0 @@
-package io.zipcoder.casino;
-
-public class Player {
-    private Wallet wallet;
-    private double bet;
-   // private  double hand;
-
-    public Player(Wallet wallet, double bet) {
-        this.bet = bet;
-        this.wallet=wallet;
-    }
-
-
-    public void play(){
-
-    }
-
-
-    public void bet (double money) {
-
-       this.bet = money;
-    }
-
-
-    public double getBet() {
-
-        return bet;
-    }
-
-    public void addWining(){
-
-        this.wallet.addMoney(bet);
-    }
-
-    public void subtractLoss ()
-    {
-        this.wallet.takeMoney(bet);
-    }
-}

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

@@ -0,0 +1,40 @@
+package io.zipcoder.casino;
+
+public enum Rank {
+    ACE(1, 11),
+    TWO(2),
+    THREE(3),
+    FOUR(4),
+    FIVE(5),
+    SIX(6),
+    SEVEN(7),
+    EIGHT(8),
+    NINE(9),
+    TEN(10),
+    JACK(10),
+    QUEEN(10),
+    KING(10);
+
+    private int primaryValue;
+    private int secondaryValue;
+
+    Rank(int primaryValue)
+    {
+        this.primaryValue = primaryValue;
+        this.secondaryValue = primaryValue;
+    }
+
+    Rank(int primaryValue, int secondaryValue)
+    {
+        this.primaryValue = primaryValue;
+        this.secondaryValue = secondaryValue;
+    }
+
+    public int getPrimaryValue() {
+        return primaryValue;
+    }
+
+    public int getSecondaryValue() {
+        return secondaryValue;
+    }
+}

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

@@ -0,0 +1,22 @@
+package io.zipcoder.casino;
+
+public enum Suit {
+    DIAMOND("♦"),
+    CLUBS("♣"),
+    SPADES("♠"),
+    HEART("♥");
+
+    private final String Symbol;
+
+    Suit(String Symbol)
+    {
+        this.Symbol = Symbol;
+    }
+
+    public String getSymbol()
+    {
+        return Symbol;
+    }
+
+
+}

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

@@ -1,38 +1,33 @@
 package io.zipcoder.casino;
 
 public class Wallet {
+
     private double money;
-    private  String id;
+    private String id;
 
-    public Wallet(double money, String id) {
-        this.money = money;
-        this.id = id;
+    public Wallet(id, money)
+    {
+        this.id=id;
+        this.money=money;
     }
 
+    public void IncreaseMoney()
+    (
 
-    public double getMoney() {
-
-        return money;
-    }
-
+            )
 
-    public String getId() {
+    public void DecreaseMoney()
+    {
 
-        return id;
     }
 
-    public void setId(String id) {
+    public String getId()
+    {
 
-        this.id = id;
     }
 
-    public void addMoney(double amount){
-        money += amount;
-
-
-    }
-    public void takeMoney(double amount){
+    public void Setid()
+    {
 
-        money -= amount;
     }
 }

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

@@ -1,5 +1,12 @@
 package io.zipcoder.casino;
 
 
+import org.junit.Test;
+
 public class CasinoTest {
-}
+    @Test
+    public CardTest() {
+        Card newcard = new Card(Suit.HEART, Rank.TWO);
+        System.out.println(newcard);
+    }
+}

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

@@ -1,8 +0,0 @@
-package io.zipcoder.casino;
-
-import org.junit.Test;
-
-public class TestPlayer {
-    @Test
-    public
-}

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

@@ -1,79 +0,0 @@
-package io.zipcoder.casino;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-public class TestWallet {
-
-    @Test
-    public void getBalance(){
-        Wallet wallet= new Wallet(0.0, "Nury H.");
-        //given
-       double amount = 100;
-       wallet.addMoney(amount);
-       //when
-        double actual = wallet.getMoney();
-        //then
-        Assert.assertEquals(amount, actual, 0.0);
-
-       }
-
-
-
-    @Test
-    public void testGetId(){
-        //given
-        Wallet wallet= new Wallet(0.0, "Nury H.");
-        String expected = "Nury H.";
-
-        //when
-        String actual = wallet.getId();
-        //then
-        Assert.assertEquals(expected, actual);
-
-    }
-
-
-    @Test
-    public void testSetid(){
-        //given
-        Wallet wallet= new Wallet(0.0, "Nury H.");
-        wallet.setId("Dayhani");
-
-        //when
-        String actual = wallet.getId();
-        //then
-        Assert.assertEquals("Dayhani", actual);
-
-    }
-
-    @Test
-    public void addMoney(){
-        Wallet wallet= new Wallet(100.00, "Nury H.");
-        //given
-        double amount = 100.00;
-        wallet.addMoney(amount);
-        //when
-        double actual = wallet.getMoney();
-        //then
-        Assert.assertEquals(200.00, actual,0.01);
-
-    }
-
-    @Test
-    public void takeMoney(){
-        Wallet wallet= new Wallet(230.00, "Nury H.");
-        //given
-        double amount = 75.00;
-        wallet.takeMoney(amount);
-        //when
-        double actual = wallet.getMoney();
-        //then
-        Assert.assertEquals(155.00, actual, 0.01);
-
-    }
-
-
-
-
-}