[Zope3-checkins] CVS: Zope3/src/zope/products/securitypolicy/tests - test_rolepermissionmanager.py:1.1.2.4 test_securitydirectives.py:1.1.2.4 test_zopepolicy.py:1.1.2.4

[Steve Alexander]

Update of /cvs-repository/Zope3/src/zope/products/securitypolicy/tests
In directory cvs.zope.org:/tmp/cvs-serv17568/src/zope/products/securitypolicy/tests

Modified Files:
      Tag: steveachrismcd-securitypolicy-branch
	test_rolepermissionmanager.py test_securitydirectives.py 
	test_zopepolicy.py 
Log Message:
Removed all other traces of roles from the core code.


=== Zope3/src/zope/products/securitypolicy/tests/test_rolepermissionmanager.py 1.1.2.3 => 1.1.2.4 ===
--- Zope3/src/zope/products/securitypolicy/tests/test_rolepermissionmanager.py:1.1.2.3	Wed Jan 14 01:06:49 2004
+++ Zope3/src/zope/products/securitypolicy/tests/test_rolepermissionmanager.py	Wed Jan 14 15:58:15 2004
@@ -16,7 +16,7 @@
 import unittest
 
 from zope.component.service import serviceManager as services
-from zope.app.services.servicenames import Permissions, Roles
+from zope.app.services.servicenames import Permissions
 
 from zope.app.interfaces.security import IPermissionService
 from zope.products.securitypolicy.interfaces import IRoleService
@@ -38,8 +38,8 @@
         services.defineService(Permissions, IPermissionService)
         services.provideService(Permissions, pregistry)
 
-        services.defineService(Roles, IRoleService)
-        services.provideService(Roles, rregistry)
+        services.defineService("Roles", IRoleService)
+        services.provideService("Roles", rregistry)
 
     def testUnboundRolePermission(self):
         permission = pregistry.definePermission('APerm', 'aPerm title').getId()


=== Zope3/src/zope/products/securitypolicy/tests/test_securitydirectives.py 1.1.2.3 => 1.1.2.4 ===
--- Zope3/src/zope/products/securitypolicy/tests/test_securitydirectives.py:1.1.2.3	Wed Jan 14 01:06:49 2004
+++ Zope3/src/zope/products/securitypolicy/tests/test_securitydirectives.py	Wed Jan 14 15:58:15 2004
@@ -18,7 +18,7 @@
 import unittest
 
 from zope.component.service import serviceManager as services
-from zope.app.services.servicenames import Roles, Permissions, Authentication
+from zope.app.services.servicenames import Permissions, Authentication
 from zope.app.interfaces.security import IPermissionService
 from zope.products.securitypolicy.interfaces import IRoleService
 from zope.app.interfaces.security import IAuthenticationService
@@ -42,6 +42,7 @@
 from zope.products.securitypolicy.principalrole \
     import principalRoleManager as principal_role_mgr
 
+
 class TestBase(CleanUp):
 
     def setUp(self):
@@ -50,8 +51,8 @@
         services.defineService(Permissions, IPermissionService)
         services.provideService(Permissions, pregistry)
     
-        services.defineService(Roles, IRoleService)
-        services.provideService(Roles, rregistry)
+        services.defineService("Roles", IRoleService)
+        services.provideService("Roles", rregistry)
     
         services.defineService(Authentication, IAuthenticationService)
         services.provideService(Authentication, principalRegistry)


=== Zope3/src/zope/products/securitypolicy/tests/test_zopepolicy.py 1.1.2.3 => 1.1.2.4 ===
--- Zope3/src/zope/products/securitypolicy/tests/test_zopepolicy.py:1.1.2.3	Wed Jan 14 01:06:49 2004
+++ Zope3/src/zope/products/securitypolicy/tests/test_zopepolicy.py	Wed Jan 14 15:58:16 2004
@@ -27,7 +27,7 @@
 from zope.app.interfaces.security import IAuthenticationService
 
 from zope.component import getService
-from zope.app.services.servicenames import Roles, Permissions, Adapters
+from zope.app.services.servicenames import Permissions, Adapters
 from zope.app.services.servicenames import Authentication
 from zope.products.securitypolicy.interfaces import IRolePermissionManager
 from zope.app.security.registries.permissionregistry import permissionRegistry
@@ -72,8 +72,8 @@
         services.defineService(Permissions, IPermissionService)
         services.provideService(Permissions, permissionRegistry)
 
-        services.defineService(Roles, IRoleService)
-        services.provideService(Roles, roleRegistry)
+        services.defineService("Roles", IRoleService)
+        services.provideService("Roles", roleRegistry)
 
         services.defineService(Authentication, IAuthenticationService)
         services.provideService(Authentication, principalRegistry)