ソースを参照

dealer and handtest updated

Jacob Andersen 6 年 前
コミット
091f8f41f8
共有2 個のファイルを変更した27 個の追加6 個の削除を含む
  1. 6
    6
      src/main/java/io/zipcoder/casino/Dealer.java
  2. 21
    0
      src/test/java/io/zipcoder/casino/HandTest.java

+ 6
- 6
src/main/java/io/zipcoder/casino/Dealer.java ファイルの表示

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

+ 21
- 0
src/test/java/io/zipcoder/casino/HandTest.java ファイルの表示

@@ -18,4 +18,25 @@ public class HandTest {
18 18
         int actual = hand.getValue();
19 19
         Assert.assertEquals(expected,actual);
20 20
     }
21
+    @Test
22
+    public void testHandSize()
23
+    {
24
+        Card card1 = new Card(Suit.HEART,Rank.THREE);
25
+        Card card2 = new Card(Suit.CLUBS,Rank.FIVE);
26
+        Card card3 = new Card(Suit.SPADES,Rank.FOUR);
27
+        Card card = new Card(Suit.DIAMOND,Rank.TWO);
28
+
29
+        Hand hand = new Hand(new ArrayList<>());
30
+
31
+        hand.add(card);
32
+        hand.add(card1);
33
+        hand.add(card2);
34
+        hand.add(card3);
35
+
36
+        int expected =4;
37
+        int actual = hand.size();
38
+
39
+        Assert.assertEquals(expected,actual);
40
+    }
41
+    @Test
21 42
 }