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

[Steve Spicklemire]

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

Modified Files:
      Tag: Zope-3x-branch
	testPrincipalRoleManager.py 
Log Message:
clean up tests

=== Zope3/lib/python/Zope/App/Security/tests/testPrincipalRoleManager.py 1.1.2.6 => 1.1.2.7 ===
 
     def testManyPrincipalsOneRole(self):
-        perm1 = rregistry.defineRole('Role One', 'Role #1').getId()
+        role1 = rregistry.defineRole('Role One', 'Role #1').getId()
         prin1 = self._make_principal()
         prin2 = self._make_principal('Principal 2', 'Principal Two')
-        principalRoleManager.assignRoleToPrincipal(perm1, prin1)
-        principalRoleManager.assignRoleToPrincipal(perm1, prin2)
-        principals = principalRoleManager.getPrincipalsForRole(perm1)
+        principalRoleManager.assignRoleToPrincipal(role1, prin1)
+        principalRoleManager.assignRoleToPrincipal(role1, prin2)
+        principals = principalRoleManager.getPrincipalsForRole(role1)
         self.assertEqual(len(principals), 2)
-        self.failUnless(prin1 in principals)
-        self.failUnless(prin2 in principals)
+        self.failUnless((prin1,Assign) in principals)
+        self.failUnless((prin2,Assign) in principals)
 
 def test_suite():
     loader=unittest.TestLoader()