Changeset 279 for trunk/game

Timestamp:

09/08/09 08:32:03 (10 years ago)

Author:

b0rland_parpg

Message:

Ticket #67: Patch by b0rland

• Moved GameObject? tests to a separate file and added more tests
• Rewrote run_tests to automatically execute all tests from tests directory
• Converted all tests into camelCase naming convention

Location:

trunk/game

Files:

• run_tests.py (modified) (1 diff)
• tests/test_crate.py (modified) (2 diffs)
• tests/test_game_object.py (added)
• tests/test_objects_base.py (modified) (1 diff)

trunk/game/run_tests.py

@@ -5 +5 @@
     return os.path.sep.join(path.split('/'))
 
-_paths = ('../../engine/swigwrappers/python', '../../engine/extensions')
+_paths = ('../../engine/swigwrappers/python', '../../engine/extensions','tests')
+test_suite = unittest.TestSuite()
+
 for p in _paths:
     if p not in sys.path:
         sys.path.append(_jp(p))
 
-from tests.test_objects_base import *
-from tests.test_crate import *
+for p in os.listdir("tests") :
+    if p[-3:] == ".py" :
+        test_suite.addTest(unittest.TestLoader().loadTestsFromName(p[:-3]))
 
-if __name__ == '__main__':
-    unittest.main()
+unittest.TextTestRunner(verbosity=2).run(test_suite)

trunk/game/tests/test_crate.py

@@ -9 +9 @@
         self.crate2 = WoodenCrate(ID='crate02', locked=False)
 
-    def test_creation(self):
+    def testCreation(self):
         self.assertEqual(self.crate.ID, 'crate01')
         self.assertEqual(self.crate.name, 'Wooden Crate')
@@ -26 +26 @@
     # can't test containing functionality...there are no containable objects
 
-    def test_lockable(self):
+    def testLockable(self):
         self.crate2.lock()
         self.assertEqual(self.crate2.locked, True)

trunk/game/tests/test_objects_base.py

@@ -5 +5 @@
 
 class TestObjectsBase(unittest.TestCase):
-    def test_game_object(self):
-        test = GameObject (1, {'map':'img/test.png'},
-                           1, 1, None, 'Test object', 'Description')
-        self.assertEqual(test.coords, (1, 1))
-        self.assertEqual(test.X, 1)
-        self.assertEqual(test.Y, 1)
-        test.coords = (2,2)
-        self.assertEqual(test.X, 2.0)
-        self.assertEqual(test.Y, 2.0)
 
-    def test_wildcard(self):
+    def testWildcard(self):
         class Wildcard (GameObject, Lockable, Container, Living, Scriptable,
                         CharStats, Wearable, Usable, Weapon, Destructable,