Update functional tests to use zope.app.wsgi instead of zope.app.test…

…ing.

CHANGES.txt

@@ -4,8 +4,8 @@ Changes
 1.6 (unreleased)
 ----------------
 
-- Nothing changed yet.
-
+- Update functional tests to zope.app.wsgi Browser instead of zope.app.testing
+  one.
 
 1.5 (2009-12-13)
 ----------------

setup.py

@@ -11,7 +11,7 @@ def read(*rnames):
     )
 
 tests_require = [
-    'zope.app.testing',
+    'zope.app.wsgi',
     'zope.app.zcmlfiles',
     'zope.component',
     'zope.configuration',

src/grokcore/formlib/ftests/form/actions.py

@@ -6,7 +6,7 @@
 
   >>> getRootFolder()["manfred"] = Mammoth()
 
-  >>> from zope.testbrowser.testing import Browser
+  >>> from zope.app.wsgi.testlayer import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
   >>> browser.open("http://localhost/manfred/@@edit")

src/grokcore/formlib/ftests/form/addform.py

@@ -3,7 +3,7 @@
 
   >>> getRootFolder()["zoo"] = Zoo()
 
-  >>> from zope.testbrowser.testing import Browser
+  >>> from zope.app.wsgi.testlayer import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
 

src/grokcore/formlib/ftests/form/addform_applydata.py

@@ -5,7 +5,7 @@
 
   >>> getRootFolder()["zoo"] = Zoo()
 
-  >>> from zope.testbrowser.testing import Browser
+  >>> from zope.app.wsgi.testlayer import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
 

src/grokcore/formlib/ftests/form/editform_applydata.py

@@ -5,7 +5,7 @@
 
   >>> getRootFolder()["manfred"] = Mammoth('Manfred the Mammoth', 'Really big')
 
-  >>> from zope.testbrowser.testing import Browser
+  >>> from zope.app.wsgi.testlayer import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
 

src/grokcore/formlib/ftests/form/editform_applydata_schema.py

@@ -8,7 +8,7 @@
 
   >>> getRootFolder()["manfred"] = Mammoth('Manfred the Mammoth', 'Really big')
 
-  >>> from zope.testbrowser.testing import Browser
+  >>> from zope.app.wsgi.testlayer import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
 

src/grokcore/formlib/ftests/form/editform_applydata_schemafields.py

@@ -11,7 +11,7 @@
   >>> mammoth.name = 'Manfred the Mammoth'
   >>> mammoth.size = 'Really big'
 
-  >>> from zope.testbrowser.testing import Browser
+  >>> from zope.app.wsgi.testlayer import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
 

src/grokcore/formlib/ftests/form/form.py

@@ -3,7 +3,7 @@
 
   >>> getRootFolder()["manfred"] = Mammoth()
 
-  >>> from zope.testbrowser.testing import Browser
+  >>> from zope.app.wsgi.testlayer import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
   >>> browser.open("http://localhost/manfred/@@edit")

src/grokcore/formlib/ftests/form/update.py

@@ -4,7 +4,7 @@
 
   >>> getRootFolder()["manfred"] = Mammoth()
 
-  >>> from zope.testbrowser.testing import Browser
+  >>> from zope.app.wsgi.testlayer import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
   >>> browser.open("http://localhost/manfred/edit")

src/grokcore/formlib/ftests/test_functional.py

@@ -1,29 +1,19 @@
 import re
 import unittest
 import grokcore.formlib
-import os.path
 
 from pkg_resources import resource_listdir
 from zope.testing import doctest, renormalizing
-from zope.app.testing.functional import (getRootFolder, FunctionalTestSetup,
-                                         ZCMLLayer)
+from zope.app.wsgi.testlayer import BrowserLayer
 
-ftesting_zcml = os.path.join(os.path.dirname(grokcore.formlib.__file__),
-                             'ftesting.zcml')
-FunctionalLayer = ZCMLLayer(ftesting_zcml, __name__, 'FunctionalLayer',
-                            allow_teardown=True)
-
-def setUp(test):
-    FunctionalTestSetup().setUp()
-
-def tearDown(test):
-    FunctionalTestSetup().tearDown()
+FunctionalLayer = BrowserLayer(grokcore.formlib)
 
 checker = renormalizing.RENormalizing([
     # Accommodate to exception wrapping in newer versions of mechanize
     (re.compile(r'httperror_seek_wrapper:', re.M), 'HTTPError:'),
     ])
 
+
 def suiteFromPackage(name):
     files = resource_listdir(__name__, name)
     suite = unittest.TestSuite()
@@ -35,9 +25,9 @@ def suiteFromPackage(name):
 
         dottedname = 'grokcore.formlib.ftests.%s.%s' % (name, filename[:-3])
         test = doctest.DocTestSuite(
-            dottedname, setUp=setUp, tearDown=tearDown,
+            dottedname,
             checker=checker,
-            extraglobs=dict(getRootFolder=getRootFolder),
+            extraglobs=dict(getRootFolder=FunctionalLayer.getRootFolder),
             optionflags=(doctest.ELLIPSIS+
                          doctest.NORMALIZE_WHITESPACE+
                          doctest.REPORT_NDIFF)