Added test for Exercise 12.3

knmenezes · knmenezes · commit dbf06136ef62 · 2021-06-23T01:26:09.000-06:00
diff --git a/ch12/Card.java b/ch12/Card.java
@@ -35,6 +35,10 @@ public int compareTo(Card that) {
             return 1;
         }
         if (this.rank < that.rank) {
+            if (this.rank == 1)    // Exercise 12.2
+            {
+                return 1;
+            }
             return -1;
         }
         if (this.rank > that.rank) {
diff --git a/ch12/Deck.java b/ch12/Deck.java
@@ -0,0 +1,68 @@
+public class Deck {
+
+    public static Card[] makeDeck()
+    {
+        Card[] newCardDeck = new Card[52];
+        int index = 0;
+        for (int suit = 0; suit < 4; suit ++)
+        {
+            for (int rank = 1; rank < 14; rank++)
+            {
+                newCardDeck[index++] = new Card(rank, suit);
+            }
+        }
+        return newCardDeck;
+    }
+
+    public static int[] suitHist(Card[] hand)
+    {
+        int[] suitHistogram = new int[4];
+        for (Card card: hand)
+        {
+            suitHistogram[card.getSuit()]++;
+        }
+        return suitHistogram;
+    }
+
+    public static boolean hasFlush(Card[] hand)
+    {
+        int[] suitHistogram = suitHist(hand);
+        for (int count : suitHistogram)
+        {
+            if (count >= 5) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static boolean hasRoyal(Card[] hand)
+    {
+        int[] suitHistogram = suitHist(hand);
+        for (int suit = 0; suit < 4; suit++)
+        {
+            int count = suitHistogram[suit];
+            if (count >= 5) {
+                int numRoyalCards = 0;
+                for (Card card: hand)
+                {
+                    if (card.getSuit() == suit
+                            && (card.getRank() >= 10 || card.getRank() == 1))
+                    {
+                        numRoyalCards++;
+                    }
+                }
+                if (numRoyalCards >= 5)
+                {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    public static void main(String[] args)
+    {
+        Card[] deck = makeDeck();
+    }
+}
diff --git a/ch12/PokerHandTest.java b/ch12/PokerHandTest.java
@@ -0,0 +1,82 @@
+import junit.framework.TestCase;
+import org.junit.Test;
+
+/**
+ * Class to test Exercise 12.3 Poker Hand
+ */
+public class PokerHandTest extends TestCase
+{
+    public void testPokerHand()
+    {
+        Card[] hand = new Card[9];
+
+        // No flush, no royal flush
+        hand[0] = new Card(1, 0);
+        hand[1] = new Card(2, 1);
+        hand[2] = new Card(3,2);
+        hand[3] = new Card(4, 3);
+
+        hand[4] = new Card(5, 0);
+        hand[5] = new Card(6, 1);
+        hand[6] = new Card(7,2);
+        hand[7] = new Card(8, 3);
+
+        hand[8] = new Card(9, 0);
+
+        int[] suitHistogram = Deck.suitHist(hand);
+
+        int[] expectedResult = {3, 2, 2, 2};
+        for(int i = 0; i < 4; i++) {
+            assertEquals(expectedResult[i], suitHistogram[i]);
+        }
+
+        System.out.println("Suit histogram test passes!");
+
+        boolean hasFlush = Deck.hasFlush(hand);
+        assertFalse(hasFlush);
+
+        System.out.println("No flush test passes!");
+
+        // Flush
+        hand[0] = new Card(1, 1);
+        hand[1] = new Card(2, 1);
+        hand[2] = new Card(3,1);
+        hand[3] = new Card(4, 3);
+
+        hand[4] = new Card(5, 0);
+        hand[5] = new Card(6, 1);
+        hand[6] = new Card(7,1);
+        hand[7] = new Card(8, 3);
+
+        hand[8] = new Card(9, 0);
+
+        hasFlush = Deck.hasFlush(hand);
+        assertTrue(hasFlush);
+
+        System.out.println("Has flush test passes!");
+
+        boolean hasRoyal = Deck.hasRoyal(hand);
+        assertFalse(hasRoyal);
+
+        System.out.println("No royal flush test passes!");
+
+        // Royal Flush
+        hand[0] = new Card(1, 1);
+        hand[1] = new Card(13, 1);
+        hand[2] = new Card(12,1);
+        hand[3] = new Card(11, 1);
+
+        hand[4] = new Card(10, 1);
+        hand[5] = new Card(6, 1);
+        hand[6] = new Card(7,1);
+        hand[7] = new Card(8, 3);
+
+        hand[8] = new Card(9, 0);
+
+        hasRoyal = Deck.hasRoyal(hand);
+        assertTrue(hasRoyal);
+
+        System.out.println("Has royal flush test passes!");
+
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,10 @@ public int compareTo(Card that) {`
`35`	`35`	`return 1;`
`36`	`36`	`}`
`37`	`37`	`if (this.rank < that.rank) {`
	`38`	`+ if (this.rank == 1) // Exercise 12.2`
	`39`	`+ {`
	`40`	`+ return 1;`
	`41`	`+ }`
`38`	`42`	`return -1;`
`39`	`43`	`}`
`40`	`44`	`if (this.rank > that.rank) {`