RubyGems - acpc_poker_types - Versions diffs - 0.0.10 → 1.0.0 - Mend

acpc_poker_types 0.0.10 → 1.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (41) hide show

checksums.yaml +4 -4
data/Rakefile +7 -4
data/acpc_poker_types.gemspec +4 -2
data/lib/acpc_poker_types.rb +13 -12
data/lib/acpc_poker_types/acpc_dealer_data.rb +9 -0
data/lib/acpc_poker_types/acpc_dealer_data/action_messages.rb +133 -0
data/lib/acpc_poker_types/acpc_dealer_data/hand_data.rb +182 -0
data/lib/acpc_poker_types/acpc_dealer_data/hand_results.rb +79 -0
data/lib/acpc_poker_types/acpc_dealer_data/log_file.rb +5 -0
data/lib/acpc_poker_types/acpc_dealer_data/match_definition.rb +54 -0
data/lib/acpc_poker_types/acpc_dealer_data/poker_match_data.rb +393 -0
data/lib/acpc_poker_types/board_cards.rb +4 -4
data/lib/acpc_poker_types/card.rb +16 -16
data/lib/acpc_poker_types/chip_stack.rb +1 -1
data/lib/acpc_poker_types/game_definition.rb +34 -38
data/lib/acpc_poker_types/hand.rb +5 -5
data/lib/acpc_poker_types/match_state.rb +31 -32
data/lib/acpc_poker_types/pile_of_cards.rb +1 -1
data/lib/acpc_poker_types/player.rb +16 -15
data/lib/acpc_poker_types/poker_action.rb +6 -6
data/lib/acpc_poker_types/rank.rb +2 -2
data/lib/acpc_poker_types/suit.rb +4 -4
data/lib/acpc_poker_types/version.rb +1 -1
data/spec/action_messages_spec.rb +450 -0
data/spec/board_cards_spec.rb +9 -9
data/spec/card_spec.rb +20 -20
data/spec/chip_stack_spec.rb +28 -29
data/spec/game_definition_spec.rb +11 -11
data/spec/hand_data_spec.rb +295 -0
data/spec/hand_results_spec.rb +292 -0
data/spec/hand_spec.rb +11 -11
data/spec/match_definition_spec.rb +95 -0
data/spec/match_state_spec.rb +105 -287
data/spec/pile_of_cards_spec.rb +14 -14
data/spec/player_spec.rb +61 -61
data/spec/poker_action_spec.rb +49 -49
data/spec/poker_match_data_spec.rb +388 -0
data/spec/rank_spec.rb +19 -19
data/spec/suit_spec.rb +19 -19
data/spec/support/spec_helper.rb +28 -6
metadata +55 -10

data/spec/poker_match_data_spec.rb ADDED

@@ -0,0 +1,388 @@
+# Spec helper (must include first to track code coverage with SimpleCov)
+require_relative 'support/spec_helper'
+require 'mocha/setup'
+require 'acpc_dealer'
+require 'acpc_poker_types/match_state'
+require 'acpc_poker_types/poker_action'
+require 'acpc_poker_types/acpc_dealer_data/hand_data'
+require 'acpc_poker_types/acpc_dealer_data/match_definition'
+require 'acpc_poker_types/acpc_dealer_data/poker_match_data'
+describe AcpcPokerTypes::AcpcDealerData::PokerMatchData do
+  before do
+    @patient = nil
+    @chip_distribution = nil
+    @match_def = nil
+    @match_def_line_index = nil
+    @player_names = nil
+    @hand_number = nil
+    @hand_data_list = nil
+    @final_hand = nil
+    @no_chip_distribution = false
+  end
+  describe 'when given action and result messages' do
+    describe 'raises an exception if' do
+      it 'match definitions do not match' do
+        init_data! do |action_messages, result_messages|
+          new_action_messages = action_messages.dup
+          new_action_messages[@match_def_line_index] = '# name/game/hands/seed different_name holdem.limit.2p.reverse_blinds.game 2 0\n'
+          ->() do
+            AcpcPokerTypes::AcpcDealerData::PokerMatchData.parse(
+              new_action_messages,
+              result_messages,
+              @player_names,
+              AcpcDealer::DEALER_DIRECTORY
+            )
+          end.must_raise AcpcPokerTypes::AcpcDealerData::PokerMatchData::MatchDefinitionsDoNotMatch
+          new_result_messages = result_messages.dup
+          new_result_messages[@match_def_line_index] = '# name/game/hands/seed different_name holdem.limit.2p.reverse_blinds.game 2 0\n'
+          ->() do
+            AcpcPokerTypes::AcpcDealerData::PokerMatchData.parse(
+              action_messages,
+              new_result_messages,
+              @player_names,
+              AcpcDealer::DEALER_DIRECTORY
+            )
+          end.must_raise AcpcPokerTypes::AcpcDealerData::PokerMatchData::MatchDefinitionsDoNotMatch
+        end
+      end
+      it 'the final scores from each set of messages do not match' do
+        init_data! do |action_messages, result_messages|
+          new_action_messages = action_messages.dup
+          new_action_messages.pop
+          new_action_messages.pop
+          new_action_messages << 'SCORE:9001|-9001:p1|p2'
+          ->() do
+            AcpcPokerTypes::AcpcDealerData::PokerMatchData.parse(
+              new_action_messages,
+              result_messages,
+              @player_names,
+              AcpcDealer::DEALER_DIRECTORY
+            )
+          end.must_raise AcpcPokerTypes::AcpcDealerData::PokerMatchData::FinalScoresDoNotMatch
+          new_result_messages = result_messages.dup
+          new_result_messages.pop
+          new_result_messages.pop
+          new_result_messages << 'SCORE:9001|-9001:p1|p2'
+          ->() do
+            AcpcPokerTypes::AcpcDealerData::PokerMatchData.parse(
+              action_messages,
+              new_result_messages,
+              @player_names,
+              AcpcDealer::DEALER_DIRECTORY
+            )
+          end.must_raise AcpcPokerTypes::AcpcDealerData::PokerMatchData::FinalScoresDoNotMatch
+        end
+      end
+    end
+    describe 'works properly' do
+      it 'for every hand' do
+        init_data! do |action_messages, result_messages|
+          @patient = AcpcPokerTypes::AcpcDealerData::PokerMatchData.parse(
+            action_messages,
+            result_messages,
+            @player_names,
+            AcpcDealer::DEALER_DIRECTORY
+          )
+          @patient.seat = 0
+          @hand_number = 0
+          @patient.for_every_hand! do
+            @turn_number = 0
+            @final_hand = @hand_number >= @hand_data_list.length - 1
+            @patient.for_every_turn! do
+              check_patient
+              @turn_number += 1
+            end
+            @hand_number += 1
+          end
+        end
+      end
+      it 'for a particular number of hands' do
+        num_hands = 1
+        @no_chip_distribution = true
+        init_data!(num_hands) do |action_messages, result_messages|
+          @chip_distribution = nil
+          @patient = AcpcPokerTypes::AcpcDealerData::PokerMatchData.parse(
+            action_messages,
+            result_messages,
+            @player_names,
+            AcpcDealer::DEALER_DIRECTORY,
+            num_hands
+          )
+          @patient.seat = 0
+          @hand_number = 0
+          @patient.for_every_hand! do
+            @turn_number = 0
+            @final_hand = @hand_number >= @hand_data_list.length - 1
+            @patient.for_every_turn! do
+              check_patient
+              @turn_number += 1
+            end
+            @hand_number += 1
+          end
+        end
+      end
+    end
+  end
+  describe '#player_acting_sequence' do
+    describe "doesn't append an empty array to the list when no players are active" do
+      it 'in two player' do
+        action_messages =
+          "# name/game/hands/seed 2p.limit.h1000.r0 holdem.limit.2p.reverse_blinds.game 1 0
+          #--t_response 600000
+          #--t_hand 600000
+          #--t_per_hand 7000
+          STARTED at 1341695999.222081
+          TO 1 at 1341695999.222281 MATCHSTATE:0:0::5d5c|
+          TO 2 at 1341695999.222349 MATCHSTATE:1:0::|9hQd
+          FROM 2 at 1341695999.222281 MATCHSTATE:0:0::5d5c|:c
+          TO 1 at 1341695999.222281 MATCHSTATE:0:0:c:5d5c|
+          TO 2 at 1341695999.222349 MATCHSTATE:1:0:c:|9hQd
+          FROM 1 at 1341695999.222349 MATCHSTATE:1:0:cr:|9hQd:r
+          TO 1 at 1341695999.222281 MATCHSTATE:0:0:cr:5d5c|
+          TO 2 at 1341695999.222349 MATCHSTATE:1:0:cr:|9hQd
+          FROM 2 at 1341695999.222281 MATCHSTATE:0:0:cr:5d5c:f
+          TO 1 at 1341695999.222281 MATCHSTATE:0:0:crf:5d5c|
+          TO 2 at 1341695999.222349 MATCHSTATE:1:0:crf:|9hQd
+          SCORE:-20|20:p1|p2".split("\n").map {|line| line += "\n" }
+        result_messages = [
+          "# name/game/hands/seed 2p.limit.h1000.r0 holdem.limit.2p.reverse_blinds.game 1 0\n",
+          "#--t_response 600000\n",
+          "#--t_hand 600000\n",
+          "#--t_per_hand 7000\n",
+          "STATE:0:crf:5d5c|9hQd:-20|20:p1|p2\n",
+          'SCORE:-20|20:p1|p2'
+        ]
+        player_acting_sequence = [[1, 0, 1]]
+        @patient = AcpcPokerTypes::AcpcDealerData::PokerMatchData.parse(
+          action_messages,
+          result_messages,
+          ['p1', 'p2'],
+          AcpcDealer::DEALER_DIRECTORY
+        )
+        @patient.hand_number = 0
+        @patient.current_hand.turn_number = 3
+        @patient.player_acting_sequence.must_equal player_acting_sequence
+      end
+      it 'in three player' do
+        action_messages =
+          "# name/game/hands/seed 3p.limit.h1000.r0 holdem.limit.3p.game 1 0
+          #--t_response 600000
+          #--t_hand 600000
+          #--t_per_hand 7000
+          STARTED at 1341695999.222081
+          TO 1 at 1341695999.222281 MATCHSTATE:0:0::5d5c||
+          TO 2 at 1341695999.222349 MATCHSTATE:1:0::|9hQd|
+          TO 3 at 1341695999.222349 MATCHSTATE:3:0::||9cQh
+          FROM 1 at 1341695999.222281 MATCHSTATE:0:0::5d5c||:r
+          TO 1 at 1341695999.222281 MATCHSTATE:0:0:r:5d5c||
+          TO 2 at 1341695999.222349 MATCHSTATE:1:0:r:|9hQd|
+          TO 3 at 1341695999.222349 MATCHSTATE:3:0:r:||9cQh
+          FROM 2 at 1341695999.222349 MATCHSTATE:1:0:r:|9hQd|:f
+          TO 1 at 1341695999.222281 MATCHSTATE:0:0:rf:5d5c||
+          TO 2 at 1341695999.222349 MATCHSTATE:1:0:rf:|9hQd|
+          TO 3 at 1341695999.222349 MATCHSTATE:3:0:rf:||9cQh
+          FROM 3 at 1341695999.222349 MATCHSTATE:3:0:rf:||9cQh:f
+          TO 1 at 1341695999.222281 MATCHSTATE:0:0:rff:5d5c||
+          TO 2 at 1341695999.222349 MATCHSTATE:1:0:rff:|9hQd|
+          TO 3 at 1341695999.222349 MATCHSTATE:3:0:rff:||9cQh
+          SCORE:20|-20|-20:p1|p2|p3".split("\n").map {|line| line += "\n" }
+        result_messages = [
+          "# name/game/hands/seed 3p.limit.h1000.r0 holdem.limit.3p.game 1 0\n",
+          "#--t_response 600000\n",
+          "#--t_hand 600000\n",
+          "#--t_per_hand 7000\n",
+          "STATE:0:cff:5d5c|9hQd|9cQh:20|-20|-20:p1|p2|p3\n",
+          'SCORE:20|-20|-20:p1|p2|p3'
+        ]
+        player_acting_sequence = [[0, 1, 2]]
+        @patient = AcpcPokerTypes::AcpcDealerData::PokerMatchData.parse(
+          action_messages,
+          result_messages,
+          ['p1', 'p2', 'p3'],
+          AcpcDealer::DEALER_DIRECTORY
+        )
+        @patient.hand_number = 0
+        @patient.current_hand.turn_number = 3
+        @patient.player_acting_sequence.must_equal player_acting_sequence
+      end
+    end
+  end
+  def check_patient
+    @patient.match_def.must_equal @match_def
+    @patient.chip_distribution.must_equal @chip_distribution unless @no_chip_distribution
+    @patient.hand_number.must_equal @hand_number
+    @patient.current_hand.must_equal @hand_data_list[@hand_number]
+    @patient.final_hand?.must_equal @final_hand
+    @patient.player_acting_sequence.must_equal @player_acting_sequences[@hand_number] if @turn_number + 1 == @hand_data_list[@hand_number].data.length
+  end
+  def init_data!(num_hands=nil)
+    data.each do |game, data_hash|
+      @chip_distribution = data_hash[:chip_distribution]
+      @match_def_line_index = data_hash[:match_def_line_index]
+      @player_names = data_hash[:player_names]
+      @match_def = AcpcPokerTypes::AcpcDealerData::MatchDefinition.parse(
+        data_hash[:result_messages][@match_def_line_index],
+        @player_names,
+        AcpcDealer::DEALER_DIRECTORY
+      )
+      init_expected!(data_hash, num_hands, @match_def)
+      @player_acting_sequences = data_hash[:player_acting_sequences]
+      yield data_hash[:action_messages], data_hash[:result_messages]
+    end
+    self
+  end
+  def init_expected!(data_hash, num_hands=nil, match_def=@match_def)
+    action_messages = AcpcPokerTypes::AcpcDealerData::ActionMessages.parse(
+      data_hash[:action_messages],
+      @player_names,
+      AcpcDealer::DEALER_DIRECTORY,
+      num_hands
+    )
+    result_messages = AcpcPokerTypes::AcpcDealerData::HandResults.parse(
+      data_hash[:result_messages],
+      @player_names,
+      AcpcDealer::DEALER_DIRECTORY,
+      num_hands
+    )
+    @hand_data_list = []
+    action_messages.data.zip(result_messages.data)
+      .each do |action_messages_by_hand, hand_result|
+      @hand_data_list << AcpcPokerTypes::AcpcDealerData::HandData.new(
+        match_def,
+        action_messages_by_hand,
+        hand_result
+      )
+    end
+    self
+  end
+  def data
+    {
+      two_player_limit: {
+        action_messages:
+          "# name/game/hands/seed 2p.limit.h1000.r0 holdem.limit.2p.reverse_blinds.game 2 0
+          #--t_response 600000
+          #--t_hand 600000
+          #--t_per_hand 7000
+          STARTED at 1341695999.222081
+          TO 1 at 1341695999.222281 MATCHSTATE:0:0::5d5c|
+          TO 2 at 1341695999.222349 MATCHSTATE:1:0::|9hQd
+          FROM 2 at 1341695999.222410 MATCHSTATE:1:0::|9hQd:c
+          TO 1 at 1341695999.222450 MATCHSTATE:0:0:c:5d5c|
+          TO 2 at 1341695999.222496 MATCHSTATE:1:0:c:|9hQd
+          FROM 1 at 1341695999.222519 MATCHSTATE:0:0:c:5d5c|:c
+          TO 1 at 1341695999.222546 MATCHSTATE:0:0:cc/:5d5c|/8dAs8s
+          TO 2 at 1341695999.222583 MATCHSTATE:1:0:cc/:|9hQd/8dAs8s
+          FROM 1 at 1341695999.222605 MATCHSTATE:0:0:cc/:5d5c|/8dAs8s:c
+          TO 1 at 1341695999.222633 MATCHSTATE:0:0:cc/c:5d5c|/8dAs8s
+          TO 2 at 1341695999.222664 MATCHSTATE:1:0:cc/c:|9hQd/8dAs8s
+          FROM 2 at 1341695999.222704 MATCHSTATE:1:0:cc/c:|9hQd/8dAs8s:r
+          TO 1 at 1341695999.222734 MATCHSTATE:0:0:cc/cr:5d5c|/8dAs8s
+          TO 2 at 1341695999.222770 MATCHSTATE:1:0:cc/cr:|9hQd/8dAs8s
+          FROM 1 at 1341695999.222792 MATCHSTATE:0:0:cc/cr:5d5c|/8dAs8s:c
+          TO 1 at 1341695999.222820 MATCHSTATE:0:0:cc/crc/:5d5c|/8dAs8s/4h
+          TO 2 at 1341695999.222879 MATCHSTATE:1:0:cc/crc/:|9hQd/8dAs8s/4h
+          FROM 1 at 1341695999.222904 MATCHSTATE:0:0:cc/crc/:5d5c|/8dAs8s/4h:c
+          TO 1 at 1341695999.222932 MATCHSTATE:0:0:cc/crc/c:5d5c|/8dAs8s/4h
+          TO 2 at 1341695999.222964 MATCHSTATE:1:0:cc/crc/c:|9hQd/8dAs8s/4h
+          FROM 2 at 1341695999.223004 MATCHSTATE:1:0:cc/crc/c:|9hQd/8dAs8s/4h:c
+          TO 1 at 1341695999.223033 MATCHSTATE:0:0:cc/crc/cc/:5d5c|/8dAs8s/4h/6d
+          TO 2 at 1341695999.223069 MATCHSTATE:1:0:cc/crc/cc/:|9hQd/8dAs8s/4h/6d
+          FROM 1 at 1341695999.223091 MATCHSTATE:0:0:cc/crc/cc/:5d5c|/8dAs8s/4h/6d:c
+          TO 1 at 1341695999.223118 MATCHSTATE:0:0:cc/crc/cc/c:5d5c|/8dAs8s/4h/6d
+          TO 2 at 1341695999.223150 MATCHSTATE:1:0:cc/crc/cc/c:|9hQd/8dAs8s/4h/6d
+          FROM 2 at 1341695999.223189 MATCHSTATE:1:0:cc/crc/cc/c:|9hQd/8dAs8s/4h/6d:c
+          TO 1 at 1341695999.223272 MATCHSTATE:0:0:cc/crc/cc/cc:5d5c|9hQd/8dAs8s/4h/6d
+          TO 2 at 1341695999.223307 MATCHSTATE:1:0:cc/crc/cc/cc:5d5c|9hQd/8dAs8s/4h/6d
+          TO 1 at 1341695999.223333 MATCHSTATE:1:1::|5dJd
+          TO 2 at 1341695999.223366 MATCHSTATE:0:1::6sKs|
+          FROM 1 at 1341695999.223388 MATCHSTATE:1:1::|5dJd:c
+          TO 1 at 1341695999.223415 MATCHSTATE:1:1:c:|5dJd
+          TO 2 at 1341695999.223446 MATCHSTATE:0:1:c:6sKs|
+          FROM 2 at 1341695999.223485 MATCHSTATE:0:1:c:6sKs|:r
+          TO 1 at 1341695999.223513 MATCHSTATE:1:1:cr:|5dJd
+          TO 2 at 1341695999.223548 MATCHSTATE:0:1:cr:6sKs|
+          FROM 1 at 1341695999.223570 MATCHSTATE:1:1:cr:|5dJd:c
+          TO 1 at 1341695999.223596 MATCHSTATE:1:1:crc/:|5dJd/2sTh2h
+          TO 2 at 1341695999.223627 MATCHSTATE:0:1:crc/:6sKs|/2sTh2h
+          FROM 2 at 1341695999.223664 MATCHSTATE:0:1:crc/:6sKs|/2sTh2h:r
+          TO 1 at 1341695999.223692 MATCHSTATE:1:1:crc/r:|5dJd/2sTh2h
+          TO 2 at 1341695999.223728 MATCHSTATE:0:1:crc/r:6sKs|/2sTh2h
+          FROM 1 at 1341695999.223749 MATCHSTATE:1:1:crc/r:|5dJd/2sTh2h:c
+          TO 1 at 1341695999.223776 MATCHSTATE:1:1:crc/rc/:|5dJd/2sTh2h/Qh
+          TO 2 at 1341695999.223807 MATCHSTATE:0:1:crc/rc/:6sKs|/2sTh2h/Qh
+          FROM 2 at 1341695999.223863 MATCHSTATE:0:1:crc/rc/:6sKs|/2sTh2h/Qh:r
+          TO 1 at 1341695999.223897 MATCHSTATE:1:1:crc/rc/r:|5dJd/2sTh2h/Qh
+          TO 2 at 1341695999.223934 MATCHSTATE:0:1:crc/rc/r:6sKs|/2sTh2h/Qh
+          FROM 1 at 1341695999.223956 MATCHSTATE:1:1:crc/rc/r:|5dJd/2sTh2h/Qh:r
+          TO 1 at 1341695999.223984 MATCHSTATE:1:1:crc/rc/rr:|5dJd/2sTh2h/Qh
+          TO 2 at 1341695999.224015 MATCHSTATE:0:1:crc/rc/rr:6sKs|/2sTh2h/Qh
+          FROM 2 at 1341695999.224053 MATCHSTATE:0:1:crc/rc/rr:6sKs|/2sTh2h/Qh:c
+          TO 1 at 1341695999.224081 MATCHSTATE:1:1:crc/rc/rrc/:|5dJd/2sTh2h/Qh/8h
+          TO 2 at 1341695999.224114 MATCHSTATE:0:1:crc/rc/rrc/:6sKs|/2sTh2h/Qh/8h
+          FROM 2 at 1341695999.224149 MATCHSTATE:0:1:crc/rc/rrc/:6sKs|/2sTh2h/Qh/8h:r
+          TO 1 at 1341695999.224178 MATCHSTATE:1:1:crc/rc/rrc/r:|5dJd/2sTh2h/Qh/8h
+          TO 2 at 1341695999.224213 MATCHSTATE:0:1:crc/rc/rrc/r:6sKs|/2sTh2h/Qh/8h
+          FROM 1 at 1341695999.224235 MATCHSTATE:1:1:crc/rc/rrc/r:|5dJd/2sTh2h/Qh/8h:c
+          TO 1 at 1341695999.224292 MATCHSTATE:1:1:crc/rc/rrc/rc:6sKs|5dJd/2sTh2h/Qh/8h
+          TO 2 at 1341695999.224329 MATCHSTATE:0:1:crc/rc/rrc/rc:6sKs|5dJd/2sTh2h/Qh/8h
+          FINISHED at 1341696000.058664
+          SCORE:110|-110:p1|p2
+          ".split("\n").map { |line| line += "\n" }, # Make each line an element in an array while preserving newlines
+        result_messages: [
+          "# name/game/hands/seed 2p.limit.h1000.r0 holdem.limit.2p.reverse_blinds.game 2 0\n",
+          "#--t_response 600000\n",
+          "#--t_hand 600000\n",
+          "#--t_per_hand 7000\n",
+          "STATE:0:cc/crc/cc/cc:5d5c|9hQd/8dAs8s/4h/6d:20|-20:p1|p2\n",
+          "STATE:1:crc/rc/rrc/rc:6sKs|5dJd/2sTh2h/Qh/8h:-90|90:p2|p1\n",
+          'SCORE:110|-110:p1|p2'
+        ],
+        hand_start_line_indices: [6, 35],
+        match_def_line_index: 0,
+        player_names: ['p1', 'p2'],
+        chip_distribution: [110, -110],
+        player_acting_sequences: [
+          [
+            [1, 0], [0, 1, 0], [0, 1], [0, 1]
+          ],
+          [
+            [0, 1, 0], [1, 0], [1, 0, 1], [1, 0]
+          ]
+        ]
+      }
+    }
+  end
+end

data/spec/rank_spec.rb CHANGED

@@ -2,46 +2,46 @@
 # Spec helper (must include first to track code coverage with SimpleCov)
 require File.expand_path('../support/spec_helper', __FILE__)
-require "#{LIB_ACPC_POKER_TYPES_PATH}/rank"
+require "acpc_poker_types/rank"
-describe Rank do
+describe AcpcPokerTypes::Rank do
   describe '#new' do
     it 'raises an exception if the given rank is invalid' do
-      expect{Rank.new(:not_a_rank)}.to raise_exception(Rank::UnrecognizedRank)
+      ->{AcpcPokerTypes::Rank.new(:not_a_rank)}.must_raise(AcpcPokerTypes::Rank::UnrecognizedRank)
     end
     describe 'correctly understands all ranks' do
       it 'in symbol form' do
         for_every_rank do
-          @patient = Rank.new(@symbol)
+          @patient = AcpcPokerTypes::Rank.new(@symbol)
           check_patient!
         end
       end
       it 'in ACPC form' do
         for_every_rank do
-          @patient = Rank.new(@acpc)
+          @patient = AcpcPokerTypes::Rank.new(@acpc)
           check_patient!
         end
       end
       it 'in numeric ACPC form' do
         for_every_rank do
-          @patient = Rank.new(@number)
+          @patient = AcpcPokerTypes::Rank.new(@number)
           check_patient!
         end
       end
       it 'in HTML form' do
         for_every_rank do
-          @patient = Rank.new(@html)
+          @patient = AcpcPokerTypes::Rank.new(@html)
           check_patient!
         end
       end
       it 'in string form' do
         for_every_rank do
-          @patient = Rank.new(@string)
+          @patient = AcpcPokerTypes::Rank.new(@string)
           check_patient!
         end
       end
@@ -49,7 +49,7 @@ describe Rank do
   end
   def for_every_rank
-    Rank::DOMAIN.each do |rank, properties|
+    AcpcPokerTypes::Rank::DOMAIN.each do |rank, properties|
       @symbol = rank
       @number = properties[:number]
       @string = properties[:text]
@@ -61,10 +61,10 @@ describe Rank do
   end
   def check_patient!
-    @patient.to_sym.should == @symbol
-    @patient.to_i.should == @number
-    @patient.to_acpc.should == @acpc
-    @patient.to_s.should == @string
-    @patient.to_html.should == @html
+    @patient.to_sym.must_equal @symbol
+    @patient.to_i.must_equal @number
+    @patient.to_acpc.must_equal @acpc
+    @patient.to_s.must_equal @string
+    @patient.to_html.must_equal @html
   end
 end