[Checkins] SVN: zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_ Replace zope.app.testing placeless setup with simple zope.component.testing setup.

[Dan Korostelev]

Log message for revision 98089:
  Replace zope.app.testing placeless setup with simple zope.component.testing setup.

Changed:
  U   zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationprincipalpermissionmanager.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

-=-
Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationprincipalpermissionmanager.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationprincipalpermissionmanager.py	2009-03-14 11:03:38 UTC (rev 98088)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationprincipalpermissionmanager.py	2009-03-14 11:08:54 UTC (rev 98089)
@@ -18,6 +18,7 @@
 import unittest
 
 from zope.component import provideAdapter, provideUtility
+from zope.component.testing import PlacelessSetup
 from zope.interface import implements
 from zope.annotation.attribute import AttributeAnnotations
 from zope.annotation.interfaces import IAttributeAnnotatable, IAnnotations
@@ -29,7 +30,6 @@
     AnnotationPrincipalPermissionManager
 
 from zope.principalregistry.principalregistry import principalRegistry
-from zope.app.testing.placelesssetup import PlacelessSetup
 
 class Manageable(object):
     implements(IAttributeAnnotatable)

Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_principalpermissionmanager.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_principalpermissionmanager.py	2009-03-14 11:03:38 UTC (rev 98088)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_principalpermissionmanager.py	2009-03-14 11:08:54 UTC (rev 98089)
@@ -18,10 +18,10 @@
 import unittest
 
 from zope.component import provideUtility
+from zope.component.testing import PlacelessSetup
 from zope.security.interfaces import IPermission
 from zope.security.permission import Permission
 
-from zope.app.testing.placelesssetup import PlacelessSetup
 from zope.authentication.interfaces import IAuthentication
 from zope.principalregistry.principalregistry import principalRegistry
 

Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_principalrolemanager.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_principalrolemanager.py	2009-03-14 11:03:38 UTC (rev 98088)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_principalrolemanager.py	2009-03-14 11:08:54 UTC (rev 98089)
@@ -18,7 +18,7 @@
 import unittest
 
 from zope.component import provideUtility
-from zope.app.testing.placelesssetup import PlacelessSetup
+from zope.component.testing import PlacelessSetup
 
 from zope.authentication.interfaces import IAuthentication
 from zope.principalregistry.principalregistry import principalRegistry

Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_rolepermissionmanager.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_rolepermissionmanager.py	2009-03-14 11:03:38 UTC (rev 98088)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_rolepermissionmanager.py	2009-03-14 11:08:54 UTC (rev 98089)
@@ -18,10 +18,10 @@
 import unittest
 
 from zope.component import provideUtility
+from zope.component.testing import PlacelessSetup
 from zope.security.interfaces import IPermission
 from zope.security.permission import Permission
 
-from zope.app.testing.placelesssetup import PlacelessSetup
 from zope.securitypolicy.role import Role
 from zope.securitypolicy.interfaces import Allow, Deny
 from zope.securitypolicy.interfaces import IRole

Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_securitydirectives.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_securitydirectives.py	2009-03-14 11:03:38 UTC (rev 98088)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_securitydirectives.py	2009-03-14 11:08:54 UTC (rev 98089)
@@ -23,7 +23,7 @@
 from zope.security.interfaces import IPermission
 from zope.security.permission import Permission
 
-from zope.app.testing.placelesssetup import PlacelessSetup
+from zope.component.testing import PlacelessSetup
 from zope.authentication.interfaces import IAuthentication
 from zope.principalregistry.principalregistry import principalRegistry
 

Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_zopepolicy.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_zopepolicy.py	2009-03-14 11:03:38 UTC (rev 98088)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_zopepolicy.py	2009-03-14 11:08:54 UTC (rev 98089)
@@ -18,6 +18,8 @@
 
 import unittest
 from zope.component import provideAdapter
+from zope.component.testing import setUp as componentSetUp
+from zope.component.testing import tearDown as componentTearDown
 from zope.testing.doctestunit import DocFileSuite
 from zope.annotation.interfaces import IAnnotatable
 from zope.annotation.interfaces import IAttributeAnnotatable
@@ -25,7 +27,6 @@
 from zope.annotation.attribute import AttributeAnnotations
 from zope.security.management import endInteraction
 
-from zope.app.testing import placelesssetup
 from zope.securitypolicy.interfaces import IGrantInfo
 from zope.securitypolicy.interfaces import IPrincipalRoleManager
 from zope.securitypolicy.interfaces import IPrincipalPermissionManager
@@ -40,7 +41,7 @@
      AnnotationGrantInfo
 
 def setUp(test):
-    placelesssetup.setUp()
+    componentSetUp()
     endInteraction()
     provideAdapter(AttributeAnnotations)
     provideAdapter(AnnotationPrincipalPermissionManager, (IAnnotatable,),
@@ -56,7 +57,7 @@
     return unittest.TestSuite((
         DocFileSuite('zopepolicy.txt',
             package='zope.securitypolicy',
-            setUp=setUp, tearDown=placelesssetup.tearDown),
+            setUp=setUp, tearDown=componentTearDown),
         ))
 
 if __name__ == '__main__':