[Checkins] SVN: zope.securitypolicy/trunk/src/zope/securitypolicy/ Move forward on getting rid of zope.app.testing - replace ztapi calls with simple zope.component calls.
Dan Korostelev
nadako at gmail.com
Sat Mar 14 07:03:38 EDT 2009
Log message for revision 98088:
Move forward on getting rid of zope.app.testing - replace ztapi calls with simple zope.component calls.
Changed:
U zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationprincipalpermissionmanager.py
U zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationrolepermissionmanager.py
U zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_principalpermissionmanager.py
U zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_principalrolemanager.py
U zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_rolepermissionmanager.py
U zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_securitydirectives.py
U zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_zopepolicy.py
U zope.securitypolicy/trunk/src/zope/securitypolicy/vocabulary.py
U zope.securitypolicy/trunk/src/zope/securitypolicy/zopepolicy.txt
-=-
Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationprincipalpermissionmanager.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationprincipalpermissionmanager.py 2009-03-14 10:54:40 UTC (rev 98087)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationprincipalpermissionmanager.py 2009-03-14 11:03:38 UTC (rev 98088)
@@ -17,6 +17,7 @@
"""
import unittest
+from zope.component import provideAdapter, provideUtility
from zope.interface import implements
from zope.annotation.attribute import AttributeAnnotations
from zope.annotation.interfaces import IAttributeAnnotatable, IAnnotations
@@ -27,7 +28,6 @@
from zope.securitypolicy.principalpermission import \
AnnotationPrincipalPermissionManager
-from zope.app.testing import ztapi
from zope.principalregistry.principalregistry import principalRegistry
from zope.app.testing.placelesssetup import PlacelessSetup
@@ -38,9 +38,7 @@
def setUp(self):
super(Test, self).setUp()
- ztapi.provideAdapter(
- IAttributeAnnotatable, IAnnotations,
- AttributeAnnotations)
+ provideAdapter(AttributeAnnotations)
def _make_principal(self, id=None, title=None):
p = principalRegistry.definePrincipal(
@@ -51,7 +49,7 @@
def testUnboundPrincipalPermission(self):
manager = AnnotationPrincipalPermissionManager(Manageable())
- ztapi.provideUtility(IPermission, Permission('APerm', 'title'), 'APerm')
+ provideUtility(Permission('APerm', 'title'), IPermission, 'APerm')
permission = 'APerm'
principal = self._make_principal()
self.assertEqual(manager.getPrincipalsForPermission(permission), [])
@@ -59,7 +57,7 @@
def testPrincipalPermission(self):
manager = AnnotationPrincipalPermissionManager(Manageable())
- ztapi.provideUtility(IPermission, Permission('APerm', 'title'), 'APerm')
+ provideUtility(Permission('APerm', 'title'), IPermission, 'APerm')
permission = 'APerm'
principal = self._make_principal()
@@ -115,11 +113,11 @@
def testManyPermissionsOnePrincipal(self):
manager = AnnotationPrincipalPermissionManager(Manageable())
- ztapi.provideUtility(
- IPermission, Permission('Perm One', 'title'), 'Perm One')
+ provideUtility(Permission('Perm One', 'title'), IPermission,
+ 'Perm One')
perm1 = 'Perm One'
- ztapi.provideUtility(
- IPermission, Permission('Perm Two', 'title'), 'Perm Two')
+ provideUtility(Permission('Perm Two', 'title'), IPermission,
+ 'Perm Two')
perm2 = 'Perm Two'
prin1 = self._make_principal()
manager.grantPermissionToPrincipal(perm1, prin1)
@@ -136,8 +134,8 @@
def testManyPrincipalsOnePermission(self):
manager = AnnotationPrincipalPermissionManager(Manageable())
- ztapi.provideUtility(
- IPermission, Permission('Perm One', 'title'), 'Perm One')
+ provideUtility(Permission('Perm One', 'title'), IPermission,
+ 'Perm One')
perm1 = 'Perm One'
prin1 = self._make_principal()
prin2 = self._make_principal('Principal 2', 'Principal Two')
Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationrolepermissionmanager.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationrolepermissionmanager.py 2009-03-14 10:54:40 UTC (rev 98087)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationrolepermissionmanager.py 2009-03-14 11:03:38 UTC (rev 98088)
@@ -16,12 +16,12 @@
$Id$
"""
import unittest
+from zope.component import provideUtility
from zope.interface import implements
from zope.annotation.interfaces import IAttributeAnnotatable
from zope.security.interfaces import IPermission
from zope.security.permission import Permission
-from zope.app.testing import ztapi
from zope.app.component.testing import PlacefulSetup
from zope.securitypolicy.role import Role
@@ -38,19 +38,19 @@
PlacefulSetup.setUp(self)
read = Permission('read', 'Read Something')
- ztapi.provideUtility(IPermission, read, name=read.id)
+ provideUtility(read, IPermission, read.id)
self.read = read.id
write = Permission('write', 'Write Something')
- ztapi.provideUtility(IPermission, write, name=write.id)
+ provideUtility(write, IPermission, write.id)
self.write = write.id
peon = Role('peon', 'Poor Slob')
- ztapi.provideUtility(IRole, peon, name=peon.id)
+ provideUtility(peon, IRole, peon.id)
self.peon = peon.id
manager = Role('manager', 'Supreme Being')
- ztapi.provideUtility(IRole, manager, name=manager.id)
+ provideUtility(manager, IRole, manager.id)
self.manager = manager.id
def testNormal(self):
Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_principalpermissionmanager.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_principalpermissionmanager.py 2009-03-14 10:54:40 UTC (rev 98087)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_principalpermissionmanager.py 2009-03-14 11:03:38 UTC (rev 98088)
@@ -17,10 +17,10 @@
"""
import unittest
+from zope.component import provideUtility
from zope.security.interfaces import IPermission
from zope.security.permission import Permission
-from zope.app.testing import ztapi
from zope.app.testing.placelesssetup import PlacelessSetup
from zope.authentication.interfaces import IAuthentication
from zope.principalregistry.principalregistry import principalRegistry
@@ -32,14 +32,14 @@
def definePermission(id, title=None, description=None):
perm = Permission(id, title, description)
- ztapi.provideUtility(IPermission, perm, name=perm.id)
+ provideUtility(perm, IPermission, perm.id)
return perm
class Test(PlacelessSetup, unittest.TestCase):
def setUp(self):
super(Test, self).setUp()
- ztapi.provideUtility(IAuthentication, principalRegistry)
+ provideUtility(principalRegistry, IAuthentication)
def _make_principal(self, id=None, title=None):
Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_principalrolemanager.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_principalrolemanager.py 2009-03-14 10:54:40 UTC (rev 98087)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_principalrolemanager.py 2009-03-14 11:03:38 UTC (rev 98088)
@@ -17,7 +17,7 @@
"""
import unittest
-from zope.app.testing import ztapi
+from zope.component import provideUtility
from zope.app.testing.placelesssetup import PlacelessSetup
from zope.authentication.interfaces import IAuthentication
@@ -30,14 +30,14 @@
def defineRole(id, title=None, description=None):
role = Role(id, title, description)
- ztapi.provideUtility(IRole, role, name=role.id)
+ provideUtility(role, IRole, role.id)
return role
class Test(PlacelessSetup, unittest.TestCase):
def setUp(self):
super(Test, self).setUp()
- ztapi.provideUtility(IAuthentication, principalRegistry)
+ provideUtility(principalRegistry, IAuthentication)
def _make_principal(self, id=None, title=None):
p = principalRegistry.definePrincipal(
Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_rolepermissionmanager.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_rolepermissionmanager.py 2009-03-14 10:54:40 UTC (rev 98087)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_rolepermissionmanager.py 2009-03-14 11:03:38 UTC (rev 98088)
@@ -17,11 +17,11 @@
"""
import unittest
+from zope.component import provideUtility
from zope.security.interfaces import IPermission
from zope.security.permission import Permission
from zope.app.testing.placelesssetup import PlacelessSetup
-from zope.app.testing import ztapi
from zope.securitypolicy.role import Role
from zope.securitypolicy.interfaces import Allow, Deny
from zope.securitypolicy.interfaces import IRole
@@ -30,12 +30,12 @@
def defineRole(id, title=None, description=None):
role = Role(id, title, description)
- ztapi.provideUtility(IRole, role, name=role.id)
+ provideUtility(role, IRole, role.id)
return role
def definePermission(id, title=None, description=None):
perm = Permission(id, title, description)
- ztapi.provideUtility(IPermission, perm, name=perm.id)
+ provideUtility(perm, IPermission, perm.id)
return perm
class Test(PlacelessSetup, unittest.TestCase):
Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_securitydirectives.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_securitydirectives.py 2009-03-14 10:54:40 UTC (rev 98087)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_securitydirectives.py 2009-03-14 11:03:38 UTC (rev 98088)
@@ -23,7 +23,6 @@
from zope.security.interfaces import IPermission
from zope.security.permission import Permission
-from zope.app.testing import ztapi
from zope.app.testing.placelesssetup import PlacelessSetup
from zope.authentication.interfaces import IAuthentication
from zope.principalregistry.principalregistry import principalRegistry
@@ -42,7 +41,7 @@
def defineRole(id, title=None, description=None):
role = Role(id, title, description)
- ztapi.provideUtility(IRole, role, name=role.id)
+ zope.component.provideUtility(role, IRole, role.id)
return role
@@ -50,7 +49,7 @@
def setUp(self):
super(TestBase, self).setUp()
- ztapi.provideUtility(IAuthentication, principalRegistry)
+ zope.component.provideUtility(principalRegistry, IAuthentication)
class TestRoleDirective(TestBase, unittest.TestCase):
@@ -73,8 +72,8 @@
def setUp(self):
super(TestSecurityMapping, self).setUp()
- ztapi.provideUtility(IPermission, Permission('zope.Foo', ''),
- name='zope.Foo')
+ zope.component.provideUtility(Permission('zope.Foo', ''),
+ IPermission, 'zope.Foo')
defineRole("zope.Bar", '', '')
principalRegistry.definePrincipal("zope.Blah", '', '')
self.context = xmlconfig.file("mapping.zcml", zope.securitypolicy.tests)
Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_zopepolicy.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_zopepolicy.py 2009-03-14 10:54:40 UTC (rev 98087)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_zopepolicy.py 2009-03-14 11:03:38 UTC (rev 98088)
@@ -17,6 +17,7 @@
"""
import unittest
+from zope.component import provideAdapter
from zope.testing.doctestunit import DocFileSuite
from zope.annotation.interfaces import IAnnotatable
from zope.annotation.interfaces import IAttributeAnnotatable
@@ -24,7 +25,7 @@
from zope.annotation.attribute import AttributeAnnotations
from zope.security.management import endInteraction
-from zope.app.testing import placelesssetup, ztapi
+from zope.app.testing import placelesssetup
from zope.securitypolicy.interfaces import IGrantInfo
from zope.securitypolicy.interfaces import IPrincipalRoleManager
from zope.securitypolicy.interfaces import IPrincipalPermissionManager
@@ -41,21 +42,14 @@
def setUp(test):
placelesssetup.setUp()
endInteraction()
- ztapi.provideAdapter(
- IAttributeAnnotatable, IAnnotations,
- AttributeAnnotations)
- ztapi.provideAdapter(
- IAnnotatable, IPrincipalPermissionManager,
- AnnotationPrincipalPermissionManager)
- ztapi.provideAdapter(
- IAnnotatable, IPrincipalRoleManager,
- AnnotationPrincipalRoleManager)
- ztapi.provideAdapter(
- IAnnotatable, IRolePermissionManager,
- AnnotationRolePermissionManager)
- ztapi.provideAdapter(
- IAnnotatable, IGrantInfo,
- AnnotationGrantInfo)
+ provideAdapter(AttributeAnnotations)
+ provideAdapter(AnnotationPrincipalPermissionManager, (IAnnotatable,),
+ IPrincipalPermissionManager)
+ provideAdapter(AnnotationPrincipalRoleManager, (IAnnotatable,),
+ IPrincipalRoleManager)
+ provideAdapter(AnnotationRolePermissionManager, (IAnnotatable,),
+ IRolePermissionManager)
+ provideAdapter(AnnotationGrantInfo, (IAnnotatable,), IGrantInfo)
def test_suite():
Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/vocabulary.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/vocabulary.py 2009-03-14 10:54:40 UTC (rev 98087)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/vocabulary.py 2009-03-14 11:03:38 UTC (rev 98088)
@@ -46,9 +46,9 @@
>>> from zope.securitypolicy.interfaces import IRole
>>> from zope.securitypolicy.role import Role
- >>> from zope.app.testing import ztapi
- >>> ztapi.provideUtility(IRole, Role('a_id','a_title'), 'a_id')
- >>> ztapi.provideUtility(IRole, Role('b_id','b_title'), 'b_id')
+ >>> from zope.component import provideUtility
+ >>> provideUtility(Role('a_id','a_title'), IRole, 'a_id')
+ >>> provideUtility(Role('b_id','b_title'), IRole, 'b_id')
Let's lookup the roles using the vocabulary
Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/zopepolicy.txt
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/zopepolicy.txt 2009-03-14 10:54:40 UTC (rev 98087)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/zopepolicy.txt 2009-03-14 11:03:38 UTC (rev 98088)
@@ -512,8 +512,8 @@
>>> auth = FauxPrincipals()
- >>> from zope.app.testing import ztapi
- >>> ztapi.provideUtility(IAuthentication, auth)
+ >>> from zope.component import provideUtility
+ >>> provideUtility(auth, IAuthentication)
Let's define a group:
More information about the Checkins
mailing list