erge branch 'feat/player_wallet' into feat/dev

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

@@ -4,53 +4,40 @@ import java.util.ArrayList;
 import java.util.logging.Handler;
 
 
-public class Dealer extends Deck{
+public class Dealer{
+    private Deck deck;
 
-   // private ArrayList<Card> playerhand;
+    public Dealer(Deck deck) {
+        this.deck = deck;
+    }
+
+    // private ArrayList<Card> playerhand;
    // private ArrayList<Card> dealerhand;
 
  //   public Dealer(ArrayList<Card> dealerhand) {
  //       this.dealerhand = dealerhand;
   //  }
 
-    Hand dealerhand = new Hand();
-    Hand playerhand = new Hand();
-    Wallet wallet = new Wallet (1000,"Player");
-
-    public void Deal() {
-        this.playerhand.add(dealCard());
-        this.playerhand.add(dealCard());
-        this.dealerhand.add(dealCard());
-        this.dealerhand.add(dealCard());
-    }
+    Hand dealerhand = new Hand(null);
+    Hand playerhand = new Hand(null);
 
-<<<<<<< HEAD
-=======
-    public int getValueOfHand(ArrayList<Card> hand)
-    {
-        int value=0;
-        for (int i=0; i<hand.size();i++)
-        {
-            value+=hand.get(i).getValue();
+    public void Deal(BlackJackPlayer p) {
+//        p.getHand().addCard(deck.pop())
 
-        }
-        return value;
     }
 
-
->>>>>>> feat/deckandcard
     public void DealersTurn() {
         while (dealerhand.getValue() < 17) {
-            this.dealerhand.add(dealCard());
+//            this.dealerhand.add(dealCard());
         }
         int playervalue = playerhand.getValue();
         int dealervalue = dealerhand.getValue();
 
         if (playervalue > dealervalue) {
-            wallet.addMoney(wallet.getMoney());// player WON
+//            wallet.addMoney(wallet.getMoney());// player WON
             // add bet to players wallet
         } else {
-            wallet.takeMoney(wallet.getMoney());
+//            wallet.takeMoney(wallet.getMoney());
             // player LOST
             //takeMoney(getBet()); // from players wallet
         }

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

@@ -6,9 +6,9 @@ import java.util.List;
 public class Hand {
     private ArrayList<Card> list;
 
-    public Hand()
+    public Hand(ArrayList<Card>list)
     {
-
+    this.list = list;
     }
 
     public void add(Card card) {

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

@@ -3,4 +3,5 @@ package io.zipcoder.casino;
 public class DealerTest {
 
 
+
 }

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

@@ -0,0 +1,16 @@
+package io.zipcoder.casino;
+
+import org.junit.Test;
+
+import java.util.ArrayList;
+
+public class HandTest {
+    @Test
+    public void testHand()
+    {
+        Card card = new Card(Suit.HEART,Rank.FIVE);
+        Hand hand = new Hand(new ArrayList<>());
+
+        hand.add(card);
+    }
+}