Tests now use the new zope.app.wsgi changes.

zopefoundation · Apr 30, 2010 · 3f7cdcc · 3f7cdcc
1 parent d485b60
commit 3f7cdcc
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 36 deletions.
diff --git a/setup.py b/setup.py
@@ -3,19 +3,18 @@
 
 tests_require = [
     'zope.annotation',
+    'zope.app.wsgi',
     'zope.app.appsetup',
     'zope.app.pagetemplate',
     'zope.app.publication',
-    'zope.app.testing',
     'zope.browserpage',
     'zope.browserresource',
     'zope.container',
     'zope.contentprovider',
     'zope.password',
     'zope.principalregistry',
+    'zope.security',
     'zope.securitypolicy',
-    'zope.testbrowser',
-    'zope.testing',
     ]
 
 def read(*rnames):
@@ -66,7 +65,6 @@ def read(*rnames):
           'zope.interface',
           'zope.location',
           'zope.publisher',
-          'zope.security',
           'zope.site',
           'zope.traversing',
           ],

diff --git a/src/grokui/base/README.txt b/src/grokui/base/README.txt
@@ -5,9 +5,6 @@
 Detailed Description
 ********************
 
-.. :doctest:
-.. :layer: grokui.base.tests.FunctionalLayer
-
 ``grokui.base`` provides tools to assemble a coherent environment.
 
 
@@ -56,10 +53,9 @@ We grok this view to register it with the component architechture:
 
 Let's create a browser to lookup this view:
 
-    >>> from zope.testbrowser.testing import Browser
+    >>> from zope.app.wsgi.testlayer import Browser
     >>> browser = Browser()
     >>> browser.addHeader('Authorization', 'Basic mgr:mgrpw')
-    >>> browser.handleErrors = False
 
 We can get this screen when we ask for the correct namespace:
 
@@ -73,7 +69,7 @@ will not be found:
     >>> browser.open('http://localhost/@@helloadmin')
     Traceback (most recent call last):
     ...
-    NotFound: Object: <zope....Folder object at 0x...>, name: u'@@helloadmin'
+    HTTPError: HTTP Error 404: Not Found
 
 
 GrokUI Pages

diff --git a/src/grokui/base/tests/ftesting.zcml → src/grokui/base/ftesting.zcml b/src/grokui/base/tests/ftesting.zcml → src/grokui/base/ftesting.zcml
@@ -6,7 +6,6 @@
    package="grokui.base">
 
   <include package="grokcore.message" file="ftesting.zcml" />
-
   <include package="zope.securitypolicy" file="meta.zcml" />
   <include package="zope.principalregistry" file="meta.zcml" />
   <include package="zope.publisher" file="meta.zcml" />
@@ -29,6 +28,8 @@
   <include package="grokcore.view" />
   <include package="grokui.base" />
 
+  <grok:grok package="grokui.base.tests" />
+
  <browser:defaultView name="index.html" />
 
   <securityPolicy

diff --git a/src/grokui/base/tests/__init__.py b/src/grokui/base/tests/__init__.py
@@ -1,8 +1,2 @@
-import os.path
-from zope.app.testing import functional
+# -*- coding: utf-8 -*-
 
-ftesting_zcml = os.path.join(
-    os.path.dirname(__file__), 'ftesting.zcml')
-
-FunctionalLayer = functional.ZCMLLayer(
-    ftesting_zcml, __name__, 'GrokUIBaseFunctionalLayer', allow_teardown=True)
diff --git a/src/grokui/base/tests/test_layout.py b/src/grokui/base/tests/test_layout.py
@@ -2,15 +2,9 @@
 Building panels using `GrokUIView`
 ===================================
 
-:doctest:
-:layer: grokui.base.tests.FunctionalLayer
-
-    >>> from grokcore.component import testing
-    >>> testing.grok(__file__)
-
 We create a browser to watch our views:
 
-    >>> from zope.testbrowser.testing import Browser
+    >>> from zope.app.wsgi.testlayer import Browser
     >>> browser = Browser()
     >>> browser.addHeader('Authorization', 'Basic mgr:mgrpw')
     >>> browser.handleErrors = False
@@ -53,12 +47,12 @@
     </html>
 
 """
-import grokcore.component as grok
+import grokui.base
 import unittest
+import doctest
+import grokcore.component as grok
 from grokui.base import GrokUIView
-from grokui.base.tests import FunctionalLayer
-from zope.testing import doctest
-from zope.app.testing import functional
+from zope.app.wsgi.testlayer import BrowserLayer
 
 
 class CaveAdminView(GrokUIView):
@@ -76,8 +70,8 @@ def render(self):
 
 def test_suite():
     suite = unittest.TestSuite()
-    test = functional.FunctionalDocFileSuite(
+    test = doctest.DocTestSuite(
         optionflags=doctest.ELLIPSIS + doctest.NORMALIZE_WHITESPACE)
-    test.layer = FunctionalLayer
+    test.layer = BrowserLayer(grokui.base)
     suite.addTest(test)
     return suite
diff --git a/src/grokui/base/tests/test_readme.py b/src/grokui/base/tests/test_readme.py
@@ -1,14 +1,17 @@
 # -*- coding: utf-8 -*-
 
-import unittest
-from zope.app.testing import functional
-from grokui.base.tests import FunctionalLayer
+import unittest, doctest
+import grokui.base
+from zope.app.wsgi.testlayer import BrowserLayer
 
 
 def test_suite():
     suite = unittest.TestSuite()
-    readme = functional.FunctionalDocFileSuite('../README.txt')
-    readme.layer = FunctionalLayer
+    readme = doctest.DocFileSuite(
+        '../README.txt',
+        optionflags=(doctest.ELLIPSIS|doctest.NORMALIZE_WHITESPACE|
+                     doctest.REPORT_NDIFF))
+    readme.layer = BrowserLayer(grokui.base)
     suite.addTest(readme)
     return suite