[Checkins] SVN: z3ext.ownership/trunk/ update tests

[Nikolay Kim]

Log message for revision 106975:
  update tests

Changed:
  U   z3ext.ownership/trunk/CHANGES.txt
  U   z3ext.ownership/trunk/buildout.cfg
  U   z3ext.ownership/trunk/setup.py
  U   z3ext.ownership/trunk/src/z3ext/ownership/README.txt
  U   z3ext.ownership/trunk/src/z3ext/ownership/principalgroups.py
  U   z3ext.ownership/trunk/src/z3ext/ownership/tests.py

-=-
Modified: z3ext.ownership/trunk/CHANGES.txt
===================================================================
--- z3ext.ownership/trunk/CHANGES.txt	2009-12-22 23:48:48 UTC (rev 106974)
+++ z3ext.ownership/trunk/CHANGES.txt	2009-12-22 23:49:21 UTC (rev 106975)
@@ -2,10 +2,12 @@
 CHANGES
 =======
 
-1.2.1 (Unreleased)
+1.3.0 (Unreleased)
 ------------------
 
+- ZTK support
 
+
 1.2.0 (2009-08-11)
 ------------------
 

Modified: z3ext.ownership/trunk/buildout.cfg
===================================================================
--- z3ext.ownership/trunk/buildout.cfg	2009-12-22 23:48:48 UTC (rev 106974)
+++ z3ext.ownership/trunk/buildout.cfg	2009-12-22 23:49:21 UTC (rev 106975)
@@ -4,11 +4,11 @@
 
 [test]
 recipe = zc.recipe.testrunner
-eggs = z3ext.ownership [test]
+eggs = z3ext.ownership
 
 [coverage-test]
 recipe = zc.recipe.testrunner
-eggs = z3ext.ownership [test]
+eggs = z3ext.ownership
 defaults = ['--coverage', '../../coverage']
 
 [coverage-report]

Modified: z3ext.ownership/trunk/setup.py
===================================================================
--- z3ext.ownership/trunk/setup.py	2009-12-22 23:48:48 UTC (rev 106974)
+++ z3ext.ownership/trunk/setup.py	2009-12-22 23:49:21 UTC (rev 106975)
@@ -21,7 +21,7 @@
 def read(*rnames):
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
-version='1.2.1dev'
+version='0'
 
 
 setup(name = 'z3ext.ownership',
@@ -47,7 +47,7 @@
         'Operating System :: OS Independent',
         'Topic :: Internet :: WWW/HTTP',
         'Framework :: Zope3'],
-      url='http://z3ext.net/',
+      url='http://pypi.python.org/pypi/z3ext.ownership/',
       license='ZPL 2.1',
       packages=find_packages('src'),
       package_dir = {'':'src'},
@@ -60,12 +60,9 @@
                           'zope.securitypolicy',
                           'zope.annotation',
                           'zope.lifecycleevent',
-                          'zope.app.security',
+                          'zope.authentication',
                           'z3ext.security',
                           ],
-      extras_require = dict(test=['zope.app.testing',
-                                  'zope.testing',
-                                  ]),
       include_package_data = True,
       zip_safe = False
       )

Modified: z3ext.ownership/trunk/src/z3ext/ownership/README.txt
===================================================================
--- z3ext.ownership/trunk/src/z3ext/ownership/README.txt	2009-12-22 23:48:48 UTC (rev 106974)
+++ z3ext.ownership/trunk/src/z3ext/ownership/README.txt	2009-12-22 23:49:21 UTC (rev 106975)
@@ -13,7 +13,7 @@
   >>> from z3ext.ownership.interfaces import IOwnership
   >>> from z3ext.ownership.interfaces import IOwnerAware, IOwnerGroupAware
 
-  >>> from zope.app.security.interfaces import IAuthentication
+  >>> from zope.authentication.interfaces import IAuthentication
  
   >>> principal1 = tests.Principal('bob')
   >>> principal2 = tests.Principal('meg')
@@ -211,6 +211,8 @@
   PermissionSetting: Allow
   >>> map.getSetting('content.Owner', 'meg')
   PermissionSetting: Deny
+  >>> map.getPrincipalsAndRoles()
+  ()
 
 
 Group owner
@@ -251,3 +253,5 @@
   PermissionSetting: Allow
   >>> map.getSetting('content.GroupOwner', 'meg')
   PermissionSetting: Deny
+  >>> map.getPrincipalsAndRoles()
+  ()

Modified: z3ext.ownership/trunk/src/z3ext/ownership/principalgroups.py
===================================================================
--- z3ext.ownership/trunk/src/z3ext/ownership/principalgroups.py	2009-12-22 23:48:48 UTC (rev 106974)
+++ z3ext.ownership/trunk/src/z3ext/ownership/principalgroups.py	2009-12-22 23:49:21 UTC (rev 106975)
@@ -17,7 +17,7 @@
 """
 from zope import interface, component
 from zope.component import queryUtility
-from zope.app.security.interfaces import IUnauthenticatedPrincipal
+from zope.authentication.interfaces import IUnauthenticatedPrincipal
 
 from z3ext.security.interfaces import IPrincipalGroups
 from z3ext.ownership.interfaces import IOwnerAware, IOwnership

Modified: z3ext.ownership/trunk/src/z3ext/ownership/tests.py
===================================================================
--- z3ext.ownership/trunk/src/z3ext/ownership/tests.py	2009-12-22 23:48:48 UTC (rev 106974)
+++ z3ext.ownership/trunk/src/z3ext/ownership/tests.py	2009-12-22 23:49:21 UTC (rev 106975)
@@ -17,10 +17,11 @@
 """
 import unittest, doctest
 from zope import interface, component
-from zope.app.testing import placelesssetup
 from zope.annotation.attribute import AttributeAnnotations
 
 import zope.security.management
+from zope.component import eventtesting
+from zope.component.testing import tearDown
 from zope.security.interfaces import IPrincipal
 from z3ext.security import tests as sectests
 from z3ext.security.securitypolicy import SecurityPolicy
@@ -48,6 +49,7 @@
 
 def setUp(test):
     sectests.setUp(test)
+    eventtesting.setUp()
     zope.security.management.setSecurityPolicy(SecurityPolicy)
 
     sm = component.getSiteManager()
@@ -63,6 +65,6 @@
     return unittest.TestSuite((
             doctest.DocFileSuite(
                 'README.txt',
-                setUp=setUp, tearDown=placelesssetup.tearDown,
+                setUp=setUp, tearDown=tearDown,
                 optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS),
             ))