[Checkins] SVN: z3c.formui/trunk/ Fixed tests so they do not break for `z3c.form` 2.2.0.

[Michael Howitz]

Log message for revision 107197:
  Fixed tests so they do not break for `z3c.form` 2.2.0.
  

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

-=-
Modified: z3c.formui/trunk/CHANGES.txt
===================================================================
--- z3c.formui/trunk/CHANGES.txt	2009-12-28 09:13:13 UTC (rev 107196)
+++ z3c.formui/trunk/CHANGES.txt	2009-12-28 10:26:26 UTC (rev 107197)
@@ -5,7 +5,7 @@
 2.1.1 (unreleased)
 ------------------
 
-- ...
+- Fixed tests so they do not break for `z3c.form` 2.2.0.
 
 2.1.0 (2009-09-01)
 ------------------

Modified: z3c.formui/trunk/setup.py
===================================================================
--- z3c.formui/trunk/setup.py	2009-12-28 09:13:13 UTC (rev 107196)
+++ z3c.formui/trunk/setup.py	2009-12-28 10:26:26 UTC (rev 107197)
@@ -58,7 +58,7 @@
         ),
     install_requires = [
         'setuptools',
-        'z3c.form>=2.0',
+        'z3c.form >= 2.2.0',
         'z3c.macro',
         'z3c.template',
         'zope.component',

Modified: z3c.formui/trunk/src/z3c/formui/tests.py
===================================================================
--- z3c.formui/trunk/src/z3c/formui/tests.py	2009-12-28 09:13:13 UTC (rev 107196)
+++ z3c.formui/trunk/src/z3c/formui/tests.py	2009-12-28 10:26:26 UTC (rev 107197)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2005 Zope Foundation and Contributors.
+# Copyright (c) 2005-2009 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
@@ -16,30 +16,35 @@
 """
 __docformat__ = "reStructuredText"
 
+from zope.testing import doctest
 import unittest
-from zope.testing import doctest
+import z3c.form.outputchecker
+import z3c.form.testing
 
-from z3c.form import testing
 
 def setUpZPT(test):
-    testing.setUpZPT(test)
+    z3c.form.testing.setUpZPT(test)
     from zope.app.pagetemplate.metaconfigure import registerType
     from zope.contentprovider.tales import TALESProviderExpression
     from z3c.macro.tales import MacroExpression
     registerType('macro', MacroExpression)
     registerType('provider', TALESProviderExpression)
 
+
 def setUpZ3CPT(test):
-    testing.setUpZ3CPT(test)
+    z3c.form.testing.setUpZ3CPT(test)
     from zope.component import provideUtility
     from z3c.macro.tales import z3cpt_macro_expression
     provideUtility(z3cpt_macro_expression, name='macro')
 
+
 def test_suite():
     return unittest.TestSuite([
-        doctest.DocFileSuite('README.txt',
-            setUp=setUp, tearDown=testing.tearDown,
+        doctest.DocFileSuite(
+            'README.txt',
+            setUp=setUp,
+            tearDown=z3c.form.testing.tearDown,
             optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
-            checker=testing.OutputChecker(doctest))
+            checker=z3c.form.outputchecker.OutputChecker(doctest))
         #for setUp in (setUpZPT, setUpZ3CPT)]) # XXX: broken macro tests
         for setUp in (setUpZPT, )])