Changeset 2972 in products

Timestamp:

Nov 4, 2010 8:36:57 PM (13 years ago)

Author:

mylan

Message:

#234: Fixed absence of total string

File:

• quintagroup.canonicalpath/trunk/quintagroup/canonicalpath/tests.py (modified) (5 diffs)

quintagroup.canonicalpath/trunk/quintagroup/canonicalpath/tests.py

@@ -35 +35 @@
 from quintagroup.canonicalpath.upgrades import CanonicalConvertor
 
+def registerCanonicalPathInReg():
+    import quintagroup.canonicalpath, Products.Five
+    fiveconfigure.debug_mode = True
+    zcml.load_config('meta.zcml', Products.Five)
+    zcml.load_config('configure.zcml', quintagroup.canonicalpath)
+    fiveconfigure.debug_mode = False
+
 class TestCase(ptc.PloneTestCase):
     class layer(PloneSite):
         @classmethod
         def setUp(cls):
-            import quintagroup.canonicalpath
-            fiveconfigure.debug_mode = True
-            zcml.load_config('configure.zcml', quintagroup.canonicalpath)
-            fiveconfigure.debug_mode = False
+            registerCanonicalPathInReg()
+            # import quintagroup.canonicalpath
+            # fiveconfigure.debug_mode = True
+            # zcml.load_config('configure.zcml', quintagroup.canonicalpath)
+            # fiveconfigure.debug_mode = False
 
 ptc.setupPloneSite()
@@ -323 +331 @@
     """Not adaptable object."""
 
-class TestConvertor(TestCase):
+
+class TestConvertor(unittest.TestCase):
 
     def setUp(self):
+        registerCanonicalPathInReg()
         self.convertor = CanonicalConvertor("http://domain.com")
 
@@ -358 +368 @@
         self.convertor.convertIPathToLink(bad)
         result = self.convertor.getLogs()
-        expect = "ERROR: exceptions.AttributeError: " \
-                 "NotPropertyProviderItem instance has no attribute 'hasProperty'"
+        expect = "NotPropertyProviderItem instance has no attribute 'hasProperty'"
         self.assertEqual(expect in result, True, "Wrong log: %s" % result)
 
@@ -365 +374 @@
         self.convertor.convertIPathToLink(bad)
         result = self.convertor.getLogs()
-        expect = "ERROR: zope.component.interfaces.ComponentLookupError: "
+        expect = "zope.component.interfaces.ComponentLookupError"
         self.assertEqual(expect in result, True, "Wrong log: %s" % result)
 
@@ -399 +408 @@
 
 
-class TestAdaptersRegistration(TestCase):
+class TestAdaptersRegistration(unittest.TestCase):
     """Test of default adapters registration."""
 
     def setUp(self):
+        registerCanonicalPathInReg()
         self.cant = "Can't get \"%s\" adapter for object, which implement: "
         self.doget = "Get \"%s\" adapter for object, which implement: "