[Zope3-checkins] CVS: Zope3/src/zope/app/browser/tests - test_absoluteurl.py:1.3.2.1 test_menu.py:1.3.2.1 test_objectname.py:1.3.2.1

[Sidnei da Silva]

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

Modified Files:
      Tag: paris-copypasterename-branch
	test_absoluteurl.py test_menu.py test_objectname.py 
Log Message:
Updating from HEAD to make sure everything still works before merging

=== Zope3/src/zope/app/browser/tests/test_absoluteurl.py 1.3 => 1.3.2.1 ===
--- Zope3/src/zope/app/browser/tests/test_absoluteurl.py:1.3	Mon Dec 30 21:51:56 2002
+++ Zope3/src/zope/app/browser/tests/test_absoluteurl.py	Tue Feb 11 09:41:09 2003
@@ -22,6 +22,7 @@
 
 from zope.app.tests.placelesssetup import PlacelessSetup
 from zope.component import getService, getView
+from zope.component.servicenames import Adapters, Views
 
 from zope.i18n.interfaces import IUserPreferredCharsets
 
@@ -46,12 +47,12 @@
         PlacelessSetup.setUp(self)
         from zope.app.browser.absoluteurl \
              import AbsoluteURL, SiteAbsoluteURL
-        provideView=getService(None,"Views").provideView
+        provideView=getService(None,Views).provideView
         provideView(None, 'absolute_url', IBrowserPresentation,
                     [AbsoluteURL])
         provideView(IRoot, 'absolute_url', IBrowserPresentation,
                     [SiteAbsoluteURL])
-        provideAdapter = getService(None, "Adapters").provideAdapter
+        provideAdapter = getService(None, Adapters).provideAdapter
         provideAdapter(IHTTPRequest, IUserPreferredCharsets, HTTPCharsets)
 
     def testBadObject(self):


=== Zope3/src/zope/app/browser/tests/test_menu.py 1.3 => 1.3.2.1 ===
--- Zope3/src/zope/app/browser/tests/test_menu.py:1.3	Mon Dec 30 22:35:06 2002
+++ Zope3/src/zope/app/browser/tests/test_menu.py	Tue Feb 11 09:41:09 2003
@@ -20,6 +20,7 @@
 from zope.interface import Interface
 
 from zope.component import getService, getServiceManager
+from zope.component.servicenames import Views
 from zope.app.services.tests.placefulsetup \
            import PlacefulSetup
 
@@ -79,9 +80,9 @@
 
         defineService('BrowserMenu', IBrowserMenuService)
         provideService('BrowserMenu', Service())
-        getService(None,"Views").provideView(
+        getService(None,Views).provideView(
             I, 'a3', IBrowserPresentation, [V])
-        getService(None, "Views").provideView(None, '_traverse',
+        getService(None, Views).provideView(None, '_traverse',
                             IBrowserPresentation, [TestTraverser])
         defineChecker(C, NamesChecker(['a1', 'a2', 'a3', '__call__'],
                                       CheckerPublic,


=== Zope3/src/zope/app/browser/tests/test_objectname.py 1.3 => 1.3.2.1 ===
--- Zope3/src/zope/app/browser/tests/test_objectname.py:1.3	Mon Dec 30 21:51:56 2002
+++ Zope3/src/zope/app/browser/tests/test_objectname.py	Tue Feb 11 09:41:09 2003
@@ -21,6 +21,7 @@
 
 from zope.app.tests.placelesssetup import PlacelessSetup
 from zope.component import getService, getView, getAdapter
+from zope.component.servicenames import Adapters, Views
 
 from zope.i18n.interfaces import IUserPreferredCharsets
 
@@ -46,13 +47,13 @@
 
     def setUp(self):
         PlacelessSetup.setUp(self)
-        provideView = getService(None, "Views").provideView
+        provideView = getService(None, Views).provideView
         provideView(None, 'object_name', IBrowserPresentation,
                     [ObjectNameView])
         provideView(IRoot, 'object_name', IBrowserPresentation,
                     [SiteObjectNameView])
 
-        provideAdapter = getService(None, "Adapters").provideAdapter
+        provideAdapter = getService(None, Adapters).provideAdapter
         provideAdapter(IHTTPRequest, IUserPreferredCharsets, HTTPCharsets)
 
     def testViewBadObject(self):