[Zope3-checkins] CVS: Zope3/src/zope/app/dublincore/tests - test_creatorannotator.py:1.2.10.1 test_zdcannotatableadapter.py:1.2.26.1

[Grégoire Weber]

Update of /cvs-repository/Zope3/src/zope/app/dublincore/tests
In directory cvs.zope.org:/tmp/cvs-serv24874/src/zope/app/dublincore/tests

Modified Files:
      Tag: cw-mail-branch
	test_creatorannotator.py test_zdcannotatableadapter.py 
Log Message:
Synced up with HEAD

=== Zope3/src/zope/app/dublincore/tests/test_creatorannotator.py 1.2 => 1.2.10.1 ===
--- Zope3/src/zope/app/dublincore/tests/test_creatorannotator.py:1.2	Thu May  1 15:35:15 2003
+++ Zope3/src/zope/app/dublincore/tests/test_creatorannotator.py	Sun Jun 22 10:23:00 2003
@@ -20,7 +20,7 @@
 from zope.app.services.tests.placefulsetup import PlacefulSetup
 from zope.testing.cleanup import CleanUp
 
-from zope.interface import Interface
+from zope.interface import Interface, implements
 from zope.component.adapter import provideAdapter
 
 from zope.app.dublincore.creatorannotator import CreatorAnnotator
@@ -33,12 +33,12 @@
     pass
 
 class DummyEvent:
-    __implements__ = IEvent
+    implements(IEvent)
 
 class DummyDCAdapter(object):
 
     __used_for__ = IDummyContent
-    __implements__ = IZopeDublinCore
+    implements(IZopeDublinCore)
 
     def _getcreator(self):
         return self.context.creators
@@ -54,12 +54,12 @@
 
 class DummyDublinCore:
 
-    __implements__ = IDummyContent
+    implements(IDummyContent)
 
     creators = ()
 
 class DummyPrincipal:
-    __implements__ = IPrincipal
+    implements(IPrincipal)
 
     def getId(self):
         return self._id
@@ -69,9 +69,6 @@
 
     def getDescription(self):
         return self._description
-
-    def getRoles(self):
-        return self._roles
 
 class Test(PlacefulSetup, TestCase, CleanUp):
 


=== Zope3/src/zope/app/dublincore/tests/test_zdcannotatableadapter.py 1.2 => 1.2.26.1 ===
--- Zope3/src/zope/app/dublincore/tests/test_zdcannotatableadapter.py:1.2	Wed Dec 25 09:12:50 2002
+++ Zope3/src/zope/app/dublincore/tests/test_zdcannotatableadapter.py	Sun Jun 22 10:23:00 2003
@@ -21,10 +21,11 @@
 from unittest import TestCase, TestSuite, main, makeSuite
 from zope.app.interfaces.annotation import IAnnotations
 from zope.app.tests.placelesssetup import PlacelessSetup
+from zope.interface import implements
 
 class TestAnnotations(dict):
 
-    __implements__ = IAnnotations
+    implements(IAnnotations)
 
 
 class Test(PlacelessSetup, TestCase):