Explorar el Código

updated dealer and hand

Jacob Andersen hace 6 años
padre
commit
f25257ce8a

+ 14
- 10
src/main/java/io/zipcoder/casino/Dealer.java Ver fichero

@@ -6,6 +6,7 @@ import java.util.logging.Handler;
6 6
 
7 7
 public class Dealer{
8 8
     private Deck deck;
9
+    private Wallet dealerwallet;
9 10
 
10 11
     public Dealer(Deck deck) {
11 12
         this.deck = deck;
@@ -18,26 +19,29 @@ public class Dealer{
18 19
  //       this.dealerhand = dealerhand;
19 20
   //  }
20 21
 
22
+    BlackJackPlayer dealer = new BlackJackPlayer(new Wallet(0, ""),0);
23
+    BlackJackPlayer player = new BlackJackPlayer(new Wallet(0,""),0);
24
+
21 25
     Hand dealerhand = new Hand(null);
22 26
     Hand playerhand = new Hand(null);
23 27
 
24
-    public void Deal(BlackJackPlayer p) {
25
-//        p.getHand().addCard(deck.pop())
26
-
28
+    public void Deal(BlackJackPlayer p)
29
+    {
30
+        p.getHand().add(deck.dealCard());
27 31
     }
28 32
 
29
-    public void DealersTurn() {
30
-        while (dealerhand.getValue() < 17) {
31
-//            this.dealerhand.add(dealCard());
33
+    public void DealersTurn(BlackJackPlayer dealer, BlackJackPlayer player) {
34
+        while (dealer.getHand().getValue() < 17) {
35
+            Deal(dealer);
32 36
         }
33
-        int playervalue = playerhand.getValue();
34
-        int dealervalue = dealerhand.getValue();
37
+        int playervalue = player.getHand().getValue();
38
+        int dealervalue = dealer.getHand().getValue();
35 39
 
36 40
         if (playervalue > dealervalue) {
37
-//            wallet.addMoney(wallet.getMoney());// player WON
41
+           player.addWining();// player WON
38 42
             // add bet to players wallet
39 43
         } else {
40
-//            wallet.takeMoney(wallet.getMoney());
44
+            player.subtractLoss();
41 45
             // player LOST
42 46
             //takeMoney(getBet()); // from players wallet
43 47
         }

+ 5
- 0
src/test/java/io/zipcoder/casino/HandTest.java Ver fichero

@@ -1,5 +1,6 @@
1 1
 package io.zipcoder.casino;
2 2
 
3
+import org.junit.Assert;
3 4
 import org.junit.Test;
4 5
 
5 6
 import java.util.ArrayList;
@@ -12,5 +13,9 @@ public class HandTest {
12 13
         Hand hand = new Hand(new ArrayList<>());
13 14
 
14 15
         hand.add(card);
16
+
17
+        int expected = 5;
18
+        int actual = hand.getValue();
19
+        Assert.assertEquals(expected,actual);
15 20
     }
16 21
 }