Tue, 9 Apr 2002 12:37:15 -0400

Update of /cvs-repository/Zope3/lib/python/Zope/App/Security/tests
In directory cvs.zope.org:/tmp/cvs-serv11768/Zope/App/Security/tests

Modified Files:
      Tag: casey-security-reorg-branch
	testProtectClass.py testSecurityDirectives.py testZSP.py 
Removed Files:
      Tag: casey-security-reorg-branch
	RolePermissionManager.py 
	testAttributePrincipalPermissionManager.py 
	testAttributePrincipalRoleManager.py 
	testAttributeRolePermissionManager.py 
	testPrincipalPermissionManager.py 
	testPrincipalPermissionView.py testPrincipalRoleManager.py 
	testPrincipalRoleView.py testRolePermissionManager.py 
	testRolePermissionView.py testSettings.py 
Log Message:
Mass checkin for security reorganization branch. I will retest this and merge
upon BDFL approval...


=== Zope3/lib/python/Zope/App/Security/tests/testProtectClass.py 1.1.2.10 => 1.1.2.10.6.1 ===
 def defineDirectives():
     xmlconfig(StringIO("""
-    <zopeConfigure xmlns='http://namespaces.zope.org/zope'
-                   xmlns:security='http://namespaces.zope.org/security'>
+    <zopeConfigure xmlns="http://namespaces.zope.org/zope"
+                   xmlns:security="http://namespaces.zope.org/security">
        <directive namespace="http://namespaces.zope.org/security"
                name="permission"
                attributes="permission_id, title, description"


=== Zope3/lib/python/Zope/App/Security/tests/testSecurityDirectives.py 1.1.2.13 => 1.1.2.13.6.1 ===
 from Zope.App.Security.PrincipalRegistry import principalRegistry
 from Zope.App.Security.PermissionRegistry \
-        import permissionRegistry as pregistry
+     import permissionRegistry as pregistry
 from Zope.App.Security.RoleRegistry import roleRegistry as rregistry
-from Zope.App.Security.RolePermissionManager \
-        import rolePermissionManager as role_perm_mgr
-from Zope.App.Security.PrincipalPermissionManager \
-    import principalPermissionManager as principal_perm_mgr
-from Zope.App.Security.PrincipalRoleManager \
-    import principalRoleManager as principal_role_mgr
-from Zope.App.Security.Settings import Allow, Deny, Unset, Remove, Assign
+from Zope.App.Security.Management.GlobalRolePermissions \
+     import rolePermissionsManager as role_perm_mgr
+from Zope.App.Security.Management.GlobalPrincipalPermissions \
+     import principalPermissionsManager as principal_perm_mgr
+from Zope.App.Security.Management.GlobalPrincipalRoles \
+     import principalRolesManager as principal_role_mgr
+from Zope.App.Security.Management.Settings import Allow, Deny, Unset, Remove, Assign
 
 def configfile(s):
     return StringIO("""<zopeConfigure


=== Zope3/lib/python/Zope/App/Security/tests/testZSP.py 1.1.2.11 => 1.1.2.11.2.1 ===
 from Zope.ContextWrapper import Wrapper
 from Zope.ComponentArchitecture import provideAdapter
-from Zope.App.Security.IRolePermissionManager import IRolePermissionManager
+from Zope.App.Security.Management.IRolePermissions \
+     import IRolePermissionsManager
 from Zope.App.Security.PermissionRegistry import permissionRegistry 
 from Zope.App.Security.PrincipalRegistry import principalRegistry 
 from Zope.App.Security.RoleRegistry import roleRegistry
-from Zope.App.Security.PrincipalPermissionManager \
-     import principalPermissionManager 
-from Zope.App.Security.RolePermissionManager import rolePermissionManager 
-from Zope.App.Security.PrincipalRoleManager import principalRoleManager 
-from Zope.App.Security.AttributePrincipalPermissionManager \
-    import AttributePrincipalPermissionManager 
-from Zope.App.Security.PrincipalPermissionManager \
-    import PrincipalPermissionManager 
-from Zope.App.Security.IPrincipalPermissionManager \
-    import IPrincipalPermissionManager 
-from Zope.App.Security.AttributePrincipalRoleManager \
-    import AttributePrincipalRoleManager 
-from Zope.App.Security.PrincipalRoleManager \
-    import PrincipalRoleManager 
-from Zope.App.Security.AttributeRolePermissionManager \
-    import AttributeRolePermissionManager 
-from Zope.App.Security.IPrincipalRoleManager import IPrincipalRoleManager 
+from Zope.App.Security.Management.GlobalPrincipalPermissions \
+     import principalPermissionsManager 
+from Zope.App.Security.Management.GlobalRolePermissions \
+     import rolePermissionsManager 
+from Zope.App.Security.Management.GlobalPrincipalRoles \
+     import principalRolesManager 
+from Zope.App.Security.Management.MementoPrincipalPermissions \
+     import MementoPrincipalPermissionsManager 
+from Zope.App.Security.Management.GlobalPrincipalPermissions \
+     import principalPermissionsManager 
+from Zope.App.Security.Management.IPrincipalPermissions \
+     import IPrincipalPermissionsManager 
+from Zope.App.Security.Management.MementoPrincipalRoles \
+     import MementoPrincipalRolesManager 
+from Zope.App.Security.Management.MementoRolePermissions \
+     import MementoRolePermissionsManager 
+from Zope.App.Security.Management.IPrincipalRoles \
+     import IPrincipalRolesManager 
 from Zope.Exceptions import Unauthorized, Forbidden
 from Zope.App.OFS.Memento.IAttributeMementoStorable \
      import IAttributeMementoStorable
@@ -95,13 +97,13 @@
         arole = roleRegistry.defineRole('Another', 'Another Role')
         self.arole = arole.getId()
 
-        rolePermissionManager.grantPermissionToRole(self.read, self.peon)
+        rolePermissionsManager.grantPermissionToRole(self.read, self.peon)
         
-        rolePermissionManager.grantPermissionToRole(self.read, self.manager)
-        rolePermissionManager.grantPermissionToRole(self.write, self.manager)
+        rolePermissionsManager.grantPermissionToRole(self.read, self.manager)
+        rolePermissionsManager.grantPermissionToRole(self.write, self.manager)
 
-        principalRoleManager.assignRoleToPrincipal(self.peon, self.jim)
-        principalRoleManager.assignRoleToPrincipal(self.manager, self.tim)
+        principalRolesManager.assignRoleToPrincipal(self.peon, self.jim)
+        principalRolesManager.assignRoleToPrincipal(self.manager, self.tim)
 
         self.policy = self._makePolicy()
 
@@ -131,21 +133,21 @@
             self.policy.checkPermission(
             self.read, None, Context(self.unknown)))
 
-        rolePermissionManager.grantPermissionToRole(self.read, 'Anonymous')
+        rolePermissionsManager.grantPermissionToRole(self.read, 'Anonymous')
         
         self.failUnless(
             self.policy.checkPermission(
             self.read, None, Context(self.unknown)))
 
-        principalPermissionManager.grantPermissionToPrincipal(
+        principalPermissionsManager.grantPermissionToPrincipal(
             self.write, self.jim)
         self.failUnless(
             self.policy.checkPermission(self.write, None, Context(self.jim)))
 
     def testPlayfulRolePermissions(self):
         
-        ARPM = AttributeRolePermissionManager
-        provideAdapter(ITest, IRolePermissionManager, ARPM)
+        ARPM = MementoRolePermissionsManager
+        provideAdapter(ITest, IRolePermissionsManager, ARPM)
         test = permissionRegistry.definePermission('test', 'Test', '')
         test = test.getId()
 
@@ -165,11 +167,11 @@
         self.failUnless(self.policy.checkPermission(
             test, ob, Context(self.jim)))
         # Make sure global principal permissions override placeful role perms
-        principalPermissionManager.denyPermissionToPrincipal(
+        principalPermissionsManager.denyPermissionToPrincipal(
             test, self.jim)
         self.failIf(self.policy.checkPermission(
             test, ob, Context(self.jim)))
-        principalPermissionManager.unsetPermissionForPrincipal(
+        principalPermissionsManager.unsetPermissionForPrincipal(
             test, self.jim)
         # Make sure multiple conflicting role permissions resolve correctly
         ARPM(ob2).grantPermissionToRole(test, 'Anonymous')
@@ -179,14 +181,14 @@
         new = principalRegistry.definePrincipal('new', 'Newbie', 
                                                 'Newbie User', 'new', '098')
         new = new.getId()
-        principalRoleManager.assignRoleToPrincipal(self.arole, new)
+        principalRolesManager.assignRoleToPrincipal(self.arole, new)
         self.failUnless(self.policy.checkPermission(test, ob, Context(new)))
-        principalRoleManager.assignRoleToPrincipal(self.peon, new)
+        principalRolesManager.assignRoleToPrincipal(self.peon, new)
         self.failIf(self.policy.checkPermission(test, ob, Context(new)))
                     
     def testPlayfulPrinciplePermissions(self):
-        APPM = AttributePrincipalPermissionManager
-        provideAdapter(ITest, IPrincipalPermissionManager, APPM)
+        APPM = MementoPrincipalPermissionsManager
+        provideAdapter(ITest, IPrincipalPermissionsManager, APPM)
 
         ob1 = TestClass()
         ob2 = TestClass()
@@ -212,11 +214,11 @@
                                                 Context(self.jim)))
         # make sure placeful principal permissions override global ones
         APPM(ob).grantPermissionToPrincipal(test, self.tim)
-        principalPermissionManager.denyPermissionToPrincipal(
+        principalPermissionsManager.denyPermissionToPrincipal(
             test, self.tim)
         self.failUnless(self.policy.checkPermission(test, ob,
                                                     Context(self.tim)))
-        principalPermissionManager.unsetPermissionForPrincipal(
+        principalPermissionsManager.unsetPermissionForPrincipal(
             test, self.tim)
 
 
@@ -234,11 +236,11 @@
                           self.policy.validate,
                           'x', Protected(self.write), Context(self.unknown))
         
-        rolePermissionManager.grantPermissionToRole(self.read, 'Anonymous')
+        rolePermissionsManager.grantPermissionToRole(self.read, 'Anonymous')
         
         self.policy.validate('_', Protected(self.read), Context(self.unknown))
 
-        principalPermissionManager.grantPermissionToPrincipal(self.write,
+        principalPermissionsManager.grantPermissionToPrincipal(self.write,
                                                               self.jim)
         self.policy.validate('_', Protected(self.write), Context(self.jim))
         

=== Removed File Zope3/lib/python/Zope/App/Security/tests/RolePermissionManager.py ===

=== Removed File Zope3/lib/python/Zope/App/Security/tests/testAttributePrincipalPermissionManager.py ===

=== Removed File Zope3/lib/python/Zope/App/Security/tests/testAttributePrincipalRoleManager.py ===

=== Removed File Zope3/lib/python/Zope/App/Security/tests/testAttributeRolePermissionManager.py ===

=== Removed File Zope3/lib/python/Zope/App/Security/tests/testPrincipalPermissionManager.py ===

=== Removed File Zope3/lib/python/Zope/App/Security/tests/testPrincipalPermissionView.py ===

=== Removed File Zope3/lib/python/Zope/App/Security/tests/testPrincipalRoleManager.py ===

=== Removed File Zope3/lib/python/Zope/App/Security/tests/testPrincipalRoleView.py ===

=== Removed File Zope3/lib/python/Zope/App/Security/tests/testRolePermissionManager.py ===

=== Removed File Zope3/lib/python/Zope/App/Security/tests/testRolePermissionView.py ===

=== Removed File Zope3/lib/python/Zope/App/Security/tests/testSettings.py ===




