[Zope3-checkins] CVS: Zope3/src/zope/app/tests - test_clipboard.py:1.6

Jim Fulton jim@zope.com
Thu, 29 May 2003 14:15:56 -0400


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

Modified Files:
	test_clipboard.py 
Log Message:
Renamed the getAnnotation and hasAnnotation methods of principal
annotation services to getAnnotations and hasAnnotations.


=== Zope3/src/zope/app/tests/test_clipboard.py 1.5 => 1.6 ===
--- Zope3/src/zope/app/tests/test_clipboard.py:1.5	Thu May  1 15:35:37 2003
+++ Zope3/src/zope/app/tests/test_clipboard.py	Thu May 29 14:15:56 2003
@@ -50,7 +50,7 @@
         user = auth.getPrincipalByLogin('srichter')
 
         annotationsvc = getService(self, 'PrincipalAnnotation')
-        annotations = annotationsvc.getAnnotation(user)
+        annotations = annotationsvc.getAnnotations(user)
         clipboard = getAdapter(annotations, IPrincipalClipboard)
         clipboard.addItems('move', ['bla', 'bla/foo', 'bla/bar'])
         expected = ({'action':'move', 'target':'bla'},
@@ -67,7 +67,7 @@
         user = auth.getPrincipalByLogin('srichter')
 
         annotationsvc = getService(self, 'PrincipalAnnotation')
-        annotations = annotationsvc.getAnnotation(user)
+        annotations = annotationsvc.getAnnotations(user)
         clipboard = getAdapter(annotations, IPrincipalClipboard)
 
         expected = ({'action':'move', 'target':'bla'},
@@ -83,7 +83,7 @@
         auth = self._auth
         user = auth.getPrincipalByLogin('srichter')
         annotationsvc = getService(self, 'PrincipalAnnotation')
-        annotations = annotationsvc.getAnnotation(user)
+        annotations = annotationsvc.getAnnotations(user)
         clipboard = getAdapter(annotations, IPrincipalClipboard)
         clipboard.clearContents()
         self.failUnless(clipboard.getContents() == ())