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

[Jim Fulton]

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

Modified Files:
      Tag: Zope-3x-branch
	testPrincipalRoleManager.py 
Log Message:
Changed to reflect the fact that the role-permission manager
works on ids, not instances.


=== Zope3/lib/python/Zope/App/Security/tests/testPrincipalRoleManager.py 1.1.2.3 => 1.1.2.4 ===
         
     def _make_principal(self, id=None, title=None):
-        return pregistry.definePrincipal(
+        pregistry.definePrincipal(
             id or 'APrincipal',
             title or 'A Principal',
             login = id or 'APrincipal')
+        return id or 'APrincipal'
 
     def testUnboundPrincipalRole(self):
-        role = rregistry.defineRole('ARole', 'A Role')
+        role = rregistry.defineRole('ARole', 'A Role').getId()
         principal = self._make_principal()
         self.assertEqual(principalRoleManager.getPrincipalsForRole(role), [])
-        self.assertEqual(principalRoleManager.getRolesForPrincipal(principal), [])
+        self.assertEqual(principalRoleManager.getRolesForPrincipal(principal),
+                         [])
 
     def testPrincipalRole(self):
-        role = rregistry.defineRole('ARole', 'A Role')
+        role = rregistry.defineRole('ARole', 'A Role').getId()
         principal = self._make_principal()
         principalRoleManager.assignRoleToPrincipal(role, principal)
         self.assertEqual(principalRoleManager.getPrincipalsForRole(role),
@@ -47,8 +49,8 @@
                          [role])
 
     def testManyRolesOnePrincipal(self):
-        perm1 = rregistry.defineRole('Role One', 'Role #1')
-        perm2 = rregistry.defineRole('Role Two', 'Role #2')
+        perm1 = rregistry.defineRole('Role One', 'Role #1').getId()
+        perm2 = rregistry.defineRole('Role Two', 'Role #2').getId()
         prin1 = self._make_principal()
         principalRoleManager.assignRoleToPrincipal(perm1, prin1)
         principalRoleManager.assignRoleToPrincipal(perm2, prin1)
@@ -58,7 +60,7 @@
         self.failUnless(perm2 in perms)
 
     def testManyPrincipalsOneRole(self):
-        perm1 = rregistry.defineRole('Role One', 'Role #1')
+        perm1 = rregistry.defineRole('Role One', 'Role #1').getId()
         prin1 = self._make_principal()
         prin2 = self._make_principal('Principal 2', 'Principal Two')
         principalRoleManager.assignRoleToPrincipal(perm1, prin1)