changeset 728:db0762f1de5a pyntnclick

Kill off assert_current_detail and close_detail - no longer relevant
author Stefano Rivera <stefano@rivera.za.net>
date Tue, 15 Jan 2013 22:52:34 +0200
parents 657b4da736bc
children 7d777c9a1af1
files gamelib/tests/game_logic_utils.py gamelib/tests/test_scene_interactions_cryo.py gamelib/tests/test_walkthrough.py
diffstat 3 files changed, 0 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/gamelib/tests/game_logic_utils.py	Tue Jan 15 22:48:44 2013 +0200
+++ b/gamelib/tests/game_logic_utils.py	Tue Jan 15 22:52:34 2013 +0200
@@ -63,10 +63,6 @@
     def assert_current_scene(self, scene):
         self.assertEquals(scene, self.state.current_scene.name)
 
-    def assert_current_detail(self, scene):
-        # TODO: Delete?
-        return
-
     def handle_result(self, result):
         if result is None:
             return None
@@ -93,7 +89,3 @@
         target_obj = self.state.items[target_item]
         result = target_obj.interact(item_obj)
         return self.handle_result(result)
-
-    def close_detail(self):
-        # TODO: Delete?
-        return
--- a/gamelib/tests/test_scene_interactions_cryo.py	Tue Jan 15 22:48:44 2013 +0200
+++ b/gamelib/tests/test_scene_interactions_cryo.py	Tue Jan 15 22:52:34 2013 +0200
@@ -77,7 +77,6 @@
 
         self.assert_inventory_item('titanium_leg', True)
         self.assert_detail_thing('cryo.titanium_leg', False)
-        self.close_detail()
         self.assert_game_data('contains_titanium_leg', False, 'cryo.unit.1')
 
     def test_cryo_unit_detail(self):
--- a/gamelib/tests/test_walkthrough.py	Tue Jan 15 22:48:44 2013 +0200
+++ b/gamelib/tests/test_walkthrough.py	Tue Jan 15 22:52:34 2013 +0200
@@ -25,12 +25,10 @@
 
         # Get the titanium leg.
         self.interact_thing('cryo.unit.1')
-        self.assert_current_detail('cryo_detail')
         self.assert_detail_thing('cryo.titanium_leg')
         self.interact_thing('cryo.titanium_leg', detail='cryo_detail')
         self.assert_detail_thing('cryo.titanium_leg', False)
         self.assert_inventory_item('titanium_leg')
-        self.close_detail()
 
         # Open the door the rest of the way.
         self.interact_thing('cryo.door', 'titanium_leg')
@@ -109,11 +107,9 @@
 
         # Get the superconductor.
         self.interact_thing('bridge.massagechair_base')
-        self.assert_current_detail('chair_detail')
         self.interact_thing('bridge.superconductor', detail='chair_detail')
         self.assert_inventory_item('superconductor')
         self.assert_detail_thing('bridge.superconductor', False)
-        self.close_detail()
 
         # Go to the crew quarters.
         self.move_to('crew_quarters')
@@ -298,7 +294,6 @@
 
         # Bring up nav console.
         self.interact_thing('bridge.comp')
-        self.assert_current_detail('bridge_comp_detail')
         self.interact_thing('bridge_comp.nav_tab', detail='bridge_comp_detail')
         self.assert_game_data('tab', 'nav', detail='bridge_comp_detail')