[Checkins] SVN: grokcore.view/branches/1.13/ Update tests to use Browser implementation from zope.app.wsgi instead of zope.app.testing.

Sylvain Viollon sylvain at infrae.com
Wed Apr 14 08:24:09 EDT 2010


Log message for revision 110858:
  Update tests to use Browser implementation from zope.app.wsgi instead of zope.app.testing.
  
  

Changed:
  U   grokcore.view/branches/1.13/CHANGES.txt
  U   grokcore.view/branches/1.13/setup.py
  U   grokcore.view/branches/1.13/src/grokcore/view/ftesting.zcml
  U   grokcore.view/branches/1.13/src/grokcore/view/ftests/directoryresource/dirresource.py
  U   grokcore.view/branches/1.13/src/grokcore/view/ftests/staticdir/simple.py
  U   grokcore.view/branches/1.13/src/grokcore/view/ftests/test_functional.py
  U   grokcore.view/branches/1.13/src/grokcore/view/ftests/url/redirect.py
  U   grokcore.view/branches/1.13/src/grokcore/view/ftests/url/url.py
  U   grokcore.view/branches/1.13/src/grokcore/view/ftests/url/url_function.py
  U   grokcore.view/branches/1.13/src/grokcore/view/ftests/view/argument.py
  U   grokcore.view/branches/1.13/src/grokcore/view/ftests/view/index.py
  U   grokcore.view/branches/1.13/src/grokcore/view/ftests/view/macros.py
  U   grokcore.view/branches/1.13/src/grokcore/view/ftests/view/require.py
  U   grokcore.view/branches/1.13/src/grokcore/view/ftests/view/skindirective.py
  U   grokcore.view/branches/1.13/src/grokcore/view/ftests/view/view.py

-=-
Modified: grokcore.view/branches/1.13/CHANGES.txt
===================================================================
--- grokcore.view/branches/1.13/CHANGES.txt	2010-04-14 12:21:48 UTC (rev 110857)
+++ grokcore.view/branches/1.13/CHANGES.txt	2010-04-14 12:24:08 UTC (rev 110858)
@@ -1,10 +1,10 @@
 Changes
 =======
 
-1.13.3 (unreleased)
+1.14.0 (unreleased)
 -------------------
 
-- Nothing changed yet.
+- Update tests not to require zope.app.testing anymore.
 
 
 1.13.2 (2010-01-09)

Modified: grokcore.view/branches/1.13/setup.py
===================================================================
--- grokcore.view/branches/1.13/setup.py	2010-04-14 12:21:48 UTC (rev 110857)
+++ grokcore.view/branches/1.13/setup.py	2010-04-14 12:24:08 UTC (rev 110858)
@@ -30,7 +30,6 @@
     'zope.app.authentication',
     'zope.app.basicskin',
     'zope.app.rotterdam',
-    'zope.app.testing',
     'zope.app.zcmlfiles',
     'zope.configuration',
     'zope.container',
@@ -42,7 +41,7 @@
 
 setup(
     name='grokcore.view',
-    version = '1.13.3dev',
+    version = '1.14.0dev',
     author='Grok Team',
     author_email='grok-dev at zope.org',
     url='http://grok.zope.org',

Modified: grokcore.view/branches/1.13/src/grokcore/view/ftesting.zcml
===================================================================
--- grokcore.view/branches/1.13/src/grokcore/view/ftesting.zcml	2010-04-14 12:21:48 UTC (rev 110857)
+++ grokcore.view/branches/1.13/src/grokcore/view/ftesting.zcml	2010-04-14 12:24:08 UTC (rev 110858)
@@ -16,6 +16,8 @@
   <include package="grokcore.view" />
   <grok:grok package="grokcore.view.ftests" />
 
+  <include package="zope.app.wsgi" file="ftesting.zcml" />
+
   <securityPolicy
       component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy"
       />

Modified: grokcore.view/branches/1.13/src/grokcore/view/ftests/directoryresource/dirresource.py
===================================================================
--- grokcore.view/branches/1.13/src/grokcore/view/ftests/directoryresource/dirresource.py	2010-04-14 12:21:48 UTC (rev 110857)
+++ grokcore.view/branches/1.13/src/grokcore/view/ftests/directoryresource/dirresource.py	2010-04-14 12:24:08 UTC (rev 110858)
@@ -3,7 +3,7 @@
 through the dotted name of the module in which the directoryresource is
 defined::
 
-  >>> from zope.testbrowser.testing import Browser
+  >>> from zope.app.wsgi.testlayer import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
   >>> browser.open(

Modified: grokcore.view/branches/1.13/src/grokcore/view/ftests/staticdir/simple.py
===================================================================
--- grokcore.view/branches/1.13/src/grokcore/view/ftests/staticdir/simple.py	2010-04-14 12:21:48 UTC (rev 110857)
+++ grokcore.view/branches/1.13/src/grokcore/view/ftests/staticdir/simple.py	2010-04-14 12:24:08 UTC (rev 110858)
@@ -2,7 +2,7 @@
 If there is a static/ directory inside of a grokked package, its
 contents will be available as static resources under a URL:
 
-  >>> from zope.testbrowser.testing import Browser
+  >>> from zope.app.wsgi.testlayer import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
   >>> browser.open(

Modified: grokcore.view/branches/1.13/src/grokcore/view/ftests/test_functional.py
===================================================================
--- grokcore.view/branches/1.13/src/grokcore/view/ftests/test_functional.py	2010-04-14 12:21:48 UTC (rev 110857)
+++ grokcore.view/branches/1.13/src/grokcore/view/ftests/test_functional.py	2010-04-14 12:24:08 UTC (rev 110858)
@@ -5,25 +5,16 @@
 
 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(grokcore.view.__file__),
-                             'ftesting.zcml')
-FunctionalLayer = ZCMLLayer(ftesting_zcml, __name__, 'FunctionalLayer',
-                            allow_teardown=True)
+FunctionalLayer = BrowserLayer(grokcore.view)
 
-def setUp(test):
-    FunctionalTestSetup().setUp()
-
-def tearDown(test):
-    FunctionalTestSetup().tearDown()
-
 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,15 +26,12 @@
 
         dottedname = 'grokcore.view.ftests.%s.%s' % (name, filename[:-3])
         test = doctest.DocTestSuite(
-            dottedname, setUp=setUp, tearDown=tearDown,
+            dottedname,
             checker=checker,
-            extraglobs=dict(http=HTTPCaller(),
-                            getRootFolder=getRootFolder,
-                            sync=sync),
+            extraglobs=dict(getRootFolder=FunctionalLayer.getRootFolder),
             optionflags=(doctest.ELLIPSIS+
                          doctest.NORMALIZE_WHITESPACE+
-                         doctest.REPORT_NDIFF)
-            )
+                         doctest.REPORT_NDIFF))
         test.layer = FunctionalLayer
 
         suite.addTest(test)

Modified: grokcore.view/branches/1.13/src/grokcore/view/ftests/url/redirect.py
===================================================================
--- grokcore.view/branches/1.13/src/grokcore/view/ftests/url/redirect.py	2010-04-14 12:21:48 UTC (rev 110857)
+++ grokcore.view/branches/1.13/src/grokcore/view/ftests/url/redirect.py	2010-04-14 12:24:08 UTC (rev 110858)
@@ -6,7 +6,7 @@
 Since the index view redirects to mammoth, we expect to see the URL
 point to mammoth:
 
-  >>> from zope.testbrowser.testing import Browser
+  >>> from zope.app.wsgi.testlayer import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
   >>> browser.open('http://localhost/manfred')

Modified: grokcore.view/branches/1.13/src/grokcore/view/ftests/url/url.py
===================================================================
--- grokcore.view/branches/1.13/src/grokcore/view/ftests/url/url.py	2010-04-14 12:21:48 UTC (rev 110857)
+++ grokcore.view/branches/1.13/src/grokcore/view/ftests/url/url.py	2010-04-14 12:24:08 UTC (rev 110858)
@@ -10,7 +10,7 @@
 
 The views in this test implement self.url():
 
-  >>> from zope.testbrowser.testing import Browser
+  >>> from zope.app.wsgi.testlayer import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
   >>> browser.open("http://localhost/herd/manfred/index")

Modified: grokcore.view/branches/1.13/src/grokcore/view/ftests/url/url_function.py
===================================================================
--- grokcore.view/branches/1.13/src/grokcore/view/ftests/url/url_function.py	2010-04-14 12:21:48 UTC (rev 110857)
+++ grokcore.view/branches/1.13/src/grokcore/view/ftests/url/url_function.py	2010-04-14 12:24:08 UTC (rev 110858)
@@ -13,7 +13,7 @@
 
 Now let's use url on some things::
 
-  >>> from zope.testbrowser.testing import Browser
+  >>> from zope.app.wsgi.testlayer import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
   >>> browser.open("http://localhost/herd/manfred/index")

Modified: grokcore.view/branches/1.13/src/grokcore/view/ftests/view/argument.py
===================================================================
--- grokcore.view/branches/1.13/src/grokcore/view/ftests/view/argument.py	2010-04-14 12:21:48 UTC (rev 110857)
+++ grokcore.view/branches/1.13/src/grokcore/view/ftests/view/argument.py	2010-04-14 12:24:08 UTC (rev 110858)
@@ -1,7 +1,7 @@
 """
   >>> getRootFolder()["manfred"] = Mammoth()
 
-  >>> from zope.testbrowser.testing import Browser
+  >>> from zope.app.wsgi.testlayer import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
 

Modified: grokcore.view/branches/1.13/src/grokcore/view/ftests/view/index.py
===================================================================
--- grokcore.view/branches/1.13/src/grokcore/view/ftests/view/index.py	2010-04-14 12:21:48 UTC (rev 110857)
+++ grokcore.view/branches/1.13/src/grokcore/view/ftests/view/index.py	2010-04-14 12:24:08 UTC (rev 110858)
@@ -3,7 +3,7 @@
 
 The default view name for a model is 'index':
 
-  >>> from zope.testbrowser.testing import Browser
+  >>> from zope.app.wsgi.testlayer import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
   >>> browser.open("http://localhost/manfred")

Modified: grokcore.view/branches/1.13/src/grokcore/view/ftests/view/macros.py
===================================================================
--- grokcore.view/branches/1.13/src/grokcore/view/ftests/view/macros.py	2010-04-14 12:21:48 UTC (rev 110857)
+++ grokcore.view/branches/1.13/src/grokcore/view/ftests/view/macros.py	2010-04-14 12:24:08 UTC (rev 110858)
@@ -1,7 +1,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/@@painting")

Modified: grokcore.view/branches/1.13/src/grokcore/view/ftests/view/require.py
===================================================================
--- grokcore.view/branches/1.13/src/grokcore/view/ftests/view/require.py	2010-04-14 12:21:48 UTC (rev 110857)
+++ grokcore.view/branches/1.13/src/grokcore/view/ftests/view/require.py	2010-04-14 12:24:08 UTC (rev 110858)
@@ -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/@@painting")
   Traceback (most recent call last):

Modified: grokcore.view/branches/1.13/src/grokcore/view/ftests/view/skindirective.py
===================================================================
--- grokcore.view/branches/1.13/src/grokcore/view/ftests/view/skindirective.py	2010-04-14 12:21:48 UTC (rev 110857)
+++ grokcore.view/branches/1.13/src/grokcore/view/ftests/view/skindirective.py	2010-04-14 12:24:08 UTC (rev 110858)
@@ -1,7 +1,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/++skin++Basic/manfred/@@cavedrawings")

Modified: grokcore.view/branches/1.13/src/grokcore/view/ftests/view/view.py
===================================================================
--- grokcore.view/branches/1.13/src/grokcore/view/ftests/view/view.py	2010-04-14 12:21:48 UTC (rev 110857)
+++ grokcore.view/branches/1.13/src/grokcore/view/ftests/view/view.py	2010-04-14 12:24:08 UTC (rev 110858)
@@ -1,7 +1,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/@@painting")



More information about the checkins mailing list