[Checkins] SVN: z3c.formwidget.query/trunk/ Avoid test dependency on zope.app.testing.

[Hano Schlichting]

Log message for revision 126493:
  Avoid test dependency on zope.app.testing.
  

Changed:
  U   z3c.formwidget.query/trunk/CHANGES.txt
  U   z3c.formwidget.query/trunk/setup.py
  U   z3c.formwidget.query/trunk/src/z3c/formwidget/query/tests.py

-=-
Modified: z3c.formwidget.query/trunk/CHANGES.txt
===================================================================
--- z3c.formwidget.query/trunk/CHANGES.txt	2012-05-24 18:15:28 UTC (rev 126492)
+++ z3c.formwidget.query/trunk/CHANGES.txt	2012-05-24 18:19:54 UTC (rev 126493)
@@ -4,6 +4,9 @@
 0.9 - unreleased
 ----------------
 
+* Avoid test dependency on zope.app.testing.
+  [hannosch]
+
 * Remove unused dependency on zope.app.form.
   [hannosch]
 

Modified: z3c.formwidget.query/trunk/setup.py
===================================================================
--- z3c.formwidget.query/trunk/setup.py	2012-05-24 18:15:28 UTC (rev 126492)
+++ z3c.formwidget.query/trunk/setup.py	2012-05-24 18:19:54 UTC (rev 126493)
@@ -19,8 +19,7 @@
       include_package_data=True,
       package_dir = {'':'src'},
       namespace_packages=['z3c', 'z3c.formwidget'],
-      extras_require = dict(test=['zope.app.testing',
-                                  'zope.testing',
+      extras_require = dict(test=['zope.testing',
                                   'z3c.form [test]'
                                   ]),
       install_requires = ['setuptools',

Modified: z3c.formwidget.query/trunk/src/z3c/formwidget/query/tests.py
===================================================================
--- z3c.formwidget.query/trunk/src/z3c/formwidget/query/tests.py	2012-05-24 18:15:28 UTC (rev 126492)
+++ z3c.formwidget.query/trunk/src/z3c/formwidget/query/tests.py	2012-05-24 18:19:54 UTC (rev 126493)
@@ -1,19 +1,20 @@
 import doctest
 import unittest
 from zope import interface, component, schema
-from zope.app.testing import setup
+from zope.testing.cleanup import cleanUp
+from z3c.form import testing
 
 
 def setUp(test):
-    test.globs = dict(
-        root=setup.placefulSetUp(True),
+    testing.setUp(test)
+    test.globs.update(dict(
         interface=interface,
         component=component,
-        schema=schema)
+        schema=schema))
 
 
 def tearDown(test):
-    setup.placefulTearDown()
+    cleanUp()
 
 
 def test_suite():