acpc_poker_types 6.2.3 → 7.0.0

data/spec/{hand_data_spec.rb → dealer_data/hand_data_spec.rb}

@@ -1,6 +1,5 @@
-
 # Spec helper (must include first to track code coverage with SimpleCov)
-require_relative 'support/spec_helper'
+require_relative '../support/spec_helper'
 
 require 'mocha/setup'
 
@@ -8,12 +7,12 @@ require 'acpc_dealer'
 require 'acpc_poker_types/match_state'
 require 'acpc_poker_types/poker_action'
 
-require 'acpc_poker_types/acpc_dealer_data/action_messages'
-require 'acpc_poker_types/acpc_dealer_data/hand_data'
-require 'acpc_poker_types/acpc_dealer_data/hand_results'
-require 'acpc_poker_types/acpc_dealer_data/match_definition'
+require 'acpc_poker_types/dealer_data/action_messages'
+require 'acpc_poker_types/dealer_data/hand_data'
+require 'acpc_poker_types/dealer_data/hand_results'
+require 'acpc_poker_types/dealer_data/match_definition'
 
-describe AcpcPokerTypes::AcpcDealerData::HandData do
+describe AcpcPokerTypes::DealerData::HandData do
   before do
     @patient = nil
     @chip_distribution = nil
@@ -32,19 +31,19 @@ describe AcpcPokerTypes::AcpcDealerData::HandData do
     it 'if the given action data does not have the proper format' do
       init_data do |action_data, result|
         ->() do
-          @patient = AcpcPokerTypes::AcpcDealerData::HandData.new(
+          @patient = AcpcPokerTypes::DealerData::HandData.new(
             @match_def,
             (action_data.data.first + [action_data.data.first.last]).flatten,
             result.data.first
           )
-        end.must_raise AcpcPokerTypes::AcpcDealerData::HandData::InvalidData
+        end.must_raise AcpcPokerTypes::DealerData::HandData::InvalidData
       end
     end
   end
 
   it 'reports the chip distribution for every seat' do
     init_data do |action_data, result|
-      @patient = AcpcPokerTypes::AcpcDealerData::HandData.new @match_def, action_data.data.first, result.data.first
+      @patient = AcpcPokerTypes::DealerData::HandData.new @match_def, action_data.data.first, result.data.first
 
       check_patient
     end
@@ -61,7 +60,7 @@ describe AcpcPokerTypes::AcpcDealerData::HandData do
         @last_action = nil
         @next_action = nil
 
-        @patient = AcpcPokerTypes::AcpcDealerData::HandData.new @match_def, action_data.data.first, result.data.first
+        @patient = AcpcPokerTypes::DealerData::HandData.new @match_def, action_data.data.first, result.data.first
 
         @turn_number = 0
         @patient.for_every_turn!(@seat) do
@@ -98,12 +97,12 @@ describe AcpcPokerTypes::AcpcDealerData::HandData do
     data.each do |game, data_hash|
       @chip_distribution = data_hash[:chip_distribution]
       @turn_data = data_hash[:turn_data]
-      @action_data = AcpcPokerTypes::AcpcDealerData::ActionMessages.parse(
+      @action_data = AcpcPokerTypes::DealerData::ActionMessages.parse(
         data_hash[:action_messages],
         data_hash[:player_names],
         AcpcDealer::DEALER_DIRECTORY
       )
-      @hand_result = AcpcPokerTypes::AcpcDealerData::HandResults.parse(
+      @hand_result = AcpcPokerTypes::DealerData::HandResults.parse(
         data_hash[:result_message],
         data_hash[:player_names],
         AcpcDealer::DEALER_DIRECTORY
@@ -137,29 +136,29 @@ describe AcpcPokerTypes::AcpcDealerData::HandData do
         chip_distribution: [60, -60],
         player_names:  ['p1', 'p2'],
         turn_data: [
-          AcpcPokerTypes::AcpcDealerData::HandData::Turn.new(
+          AcpcPokerTypes::DealerData::HandData::Turn.new(
             [
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:1:999:crc/cc/cc/:|TdQd/As6d6h/7h/4s'),
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:0:999:crc/cc/cc/:Jc8d|/As6d6h/7h/4s')
             ],
-            AcpcPokerTypes::AcpcDealerData::ActionMessages::FromMessage.new(
+            AcpcPokerTypes::DealerData::ActionMessages::FromMessage.new(
               1,
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:0:999:crc/cc/cc/:Jc8d|/As6d6h/7h/4s'),
               AcpcPokerTypes::PokerAction.new('r')
             )
           ),
-          AcpcPokerTypes::AcpcDealerData::HandData::Turn.new(
+          AcpcPokerTypes::DealerData::HandData::Turn.new(
             [
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:1:999:crc/cc/cc/r:|TdQd/As6d6h/7h/4s'),
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:0:999:crc/cc/cc/r:Jc8d|/As6d6h/7h/4s')
             ],
-            AcpcPokerTypes::AcpcDealerData::ActionMessages::FromMessage.new(
+            AcpcPokerTypes::DealerData::ActionMessages::FromMessage.new(
               0,
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:1:999:crc/cc/cc/r:|TdQd/As6d6h/7h/4s'),
               AcpcPokerTypes::PokerAction.new('c')
             )
           ),
-          AcpcPokerTypes::AcpcDealerData::HandData::Turn.new(
+          AcpcPokerTypes::DealerData::HandData::Turn.new(
             [
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:1:999:crc/cc/cc/rc:Jc8d|TdQd/As6d6h/7h/4s'),
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:0:999:crc/cc/cc/rc:Jc8d|TdQd/As6d6h/7h/4s')
@@ -186,18 +185,18 @@ describe AcpcPokerTypes::AcpcDealerData::HandData do
         chip_distribution: [19718, -19718],
         player_names:  ['p1', 'p2'],
         turn_data: [
-          AcpcPokerTypes::AcpcDealerData::HandData::Turn.new(
+          AcpcPokerTypes::DealerData::HandData::Turn.new(
             [
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:1:999::|TdQd'),
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:0:999::Jc8d|')
             ],
-            AcpcPokerTypes::AcpcDealerData::ActionMessages::FromMessage.new(
+            AcpcPokerTypes::DealerData::ActionMessages::FromMessage.new(
               0,
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:1:999::|TdQd'),
               AcpcPokerTypes::PokerAction.new('f')
             )
           ),
-          AcpcPokerTypes::AcpcDealerData::HandData::Turn.new(
+          AcpcPokerTypes::DealerData::HandData::Turn.new(
             [
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:1:999:f:|TdQd'),
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:0:999:f:Jc8d|')
@@ -226,19 +225,19 @@ describe AcpcPokerTypes::AcpcDealerData::HandData do
         chip_distribution: [360, -190, -170],
         player_names:  ['p1', 'p2', 'p3'],
         turn_data: [
-          AcpcPokerTypes::AcpcDealerData::HandData::Turn.new(
+          AcpcPokerTypes::DealerData::HandData::Turn.new(
             [
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:0:999:ccc/ccc/rrcc/rrrfr:QsAs||/4d6d2d/5d/2c'),
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:1:999:ccc/ccc/rrcc/rrrfr:|3s8h|/4d6d2d/5d/2c'),
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:2:999:ccc/ccc/rrcc/rrrfr:||Qd3c/4d6d2d/5d/2c')
             ],
-            AcpcPokerTypes::AcpcDealerData::ActionMessages::FromMessage.new(
+            AcpcPokerTypes::DealerData::ActionMessages::FromMessage.new(
               2,
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:2:999:ccc/ccc/rrcc/rrrfr:||Qd3c/4d6d2d/5d/2c'),
               AcpcPokerTypes::PokerAction.new('c')
             )
           ),
-          AcpcPokerTypes::AcpcDealerData::HandData::Turn.new(
+          AcpcPokerTypes::DealerData::HandData::Turn.new(
             [
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:0:999:ccc/ccc/rrcc/rrrfrc:QsAs|3s8h|Qd3c/4d6d2d/5d/2c'),
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:1:999:ccc/ccc/rrcc/rrrfrc:|3s8h|Qd3c/4d6d2d/5d/2c'),
@@ -268,19 +267,19 @@ describe AcpcPokerTypes::AcpcDealerData::HandData do
         chip_distribution: [40000, -20000, -20000],
         player_names:  ['p1', 'p2', 'p3'],
         turn_data: [
-          AcpcPokerTypes::AcpcDealerData::HandData::Turn.new(
+          AcpcPokerTypes::DealerData::HandData::Turn.new(
             [
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:0:999:ccr12926r20000c:QsAs||'),
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:1:999:ccr12926r20000c:|3s8h|'),
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:2:999:ccr12926r20000c:||Qd3c')
             ],
-            AcpcPokerTypes::AcpcDealerData::ActionMessages::FromMessage.new(
+            AcpcPokerTypes::DealerData::ActionMessages::FromMessage.new(
               1,
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:1:999:ccr12926r20000c:|3s8h|'),
               AcpcPokerTypes::PokerAction.new('c')
             )
           ),
-          AcpcPokerTypes::AcpcDealerData::HandData::Turn.new(
+          AcpcPokerTypes::DealerData::HandData::Turn.new(
             [
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:0:999:ccr12926r20000cc///:QsAs|3s8h|Qd3c/4d6d2d/5d/2c'),
               AcpcPokerTypes::MatchState.parse('MATCHSTATE:1:999:ccr12926r20000cc///:QsAs|3s8h|Qd3c/4d6d2d/5d/2c'),

data/spec/{hand_results_spec.rb → dealer_data/hand_results_spec.rb}

@@ -1,15 +1,14 @@
-
 # Spec helper (must include first to track code coverage with SimpleCov)
-require_relative 'support/spec_helper'
+require_relative '../support/spec_helper'
 
 require 'mocha/setup'
 
 require 'acpc_dealer'
 
-require 'acpc_poker_types/acpc_dealer_data/hand_results'
-require 'acpc_poker_types/acpc_dealer_data/match_definition'
+require 'acpc_poker_types/dealer_data/hand_results'
+require 'acpc_poker_types/dealer_data/match_definition'
 
-describe AcpcPokerTypes::AcpcDealerData::HandResults do
+describe AcpcPokerTypes::DealerData::HandResults do
   before do
     @patient = nil
     @data = nil
@@ -32,12 +31,12 @@ describe AcpcPokerTypes::AcpcDealerData::HandResults do
           {p1: -20000, p2: -20000, p3: 40000}
       ].each do |state_to_player_results|
         state_to_player_results.each do |state_string, expected_values|
-          AcpcPokerTypes::AcpcDealerData::HandResults.parse_state(state_string).must_equal expected_values
+          AcpcPokerTypes::DealerData::HandResults.parse_state(state_string).must_equal expected_values
         end
       end
     end
     it 'returns nil if asked to parse an improperly formatted string' do
-      AcpcPokerTypes::AcpcDealerData::HandResults.parse_state("improperly formatted string").must_be_nil
+      AcpcPokerTypes::DealerData::HandResults.parse_state("improperly formatted string").must_be_nil
     end
   end
   describe '::parse_score' do
@@ -47,12 +46,12 @@ describe AcpcPokerTypes::AcpcDealerData::HandResults do
         'SCORE:19835|621.5|-20455.5:p1|p2|p3' => {p1: 19835, p2: 621.5, p3: -20455.5}
       ].each do |score_to_player_results|
         score_to_player_results.each do |score_string, expected_values|
-          AcpcPokerTypes::AcpcDealerData::HandResults.parse_score(score_string).must_equal expected_values
+          AcpcPokerTypes::DealerData::HandResults.parse_score(score_string).must_equal expected_values
         end
       end
     end
     it 'returns nil if asked to parse an improperly formatted string' do
-      AcpcPokerTypes::AcpcDealerData::HandResults.parse_score("improperly formatted string").must_be_nil
+      AcpcPokerTypes::DealerData::HandResults.parse_score("improperly formatted string").must_be_nil
     end
   end
 
@@ -61,17 +60,17 @@ describe AcpcPokerTypes::AcpcDealerData::HandResults do
       it 'when every hand is desired' do
         init_data do |log_statements|
           file_name = 'file_name'
-          AcpcPokerTypes::AcpcDealerData::LogFile.stubs(:open).with(file_name, 'r').yields(
+          AcpcPokerTypes::DealerData::LogFile.stubs(:open).with(file_name, 'r').yields(
             log_statements
           ).returns(
-            AcpcPokerTypes::AcpcDealerData::HandResults.parse(
+            AcpcPokerTypes::DealerData::HandResults.parse(
               log_statements,
               @player_names,
               AcpcDealer::DEALER_DIRECTORY
             )
           )
 
-          @patient = AcpcPokerTypes::AcpcDealerData::HandResults.parse_file(
+          @patient = AcpcPokerTypes::DealerData::HandResults.parse_file(
             file_name,
             @player_names,
             AcpcDealer::DEALER_DIRECTORY
@@ -85,10 +84,10 @@ describe AcpcPokerTypes::AcpcDealerData::HandResults do
         num_hands = 3
         init_data do |log_statements|
           file_name = 'file_name'
-          AcpcPokerTypes::AcpcDealerData::LogFile.stubs(:open).with(file_name, 'r').yields(
+          AcpcPokerTypes::DealerData::LogFile.stubs(:open).with(file_name, 'r').yields(
             log_statements
           ).returns(
-            AcpcPokerTypes::AcpcDealerData::HandResults.parse(
+            AcpcPokerTypes::DealerData::HandResults.parse(
               log_statements,
               @player_names,
               AcpcDealer::DEALER_DIRECTORY,
@@ -96,7 +95,7 @@ describe AcpcPokerTypes::AcpcDealerData::HandResults do
             )
           )
 
-          @patient = AcpcPokerTypes::AcpcDealerData::HandResults.parse_file(
+          @patient = AcpcPokerTypes::DealerData::HandResults.parse_file(
             file_name,
             @player_names,
             AcpcDealer::DEALER_DIRECTORY,
@@ -114,7 +113,7 @@ describe AcpcPokerTypes::AcpcDealerData::HandResults do
     describe 'from array' do
       it 'when every hand is desired' do
         init_data do |log_statements|
-          @patient = AcpcPokerTypes::AcpcDealerData::HandResults.parse(
+          @patient = AcpcPokerTypes::DealerData::HandResults.parse(
             log_statements,
             @player_names,
             AcpcDealer::DEALER_DIRECTORY
@@ -127,7 +126,7 @@ describe AcpcPokerTypes::AcpcDealerData::HandResults do
         @no_final_score = true
         num_hands = 3
         init_data do |log_statements|
-          @patient = AcpcPokerTypes::AcpcDealerData::HandResults.parse(
+          @patient = AcpcPokerTypes::DealerData::HandResults.parse(
             log_statements,
             @player_names,
             AcpcDealer::DEALER_DIRECTORY,
@@ -155,7 +154,7 @@ describe AcpcPokerTypes::AcpcDealerData::HandResults do
       @final_score = data_hash[:final_score]
       @data = data_hash[:data]
       @player_names = data_hash[:player_names]
-      @match_def = AcpcPokerTypes::AcpcDealerData::MatchDefinition.parse(
+      @match_def = AcpcPokerTypes::DealerData::MatchDefinition.parse(
         data_hash[:log_statements].first,
         @player_names,
         AcpcDealer::DEALER_DIRECTORY

data/spec/{match_definition_spec.rb → dealer_data/match_definition_spec.rb}

@@ -1,13 +1,12 @@
-
 # Spec helper (must include first to track code coverage with SimpleCov)
-require_relative 'support/spec_helper'
+require_relative '../support/spec_helper'
 
 require 'acpc_poker_types/game_definition'
 require 'acpc_dealer'
 
-require 'acpc_poker_types/acpc_dealer_data/match_definition'
+require 'acpc_poker_types/dealer_data/match_definition'
 
-describe AcpcPokerTypes::AcpcDealerData::MatchDefinition do
+describe AcpcPokerTypes::DealerData::MatchDefinition do
   before do
     @name = nil
     @game_def = nil
@@ -20,31 +19,31 @@ describe AcpcPokerTypes::AcpcDealerData::MatchDefinition do
   it 'raises an exception if the number of player names does not match the number of players' do
     init_components do
       ->() do
-        @patient = AcpcPokerTypes::AcpcDealerData::MatchDefinition.new(
+        @patient = AcpcPokerTypes::DealerData::MatchDefinition.new(
           @name,
           @game_def,
           @number_of_hands,
           @random_seed,
           @player_names + ['extra player']
         )
-      end.must_raise AcpcPokerTypes::AcpcDealerData::MatchDefinition::IncorrectNumberOfPlayerNames
+      end.must_raise AcpcPokerTypes::DealerData::MatchDefinition::IncorrectNumberOfPlayerNames
 
       ->() do
-        @patient = AcpcPokerTypes::AcpcDealerData::MatchDefinition.new(
+        @patient = AcpcPokerTypes::DealerData::MatchDefinition.new(
           @name,
           @game_def,
           @number_of_hands,
           @random_seed,
           [@player_names.first]
         )
-      end.must_raise AcpcPokerTypes::AcpcDealerData::MatchDefinition::IncorrectNumberOfPlayerNames
+      end.must_raise AcpcPokerTypes::DealerData::MatchDefinition::IncorrectNumberOfPlayerNames
     end
   end
 
   describe 'can be created by providing components' do
     it 'separately' do
       init_components do
-        @patient = AcpcPokerTypes::AcpcDealerData::MatchDefinition.new(
+        @patient = AcpcPokerTypes::DealerData::MatchDefinition.new(
           @name,
           @game_def,
           @number_of_hands,
@@ -58,7 +57,7 @@ describe AcpcPokerTypes::AcpcDealerData::MatchDefinition do
     it 'in string format "# name/game/hands/seed ..."' do
       init_components do
         string = "# name/game/hands/seed #{@name} #{@game_def_file_name} #{@number_of_hands} #{@random_seed}\n"
-        @patient = AcpcPokerTypes::AcpcDealerData::MatchDefinition.parse(string, @player_names, File.dirname(@game_def_file_name))
+        @patient = AcpcPokerTypes::DealerData::MatchDefinition.parse(string, @player_names, File.dirname(@game_def_file_name))
 
         check_patient
       end
@@ -66,7 +65,7 @@ describe AcpcPokerTypes::AcpcDealerData::MatchDefinition do
   end
   it 'returns nil if asked to parse an improperly formatted string' do
     string = 'improperly formatted string'
-    @patient = AcpcPokerTypes::AcpcDealerData::MatchDefinition.parse(string, ['p1', 'p2'], 'game def directory').must_be_nil
+    @patient = AcpcPokerTypes::DealerData::MatchDefinition.parse(string, ['p1', 'p2'], 'game def directory').must_be_nil
   end
 
   def init_components

data/spec/{poker_match_data_spec.rb → dealer_data/poker_match_data_spec.rb}

@@ -1,6 +1,5 @@
-
 # Spec helper (must include first to track code coverage with SimpleCov)
-require_relative 'support/spec_helper'
+require_relative '../support/spec_helper'
 
 require 'mocha/setup'
 
@@ -8,12 +7,12 @@ 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'
+require 'acpc_poker_types/dealer_data/hand_data'
+require 'acpc_poker_types/dealer_data/match_definition'
+require 'acpc_poker_types/dealer_data/poker_match_data'
 
 include AcpcPokerTypes
-include AcpcPokerTypes::AcpcDealerData
+include AcpcPokerTypes::DealerData
 
 describe PokerMatchData do
   before do
@@ -149,7 +148,7 @@ describe PokerMatchData do
     end
   end
   describe '#player_acting_sequence' do
-    describe "doesn't append an empty array to the list when no players are active" do
+    describe "doesn't append an empty array to the list when all but one player has folded" do
       it 'in two player' do
         action_messages =
           "# name/game/hands/seed 2p.limit.h1000.r0 holdem.limit.2p.reverse_blinds.game 1 0
@@ -235,6 +234,48 @@ describe PokerMatchData do
         @patient.player_acting_sequence.must_equal player_acting_sequence
       end
     end
+    describe "appends an empty array to the list whenever a new round is encountered" do
+      it 'in two player' do
+        action_messages =
+          "# name/game/hands/seed 2p.nolimit.h1000.r0 /home/dmorrill/.rvm/gems/ruby-1.9.3-p194/gems/acpc_dealer-0.0.1/vendor/project_acpc_server/holdem.nolimit.2p.reverse_blinds.game 1000 0
+          #--t_response 600000
+          #--t_hand 600000
+          #--t_per_hand 7000
+          STARTED at 1341695920.914516
+          TO 1 at 1341695920.914700 MATCHSTATE:0:0::5d5c|
+          TO 2 at 1341695920.914745 MATCHSTATE:1:0::|9hQd
+          FROM 2 at 1341695920.914807 MATCHSTATE:1:0::|9hQd:r19686
+          TO 1 at 1341695920.914864 MATCHSTATE:0:0:r19686:5d5c|
+          TO 2 at 1341695920.914907 MATCHSTATE:1:0:r19686:|9hQd
+          FROM 1 at 1341695920.914935 MATCHSTATE:0:0:r19686:5d5c|:r20000
+          TO 1 at 1341695920.914988 MATCHSTATE:0:0:r19686r20000:5d5c|
+          TO 2 at 1341695920.915032 MATCHSTATE:1:0:r19686r20000:|9hQd
+          FROM 2 at 1341695920.915073 MATCHSTATE:1:0:r19686r20000:|9hQd:c
+          TO 1 at 1341695920.915193 MATCHSTATE:0:0:r19686r20000c///:5d5c|9hQd/8dAs8s/4h/6d
+          TO 2 at 1341695920.915232 MATCHSTATE:1:0:r19686r20000c///:5d5c|9hQd/8dAs8s/4h/6d
+          SCORE:20000|-20000:p1|p2".split("\n").map {|line| line += "\n" }
+
+        result_messages =
+          "# name/game/hands/seed 2p.nolimit.h1000.r0 /home/dmorrill/.rvm/gems/ruby-1.9.3-p194/gems/acpc_dealer-0.0.1/vendor/project_acpc_server/holdem.nolimit.2p.reverse_blinds.game 1000 0
+          #--t_response 600000
+          #--t_hand 600000
+          #--t_per_hand 7000
+          STATE:0:r19686r20000c///:5d5c|9hQd/8dAs8s/4h/6d:20000|-20000:p1|p2
+          SCORE:20000|-20000:p1|p2".split("\n").map {|line| line += "\n" }
+
+        player_acting_sequence = [[1, 0, 1], [], [], []]
+        @patient = PokerMatchData.parse(
+          action_messages,
+          result_messages,
+          ['p1', 'p2'],
+          AcpcDealer::DEALER_DIRECTORY
+        )
+
+        @patient.hand_number = 0
+        @patient.current_hand.turn_number = @patient.current_hand.data.length - 1
+        @patient.player_acting_sequence.must_equal player_acting_sequence
+      end
+    end
   end
 
   def check_patient

data/spec/{player_group_spec.rb → hand_player_group_spec.rb}

@@ -1,14 +1,7 @@
 require_relative 'support/spec_helper'
 
-# require 'acpc_dealer'
-
-require_relative "../lib/acpc_poker_types/player_group"
-# require_relative "../lib/acpc_poker_types/game_definition"
-# require_relative "../lib/acpc_poker_types/match_state"
-# require_relative "../lib/acpc_poker_types/poker_action"
+require_relative "../lib/acpc_poker_types/hand_player_group"
 require_relative "../lib/acpc_poker_types/hand"
-# require_relative "../lib/acpc_poker_types/card"
-# require_relative "../lib/acpc_poker_types/acpc_dealer_data/poker_match_data"
 
 module MapWithIndex
   refine Array do
@@ -26,7 +19,7 @@ using MapWithIndex
 
 include AcpcPokerTypes
 
-describe PlayerGroup do
+describe HandPlayerGroup do
   describe '::new' do
     it 'creates HandPlayers at the start of a hand' do
       stacks = [100, 200, 150]
@@ -37,7 +30,7 @@ describe PlayerGroup do
 
         hands[position] = arbitrary_hole_card_hand
 
-        PlayerGroup.new(
+        HandPlayerGroup.new(
           hands,
           stacks,
           blinds