[CMF-checkins] CVS: Products/CMFTopic/tests - common.py:1.2.4.1 test_Topic.py:1.17.4.1

[Tres Seaver]

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

Modified Files:
      Tag: tseaver-z3_interfaces-branch
	common.py test_Topic.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/CMFTopic/tests/common.py 1.2 => 1.2.4.1 ===
--- Products/CMFTopic/tests/common.py:1.2	Wed Jun 15 10:17:40 2005
+++ Products/CMFTopic/tests/common.py	Fri Jul 15 18:41:24 2005
@@ -23,12 +23,6 @@
     def _makeOne(self, id, *args, **kw):
         return self._getTargetClass()(id, *args, **kw)
 
-    def test_z2interfaces(self):
-        from Interface.Verify import verifyClass
-        from Products.CMFTopic.interfaces import Criterion as ICriterion
-
-        verifyClass( ICriterion, self._getTargetClass() )
-
     def test_z3interfaces(self):
         from zope.interface.verify import verifyClass
         from Products.CMFTopic.interfaces import ICriterion


=== Products/CMFTopic/tests/test_Topic.py 1.17 => 1.17.4.1 ===
--- Products/CMFTopic/tests/test_Topic.py:1.17	Wed Jun 15 10:17:40 2005
+++ Products/CMFTopic/tests/test_Topic.py	Fri Jul 15 18:41:24 2005
@@ -147,21 +147,6 @@
             self.site._setObject( k, v )
             self.site.portal_catalog._index( document )
 
-    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.CMFTopic.Topic import Topic
-
-        verifyClass(IDynamicType, Topic)
-        verifyClass(IFolderish, Topic)
-        verifyClass(IOrderedContainer, Topic)
-        verifyClass(WriteLockInterface, Topic)
-
     def test_z3interfaces(self):
         from zope.interface.verify import verifyClass
         from Products.CMFCore.interfaces import IDynamicType