[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/Security/tests - testRolePermissionManager.py:1.1.2.6.2.1

Jim Fulton jim@zope.com
Mon, 11 Feb 2002 11:07:06 -0500


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

Modified Files:
      Tag: Zope-3x-security_defactor-branch
	testRolePermissionManager.py 
Log Message:
Changed tests (back) to use ids, rather than objects in security
assertions. 

I'm in the process of changing all the security tests to use ids in
security assertions. The plan is to change and check in all the tests
and then to work together on making them pass again. When this is
done, we'll merge the changes back into the 3x branch.


=== Zope3/lib/python/Zope/App/Security/tests/testRolePermissionManager.py 1.1.2.6 => 1.1.2.6.2.1 ===
         
     def testUnboundRolePermission(self):
-        permission = pregistry.definePermission('APerm', 'aPerm title')
-        role = rregistry.defineRole('ARole', 'A Role')
+        permission = pregistry.definePermission('APerm', 'aPerm title').getId()
+        role = rregistry.defineRole('ARole', 'A Role').getId()
         self.assertEqual(manager.getRolesForPermission(permission), [])
         self.assertEqual(manager.getPermissionsForRole(role), [])
 
     def testRolePermission(self):
-        permission = pregistry.definePermission('APerm', 'aPerm title')
-        role = rregistry.defineRole('ARole', 'A Role')
+        permission = pregistry.definePermission('APerm', 'aPerm title').getId()
+        role = rregistry.defineRole('ARole', 'A Role').getId()
         manager.grantPermissionToRole(permission, role)
         self.assertEqual(manager.getRolesForPermission(permission), 
                                                         [(role,Allow)])
@@ -44,10 +44,10 @@
                                                     [(permission,Allow)])
 
     def testManyPermissionsOneRole(self):
-        perm1 = pregistry.definePermission('Perm One', 'P1')
-        perm2 = pregistry.definePermission('Perm Two', 'P2')
-        perm3 = pregistry.definePermission('Perm Three', 'P3')
-        role1 = rregistry.defineRole('Role One', 'Role #1')
+        perm1 = pregistry.definePermission('Perm One', 'P1').getId()
+        perm2 = pregistry.definePermission('Perm Two', 'P2').getId()
+        perm3 = pregistry.definePermission('Perm Three', 'P3').getId()
+        role1 = rregistry.defineRole('Role One', 'Role #1').getId()
         perms = manager.getPermissionsForRole(role1)
         self.assertEqual(len(perms), 0)
         manager.grantPermissionToRole(perm1, role1)
@@ -65,9 +65,9 @@
         self.failUnless((perm2,Allow) in perms)
 
     def testManyRolesOnePermission(self):
-        perm1 = pregistry.definePermission('Perm One', 'title')
-        role1 = rregistry.defineRole('Role One', 'Role #1')
-        role2 = rregistry.defineRole('Role Two', 'Role #2')
+        perm1 = pregistry.definePermission('Perm One', 'title').getId()
+        role1 = rregistry.defineRole('Role One', 'Role #1').getId()
+        role2 = rregistry.defineRole('Role Two', 'Role #2').getId()
         roles = manager.getRolesForPermission(perm1)
         self.assertEqual(len(roles), 0)
         manager.grantPermissionToRole(perm1, role1)