[Zope3-checkins] CVS: Zope3/src/zope/app/security/tests - test_securitydirectives.py:1.7 test_zopepolicy.py:1.8

Albertas Agejevas alga@codeworks.lt
Thu, 13 Mar 2003 13:49:40 -0500


Update of /cvs-repository/Zope3/src/zope/app/security/tests
In directory cvs.zope.org:/tmp/cvs-serv1411/src/zope/app/security/tests

Modified Files:
	test_securitydirectives.py test_zopepolicy.py 
Log Message:
An unexpected raid by the Whitespace Police.

Other than fixes of nonconforming whitespace, just a couple of $Id$
docstrings has been added.



=== Zope3/src/zope/app/security/tests/test_securitydirectives.py 1.6 => 1.7 ===
--- Zope3/src/zope/app/security/tests/test_securitydirectives.py:1.6	Tue Feb 11 21:17:33 2003
+++ Zope3/src/zope/app/security/tests/test_securitydirectives.py	Thu Mar 13 13:49:09 2003
@@ -171,11 +171,11 @@
 
 class TestRolePermission(CleanUp, unittest.TestCase):
 
-    def setUp( self ):
+    def setUp(self):
         setUp(self)
         XMLConfig('meta.zcml', zope.app.security)()
 
-    def testMap( self ):
+    def testMap(self):
         pregistry.definePermission("Foo", '', '')
         rregistry.defineRole("Bar", '', '')
         f = configfile("""
@@ -189,19 +189,19 @@
         roles = role_perm_mgr.getRolesForPermission("Foo")
         perms = role_perm_mgr.getPermissionsForRole("Bar")
 
-        self.assertEqual(len( roles ), 1)
+        self.assertEqual(len(roles), 1)
         self.failUnless(("Bar",Allow) in roles)
 
-        self.assertEqual(len( perms ), 1)
+        self.assertEqual(len(perms), 1)
         self.failUnless(("Foo",Allow) in perms)
 
 class TestPrincipalPermission(CleanUp, unittest.TestCase):
 
-    def setUp( self ):
+    def setUp(self):
         setUp(self)
         XMLConfig('meta.zcml', zope.app.security)()
 
-    def testMap( self ):
+    def testMap(self):
         pregistry.definePermission("Foo", '', '')
         principalRegistry.definePrincipal("Bar", '', '')
         f = configfile("""
@@ -215,19 +215,19 @@
         principals = principal_perm_mgr.getPrincipalsForPermission("Foo")
         perms = principal_perm_mgr.getPermissionsForPrincipal("Bar")
 
-        self.assertEqual(len( principals ), 1)
+        self.assertEqual(len(principals), 1)
         self.failUnless(("Bar", Allow) in principals)
 
-        self.assertEqual(len( perms ), 1)
+        self.assertEqual(len(perms), 1)
         self.failUnless(("Foo", Allow) in perms)
 
 class TestPrincipalRole(CleanUp, unittest.TestCase):
 
-    def setUp( self ):
+    def setUp(self):
         setUp(self)
         XMLConfig('meta.zcml', zope.app.security)()
 
-    def testMap( self ):
+    def testMap(self):
         rregistry.defineRole("Foo", '', '')
         principalRegistry.definePrincipal("Bar", '', '')
         f = configfile("""
@@ -241,10 +241,10 @@
         principals = principal_role_mgr.getPrincipalsForRole("Foo")
         roles = principal_role_mgr.getRolesForPrincipal("Bar")
 
-        self.assertEqual(len( principals ), 1)
+        self.assertEqual(len(principals), 1)
         self.failUnless(("Bar",Allow) in principals)
 
-        self.assertEqual(len( roles ), 1)
+        self.assertEqual(len(roles), 1)
         self.failUnless(("Foo",Allow) in roles)
 
 def test_suite():


=== Zope3/src/zope/app/security/tests/test_zopepolicy.py 1.7 => 1.8 ===
--- Zope3/src/zope/app/security/tests/test_zopepolicy.py:1.7	Thu Mar 13 11:28:15 2003
+++ Zope3/src/zope/app/security/tests/test_zopepolicy.py	Thu Mar 13 13:49:09 2003
@@ -138,7 +138,7 @@
 
         self.policy = self._makePolicy()
 
-    def _makePolicy( self ):
+    def _makePolicy(self):
 
         from zope.app.security.zopepolicy import ZopeSecurityPolicy
         return ZopeSecurityPolicy()
@@ -148,7 +148,7 @@
         permissions.sort()
         self.assertEqual(permissions, expected)
 
-    def testImport( self ):
+    def testImport(self):
         from zope.app.security.zopepolicy import ZopeSecurityPolicy
 
     def testGlobalCheckPermission(self):