[Zope3-checkins] CVS: Zope3/src/zope/app/publisher/browser/tests - test_directives.py:1.24.6.2 test_fileresource.py:1.7.14.1 test_pagetemplateresource.py:1.1.14.1 test_resources.py:1.5.42.2 testi18nfileresource.py:1.5.14.1

[Jim Fulton]

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

Modified Files:
      Tag: adaptergeddon-branch
	test_directives.py test_fileresource.py 
	test_pagetemplateresource.py test_resources.py 
	testi18nfileresource.py 
Log Message:
Implemented local presentation services.


=== Zope3/src/zope/app/publisher/browser/tests/test_directives.py 1.24.6.1 => 1.24.6.2 ===
--- Zope3/src/zope/app/publisher/browser/tests/test_directives.py:1.24.6.1	Sun Nov  9 11:08:24 2003
+++ Zope3/src/zope/app/publisher/browser/tests/test_directives.py	Tue Nov 18 17:26:32 2003
@@ -96,11 +96,11 @@
         PlacelessSetup.setUp(self)
         XMLConfig('meta.zcml', zope.app.publisher.browser)()
 
-        from zope.component.adapter import provideAdapter
+        from zope.app.tests import ztapi
         from zope.app.traversing.adapters import DefaultTraversable
         from zope.app.interfaces.traversing import ITraversable
 
-        provideAdapter(None, ITraversable, DefaultTraversable)
+        ztapi.provideAdapter(None, ITraversable, DefaultTraversable)
 
     def testPage(self):
         self.assertEqual(queryView(ob, 'test', request),


=== Zope3/src/zope/app/publisher/browser/tests/test_fileresource.py 1.7 => 1.7.14.1 ===
--- Zope3/src/zope/app/publisher/browser/tests/test_fileresource.py:1.7	Mon Aug 11 10:58:13 2003
+++ Zope3/src/zope/app/publisher/browser/tests/test_fileresource.py	Tue Nov 18 17:26:32 2003
@@ -26,7 +26,7 @@
 from zope.exceptions import NotFoundError
 
 from zope.app.tests.placelesssetup import PlacelessSetup
-from zope.component.adapter import provideAdapter
+from zope.app.tests import ztapi
 from zope.proxy import removeAllProxies
 
 from zope.i18n.interfaces import IUserPreferredCharsets
@@ -49,7 +49,8 @@
 
     def setUp(self):
         PlacelessSetup.setUp(self)
-        provideAdapter(IHTTPRequest, IUserPreferredCharsets, HTTPCharsets)
+        ztapi.provideAdapter(IHTTPRequest, IUserPreferredCharsets,
+                             HTTPCharsets)
 
     def testNoTraversal(self):
 


=== Zope3/src/zope/app/publisher/browser/tests/test_pagetemplateresource.py 1.1 => 1.1.14.1 ===
--- Zope3/src/zope/app/publisher/browser/tests/test_pagetemplateresource.py:1.1	Mon Aug 11 10:58:13 2003
+++ Zope3/src/zope/app/publisher/browser/tests/test_pagetemplateresource.py	Tue Nov 18 17:26:32 2003
@@ -19,7 +19,7 @@
 from unittest import TestCase, main, makeSuite
 
 from zope.exceptions import NotFoundError
-from zope.component.adapter import provideAdapter
+from zope.app.tests import ztapi
 from zope.security.checker import NamesChecker
 from zope.publisher.browser import TestRequest
 
@@ -40,7 +40,7 @@
 
     def setUp(self):
         PlacelessSetup.setUp(self)
-        provideAdapter(None, ITraversable, DefaultTraversable)
+        ztapi.provideAdapter(None, ITraversable, DefaultTraversable)
 
     def testNoTraversal(self):
         path = os.path.join(test_directory, 'testfiles', 'test.pt')


=== Zope3/src/zope/app/publisher/browser/tests/test_resources.py 1.5.42.1 => 1.5.42.2 ===
--- Zope3/src/zope/app/publisher/browser/tests/test_resources.py:1.5.42.1	Sun Nov  9 11:08:24 2003
+++ Zope3/src/zope/app/publisher/browser/tests/test_resources.py	Tue Nov 18 17:26:32 2003
@@ -20,7 +20,7 @@
 from unittest import TestCase, main, makeSuite
 from zope.app.tests import ztapi
 from zope.app.tests.placelesssetup import PlacelessSetup
-from zope.component.adapter import provideAdapter
+from zope.app.tests import ztapi
 
 from zope.i18n.interfaces import IUserPreferredCharsets
 
@@ -33,7 +33,8 @@
 
     def setUp(self):
         PlacelessSetup.setUp(self)
-        provideAdapter(IHTTPRequest, IUserPreferredCharsets, HTTPCharsets)
+        ztapi.provideAdapter(IHTTPRequest, IUserPreferredCharsets,
+                             HTTPCharsets)
 
     def test_publishTraverse(self):
         from zope.app.publisher.browser.resources import Resources


=== Zope3/src/zope/app/publisher/browser/tests/testi18nfileresource.py 1.5 => 1.5.14.1 ===
--- Zope3/src/zope/app/publisher/browser/tests/testi18nfileresource.py:1.5	Mon Aug 11 10:58:13 2003
+++ Zope3/src/zope/app/publisher/browser/tests/testi18nfileresource.py	Tue Nov 18 17:26:32 2003
@@ -24,7 +24,7 @@
 from zope.exceptions import NotFoundError
 
 from zope.app.tests.placelesssetup import PlacelessSetup
-from zope.component.adapter import provideAdapter
+from zope.app.tests import ztapi
 
 from zope.i18n.interfaces import IUserPreferredCharsets
 from zope.i18n.interfaces import IUserPreferredLanguages
@@ -54,8 +54,10 @@
     def setUp(self):
         PlacelessSetup.setUp(self)
         TestII18nAware.setUp(self)
-        provideAdapter(IHTTPRequest, IUserPreferredCharsets, HTTPCharsets)
-        provideAdapter(IHTTPRequest, IUserPreferredLanguages, BrowserLanguages)
+        ztapi.provideAdapter(IHTTPRequest, IUserPreferredCharsets,
+                             HTTPCharsets)
+        ztapi.provideAdapter(IHTTPRequest, IUserPreferredLanguages,
+                             BrowserLanguages)
         # Setup the negotiator service registry entry
         managerHandler('defineService', 'LanguageNegotiation', INegotiator)
         provideService('LanguageNegotiation', negotiator, 'zope.Public')