Fri Jul 15 18:41:50 EDT 2005

Update of /cvs-repository/Products/CMFCore/tests
In directory cvs.zope.org:/tmp/cvs-serv16776/CMFCore/tests

Modified Files:
      Tag: tseaver-z3_interfaces-branch
	test_ActionInformation.py test_ActionProviderBase.py 
	test_ActionsTool.py test_CachingPolicyManager.py 
	test_CatalogTool.py test_ContentTypeRegistry.py 
	test_DiscussionTool.py test_DynamicType.py 
	test_MemberDataTool.py test_MembershipTool.py 
	test_OpaqueItems.py test_PortalContent.py test_PortalFolder.py 
	test_RegistrationTool.py test_SkinsTool.py test_TypesTool.py 
	test_URLTool.py test_UndoTool.py test_WorkflowTool.py 
Log Message:


Branch for Z3-ification of CMF interfaces

 - All interfaces declared in the CMF are now Zope3-style interfaces
   (the one remaining exception is to leave Zope2's
   'webdav.WriteLockInterface' declared by CMFCore.PortalContent and
   derivatives.).

TOOD

  - Clean up XXX'es noted during this pass.


=== Products/CMFCore/tests/test_ActionInformation.py 1.16 => 1.16.4.1 ===

--- Products/CMFCore/tests/test_ActionInformation.py:1.16	Sun Jun 26 07:10:09 2005
+++ Products/CMFCore/tests/test_ActionInformation.py	Fri Jul 15 18:41:19 2005
@@ -38,14 +38,6 @@
 
         return ActionCategory(*args, **kw)
 
-    def test_z2interfaces(self):
-        from Interface.Verify import verifyClass
-        from Products.CMFCore.ActionInformation import ActionCategory
-        from Products.CMFCore.interfaces.portal_actions \
-                import ActionCategory as IActionCategory
-
-        verifyClass(IActionCategory, ActionCategory)
-
     def test_z3interfaces(self):
         from zope.interface.verify import verifyClass
         from Products.CMFCore.ActionInformation import ActionCategory
@@ -71,14 +63,6 @@
 
         return Action(*args, **kw)
 
-    def test_z2interfaces(self):
-        from Interface.Verify import verifyClass
-        from Products.CMFCore.ActionInformation import Action
-        from Products.CMFCore.interfaces.portal_actions \
-                import Action as IAction
-
-        verifyClass(IAction, Action)
-
     def test_z3interfaces(self):
         from zope.interface.verify import verifyClass
         from Products.CMFCore.ActionInformation import Action
@@ -118,20 +102,12 @@
 
         return ActionInfo(*args, **kw)
 
-    def test_z2interfaces(self):
-        from Interface.Verify import verifyClass
-        from Products.CMFCore.ActionInformation import ActionInfo
-        from Products.CMFCore.interfaces.portal_actions \
-                import ActionInfo as IActionInfo
-
-        verifyClass(IActionInfo, ActionInfo)
-
     def test_z3interfaces(self):
         from zope.interface.verify import verifyClass
         from Products.CMFCore.ActionInformation import ActionInfo
-        from Products.CMFCore.interfaces import IActionInfo
+        from Products.CMFCore.interfaces import IActionInformation
 
-        verifyClass(IActionInfo, ActionInfo)
+        verifyClass(IActionInformation, ActionInfo)
 
     def test_create_from_Action(self):
         from Products.CMFCore.ActionInformation import Action
@@ -252,14 +228,6 @@
         from Products.CMFCore.ActionInformation import ActionInformation
 
         return ActionInformation(*args, **kw)
-
-    def test_z2interfaces(self):
-        from Interface.Verify import verifyClass
-        from Products.CMFCore.ActionInformation import ActionInformation
-        from Products.CMFCore.interfaces.portal_actions \
-                import Action as IAction
-
-        verifyClass(IAction, ActionInformation)
 
     def test_z3interfaces(self):
         from zope.interface.verify import verifyClass


=== Products/CMFCore/tests/test_ActionProviderBase.py 1.20 => 1.20.4.1 ===
--- Products/CMFCore/tests/test_ActionProviderBase.py:1.20	Wed Jun 15 10:17:38 2005
+++ Products/CMFCore/tests/test_ActionProviderBase.py	Fri Jul 15 18:41:19 2005
@@ -72,13 +72,6 @@
         klass = dummy and DummyProvider or ActionProviderBase
         return klass()
 
-    def test_z2interfaces(self):
-        from Interface.Verify import verifyClass
-        from Products.CMFCore.interfaces.portal_actions \
-                import ActionProvider as IActionProvider
-
-        verifyClass(IActionProvider, ActionProviderBase)
-
     def test_z3interfaces(self):
         from zope.interface.verify import verifyClass
         from Products.CMFCore.interfaces import IActionProvider


=== Products/CMFCore/tests/test_ActionsTool.py 1.20 => 1.20.4.1 ===
--- Products/CMFCore/tests/test_ActionsTool.py:1.20	Wed Jun 15 10:17:38 2005
+++ Products/CMFCore/tests/test_ActionsTool.py	Fri Jul 15 18:41:19 2005
@@ -46,17 +46,6 @@
         self.tool = root.portal_actions
         self.tool.action_providers = ('portal_actions',)
 
-    def test_z2interfaces(self):
-        from Interface.Verify import verifyClass
-        from Products.CMFCore.ActionsTool import ActionsTool
-        from Products.CMFCore.interfaces.portal_actions \
-                import ActionProvider as IActionProvider
-        from Products.CMFCore.interfaces.portal_actions \
-                import portal_actions as IActionsTool
-
-        verifyClass(IActionProvider, ActionsTool)
-        verifyClass(IActionsTool, ActionsTool)
-
     def test_z3interfaces(self):
         from zope.interface.verify import verifyClass
         from Products.CMFCore.ActionsTool import ActionsTool


=== Products/CMFCore/tests/test_CachingPolicyManager.py 1.16 => 1.16.4.1 ===
--- Products/CMFCore/tests/test_CachingPolicyManager.py:1.16	Wed Jun 15 10:17:38 2005
+++ Products/CMFCore/tests/test_CachingPolicyManager.py	Fri Jul 15 18:41:19 2005
@@ -268,14 +268,6 @@
     def assertEqualDelta( self, lhs, rhs, delta ):
         self.failUnless( abs( lhs - rhs ) <= delta )
 
-    def test_z2interfaces(self):
-        from Interface.Verify import verifyClass
-        from Products.CMFCore.CachingPolicyManager import CachingPolicyManager
-        from Products.CMFCore.interfaces.CachingPolicyManager \
-                import CachingPolicyManager as ICachingPolicyManager
-
-        verifyClass(ICachingPolicyManager, CachingPolicyManager)
-
     def test_z3interfaces(self):
         from zope.interface.verify import verifyClass
         from Products.CMFCore.CachingPolicyManager import CachingPolicyManager


=== Products/CMFCore/tests/test_CatalogTool.py 1.11 => 1.11.4.1 ===
--- Products/CMFCore/tests/test_CatalogTool.py:1.11	Wed Jun 15 10:17:38 2005
+++ Products/CMFCore/tests/test_CatalogTool.py	Fri Jul 15 18:41:19 2005
@@ -31,14 +31,6 @@
 
 class IndexableObjectWrapperTests(TestCase):
 
-    def test_z2interfaces(self):
-        from Interface.Verify import verifyClass
-        from Products.CMFCore.CatalogTool import IndexableObjectWrapper
-        from Products.CMFCore.interfaces.portal_catalog \
-                import IndexableObjectWrapper as IIndexableObjectWrapper
-
-        verifyClass(IIndexableObjectWrapper, IndexableObjectWrapper)
-
     def test_z3interfaces(self):
         from zope.interface.verify import verifyClass
         from Products.CMFCore.CatalogTool import IndexableObjectWrapper
@@ -53,19 +45,6 @@
         from Products.CMFCore.CatalogTool import CatalogTool
 
         return CatalogTool(*args, **kw)
-
-    def test_z2interfaces(self):
-        from Interface.Verify import verifyClass
-        from Products.CMFCore.CatalogTool import CatalogTool
-        from Products.CMFCore.interfaces.portal_actions \
-                import ActionProvider as IActionProvider
-        from Products.CMFCore.interfaces.portal_catalog \
-                import portal_catalog as ICatalogTool
-        from Products.ZCatalog.IZCatalog import IZCatalog
-
-        verifyClass(IActionProvider, CatalogTool)
-        verifyClass(ICatalogTool, CatalogTool)
-        verifyClass(IZCatalog, CatalogTool)
 
     def test_z3interfaces(self):
         from zope.interface.verify import verifyClass


=== Products/CMFCore/tests/test_ContentTypeRegistry.py 1.13 => 1.13.4.1 ===
--- Products/CMFCore/tests/test_ContentTypeRegistry.py:1.13	Wed Jun 15 10:17:38 2005
+++ Products/CMFCore/tests/test_ContentTypeRegistry.py	Fri Jul 15 18:41:19 2005
@@ -28,15 +28,6 @@
 
         return MajorMinorPredicate(*args, **kw)
 
-    def test_z2interfaces(self):
-        from Interface.Verify import verifyClass
-        from Products.CMFCore.ContentTypeRegistry import MajorMinorPredicate
-        from Products.CMFCore.interfaces.ContentTypeRegistry \
-                import ContentTypeRegistryPredicate \
-                as IContentTypeRegistryPredicate
-
-        verifyClass(IContentTypeRegistryPredicate, MajorMinorPredicate)
-
     def test_z3interfaces(self):
         from zope.interface.verify import verifyClass
         from Products.CMFCore.ContentTypeRegistry import MajorMinorPredicate
@@ -84,15 +75,6 @@
 
         return ExtensionPredicate(*args, **kw)
 
-    def test_z2interfaces(self):
-        from Interface.Verify import verifyClass
-        from Products.CMFCore.ContentTypeRegistry import ExtensionPredicate
-        from Products.CMFCore.interfaces.ContentTypeRegistry \
-                import ContentTypeRegistryPredicate \
-                as IContentTypeRegistryPredicate
-
-        verifyClass(IContentTypeRegistryPredicate, ExtensionPredicate)
-
     def test_z3interfaces(self):
         from zope.interface.verify import verifyClass
         from Products.CMFCore.ContentTypeRegistry import ExtensionPredicate
@@ -135,16 +117,6 @@
 
         return MimeTypeRegexPredicate(*args, **kw)
 
-    def test_z2interfaces(self):
-        from Interface.Verify import verifyClass
-        from Products.CMFCore.ContentTypeRegistry \
-                import MimeTypeRegexPredicate
-        from Products.CMFCore.interfaces.ContentTypeRegistry \
-                import ContentTypeRegistryPredicate \
-                as IContentTypeRegistryPredicate
-
-        verifyClass(IContentTypeRegistryPredicate, MimeTypeRegexPredicate)
-
     def test_z3interfaces(self):
         from zope.interface.verify import verifyClass
         from Products.CMFCore.ContentTypeRegistry \
@@ -181,15 +153,6 @@
 
         return NameRegexPredicate(*args, **kw)
 
-    def test_z2interfaces(self):
-        from Interface.Verify import verifyClass
-        from Products.CMFCore.ContentTypeRegistry import NameRegexPredicate
-        from Products.CMFCore.interfaces.ContentTypeRegistry \
-                import ContentTypeRegistryPredicate \
-                as IContentTypeRegistryPredicate
-
-        verifyClass(IContentTypeRegistryPredicate, NameRegexPredicate)
-
     def test_z3interfaces(self):
         from zope.interface.verify import verifyClass
         from Products.CMFCore.ContentTypeRegistry import NameRegexPredicate
@@ -228,14 +191,6 @@
 
     def setUp( self ):
         self.reg = self._makeOne()
-
-    def test_z2interfaces(self):
-        from Interface.Verify import verifyClass
-        from Products.CMFCore.ContentTypeRegistry import ContentTypeRegistry
-        from Products.CMFCore.interfaces.ContentTypeRegistry \
-                import ContentTypeRegistry as IContentTypeRegistry
-
-        verifyClass(IContentTypeRegistry, ContentTypeRegistry)
 
     def test_z3interfaces(self):
         from zope.interface.verify import verifyClass


=== Products/CMFCore/tests/test_DiscussionTool.py 1.8 => 1.8.4.1 ===
--- Products/CMFCore/tests/test_DiscussionTool.py:1.8	Wed Jun 15 10:17:38 2005
+++ Products/CMFCore/tests/test_DiscussionTool.py	Fri Jul 15 18:41:19 2005
@@ -23,49 +23,19 @@
 
 class DiscussionToolTests(TestCase):
 
-    def test_z2interfaces(self):
-        from Interface.Verify import verifyClass
-        from Products.CMFCore.DiscussionTool import DiscussionTool
-        from Products.CMFCore.interfaces.portal_actions \
-                import ActionProvider as IActionProvider
-        from Products.CMFCore.interfaces.portal_discussion \
-                import oldstyle_portal_discussion as IOldstyleDiscussionTool
-
-        verifyClass(IActionProvider, DiscussionTool)
-        verifyClass(IOldstyleDiscussionTool, DiscussionTool)
-
     def test_z3interfaces(self):
         from zope.interface.verify import verifyClass
         from Products.CMFCore.DiscussionTool import DiscussionTool
         from Products.CMFCore.interfaces import IActionProvider
-        from Products.CMFCore.interfaces import IOldstyleDiscussionTool
+        from Products.CMFCore.interfaces import IDiscussionTool
 
         verifyClass(IActionProvider, DiscussionTool)
-        verifyClass(IOldstyleDiscussionTool, DiscussionTool)
-
-
-class OldDiscussableTests(TestCase):
-
-    def test_z2interfaces(self):
-        from Interface.Verify import verifyClass
-        from Products.CMFCore.DiscussionTool import OldDiscussable
-        from Products.CMFCore.interfaces.Discussions \
-                import OldDiscussable as IOldDiscussable
-
-        verifyClass(IOldDiscussable, OldDiscussable)
-
-    def test_z3interfaces(self):
-        from zope.interface.verify import verifyClass
-        from Products.CMFCore.DiscussionTool import OldDiscussable
-        from Products.CMFCore.interfaces import IOldstyleDiscussable
-
-        verifyClass(IOldstyleDiscussable, OldDiscussable)
+        verifyClass(IDiscussionTool, DiscussionTool)
 
 
 def test_suite():
     return TestSuite((
         makeSuite( DiscussionToolTests ),
-        makeSuite( OldDiscussableTests ),
         ))
 
 if __name__ == '__main__':


=== Products/CMFCore/tests/test_DynamicType.py 1.8 => 1.8.4.1 ===
--- Products/CMFCore/tests/test_DynamicType.py:1.8	Wed Jun 15 10:17:38 2005
+++ Products/CMFCore/tests/test_DynamicType.py	Fri Jul 15 18:41:19 2005
@@ -50,13 +50,6 @@
         self.site.portal_types._setObject( 'Dummy Content 15', FTI(**fti) )
         self.site._setObject( 'foo', DummyContent() )
 
-    def test_z2interfaces(self):
-        from Interface.Verify import verifyClass
-        from Products.CMFCore.interfaces.Dynamic \
-                import DynamicType as IDynamicType
-
-        verifyClass(IDynamicType, DynamicType)
-
     def test_z3interfaces(self):
         from zope.interface.verify import verifyClass
         from Products.CMFCore.interfaces import IDynamicType


=== Products/CMFCore/tests/test_MemberDataTool.py 1.8 => 1.8.4.1 ===
--- Products/CMFCore/tests/test_MemberDataTool.py:1.8	Wed Jun 15 10:17:38 2005
+++ Products/CMFCore/tests/test_MemberDataTool.py	Fri Jul 15 18:41:19 2005
@@ -69,17 +69,6 @@
 
         return MemberDataTool(*args, **kw)
 
-    def test_z2interfaces(self):
-        from Interface.Verify import verifyClass
-        from Products.CMFCore.interfaces.portal_actions \
-                import ActionProvider as IActionProvider
-        from Products.CMFCore.interfaces.portal_memberdata \
-                import portal_memberdata as IMemberDataTool
-        from Products.CMFCore.MemberDataTool import MemberDataTool
-
-        verifyClass(IActionProvider, MemberDataTool)
-        verifyClass(IMemberDataTool, MemberDataTool)
-
     def test_z3interfaces(self):
         from zope.interface.verify import verifyClass
         from Products.CMFCore.interfaces import IActionProvider
@@ -104,14 +93,6 @@
         from Products.CMFCore.MemberDataTool import MemberData
 
         return MemberData(*args, **kw)
-
-    def test_z2interfaces(self):
-        from Interface.Verify import verifyClass
-        from Products.CMFCore.interfaces.portal_memberdata \
-                import MemberData as IMemberData
-        from Products.CMFCore.MemberDataTool import MemberData
-
-        verifyClass(IMemberData, MemberData)
 
     def test_z3interfaces(self):
         from zope.interface.verify import verifyClass


=== Products/CMFCore/tests/test_MembershipTool.py 1.13 => 1.13.2.1 ===
--- Products/CMFCore/tests/test_MembershipTool.py:1.13	Thu Jul  7 14:27:46 2005
+++ Products/CMFCore/tests/test_MembershipTool.py	Fri Jul 15 18:41:19 2005
@@ -33,17 +33,6 @@
 
 class MembershipToolTests(TestCase):
 
-    def test_z2interfaces(self):
-        from Interface.Verify import verifyClass
-        from Products.CMFCore.interfaces.portal_actions \
-                import ActionProvider as IActionProvider
-        from Products.CMFCore.interfaces.portal_membership \
-                import portal_membership as IMembershipTool
-        from Products.CMFCore.MembershipTool import MembershipTool
-
-        verifyClass(IActionProvider, MembershipTool)
-        verifyClass(IMembershipTool, MembershipTool)
-
     def test_z3interfaces(self):
         from zope.interface.verify import verifyClass
         from Products.CMFCore.interfaces import IActionProvider


=== Products/CMFCore/tests/test_OpaqueItems.py 1.11 => 1.11.4.1 ===
--- Products/CMFCore/tests/test_OpaqueItems.py:1.11	Wed Jun 15 10:17:38 2005
+++ Products/CMFCore/tests/test_OpaqueItems.py	Fri Jul 15 18:41:19 2005
@@ -19,8 +19,9 @@
 import Zope2
 Zope2.startup()
 
-from Products.CMFCore.interfaces.IOpaqueItems \
-    import ICallableOpaqueItem, ICallableOpaqueItemEvents
+from zope.interface import implements, implementedBy
+from Products.CMFCore.interfaces import ICallableOpaqueItem
+from Products.CMFCore.interfaces import ICallableOpaqueItemEvents
 from Products.CMFCore.PortalFolder import PortalFolder
 from Products.CMFCore.tests.base.dummy \
     import DummyContent as OriginalDummyContent
@@ -90,16 +91,12 @@
 class Marker(OpaqueBase):
     """ Opaque item without manage_after/before hookes but marked as callable
     """
-    __implements__ = (
-        ICallableOpaqueItem,
-    )
+    implements(ICallableOpaqueItem)
 
 class Hooks(OpaqueBase):
     """ Opaque item with manage_after/before hooks but not marked as callable
     """
-    __implements__ = (
-        ICallableOpaqueItemEvents,
-    )
+    implements(ICallableOpaqueItemEvents)
     
     def manage_afterAdd(self, item, container):
         self.addCount = self.addCounter
@@ -117,7 +114,8 @@
 class MarkerAndHooks(Marker, Hooks):
     """ Opaque item with manage_after/before hookes and marked as callable
     """
-    __implements__ = Marker.__implements__ + Hooks.__implements__
+    implements(implementedBy(Marker),
+               implementedBy(Hooks))
 
 
 # -------------------------------------------


=== Products/CMFCore/tests/test_PortalContent.py 1.11 => 1.11.4.1 ===
--- Products/CMFCore/tests/test_PortalContent.py:1.11	Wed Jun 15 10:17:38 2005
+++ Products/CMFCore/tests/test_PortalContent.py	Fri Jul 15 18:41:19 2005
@@ -32,17 +32,6 @@
 
 class PortalContentTests(TestCase):
 
-    def test_z2interfaces(self):
-        from Interface.Verify import verifyClass
-        from Products.CMFCore.interfaces.Contentish \
-                import Contentish as IContentish
-        from Products.CMFCore.interfaces.Dynamic \
-                import DynamicType as IDynamicType
-        from Products.CMFCore.PortalContent import PortalContent
-
-        verifyClass(IContentish, PortalContent)
-        verifyClass(IDynamicType, PortalContent)
-
     def test_z3interfaces(self):
         from zope.interface.verify import verifyClass
         from Products.CMFCore.interfaces import IContentish


=== Products/CMFCore/tests/test_PortalFolder.py 1.43 => 1.43.4.1 ===
--- Products/CMFCore/tests/test_PortalFolder.py:1.43	Wed Jun 15 10:17:38 2005
+++ Products/CMFCore/tests/test_PortalFolder.py	Fri Jul 15 18:41:19 2005
@@ -122,21 +122,6 @@
 
         return self.site._setObject( id, PortalFolder(id, *args, **kw) )
 
-    def test_z2interfaces(self):
-        from Interface.Verify import verifyClass
-        from OFS.IOrderSupport import IOrderedContainer
-        from webdav.WriteLockInterface import WriteLockInterface
-        from Products.CMFCore.interfaces.Dynamic \
-                import DynamicType as IDynamicType
-        from Products.CMFCore.interfaces.Folderish \
-                import Folderish as IFolderish
-        from Products.CMFCore.PortalFolder import PortalFolder
-
-        verifyClass(IDynamicType, PortalFolder)
-        verifyClass(IFolderish, PortalFolder)
-        verifyClass(IOrderedContainer, PortalFolder)
-        verifyClass(WriteLockInterface, PortalFolder)
-
     def test_z3interfaces(self):
         from zope.interface.verify import verifyClass
         from Products.CMFCore.interfaces import IDynamicType


=== Products/CMFCore/tests/test_RegistrationTool.py 1.7 => 1.7.4.1 ===
--- Products/CMFCore/tests/test_RegistrationTool.py:1.7	Wed Jun 15 10:17:38 2005
+++ Products/CMFCore/tests/test_RegistrationTool.py	Fri Jul 15 18:41:19 2005
@@ -28,17 +28,6 @@
 
         return RegistrationTool()
 
-    def test_z2interfaces(self):
-        from Interface.Verify import verifyClass
-        from Products.CMFCore.interfaces.portal_actions \
-                import ActionProvider as IActionProvider
-        from Products.CMFCore.interfaces.portal_registration \
-                import portal_registration as IRegistrationTool
-        from Products.CMFCore.RegistrationTool import RegistrationTool
-
-        verifyClass(IActionProvider, RegistrationTool)
-        verifyClass(IRegistrationTool, RegistrationTool)
-
     def test_z3interfaces(self):
         from zope.interface.verify import verifyClass
         from Products.CMFCore.interfaces import IActionProvider


=== Products/CMFCore/tests/test_SkinsTool.py 1.8 => 1.8.4.1 ===
--- Products/CMFCore/tests/test_SkinsTool.py:1.8	Wed Jun 15 10:17:38 2005
+++ Products/CMFCore/tests/test_SkinsTool.py	Fri Jul 15 18:41:19 2005
@@ -23,14 +23,6 @@
 
 class SkinsContainerTests(TestCase):
 
-    def test_z2interfaces(self):
-        from Interface.Verify import verifyClass
-        from Products.CMFCore.interfaces.portal_skins \
-                import SkinsContainer as ISkinsContainer
-        from Products.CMFCore.SkinsContainer import SkinsContainer
-
-        verifyClass(ISkinsContainer, SkinsContainer)
-
     def test_z3interfaces(self):
         from zope.interface.verify import verifyClass
         from Products.CMFCore.interfaces import ISkinsContainer
@@ -45,20 +37,6 @@
         from Products.CMFCore.SkinsTool import SkinsTool
 
         return SkinsTool(*args, **kw)
-
-    def test_z2interfaces(self):
-        from Interface.Verify import verifyClass
-        from Products.CMFCore.interfaces.portal_actions \
-                import ActionProvider as IActionProvider
-        from Products.CMFCore.interfaces.portal_skins \
-                import portal_skins as ISkinsTool
-        from Products.CMFCore.interfaces.portal_skins \
-                import SkinsContainer as ISkinsContainer
-        from Products.CMFCore.SkinsTool import SkinsTool
-
-        verifyClass(IActionProvider, SkinsTool)
-        verifyClass(ISkinsContainer, SkinsTool)
-        verifyClass(ISkinsTool, SkinsTool)
 
     def test_z3interfaces(self):
         from zope.interface.verify import verifyClass


=== Products/CMFCore/tests/test_TypesTool.py 1.39 => 1.39.4.1 ===
--- Products/CMFCore/tests/test_TypesTool.py:1.39	Wed Jun 15 10:17:38 2005
+++ Products/CMFCore/tests/test_TypesTool.py	Fri Jul 15 18:41:19 2005
@@ -69,17 +69,6 @@
         fti = FTIDATA_DUMMY[0].copy()
         self.ttool._setObject( 'Dummy Content', FTI(**fti) )
 
-    def test_z2interfaces(self):
-        from Interface.Verify import verifyClass
-        from Products.CMFCore.interfaces.portal_actions \
-                import ActionProvider as IActionProvider
-        from Products.CMFCore.interfaces.portal_types \
-                import portal_types as ITypesTool
-        from Products.CMFCore.TypesTool import TypesTool
-
-        verifyClass(IActionProvider, TypesTool)
-        verifyClass(ITypesTool, TypesTool)
-
     def test_z3interfaces(self):
         from zope.interface.verify import verifyClass
         from Products.CMFCore.interfaces import IActionProvider
@@ -444,14 +433,6 @@
 
         return FactoryTypeInformation(id, **kw)
 
-    def test_z2interfaces(self):
-        from Interface.Verify import verifyClass
-        from Products.CMFCore.interfaces.portal_types \
-                import ContentTypeInformation as ITypeInformation
-        from Products.CMFCore.TypesTool import FactoryTypeInformation
-
-        verifyClass(ITypeInformation, FactoryTypeInformation)
-
     def test_z3interfaces(self):
         from zope.interface.verify import verifyClass
         from Products.CMFCore.interfaces import ITypeInformation
@@ -478,14 +459,6 @@
         from Products.CMFCore.TypesTool import ScriptableTypeInformation
 
         return ScriptableTypeInformation(id, **kw)
-
-    def test_z2interfaces(self):
-        from Interface.Verify import verifyClass
-        from Products.CMFCore.interfaces.portal_types \
-                import ContentTypeInformation as ITypeInformation
-        from Products.CMFCore.TypesTool import ScriptableTypeInformation
-
-        verifyClass(ITypeInformation, ScriptableTypeInformation)
 
     def test_z3interfaces(self):
         from zope.interface.verify import verifyClass


=== Products/CMFCore/tests/test_URLTool.py 1.9 => 1.9.4.1 ===
--- Products/CMFCore/tests/test_URLTool.py:1.9	Wed Jun 15 10:17:38 2005
+++ Products/CMFCore/tests/test_URLTool.py	Fri Jul 15 18:41:19 2005
@@ -36,17 +36,6 @@
         url_tool = URLTool(*args, **kw)
         return url_tool.__of__( self.site )
 
-    def test_z2interfaces(self):
-        from Interface.Verify import verifyClass
-        from Products.CMFCore.interfaces.portal_actions \
-                import ActionProvider as IActionProvider
-        from Products.CMFCore.interfaces.portal_url \
-                import portal_url as IURLTool
-        from Products.CMFCore.URLTool import URLTool
-
-        verifyClass(IActionProvider, URLTool)
-        verifyClass(IURLTool, URLTool)
-
     def test_z3interfaces(self):
         from zope.interface.verify import verifyClass
         from Products.CMFCore.interfaces import IActionProvider


=== Products/CMFCore/tests/test_UndoTool.py 1.6 => 1.6.4.1 ===
--- Products/CMFCore/tests/test_UndoTool.py:1.6	Wed Jun 15 10:17:38 2005
+++ Products/CMFCore/tests/test_UndoTool.py	Fri Jul 15 18:41:19 2005
@@ -23,17 +23,6 @@
 
 class UndoToolTests(TestCase):
 
-    def test_z2interfaces(self):
-        from Interface.Verify import verifyClass
-        from Products.CMFCore.interfaces.portal_actions \
-                import ActionProvider as IActionProvider
-        from Products.CMFCore.interfaces.portal_undo \
-                import portal_undo as IUndoTool
-        from Products.CMFCore.UndoTool import UndoTool
-
-        verifyClass(IActionProvider, UndoTool)
-        verifyClass(IUndoTool, UndoTool)
-
     def test_z3interfaces(self):
         from zope.interface.verify import verifyClass
         from Products.CMFCore.interfaces import IActionProvider


=== Products/CMFCore/tests/test_WorkflowTool.py 1.14 => 1.14.4.1 ===
--- Products/CMFCore/tests/test_WorkflowTool.py:1.14	Tue Jul  5 23:28:55 2005
+++ Products/CMFCore/tests/test_WorkflowTool.py	Fri Jul 15 18:41:19 2005
@@ -169,17 +169,6 @@
         tool.setChainForPortalTypes( ( 'Dummy Content', ), ( 'a', 'b' ) )
         return tool
 
-    def test_z2interfaces(self):
-        from Interface.Verify import verifyClass
-        from Products.CMFCore.interfaces.portal_actions \
-                import ActionProvider as IActionProvider
-        from Products.CMFCore.interfaces.portal_workflow \
-                import portal_workflow as IWorkflowTool
-        from Products.CMFCore.WorkflowTool import WorkflowTool
-
-        verifyClass(IActionProvider, WorkflowTool)
-        verifyClass(IWorkflowTool, WorkflowTool)
-
     def test_z3interfaces(self):
         from zope.interface.verify import verifyClass
         from Products.CMFCore.interfaces import IActionProvider

