[Zope3-checkins] CVS: Zope3/src/zope/app/publisher/browser/tests - test_directives.py:1.9 test_globalbrowsermenuservice.py:1.5

[R. Sean Bowman]

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

Modified Files:
	test_directives.py test_globalbrowsermenuservice.py 
Log Message:
finished changing service names to use strings defined in
zope/component/servicenames.py, changed the name of
ErrorReportingService to ErrorReports and Resources to ResourceService


=== Zope3/src/zope/app/publisher/browser/tests/test_directives.py 1.8 => 1.9 ===
--- Zope3/src/zope/app/publisher/browser/tests/test_directives.py:1.8	Tue Dec 31 13:26:59 2002
+++ Zope3/src/zope/app/publisher/browser/tests/test_directives.py	Thu Feb  6 01:49:42 2003
@@ -21,6 +21,7 @@
 from zope.component.tests.views import IC, V1, VZMI, R1, RZMI
 from zope.component import getView, queryView, queryResource
 from zope.component import getDefaultViewName, getResource
+from zope.component.servicenames import Permissions
 from zope.app.tests.placelesssetup import PlacelessSetup
 from zope.security.proxy import ProxyFactory
 from zope.proxy.introspection import removeAllProxies
@@ -403,8 +404,8 @@
 
     def testProtectedPageViews(self):
 
-        serviceManager.defineService('Permissions', IPermissionService)
-        serviceManager.provideService('Permissions', permissionRegistry)
+        serviceManager.defineService(Permissions, IPermissionService)
+        serviceManager.provideService(Permissions, permissionRegistry)
         permissionRegistry.definePermission('p', 'P')
 
 
@@ -601,8 +602,8 @@
 
     def testProtectedtemplate(self):
 
-        serviceManager.defineService('Permissions', IPermissionService)
-        serviceManager.provideService('Permissions', permissionRegistry)
+        serviceManager.defineService(Permissions, IPermissionService)
+        serviceManager.provideService(Permissions, permissionRegistry)
         
         path = os.path.join(tests_path, 'test.pt')
 


=== Zope3/src/zope/app/publisher/browser/tests/test_globalbrowsermenuservice.py 1.4 => 1.5 ===
--- Zope3/src/zope/app/publisher/browser/tests/test_globalbrowsermenuservice.py:1.4	Mon Dec 30 22:35:09 2002
+++ Zope3/src/zope/app/publisher/browser/tests/test_globalbrowsermenuservice.py	Thu Feb  6 01:49:42 2003
@@ -26,6 +26,7 @@
 from zope.app.tests.placelesssetup import PlacelessSetup
 
 from zope.component.service import serviceManager
+from zope.component.servicenames import Permissions
 from zope.app.security.registries.permissionregistry import permissionRegistry
 from zope.app.interfaces.security import IPermissionService
 from zope.security.management import newSecurityManager
@@ -89,8 +90,8 @@
         self.assertEqual(list(menu), [d(5), d(6), d(3), d(2), d(1)])
 
     def test_w_permission(self):
-        serviceManager.defineService('Permissions', IPermissionService)
-        serviceManager.provideService('Permissions', permissionRegistry)
+        serviceManager.defineService(Permissions, IPermissionService)
+        serviceManager.provideService(Permissions, permissionRegistry)
         permissionRegistry.definePermission('p', 'P')
         
         r = self.__reg()