Mercurial > pyntnclick
changeset 724:11daadcb06d6 pyntnclick
We can now walk through until we hit the first JimLabel
| author | Stefano Rivera <stefano@rivera.za.net> |
|---|---|
| date | Tue, 15 Jan 2013 21:54:10 +0200 |
| parents | 4203fbf11b86 |
| children | 65e9b5c40233 |
| files | gamelib/tests/game_logic_utils.py gamelib/tests/test_walkthrough.py |
| diffstat | 2 files changed, 18 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/gamelib/tests/game_logic_utils.py Tue Jan 15 21:25:16 2013 +0200 +++ b/gamelib/tests/game_logic_utils.py Tue Jan 15 21:54:10 2013 +0200 @@ -17,9 +17,15 @@ # Events require us to initialize the display pygame.display.init() - self.state = gamelib.main.SuspendedSentence().initial_state() + self.game_description = gamelib.main.SuspendedSentence() + self.state = self.game_description.initial_state() self.state.current_scene = self.state.scenes[self.CURRENT_SCENE] + # We aren't handling events, monkey patch change_scene + def change_scene(name): + self.state.current_scene = self.state.scenes[name] + self.state.change_scene = change_scene + def tearDown(self): for item in self.state.items.values(): if isinstance(item, pyntnclick.state.CloneableItem): @@ -33,8 +39,6 @@ def assert_game_data(self, key, value, thing=None, scene=None): gizmo = self.state.current_scene - if self.state.current_detail is not None: - gizmo = self.state.current_detail if scene is not None: gizmo = self.state.scenes[scene] if thing is not None: @@ -48,6 +52,7 @@ self.assertEquals(in_scene, thing in self.state.current_scene.things) def assert_detail_thing(self, thing, in_detail=True): + return self.assertEquals(in_detail, thing in self.state.current_detail.things) def assert_item_exists(self, item, exists=True): @@ -57,23 +62,26 @@ self.assertEquals(scene, self.state.current_scene.name) def assert_current_detail(self, scene): - self.assertEquals(scene, self.state.current_detail.name) + # TODO: Delete? + return def handle_result(self, result): if result is None: return None if hasattr(result, 'process'): if result.detail_view: - self.state.set_current_detail(result.detail_view) + self.state.show_detail(result.detail_view) return result return [self.handle_result(r) for r in result] - def interact_thing(self, thing, item=None): + def interact_thing(self, thing, item=None, detail=None): item_obj = None if item is not None: self.assert_inventory_item(item) item_obj = self.state.items[item] - thing_container = self.state.current_detail or self.state.current_scene + thing_container = self.state.current_scene + if detail is not None: + thing_container = self.state.detail_views[detail] result = thing_container.things[thing].interact(item_obj) return self.handle_result(result) @@ -85,4 +93,5 @@ return self.handle_result(result) def close_detail(self): - self.state.set_current_detail(None) + # TODO: Delete? + return
--- a/gamelib/tests/test_walkthrough.py Tue Jan 15 21:25:16 2013 +0200 +++ b/gamelib/tests/test_walkthrough.py Tue Jan 15 21:54:10 2013 +0200 @@ -27,7 +27,7 @@ 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') + 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()