[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/Security - PermissionRegistry.py:1.1.2.15 PrincipalPermissionManager.py:1.1.2.10 PrincipalRegistry.py:1.1.2.13 PrincipalRoleManager.py:1.1.2.7 RolePermissionManager.py:1.1.2.10 RoleRegistry.py:1.1.2.6

[Jim Fulton]

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

Modified Files:
      Tag: Zope-3x-branch
	PermissionRegistry.py PrincipalPermissionManager.py 
	PrincipalRegistry.py PrincipalRoleManager.py 
	RolePermissionManager.py RoleRegistry.py 
Log Message:
Refactored tests to use a global-data cleanup framework.
This avoids a lot of messy clean-up code needed for tests that
use global registries, such as component services.

It is really important to make sure global registries get registered
with this framework.

See the doc strings in Zope.Testing.CleannUp.


=== Zope3/lib/python/Zope/App/Security/PermissionRegistry.py 1.1.2.14 => 1.1.2.15 ===
 
 permissionRegistry = PermissionRegistry()
+
+# Register our cleanup with Testing.CleanUp to make writing unit tests simpler.
+from Zope.Testing.CleanUp import addCleanUp
+addCleanUp(permissionRegistry._clear)
+del addCleanUp


=== Zope3/lib/python/Zope/App/Security/PrincipalPermissionManager.py 1.1.2.9 => 1.1.2.10 ===
 principalPermissionManager = PrincipalPermissionManager()
 
+
+# Register our cleanup with Testing.CleanUp to make writing unit tests simpler.
+from Zope.Testing.CleanUp import addCleanUp
+addCleanUp(principalPermissionManager._clear)
+del addCleanUp


=== Zope3/lib/python/Zope/App/Security/PrincipalRegistry.py 1.1.2.12 => 1.1.2.13 ===
 principalRegistry=PrincipalRegistry()
 
+# Register our cleanup with Testing.CleanUp to make writing unit tests simpler.
+from Zope.Testing.CleanUp import addCleanUp
+addCleanUp(principalRegistry._clear)
+del addCleanUp
+
 class Principal:
 
     __implements__ = IPrincipal


=== Zope3/lib/python/Zope/App/Security/PrincipalRoleManager.py 1.1.2.6 => 1.1.2.7 ===
 # Roles are our rows, and principals are our columns
 principalRoleManager = PrincipalRoleManager()
+
+# Register our cleanup with Testing.CleanUp to make writing unit tests simpler.
+from Zope.Testing.CleanUp import addCleanUp
+addCleanUp(principalRoleManager._clear)
+del addCleanUp


=== Zope3/lib/python/Zope/App/Security/RolePermissionManager.py 1.1.2.9 => 1.1.2.10 ===
 # Permissions are our rows, and roles are our columns
 rolePermissionManager = RolePermissionManager()
+
+# Register our cleanup with Testing.CleanUp to make writing unit tests simpler.
+from Zope.Testing.CleanUp import addCleanUp
+addCleanUp(rolePermissionManager._clear)
+del addCleanUp


=== Zope3/lib/python/Zope/App/Security/RoleRegistry.py 1.1.2.5 => 1.1.2.6 ===
 roleRegistry = RoleRegistry()
 
+
+# Register our cleanup with Testing.CleanUp to make writing unit tests simpler.
+from Zope.Testing.CleanUp import addCleanUp
+addCleanUp(roleRegistry._clear)
+del addCleanUp