Changeset 276 for trunk

Timestamp:

09/07/09 20:59:20 (10 years ago)

Author:

orlandov

Message:

Ticket #67: Refactor unit tests into runnable shape

• Move tests to their own top level directory
• Fix unit test failures
• Add base/composed classes to test suite
• Run like "nosetests ./run_python.py" OR "./run_python.py"

Location:

trunk/game

Files:

• run_tests.py (modified) (1 diff)
• scripts/objects/base.py (modified) (1 diff)
• tests (added)
• tests/__init__.py (moved) (moved from trunk/game/scripts/tests/__init__.py)
• tests/test_crate.py (moved) (moved from trunk/game/scripts/tests/classTests.py) (4 diffs)
• tests/test_objects_base.py (added)

trunk/game/run_tests.py

@@ -10 +10 @@
         sys.path.append(_jp(p))
 
-from scripts.tests.classTests import WoodenCrateTest
+from tests.test_objects_base import *
+from tests.test_crate import *
 
 if __name__ == '__main__':

trunk/game/scripts/objects/base.py

@@ -255 +255 @@
     def __init__ (self, **kwargs):
         self.is_trappable = True
-        
-if __name__=="__main__":
-    """This will be turned into a test suite"""
-    class Wildcard (GameObject, Lockable, Container, Living, Scriptable, 
-                    CharStats, Wearable, Usable, Weapon, Destructable,
-                    Trappable, Carryable, ):
-        def __init__ (self, ID, *args, **kwargs):
-            self.name = 'All-purpose carry-all'
-            self.text = 'What is this? I dont know'    
-            GameObject.  __init__( self, ID, **kwargs )
-            Lockable.    __init__( self, **kwargs )
-            Container.   __init__( self, **kwargs )
-            Living.      __init__( self, **kwargs )
-            Scriptable.  __init__( self, **kwargs )
-            CharStats.   __init__( self, **kwargs )
-            Wearable.    __init__( self, **kwargs )
-            Usable.      __init__( self, **kwargs )
-            Weapon.      __init__( self, **kwargs )
-            Destructable.__init__( self, **kwargs )
-            Trappable.   __init__( self, **kwargs )
-            Carryable.   __init__( self, **kwargs )
-    
-    test = GameObject (1, {'map':'img/test.png'}, (1,1), None, 'Test object','Description')
-    print test
-    assert test.X == 1
-    assert test.Y == 1
-    assert test.coords == (1,1)
-    test.coords = (2,2)
-    assert test.X == 2.0
-    assert test.Y == 2.0
-    
-    wc = Wildcard (2)
-    print wc
-    print wc.is_carryable
-

trunk/game/tests/test_crate.py

@@ +1 @@
+#!/usr/bin/python
+
 import unittest
 from scripts.objects.containers import WoodenCrate
@@ -10 +12 @@
         self.assertEqual(self.crate.ID, 'crate01')
         self.assertEqual(self.crate.name, 'Wooden Crate')
-        self.assertEqual(self.crate.text, 'A battered down crate')
-        self.assertEqual(self.crate.gfx, \
-                {'map': 'objects/objects/crate/image.png'})
+        self.assertEqual(self.crate.text, 'A battered crate')
+        self.assertEqual(self.crate.gfx, 'crate')
         self.assertEqual(self.crate.coords, (0.0, 0.0))
         self.assertEqual(self.crate.map_id, None)
@@ -24 +25 @@
 
     # can't test containing functionality...there are no containable objects
-   
+
     def test_lockable(self):
         self.crate2.lock()
@@ -30 +31 @@
         self.crate2.unlock()
         self.assertEqual(self.crate2.locked, False)
-
-if __name__=='__main__':
-    unittest.main()