[Zope3-checkins] CVS: Zope3/src/zope/products/securitypolicy/tests - test_annotationrolepermissionmanager.py:1.1.2.3 test_principalrolemanager.py:1.1.2.3 test_rolepermissionmanager.py:1.1.2.3 test_roleregistry.py:1.1.2.2 test_roleservice.py:1.1.2.2 test_securitydirectives.py:1.1.2.3 test_zopepolicy.py:1.1.2.3

[Chris McDonough]

Update of /cvs-repository/Zope3/src/zope/products/securitypolicy/tests
In directory cvs.zope.org:/tmp/cvs-serv26777/src/zope/products/securitypolicy/tests

Modified Files:
      Tag: steveachrismcd-securitypolicy-branch
	test_annotationrolepermissionmanager.py 
	test_principalrolemanager.py test_rolepermissionmanager.py 
	test_roleregistry.py test_roleservice.py 
	test_securitydirectives.py test_zopepolicy.py 
Log Message:
Move role-related interfaces to securitypolicy product.


=== Zope3/src/zope/products/securitypolicy/tests/test_annotationrolepermissionmanager.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/products/securitypolicy/tests/test_annotationrolepermissionmanager.py:1.1.2.2	Tue Jan 13 20:31:38 2004
+++ Zope3/src/zope/products/securitypolicy/tests/test_annotationrolepermissionmanager.py	Wed Jan 14 01:06:49 2004
@@ -19,7 +19,7 @@
 from zope.app.attributeannotations import AttributeAnnotations
 from zope.component import getServiceManager, getService
 from zope.app.services.servicenames import Permissions, Adapters
-from zope.app.interfaces.security import IRoleService
+from zope.products.securitypolicy.interfaces import IRoleService
 from zope.app.interfaces.security import IPermissionService
 from zope.products.securitypolicy.roleregistry import roleRegistry
 from zope.app.security.registries.permissionregistry import permissionRegistry


=== Zope3/src/zope/products/securitypolicy/tests/test_principalrolemanager.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/products/securitypolicy/tests/test_principalrolemanager.py:1.1.2.2	Tue Jan 13 20:31:38 2004
+++ Zope3/src/zope/products/securitypolicy/tests/test_principalrolemanager.py	Wed Jan 14 01:06:49 2004
@@ -18,7 +18,7 @@
 from zope.component.service import serviceManager as services
 from zope.app.services.servicenames import Authentication
 
-from zope.app.interfaces.security import IRoleService
+from zope.products.securitypolicy.interfaces import IRoleService
 from zope.app.interfaces.security import IAuthenticationService
 
 from zope.products.securitypolicy.roleregistry \


=== Zope3/src/zope/products/securitypolicy/tests/test_rolepermissionmanager.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/products/securitypolicy/tests/test_rolepermissionmanager.py:1.1.2.2	Tue Jan 13 20:31:38 2004
+++ Zope3/src/zope/products/securitypolicy/tests/test_rolepermissionmanager.py	Wed Jan 14 01:06:49 2004
@@ -19,7 +19,7 @@
 from zope.app.services.servicenames import Permissions, Roles
 
 from zope.app.interfaces.security import IPermissionService
-from zope.app.interfaces.security import IRoleService
+from zope.products.securitypolicy.interfaces import IRoleService
 
 from zope.app.security.registries.permissionregistry \
         import permissionRegistry as pregistry


=== Zope3/src/zope/products/securitypolicy/tests/test_roleregistry.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/products/securitypolicy/tests/test_roleregistry.py:1.1.2.1	Tue Jan 13 20:31:38 2004
+++ Zope3/src/zope/products/securitypolicy/tests/test_roleregistry.py	Wed Jan 14 01:06:49 2004
@@ -16,7 +16,7 @@
 import unittest
 
 from zope.products.securitypolicy.roleregistry import roleRegistry
-from zope.app.interfaces.security import IRole
+from zope.products.securitypolicy.interfaces import IRole
 from zope.interface.verify import verifyObject
 from zope.testing.cleanup import CleanUp # Base class w registry cleanup
 


=== Zope3/src/zope/products/securitypolicy/tests/test_roleservice.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/products/securitypolicy/tests/test_roleservice.py:1.1.2.1	Tue Jan 13 20:31:38 2004
+++ Zope3/src/zope/products/securitypolicy/tests/test_roleservice.py	Wed Jan 14 01:06:49 2004
@@ -20,7 +20,7 @@
 from zope.app.tests import setup
 from zope.app.services.tests.placefulsetup import PlacefulSetup
 from zope.component import getServiceManager
-from zope.app.interfaces.security import IRoleService
+from zope.products.securitypolicy.interfaces import IRoleService
 from zope.products.securitypolicy.roleregistry import roleRegistry
 from zope.products.securitypolicy.role import RoleService
 from zope.products.securitypolicy.role import Role


=== Zope3/src/zope/products/securitypolicy/tests/test_securitydirectives.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/products/securitypolicy/tests/test_securitydirectives.py:1.1.2.2	Tue Jan 13 20:31:38 2004
+++ Zope3/src/zope/products/securitypolicy/tests/test_securitydirectives.py	Wed Jan 14 01:06:49 2004
@@ -20,7 +20,7 @@
 from zope.component.service import serviceManager as services
 from zope.app.services.servicenames import Roles, Permissions, Authentication
 from zope.app.interfaces.security import IPermissionService
-from zope.app.interfaces.security import IRoleService
+from zope.products.securitypolicy.interfaces import IRoleService
 from zope.app.interfaces.security import IAuthenticationService
 
 from zope.configuration.config import ConfigurationConflictError


=== Zope3/src/zope/products/securitypolicy/tests/test_zopepolicy.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/products/securitypolicy/tests/test_zopepolicy.py:1.1.2.2	Tue Jan 13 20:31:38 2004
+++ Zope3/src/zope/products/securitypolicy/tests/test_zopepolicy.py	Wed Jan 14 01:06:49 2004
@@ -23,13 +23,13 @@
 from zope.interface import implements
 
 from zope.app.interfaces.security import IPermissionService
-from zope.app.interfaces.security import IRoleService
+from zope.products.securitypolicy.interfaces import IRoleService
 from zope.app.interfaces.security import IAuthenticationService
 
 from zope.component import getService
 from zope.app.services.servicenames import Roles, Permissions, Adapters
 from zope.app.services.servicenames import Authentication
-from zope.app.interfaces.security import IRolePermissionManager
+from zope.products.securitypolicy.interfaces import IRolePermissionManager
 from zope.app.security.registries.permissionregistry import permissionRegistry
 from zope.app.security.registries.principalregistry import principalRegistry
 from zope.app.security.registries.principalregistry import PrincipalBase
@@ -40,12 +40,12 @@
 from zope.products.securitypolicy.principalrole import principalRoleManager
 from zope.products.securitypolicy.principalpermission \
     import AnnotationPrincipalPermissionManager
-from zope.app.interfaces.security import IPrincipalPermissionManager
+from zope.products.securitypolicy.interfaces import IPrincipalPermissionManager
 from zope.products.securitypolicy.principalrole \
      import AnnotationPrincipalRoleManager
 from zope.products.securitypolicy.rolepermission \
     import AnnotationRolePermissionManager
-from zope.app.interfaces.security import IPrincipalRoleManager
+from zope.products.securitypolicy.interfaces import IPrincipalRoleManager
 from zope.app.interfaces.annotation import IAttributeAnnotatable
 from zope.app.interfaces.annotation import IAnnotations
 from zope.app.attributeannotations import AttributeAnnotations