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

[Barry Warsaw]

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

Modified Files:
      Tag: Zope-3x-branch
	testZSP.py 
Log Message:
Adapt and clean up tests for PermissionRegistry refactoring.


=== Zope3/lib/python/Zope/App/Security/tests/testZSP.py 1.1.2.2 => 1.1.2.3 ===
+from Zope.App.Security.RoleRegistry import defineRole
+from Zope.App.Security.RolePermissionMap import grantPermissionToRole
+
 import unittest
 
 class Unprotected:
     pass
 
-class Protected:
 
-    def __init__( self, permission ):
+class Protected:
+    def __init__(self, permission):
         self.__permission__ = permission
 
+
 class WhiteboxTest( unittest.TestCase ):
     """
         Test helper functions.
@@ -37,32 +42,28 @@
         self.failIf( policy._allowName( ['a', 'b'] ) )
 
     def testFindPermission( self ):
+        policy = self._makePolicy()
 
-        policy  = self._makePolicy()
+        fooperm = definePermission('foo')
 
-        foo     = Protected( 'foo' )
-        bar     = Unprotected()
+        foo = Protected(fooperm)
+        bar = Unprotected()
 
-        self.assertEqual( policy._findPermission( foo ), 'foo' )
-        self.assertEqual( policy._findPermission( bar ), None )
-        self.assertEqual( policy._findPermission( None ), None )
+        self.assertEqual(policy._findPermission(foo), fooperm)
+        self.assertEqual(policy._findPermission(bar), None)
+        self.assertEqual(policy._findPermission(None), None)
 
     def testListRolesFor( self ):
-
-        from Zope.App.Security.PermissionRegistry import definePermission
-        from Zope.App.Security.PermissionRegistry import defineRole
-
         policy  = self._makePolicy()
 
-        definePermission( 'foo' )
+        fooperm = definePermission( 'foo' )
 
-        foo     = Protected( 'foo' )
-        bar     = Unprotected()
+        foo = Protected(fooperm)
+        bar = Unprotected()
 
-        self.assertEqual( policy._listRolesFor( 'foo', foo ), () )
+        self.assertEqual(policy._listRolesFor(fooperm, foo), ())
 
         role = defineRole( 'Everyman' )
-        role.includePermission( 'foo' )
+        grantPermissionToRole(fooperm, role)
 
-        self.assertEqual( policy._listRolesFor( 'foo', foo )
-                        , ( 'Everyman', ) )
+        self.assertEqual(policy._listRolesFor(fooperm, foo), (role,))