# HG changeset patch # User Neil Muller # Date 1358282924 -7200 # Node ID 657b4da736bc16ce0f5df1430de3d0e894107c3b # Parent efa58c92b304cda89431011575e82c6c96c2f8fd Fix rest of the test suite diff -r efa58c92b304 -r 657b4da736bc gamelib/tests/game_logic_utils.py --- a/gamelib/tests/game_logic_utils.py Tue Jan 15 22:44:50 2013 +0200 +++ b/gamelib/tests/game_logic_utils.py Tue Jan 15 22:48:44 2013 +0200 @@ -37,10 +37,12 @@ gizmo = gizmo.things[thing] gizmo.set_data(key, value) - def assert_game_data(self, key, value, thing=None, scene=None): + def assert_game_data(self, key, value, thing=None, scene=None, detail=None): gizmo = self.state.current_scene if scene is not None: gizmo = self.state.scenes[scene] + if detail is not None: + gizmo = self.state.detail_views[detail] if thing is not None: gizmo = gizmo.things[thing] self.assertEquals(value, gizmo.get_data(key)) diff -r efa58c92b304 -r 657b4da736bc gamelib/tests/test_walkthrough.py --- a/gamelib/tests/test_walkthrough.py Tue Jan 15 22:44:50 2013 +0200 +++ b/gamelib/tests/test_walkthrough.py Tue Jan 15 22:48:44 2013 +0200 @@ -110,7 +110,7 @@ # Get the superconductor. self.interact_thing('bridge.massagechair_base') self.assert_current_detail('chair_detail') - self.interact_thing('bridge.superconductor') + self.interact_thing('bridge.superconductor', detail='chair_detail') self.assert_inventory_item('superconductor') self.assert_detail_thing('bridge.superconductor', False) self.close_detail() @@ -299,8 +299,8 @@ # Bring up nav console. self.interact_thing('bridge.comp') self.assert_current_detail('bridge_comp_detail') - self.interact_thing('bridge_comp.nav_tab') - self.assert_game_data('tab', 'nav') + self.interact_thing('bridge_comp.nav_tab', detail='bridge_comp_detail') + self.assert_game_data('tab', 'nav', detail='bridge_comp_detail') # Go somewhere interesting. - self.interact_thing('bridge_comp.nav_line2') + self.interact_thing('bridge_comp.nav_line2', detail='bridge_comp_detail')