@@ -95,14 +95,11 @@ class PokerHand def four_of_a_kind? if (md = (by_face =~ /(.). \1. \1. \1./)) # get kicker - (md.pre_match + md.post_match).match(/(\S)/) - [ - [8, Card::face_value(md[1]), Card::face_value($1)], - arrange_hand(md) - ] - else - false + result = [8, Card::face_value(md[1])] + result << Card::face_value($1) if (md.pre_match + md.post_match).match(/(\S)/) + return [result, arrange_hand(md)] end + false end def full_house? lib/ruby-poker/poker_hand.rb @@ -5,12 +5,13 @@ class TestPokerHand < Test::Unit::TestCase context "A PokerHand instance" do setup do - @trips = PokerHand.new("2D 9C AS AH AC") - @pair = PokerHand.new("As Ac Kc Qd 2s") - @two_pair = PokerHand.new("As Ac Kc Kd 2s") + @quads = PokerHand.new('Kc Kh Kd Ks Qs') @full_boat = PokerHand.new(["2H", "2D", "4C", "4D", "4S"]) @flush = PokerHand.new("3D 6D 7D TD QD 5H 2S") @straight = PokerHand.new("8H 9D TS JH QC AS") + @trips = PokerHand.new("2D 9C AS AH AC") + @two_pair = PokerHand.new("As Ac Kc Kd 2s") + @pair = PokerHand.new("As Ac Kc Qd 2s") @ace_high = PokerHand.new("As Jh 9c 7d 5s") end @@ -19,18 +20,21 @@ class TestPokerHand < Test::Unit::TestCase end should "handle two card hands" do - p = PokerHand.new('As Ac') - assert_equal(p.rank, @pair.rank) + assert_equal(PokerHand.new('As Ac').rank, @pair.rank) end should "handle three card hands" do - p = PokerHand.new('As Ac Ah') - assert_equal(p.rank, @trips.rank) + assert_equal(PokerHand.new('As Ac Ah').rank, @trips.rank) end should "handle four card hands" do - p = PokerHand.new('As Ac Kd Kh') - assert_equal(p.rank, @two_pair.rank) + assert_equal(PokerHand.new('As Ac Kd Kh').rank, @two_pair.rank) + assert_equal(PokerHand.new('As Ac Ad Ah').rank, @quads.rank) + end + + should "handle lower case face card names" do + assert_equal(0, PokerHand.new('kc kd') <=> PokerHand.new('Kc Kd')) + assert_equal(0, PokerHand.new('kc kd') <=> PokerHand.new('Kc KD')) end # there are a lot of combinations that should be tested here. I will add more @@ -237,7 +241,6 @@ class TestPokerHand < Test::Unit::TestCase PokerHand.allow_duplicates = true end end - end end test/test_poker_hand.rb 66c507761a51d60b5cff6920b42564cdf12f3037 Jonathan Wilkins jwilkins@jwilkins-mbp.local http://github.com/robolson/ruby-poker/commit/38c94c98eeafbe3f7f9ce7327482742d925016fc 38c94c98eeafbe3f7f9ce7327482742d925016fc 2009-10-27T11:05:51-07:00 2009-10-27T11:05:51-07:00 handle 4 card hands for quads eb4e7d3a8fd48bea8cb6e0f3e7ed2c2f06f62a66 Jonathan Wilkins jwilkins@jwilkins-mbp.local