[Zope3-checkins] CVS: Zope3/src/zope/app/browser/container/tests - test_contents.py:1.25.6.1

[Jim Fulton]

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

Modified Files:
      Tag: adaptergeddon-branch
	test_contents.py 
Log Message:
Implemented local presentation services.


=== Zope3/src/zope/app/browser/container/tests/test_contents.py 1.25 => 1.25.6.1 ===
--- Zope3/src/zope/app/browser/container/tests/test_contents.py:1.25	Sun Sep 21 13:30:29 2003
+++ Zope3/src/zope/app/browser/container/tests/test_contents.py	Tue Nov 18 17:26:18 2003
@@ -18,9 +18,9 @@
 """
 
 from unittest import TestCase, TestSuite, main, makeSuite
+from zope.app.tests import ztapi
 from zope.app.services.tests.placefulsetup import PlacefulSetup
 from zope.app.tests.placelesssetup import PlacelessSetup
-from zope.component.adapter import provideAdapter
 
 from zope.app.interfaces.container import IContainer
 from zope.app.interfaces.copypastemove import IObjectMover
@@ -60,10 +60,12 @@
     def setUp(self):
         PlacefulSetup.setUp(self)
         PlacefulSetup.buildFolders(self)
-        provideAdapter(None, IObjectCopier, ObjectCopier)
-        provideAdapter(None, IObjectMover, ObjectMover)
+        
+        ztapi.provideAdapter(None, IObjectCopier, ObjectCopier)
+        ztapi.provideAdapter(None, IObjectMover, ObjectMover)
 
-        provideAdapter(IAnnotations, IPrincipalClipboard, PrincipalClipboard)
+        ztapi.provideAdapter(IAnnotations, IPrincipalClipboard,
+                             PrincipalClipboard)
         root_sm = getServiceManager(None)
         svc = PrincipalAnnotationService()
         root_sm.defineService("PrincipalAnnotation", \
@@ -111,8 +113,7 @@
             created = datetime(2001, 1, 1, 1, 1, 1)
             modified = datetime(2002, 2, 2, 2, 2, 2)
 
-        from zope.component.adapter import provideAdapter
-        provideAdapter(IDocument, IZopeDublinCore, FauxDCAdapter)
+        ztapi.provideAdapter(IDocument, IZopeDublinCore, FauxDCAdapter)
 
         fc = self._TestView__newView(container)
         info = fc.listContentInfo()[0]
@@ -170,10 +171,11 @@
     def setUp(self):
         PlacefulSetup.setUp(self)
         PlacefulSetup.buildFolders(self)
-        provideAdapter(None, IObjectCopier, ObjectCopier)
-        provideAdapter(None, IObjectMover, ObjectMover)
+        ztapi.provideAdapter(None, IObjectCopier, ObjectCopier)
+        ztapi.provideAdapter(None, IObjectMover, ObjectMover)
 
-        provideAdapter(IAnnotations, IPrincipalClipboard, PrincipalClipboard)
+        ztapi.provideAdapter(IAnnotations, IPrincipalClipboard,
+                             PrincipalClipboard)
         root_sm = getServiceManager(None)
         svc = PrincipalAnnotationService()
         root_sm.defineService("PrincipalAnnotation", \