diff gamelib/tests/game_logic_utils.py @ 190:30f2308c1efc

Fix tests and add a (currently unhooked) laser welder.
author Jeremy Thurgood <firxen@gmail.com>
date Wed, 25 Aug 2010 20:09:19 +0200
parents 6b0f7364f3bf
children 0bad554d0926
line wrap: on
line diff
--- a/gamelib/tests/game_logic_utils.py	Wed Aug 25 18:04:00 2010 +0200
+++ b/gamelib/tests/game_logic_utils.py	Wed Aug 25 20:09:19 2010 +0200
@@ -10,6 +10,7 @@
 
 # We need this stuff set up so we can load images and whatnot.
 pygame.display.init()
+pygame.font.init()
 pygame.display.set_mode(SCREEN, SWSURFACE)
 
 
@@ -39,8 +40,17 @@
     def assert_inventory_item(self, item, in_inventory=True):
         self.assertEquals(in_inventory, self.state.items[item] in self.state.inventory)
 
-    def interact_thing(self, thing, item=None):
+    def assert_scene_thing(self, thing, in_scene=True):
+        self.assertEquals(in_scene, thing in self.state.current_scene.things)
+
+    def assert_detail_thing(self, thing, in_detail=True):
+        self.assertEquals(in_detail, thing in self.state.current_detail.things)
+
+    def interact_thing(self, thing, item=None, detail=False):
         item_obj = None
         if item is not None:
             item_obj = self.state.items[item]
-        self.state.scenes[self.CURRENT_SCENE].things[thing].interact(item_obj)
+        thing_container = self.state.current_scene
+        if detail:
+            thing_container = self.state.current_detail
+        return thing_container.things[thing].interact(item_obj)