[CMF-checkins] CVS: CMF/CMFCore/tests - test_CachingPolicyManager.py:1.8 test_WorkflowTool.py:1.2

[Shane Hathaway]

Update of /cvs-repository/CMF/CMFCore/tests
In directory cvs.zope.org:/tmp/cvs-serv14911

Modified Files:
	test_CachingPolicyManager.py test_WorkflowTool.py 
Log Message:
Used the new spelling of verifyClass when available.


=== CMF/CMFCore/tests/test_CachingPolicyManager.py 1.7 => 1.8 ===
             import CachingPolicyManager as ICachingPolicyManager
         from Products.CMFCore.CachingPolicyManager import CachingPolicyManager
-        from Interface import verify_class_implementation
+        try:
+            from Interface import verify_class_implementation as verifyClass
+        except ImportError:
+            from Interface.Verify import verifyClass
 
-        verify_class_implementation( ICachingPolicyManager
-                                   , CachingPolicyManager )
+        verifyClass(ICachingPolicyManager, CachingPolicyManager)
 
     def test_empty( self ):
 
@@ -240,10 +242,12 @@
         from Products.CMFCore.interfaces.CachingPolicyManager \
                 import CachingPolicyManager as ICachingPolicyManager
 
-        from Interface import verify_class_implementation
+        try:
+            from Interface import verify_class_implementation as verifyClass
+        except ImportError:
+            from Interface.Verify import verifyClass
 
-        verify_class_implementation( ICachingPolicyManager
-                                   , CachingPolicyManager )
+        verifyClass(ICachingPolicyManager, CachingPolicyManager)
 
     def test_empty( self ):
 


=== CMF/CMFCore/tests/test_WorkflowTool.py 1.1 => 1.2 ===
         from Products.CMFCore.WorkflowTool import WorkflowTool
         from Products.CMFCore.interfaces.portal_workflow import portal_workflow
-        from Interface import verify_class_implementation
+        try:
+            from Interface import verify_class_implementation as verifyClass
+        except ImportError:
+            from Interface.Verify import verifyClass
 
-        # XXX:  need better verify!
-        verify_class_implementation( portal_workflow, WorkflowTool )
+        verifyClass(portal_workflow, WorkflowTool)
 
     def test_empty( self ):