Changeset 2884

Timestamp:

03/06/07 17:06:28 (2 years ago)

Author:

nate

Message:

Added more unit tests to dObject. Added another test to dColors when I discovered I was missing code coverage (thank you coverage.py). Figured out how to exclude the if name... clauses. Still need to think of what to test with the randomColor function... Anyway, the numbers for code coverage are improving.

Files:

• trunk/dabo/dObject.py (modified) (3 diffs)
• trunk/tests/unitTests/Test_dColors.py (modified) (2 diffs)
• trunk/tests/unitTests/Test_dObject.py (modified) (1 diff)
• trunk/tests/unitTests/masterTestSuite.py (modified) (2 diffs)

trunk/dabo/dObject.py

@@ -231 +231 @@
-
-    def _getClass(self):
-
-
-
-
+
-
-
@@ -269 +266 @@
-            return "?"
-    
-
-
+
+
+
+
-        
-        
@@ -295 +294 @@
-
-    def _setPreferenceManager(self, val):
+        if not isinstance(val, dPref):
+            raise TypeError, 'PreferenceManager must be a dPref object'
-        self._preferenceManager = val
-

trunk/tests/unitTests/Test_dColors.py

@@ -129 +129 @@
-        """tupleToHex should fail with more than 3 elements in the tuple"""
-        self.assertRaises(dColors.LengthError, dColors.tupleToHex, (1,1,1,1))
+    
+    def testTupleToHexNonIntegerInput(self):
+        """tupleToHex should fail if anyone of the elements is a non-integer"""
+        self.assertRaises(dColors.IntegerTypeError, dColors.tupleToHex, ("string", 1, 1))
+        self.assertRaises(dColors.IntegerTypeError, dColors.tupleToHex, (1, "string", 1))
+        self.assertRaises(dColors.IntegerTypeError, dColors.tupleToHex, (1, 1, "string"))
-    
-    def testHexToTupleBadHexInput(self):
@@ -249 +255 @@
-
-
+
-#used for running this module bare without the test suite
-if __name__ == "__main__":

trunk/tests/unitTests/Test_dObject.py

@@ -103 +103 @@
-        self.assertEqual(a, obj.Class)
-
+class TestNameProperty(BaseTestdObject):
+    """
+    Test List:
+        - Set dObject.Name to n.  dObject.Name should be equal to n. (round trip test)
+        - dObject.Name should return '?' if no name is assigned
+        - dObject.Name should fail when given a non-string input
+    """
+    
+    def testRoundTrip(self):
+        """Set dObject.Name to n.  dObject.Name should be equal to n. (round trip test)"""
+        self.dObject.Name = "Test Name"
+        self.assertEqual("Test Name", self.dObject.Name)
+    
+    def testNoNameSet(self):
+        """dObject.Name should return '?' if no name is assigned"""
+        self.assertEqual('?', self.dObject.Name)
+    
+    def testFailOnNonStringInput(self):
+        """dObject.Name should fail when given a non-string input"""
+        def setName(val):
+            self.dObject.Name = val
+        self.assertRaises(TypeError, setName, 42)
+
+class TestParentProperty(BaseTestdObject):
+    """
+    Test List:
+        - Set dObject.Parent to n. dObject.Parent should be equal to n. (round trip test)
+        - dObject.Parent should return None if there is no parent
+    """
+    
+    def testRoundTrip(self):
+        """Set dObject.Parent to n. dObject.Parent should be equal to n. (round trip test)"""
+        test = dObject()
+        test.Parent = self.dObject
+        self.assertEqual(test.Parent, self.dObject)
+    
+    def testNoParentSet(self):
+        """dObject.Parent should return None if there is no parent"""
+        self.assertEqual(self.dObject.Parent, None)
+
+class TestPreferenceManagerProperty(BaseTestdObject):
+    """
+    Test List:
+        - Set dObject.PreferenceManager to n. dObject.PreferenceManagier should be equal to n. (round trip test)
+        - dObject.PreferenceManager should fail when set to an object not of type dPref
+        - initial conditon test???
+    """
+    
+    def testRoundTrip(self):
+        """Set dObject.PreferenceManager to n. dObject.PreferenceManagier should be equal to n. (round trip test)"""
+        from dabo.dPref import dPref
+        testDPref = dPref()
+        self.dObject.PreferenceManager = testDPref
+        self.assertEqual(testDPref, self.dObject.PreferenceManager)
+    
+    def testSetFailOnNondPrefValue(self):
+        """dObject.PreferenceManager should fail when set to an object not of type dPref"""
+        def setPreferenceManager(val):
+            self.dObject.PreferenceManager = val
+        self.assertRaises(TypeError, setPreferenceManager, 42)
+    
+    #TODO: NEED A TEST HERE FOR INITIAL CONDITION
+
+class TestSuperClassProperty(BaseTestdObject):
+    """
+    Test List:
+        - Set dObject.SuperClass should fail with any input
+        - a.SuperClass should return class Dummy when a = dObject()
+        - a.SuperClass should return class dObject when a = someObject and someObject subclasses dObject
+    """
+    
+    def testSetAlwaysFails(self):
+        """Set dObject.SuperClass should fail with any input"""
+        def setSuperClass(val):
+            self.dObject.SuperClass = val
+        self.assertRaises(AttributeError, setSuperClass, 42)
+        self.assertRaises(AttributeError, setSuperClass, "string")
+        self.assertRaises(AttributeError, setSuperClass, ("tuple", 12, 23))
+        self.assertRaises(AttributeError, setSuperClass, dObject)
+        self.assertRaises(AttributeError, setSuperClass, Dummy)
+    
+    def testGetNoSubclass(self):
+        """a.SuperClass should return class Dummy when a = dObject()"""
+        self.assertEqual(Dummy, self.dObject.SuperClass)
+    
+    def testGetWithSubclass(self):
+        """a.SuperClass should return class dObject when a = someObject and someObject subclasses dObject"""
+        class someObject(dObject):
+            pass
+        a = someObject()
+        self.assertEqual(dObject, a.SuperClass)
+
-
-#used for running this module bare without the test suite

trunk/tests/unitTests/masterTestSuite.py

@@ -13 +13 @@
-coverage.erase()
-coverage.start()
+
+coverage.exclude('if __name__ == "__main__":')
-
-import dabo
@@ -33 +35 @@
-
-coverage.stop()
-
+, dabo