[CMF-checkins] CVS: Products/CMFDefault/tests -
test_DefaultWorkflow.py:1.6.4.1
test_DiscussionTool.py:1.7.4.1 test_Discussions.py:1.23.4.1
test_Document.py:1.43.4.1 test_DublinCore.py:1.11.4.1
test_MembershipTool.py:1.14.4.1 test_MetadataTool.py:1.13.4.1
test_NewsItem.py:1.14.4.1 test_PropertiesTool.py:1.6.4.1
test_RegistrationTool.py:1.9.4.1
Tres Seaver
tseaver at palladion.com
Fri Jul 15 18:41:53 EDT 2005
Update of /cvs-repository/Products/CMFDefault/tests
In directory cvs.zope.org:/tmp/cvs-serv16776/CMFDefault/tests
Modified Files:
Tag: tseaver-z3_interfaces-branch
test_DefaultWorkflow.py test_DiscussionTool.py
test_Discussions.py test_Document.py test_DublinCore.py
test_MembershipTool.py test_MetadataTool.py test_NewsItem.py
test_PropertiesTool.py test_RegistrationTool.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/CMFDefault/tests/test_DefaultWorkflow.py 1.6 => 1.6.4.1 ===
--- Products/CMFDefault/tests/test_DefaultWorkflow.py:1.6 Wed Jun 15 10:17:39 2005
+++ Products/CMFDefault/tests/test_DefaultWorkflow.py Fri Jul 15 18:41:21 2005
@@ -23,15 +23,6 @@
class DefaultWorkflowDefinitionTests(TestCase):
- def test_z2interfaces(self):
- from Interface.Verify import verifyClass
- from Products.CMFCore.interfaces.portal_workflow \
- import WorkflowDefinition as IWorkflowDefinition
- from Products.CMFDefault.DefaultWorkflow \
- import DefaultWorkflowDefinition
-
- verifyClass(IWorkflowDefinition, DefaultWorkflowDefinition)
-
def test_z3interfaces(self):
from zope.interface.verify import verifyClass
from Products.CMFCore.interfaces import IWorkflowDefinition
=== Products/CMFDefault/tests/test_DiscussionTool.py 1.7 => 1.7.4.1 ===
--- Products/CMFDefault/tests/test_DiscussionTool.py:1.7 Wed Jun 15 10:17:39 2005
+++ Products/CMFDefault/tests/test_DiscussionTool.py Fri Jul 15 18:41:21 2005
@@ -37,17 +37,6 @@
self.site._setObject( 'portal_discussion', self._makeOne() )
self.site._setObject( 'portal_membership', DummyTool() )
- def test_z2interfaces(self):
- from Interface.Verify import verifyClass
- from Products.CMFCore.interfaces.portal_actions \
- import ActionProvider as IActionProvider
- from Products.CMFCore.interfaces.portal_discussion \
- import portal_discussion as IDiscussionTool
- from Products.CMFDefault.DiscussionTool import DiscussionTool
-
- verifyClass(IActionProvider, DiscussionTool)
- verifyClass(IDiscussionTool, DiscussionTool)
-
def test_z3interfaces(self):
from zope.interface.verify import verifyClass
from Products.CMFCore.interfaces import IActionProvider
=== Products/CMFDefault/tests/test_Discussions.py 1.23 => 1.23.4.1 ===
--- Products/CMFDefault/tests/test_Discussions.py:1.23 Wed Jun 15 10:17:39 2005
+++ Products/CMFDefault/tests/test_Discussions.py Fri Jul 15 18:41:21 2005
@@ -36,29 +36,6 @@
class DiscussionItemTests(TestCase):
- def test_z2interfaces(self):
- from Interface.Verify import verifyClass
- from Products.CMFCore.interfaces.Contentish \
- import Contentish as IContentish
- from Products.CMFCore.interfaces.Discussions \
- import DiscussionResponse as IDiscussionResponse
- from Products.CMFCore.interfaces.DublinCore \
- import CatalogableDublinCore as ICatalogableDublinCore
- from Products.CMFCore.interfaces.DublinCore \
- import DublinCore as IDublinCore
- from Products.CMFCore.interfaces.DublinCore \
- import MutableDublinCore as IMutableDublinCore
- from Products.CMFCore.interfaces.Dynamic \
- import DynamicType as IDynamicType
- from Products.CMFDefault.DiscussionItem import DiscussionItem
-
- verifyClass(ICatalogableDublinCore, DiscussionItem)
- verifyClass(IContentish, DiscussionItem)
- verifyClass(IDiscussionResponse, DiscussionItem)
- verifyClass(IDublinCore, DiscussionItem)
- verifyClass(IDynamicType, DiscussionItem)
- verifyClass(IMutableDublinCore, DiscussionItem)
-
def test_z3interfaces(self):
from zope.interface.verify import verifyClass
from Products.CMFCore.interfaces import ICatalogableDublinCore
@@ -78,14 +55,6 @@
class DiscussionItemContainerTests(TestCase):
-
- def test_z2interfaces(self):
- from Interface.Verify import verifyClass
- from Products.CMFCore.interfaces.Discussions \
- import Discussable as IDiscussable
- from Products.CMFDefault.DiscussionItem import DiscussionItemContainer
-
- verifyClass(IDiscussable, DiscussionItemContainer)
def test_z3interfaces(self):
from zope.interface.verify import verifyClass
=== Products/CMFDefault/tests/test_Document.py 1.43 => 1.43.4.1 ===
--- Products/CMFDefault/tests/test_Document.py:1.43 Wed Jun 15 10:17:39 2005
+++ Products/CMFDefault/tests/test_Document.py Fri Jul 15 18:41:21 2005
@@ -65,30 +65,6 @@
class DocumentTests(RequestTestBase):
- def test_z2interfaces(self):
- from Interface.Verify import verifyClass
- from Products.CMFCore.interfaces.Contentish \
- import Contentish as IContentish
- from Products.CMFCore.interfaces.DublinCore \
- import CatalogableDublinCore as ICatalogableDublinCore
- from Products.CMFCore.interfaces.DublinCore \
- import DublinCore as IDublinCore
- from Products.CMFCore.interfaces.DublinCore \
- import MutableDublinCore as IMutableDublinCore
- from Products.CMFCore.interfaces.Dynamic \
- import DynamicType as IDynamicType
- from Products.CMFDefault.Document import Document
- from Products.CMFDefault.interfaces.Document import IDocument
- from Products.CMFDefault.interfaces.Document import IMutableDocument
-
- verifyClass(ICatalogableDublinCore, Document)
- verifyClass(IContentish, Document)
- verifyClass(IDocument, Document)
- verifyClass(IDublinCore, Document)
- verifyClass(IDynamicType, Document)
- verifyClass(IMutableDocument, Document)
- verifyClass(IMutableDublinCore, Document)
-
def test_z3interfaces(self):
from zope.interface.verify import verifyClass
from Products.CMFCore.interfaces import ICatalogableDublinCore
=== Products/CMFDefault/tests/test_DublinCore.py 1.11 => 1.11.4.1 ===
--- Products/CMFDefault/tests/test_DublinCore.py:1.11 Wed Jun 15 10:17:39 2005
+++ Products/CMFDefault/tests/test_DublinCore.py Fri Jul 15 18:41:21 2005
@@ -68,20 +68,6 @@
return DummyContent(id, *args, **kw)
- def test_z2interfaces(self):
- from Interface.Verify import verifyClass
- from Products.CMFCore.interfaces.DublinCore \
- import CatalogableDublinCore as ICatalogableDublinCore
- from Products.CMFCore.interfaces.DublinCore \
- import DublinCore as IDublinCore
- from Products.CMFCore.interfaces.DublinCore \
- import MutableDublinCore as IMutableDublinCore
- from Products.CMFDefault.DublinCore import DefaultDublinCoreImpl
-
- verifyClass(ICatalogableDublinCore, DefaultDublinCoreImpl)
- verifyClass(IDublinCore, DefaultDublinCoreImpl)
- verifyClass(IMutableDublinCore, DefaultDublinCoreImpl)
-
def test_z3interfaces(self):
from zope.interface.verify import verifyClass
from Products.CMFCore.interfaces import ICatalogableDublinCore
=== Products/CMFDefault/tests/test_MembershipTool.py 1.14 => 1.14.4.1 ===
--- Products/CMFDefault/tests/test_MembershipTool.py:1.14 Wed Jun 15 10:17:39 2005
+++ Products/CMFDefault/tests/test_MembershipTool.py Fri Jul 15 18:41:21 2005
@@ -41,17 +41,6 @@
self.site = DummySite('site')
self.site._setObject( 'portal_membership', self._makeOne() )
- def test_z2interfaces(self):
- from Interface.Verify import verifyClass
- from Products.CMFCore.interfaces.portal_actions \
- import ActionProvider as IActionProvider
- from Products.CMFDefault.interfaces.portal_membership \
- import portal_membership as IMembershipTool
- from Products.CMFDefault.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/CMFDefault/tests/test_MetadataTool.py 1.13 => 1.13.4.1 ===
--- Products/CMFDefault/tests/test_MetadataTool.py:1.13 Wed Jun 15 10:17:39 2005
+++ Products/CMFDefault/tests/test_MetadataTool.py Fri Jul 15 18:41:21 2005
@@ -126,16 +126,6 @@
def tearDown( self ):
del self.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_metadata \
- import portal_metadata as IMetadataTool
-
- verifyClass(IActionProvider, MetadataTool)
- verifyClass(IMetadataTool, MetadataTool)
-
def test_z3interfaces(self):
from zope.interface.verify import verifyClass
from Products.CMFCore.interfaces import IActionProvider
=== Products/CMFDefault/tests/test_NewsItem.py 1.14 => 1.14.4.1 ===
--- Products/CMFDefault/tests/test_NewsItem.py:1.14 Wed Jun 15 10:17:39 2005
+++ Products/CMFDefault/tests/test_NewsItem.py Fri Jul 15 18:41:21 2005
@@ -35,26 +35,6 @@
return NewsItem(id, *args, **kw)
- def test_z2interfaces(self):
- from Interface.Verify import verifyClass
- from Products.CMFCore.interfaces.Contentish \
- import Contentish as IContentish
- from Products.CMFCore.interfaces.DublinCore \
- import CatalogableDublinCore as ICatalogableDublinCore
- from Products.CMFCore.interfaces.DublinCore \
- import DublinCore as IDublinCore
- from Products.CMFCore.interfaces.DublinCore \
- import MutableDublinCore as IMutableDublinCore
- from Products.CMFCore.interfaces.Dynamic \
- import DynamicType as IDynamicType
- from Products.CMFDefault.NewsItem import NewsItem
-
- verifyClass(ICatalogableDublinCore, NewsItem)
- verifyClass(IContentish, NewsItem)
- verifyClass(IDublinCore, NewsItem)
- verifyClass(IDynamicType, NewsItem)
- verifyClass(IMutableDublinCore, NewsItem)
-
def test_z3interfaces(self):
from zope.interface.verify import verifyClass
from Products.CMFCore.interfaces import ICatalogableDublinCore
=== Products/CMFDefault/tests/test_PropertiesTool.py 1.6 => 1.6.4.1 ===
--- Products/CMFDefault/tests/test_PropertiesTool.py:1.6 Wed Jun 15 10:17:39 2005
+++ Products/CMFDefault/tests/test_PropertiesTool.py Fri Jul 15 18:41:21 2005
@@ -23,17 +23,6 @@
class PropertiesToolTests(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_properties \
- import portal_properties as IPropertiesTool
- from Products.CMFDefault.PropertiesTool import PropertiesTool
-
- verifyClass(IActionProvider, PropertiesTool)
- verifyClass(IPropertiesTool, PropertiesTool)
-
def test_z3interfaces(self):
from zope.interface.verify import verifyClass
from Products.CMFCore.interfaces import IActionProvider
=== Products/CMFDefault/tests/test_RegistrationTool.py 1.9 => 1.9.4.1 ===
--- Products/CMFDefault/tests/test_RegistrationTool.py:1.9 Wed Jun 15 10:17:39 2005
+++ Products/CMFDefault/tests/test_RegistrationTool.py Fri Jul 15 18:41:21 2005
@@ -39,16 +39,6 @@
def _makeOne(self, *args, **kw):
return self._getTargetClass()(*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_registration \
- import portal_registration as IRegistrationTool
-
- verifyClass(IActionProvider, self._getTargetClass())
- verifyClass(IRegistrationTool, self._getTargetClass())
-
def test_z3interfaces(self):
from zope.interface.verify import verifyClass
from Products.CMFCore.interfaces import IActionProvider
More information about the CMF-checkins
mailing list