[Zope3-checkins] CVS: Products3/zwiki/tests - test_wikimail.py:1.4 test_wikipagehierarchy.py:1.9

[Stephan Richter]

Update of /cvs-repository/Products3/zwiki/tests
In directory cvs.zope.org:/tmp/cvs-serv28147/src/zopeproducts/zwiki/tests

Modified Files:
	test_wikimail.py test_wikipagehierarchy.py 
Log Message:
Fixed Wiki tests.


=== Products3/zwiki/tests/test_wikimail.py 1.3 => 1.4 ===
--- Products3/zwiki/tests/test_wikimail.py:1.3	Thu Jun  5 09:34:26 2003
+++ Products3/zwiki/tests/test_wikimail.py	Wed Jul  9 07:20:03 2003
@@ -17,7 +17,7 @@
 """
 import unittest
 
-from zope.interface.implements import implements 
+from zope.interface import classImplements 
 from zope.component.adapter import provideAdapter
 from zope.component.tests.placelesssetup import PlacelessSetup
 from zope.app.interfaces.annotation import IAnnotations, IAttributeAnnotatable
@@ -42,8 +42,8 @@
         PlacelessSetup.setUp(self)
         # This needs to be done, since the IAttributeAnnotable interface
         # is usually set in the ZCML
-        implements(WikiPage, IAttributeAnnotatable)
-        implements(Wiki, IAttributeAnnotatable)
+        classImplements(WikiPage, IAttributeAnnotatable)
+        classImplements(Wiki, IAttributeAnnotatable)
         provideAdapter(IAttributeAnnotatable, IAnnotations,
                        AttributeAnnotations)
         self._sub = MailSubscriptions(self.getTestObject())
@@ -105,8 +105,8 @@
         PlacelessSetup.setUp(self)
         # This needs to be done, since the IAttributeAnnotable interface
         # is usually set in the ZCML
-        implements(WikiPage, IAttributeAnnotatable)
-        implements(Wiki, IAttributeAnnotatable)
+        classImplements(WikiPage, IAttributeAnnotatable)
+        classImplements(Wiki, IAttributeAnnotatable)
         provideAdapter(IWikiPage, IMailSubscriptions,
                        MailSubscriptions)
         provideAdapter(IWiki, IMailSubscriptions,


=== Products3/zwiki/tests/test_wikipagehierarchy.py 1.8 => 1.9 ===
--- Products3/zwiki/tests/test_wikipagehierarchy.py:1.8	Thu Jun  5 09:34:26 2003
+++ Products3/zwiki/tests/test_wikipagehierarchy.py	Wed Jul  9 07:20:03 2003
@@ -20,17 +20,16 @@
 from zopeproducts.zwiki.interfaces import IWikiPage, IWikiPageHierarchy
 from zopeproducts.zwiki.wikipage import WikiPage, WikiPageHierarchyAdapter
 from zopeproducts.zwiki.wiki import Wiki
-from zope.interface import implements
-from zope.interface.implements import implements as late_implements
+from zope.interface import implements, classImplements
 from zope.component.tests.placelesssetup import PlacelessSetup
 from zope.component.adapter import provideAdapter
 
 from zope.app.interfaces.annotation import IAnnotations, IAttributeAnnotatable
-from zope.app.interfaces.traversing import IObjectName
+from zope.app.interfaces.traversing import IPhysicallyLocatable
 
 from zope.app.context import ContextWrapper
 from zope.app.attributeannotations import AttributeAnnotations
-from zope.app.traversing.adapters import ObjectName
+from zope.app.traversing.adapters import WrapperPhysicallyLocatable
 
 
 class TestAnnotations(dict):
@@ -43,12 +42,12 @@
         PlacelessSetup.setUp(self)
         # This needs to be done, since the IAttributeAnnotable interface
         # is usually set in the ZCML
-        late_implements(WikiPage, IAttributeAnnotatable);
+        classImplements(WikiPage, IAttributeAnnotatable);
         provideAdapter(IAttributeAnnotatable, IAnnotations,
                        AttributeAnnotations)
         provideAdapter(IWikiPage, IWikiPageHierarchy,
                        WikiPageHierarchyAdapter)
-        provideAdapter(None, IObjectName, ObjectName)
+        provideAdapter(None, IPhysicallyLocatable, WrapperPhysicallyLocatable)
         self.page = WikiPage()
 
     def makeTestObject(self):