[Checkins] SVN: persistent/trunk/persistent/tests/test_mapping.py Coverage

Tres Seaver cvs-admin at zope.org
Mon May 14 23:22:43 UTC 2012


Log message for revision 125880:
  Coverage

Changed:
  U   persistent/trunk/persistent/tests/test_mapping.py

-=-
Modified: persistent/trunk/persistent/tests/test_mapping.py
===================================================================
--- persistent/trunk/persistent/tests/test_mapping.py	2012-05-14 23:22:35 UTC (rev 125879)
+++ persistent/trunk/persistent/tests/test_mapping.py	2012-05-14 23:22:39 UTC (rev 125880)
@@ -11,21 +11,45 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-import doctest
 import unittest
 
-def test_suite():
-    return unittest.TestSuite((
-        doctest.DocFileSuite('README.txt'),
-        ))
 
 
-l0 = {}
-l1 = {0:0}
-l2 = {0:0, 1:1}
+class Test_default(unittest.TestCase):
 
-class MappingTests(unittest.TestCase):
+    def _getTargetClass(self):
+        from persistent.mapping import default
+        return default
 
+    def _makeOne(self, func):
+        return self._getTargetClass()(func)
+
+    def test___get___from_class(self):
+        _called_with = []
+        def _test(inst):
+            _called_with.append(inst)
+            return '_test'
+        descr = self._makeOne(_test)
+        class Foo(object):
+            testing = descr
+        self.assertTrue(Foo.testing is descr)
+        self.assertEqual(_called_with, [])
+
+    def test___get___from_instance(self):
+        _called_with = []
+        def _test(inst):
+            _called_with.append(inst)
+            return 'TESTING'
+        descr = self._makeOne(_test)
+        class Foo(object):
+            testing = descr
+        foo = Foo()
+        self.assertEqual(foo.testing, 'TESTING')
+        self.assertEqual(_called_with, [foo])
+
+
+class PersistentMappingTests(unittest.TestCase):
+
     def _getTargetClass(self):
         from persistent.mapping import PersistentMapping
         return PersistentMapping
@@ -41,6 +65,9 @@
 
     def testTheWorld(self):
         # Test constructors
+        l0 = {}
+        l1 = {0:0}
+        l2 = {0:0, 1:1}
         pm = self._getTargetClass()
         u = pm()
         u0 = pm(l0)
@@ -215,7 +242,9 @@
     """
 
 def test_suite():
+    import doctest
     return unittest.TestSuite((
         doctest.DocTestSuite(),
-        unittest.makeSuite(MappingTests),
-        ))
+        unittest.makeSuite(PersistentMappingTests),
+        unittest.makeSuite(Test_default),
+    ))



More information about the checkins mailing list