@@ -197,20 +197,20 @@ def test_hots_pids(self):
197197 replay = sc2reader .load_replay (replayfilename )
198198 self .assertEqual (replay .expansion , "HotS" )
199199 player_pids = set ([player .pid for player in replay .players if player .is_human ])
200- ability_pids = set ([event .player .pid for event in replay .events if "AbilityEvent " in event .name ])
200+ ability_pids = set ([event .player .pid for event in replay .events if "CommandEvent " in event .name ])
201201 self .assertEqual (ability_pids , player_pids )
202202
203203 def test_wol_pids (self ):
204204 replay = sc2reader .load_replay ("test_replays/1.5.4.24540/ggtracker_1471849.SC2Replay" )
205205 self .assertEqual (replay .expansion , "WoL" )
206- ability_pids = set ([event .player .pid for event in replay .events if "AbilityEvent " in event .name ])
206+ ability_pids = set ([event .player .pid for event in replay .events if "CommandEvent " in event .name ])
207207 player_pids = set ([player .pid for player in replay .players ])
208208 self .assertEqual (ability_pids , player_pids )
209209
210210 def test_hots_hatchfun (self ):
211211 replay = sc2reader .load_replay ("test_replays/2.0.0.24247/molten.SC2Replay" )
212212 player_pids = set ([ player .pid for player in replay .players ])
213- spawner_pids = set ([ event .player .pid for event in replay .events if "TargetAbilityEvent " in event .name and event .ability .name == "SpawnLarva" ])
213+ spawner_pids = set ([ event .player .pid for event in replay .events if "TargetUnitCommandEvent " in event .name and event .ability .name == "SpawnLarva" ])
214214 self .assertTrue (spawner_pids .issubset (player_pids ))
215215
216216 def test_hots_vs_ai (self ):
@@ -331,7 +331,7 @@ def test_gameheartnormalizer_plugin(self):
331331 # Not a GameHeart game!
332332 replay = sc2reader .load_replay ("test_replays/2.0.0.24247/molten.SC2Replay" )
333333 player_pids = set ([ player .pid for player in replay .players ])
334- spawner_pids = set ([ event .player .pid for event in replay .events if "TargetAbilityEvent " in event .name and event .ability .name == "SpawnLarva" ])
334+ spawner_pids = set ([ event .player .pid for event in replay .events if "TargetUnitCommandEvent " in event .name and event .ability .name == "SpawnLarva" ])
335335 self .assertTrue (spawner_pids .issubset (player_pids ))
336336
337337 replay = sc2reader .load_replay ("test_replays/gameheart/gameheart.SC2Replay" )
0 commit comments