Remove zope.app.testing dependency and use zope.app.wsgi testing capa…

…bitlities instead.

setup.py

@@ -14,9 +14,8 @@ def read(*rnames):
     )
 
 tests_require = [
-    'zope.app.testing',
+    'zope.app.wsgi',
     'zope.configuration',
-    'zope.testbrowser',
     'zope.testing',
     ]
 
@@ -91,7 +90,6 @@ def read(*rnames):
                       'zope.app.appsetup',
                       'zope.app.pagetemplate',
                       'zope.app.security',
-                      'zope.app.twisted',
                       'zope.deprecation',
                       'zope.dottedname',
                       'zope.hookable',

src/grok/ftests/catalog/addform.py

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

src/grok/ftests/form/form.py

@@ -8,7 +8,7 @@
 
 And we can access the display form which display the application URL::
 
-  >>> from zope.testbrowser.testing import Browser
+  >>> from zope.app.wsgi.testlayer import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
   >>> browser.open('http://localhost/world/arthur')

src/grok/ftests/security/grok_view.py

@@ -9,7 +9,7 @@
 
 Now we can look at the view::
 
-  >>> from zope.testbrowser.testing import Browser
+  >>> from zope.app.wsgi.testlayer import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
   >>> browser.open('http://localhost/app/@@index')

src/grok/ftests/security/handle_exception.py

@@ -4,7 +4,7 @@
 and cause the grok security to fail, we have a simple test here that assures
 that we don't hit this:
 
-  >>> from zope.testbrowser.testing import Browser
+  >>> from zope.app.wsgi.testlayer import Browser
   >>> browser = Browser()
   >>> browser.open("http://localhost/@@cave")
   Traceback (most recent call last):

src/grok/ftests/security/json.py

@@ -1,7 +1,7 @@
 """
 Let's test whether require decorators work for json methods.
 
-  >>> from zope.testbrowser.testing import Browser
+  >>> from zope.app.wsgi.testlayer import Browser
   >>> browser = Browser()
 
 We can access the public method just fine::

src/grok/ftests/security/preserve_permissions.py

@@ -62,7 +62,7 @@
 
 The default view is accessible::
   
-  >>> from zope.testbrowser.testing import Browser
+  >>> from zope.app.wsgi.testlayer import Browser
   >>> browser = Browser()
   >>> browser.open('http://localhost/app')
   >>> print browser.contents

src/grok/ftests/security/roles.py

@@ -2,7 +2,7 @@
 Viewing a protected view with insufficient privileges will yield
 Unauthorized:
 
-  >>> from zope.testbrowser.testing import Browser
+  >>> from zope.app.wsgi.testlayer import Browser
   >>> browser = Browser()
 
   >>> browser.open("http://localhost/@@cavepainting")

src/grok/ftests/security/security_view.py

@@ -25,7 +25,7 @@
 
 However, when we want to watch this view, we run into trouble::
 
-  >>> from zope.testbrowser.testing import Browser
+  >>> from zope.app.wsgi.testlayer import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
   >>> browser.open('http://localhost/app/@@index')

src/grok/ftests/test_grok_functional.py

@@ -1,22 +1,12 @@
 import re
 import unittest
 import grok
-import os.path
 
 from pkg_resources import resource_listdir
 from zope.testing import doctest, renormalizing
-from zope.app.testing.functional import (HTTPCaller, getRootFolder,
-                                         FunctionalTestSetup, sync, ZCMLLayer)
+from zope.app.wsgi.testlayer import BrowserLayer, http
 
-ftesting_zcml = os.path.join(os.path.dirname(grok.__file__), 'ftesting.zcml')
-GrokFunctionalLayer = ZCMLLayer(ftesting_zcml, __name__, 'GrokFunctionalLayer',
-                                allow_teardown=True)
-
-def setUp(test):
-    FunctionalTestSetup().setUp()
-
-def tearDown(test):
-    FunctionalTestSetup().tearDown()
+FunctionalLayer = BrowserLayer(grok)
 
 checker = renormalizing.RENormalizing([
     # Accommodate to exception wrapping in newer versions of mechanize
@@ -40,7 +30,7 @@ def http_call(method, path, data=None, **kw):
     if data is not None:
         request_string += '\r\n'
         request_string += data
-    return HTTPCaller()(request_string, handle_errors=False)
+    return http(request_string, handle_errors=False)
 
 def suiteFromPackage(name):
     files = resource_listdir(__name__, name)
@@ -53,17 +43,15 @@ def suiteFromPackage(name):
 
         dottedname = 'grok.ftests.%s.%s' % (name, filename[:-3])
         test = doctest.DocTestSuite(
-            dottedname, setUp=setUp, tearDown=tearDown,
+            dottedname,
             checker=checker,
-            extraglobs=dict(http=HTTPCaller(),
-                            http_call=http_call,
-                            getRootFolder=getRootFolder,
-                            sync=sync),
+            extraglobs=dict(http_call=http_call,
+                            http=http,
+                            getRootFolder=FunctionalLayer.getRootFolder),
             optionflags=(doctest.ELLIPSIS+
                          doctest.NORMALIZE_WHITESPACE+
-                         doctest.REPORT_NDIFF)
-            )
-        test.layer = GrokFunctionalLayer
+                         doctest.REPORT_NDIFF))
+        test.layer = FunctionalLayer
 
         suite.addTest(test)
     return suite

src/grok/ftests/traversal/containertraverse.py

@@ -9,7 +9,7 @@
 
 Let's first try to look up the special traversed item:
 
-  >>> from zope.testbrowser.testing import Browser
+  >>> from zope.app.wsgi.testlayer import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
   >>> browser.open("http://localhost/herd/special")

src/grok/ftests/traversal/containertraverser.py

@@ -9,7 +9,7 @@
 
 Let's first try to look up the special traversed item:
 
-  >>> from zope.testbrowser.testing import Browser
+  >>> from zope.app.wsgi.testlayer import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
   >>> browser.open("http://localhost/herd/special")

src/grok/ftests/traversal/items_before_views.py

@@ -8,7 +8,7 @@
   >>> herd['manfred'] = Mammoth('Manfred')
   >>> herd['ellie'] = Mammoth('Ellie')
 
-  >>> from zope.testbrowser.testing import Browser
+  >>> from zope.app.wsgi.testlayer import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
 

src/grok/ftests/traversal/modeltraverse.py

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

src/grok/ftests/traversal/traversableattr.py

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

src/grok/ftests/traversal/traverser.py

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

src/grok/ftests/traversal/traverser_sets_parent.py

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

src/grok/ftests/url/application.py

@@ -7,7 +7,7 @@
 
 Asking for the application_url on the cave returns the URL to the cave::
 
-  >>> from zope.testbrowser.testing import Browser
+  >>> from zope.app.wsgi.testlayer import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
   >>> browser.open('http://localhost/cave')

src/grok/ftests/viewlet/viewlet_security.py

@@ -17,7 +17,7 @@
 Traverse to the view on the model object. We get the viewlets
 registered for the default layer, with the anybody permission::
 
-  >>> from zope.testbrowser.testing import Browser
+  >>> from zope.app.wsgi.testlayer import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
   >>> browser.open("http://localhost/wilma/@@caveview")