[Checkins] SVN: zc.form/trunk/ Depending on ``zope.app.wsgi`` >=3.7 instead of ``zope.app.testing`` for test setup.

Michael Howitz mh at gocept.com
Fri Sep 23 03:34:20 EST 2011


Log message for revision 122902:
  Depending on ``zope.app.wsgi`` >=3.7 instead of ``zope.app.testing`` for test setup.
  
  

Changed:
  U   zc.form/trunk/CHANGES.txt
  U   zc.form/trunk/setup.py
  U   zc.form/trunk/src/zc/form/browser/combinationwidget.txt
  U   zc.form/trunk/src/zc/form/browser/ftests.py
  U   zc.form/trunk/src/zc/form/browser/tests.py

-=-
Modified: zc.form/trunk/CHANGES.txt
===================================================================
--- zc.form/trunk/CHANGES.txt	2011-09-23 08:17:01 UTC (rev 122901)
+++ zc.form/trunk/CHANGES.txt	2011-09-23 08:34:20 UTC (rev 122902)
@@ -11,11 +11,14 @@
 - Got rid of ``zope.app.component`` dependency by requiring at least
   ``zope.component`` 3.8.
 
-
 - Depending on ``zope.catalog`` instead of ``zope.app.catalog``.
 
 - Depending on ``zope.security`` instead of ``zope.app.security``.
 
+- Depending on ``zope.app.wsgi`` >=3.7 instead of ``zope.app.testing`` for
+  test setup.
+
+
 - Depending on ``zope.browserpage`` and ``zope.container`` instead of
   ``zope.app.publisher``.
 

Modified: zc.form/trunk/setup.py
===================================================================
--- zc.form/trunk/setup.py	2011-09-23 08:17:01 UTC (rev 122901)
+++ zc.form/trunk/setup.py	2011-09-23 08:34:20 UTC (rev 122902)
@@ -45,7 +45,7 @@
         # extras
         'zope.security',
         'zope.app.appsetup',
-        'zope.app.testing',
+        'zope.app.wsgi >= 3.7',
         'zope.configuration',
         'zope.testing',
         'zope.traversing',

Modified: zc.form/trunk/src/zc/form/browser/combinationwidget.txt
===================================================================
--- zc.form/trunk/src/zc/form/browser/combinationwidget.txt	2011-09-23 08:17:01 UTC (rev 122901)
+++ zc.form/trunk/src/zc/form/browser/combinationwidget.txt	2011-09-23 08:34:20 UTC (rev 122902)
@@ -12,14 +12,13 @@
     >>> from zope import component, interface
     >>> component.provideAdapter(default_template, name='default')
     >>> from zc.form.field import Combination, OrderedCombinationConstraint
-    >>> from zope.app.testing import ztapi
     >>> from zope.schema import Int
     >>> from zope.schema.interfaces import IInt
     >>> from zope.publisher.interfaces.browser import IBrowserRequest
     >>> from zope.formlib.interfaces import IInputWidget
     >>> from zope.formlib.textwidgets import IntWidget
-    >>> ztapi.provideView(
-    ...     IInt, IBrowserRequest, IInputWidget, '', IntWidget)
+    >>> component.provideAdapter(
+    ...     IntWidget, (IInt, IBrowserRequest), IInputWidget)
     >>> from zope import interface
     >>> class IDemo(interface.Interface):
     ...     acceptable_count = Combination(
@@ -176,8 +175,8 @@
     >>> request = TestRequest()
     >>> from zope.formlib.widget import DisplayWidget
     >>> from zope.formlib.interfaces import IDisplayWidget
-    >>> ztapi.provideView(
-    ...     IInt, IBrowserRequest, IDisplayWidget, '', DisplayWidget)
+    >>> component.provideAdapter(
+    ...     DisplayWidget, (IInt, IBrowserRequest), IDisplayWidget)
     >>> widget = CombinationDisplayWidget(IDemo['acceptable_count'], request)
     >>> widget.setPrefix('field')
     >>> widget.setRenderedValue(('10', '2'))

Modified: zc.form/trunk/src/zc/form/browser/ftests.py
===================================================================
--- zc.form/trunk/src/zc/form/browser/ftests.py	2011-09-23 08:17:01 UTC (rev 122901)
+++ zc.form/trunk/src/zc/form/browser/ftests.py	2011-09-23 08:34:20 UTC (rev 122902)
@@ -13,14 +13,14 @@
 ##############################################################################
 """functional test harness for zc.mruwidget"""
 from zope import interface, component
-from zope.app.testing.functional import FunctionalDocFileSuite, ZCMLLayer
 import doctest
 import os
+import zc.form.browser
+import zope.app.wsgi.testlayer
 import zope.browser.interfaces
 import zope.formlib.interfaces
 import zope.schema.interfaces
 
-
 colors = ['red', 'green', 'cerulean blue']
 
 
@@ -76,20 +76,18 @@
         return [c for c in colors if searchstring in c]
 
 
-here = os.path.dirname(os.path.realpath(__file__))
+ZCFormLayer = zope.app.wsgi.testlayer.BrowserLayer(zc.form.browser)
 
-ZCFormLayer = ZCMLLayer(
-    os.path.join(here, "ftesting.zcml"), __name__, "ZCFormLayer")
 
-
 def setUp(test):
     component.provideAdapter(ColorTerms)
     component.provideAdapter(SimpleColorSourceQueryView)
 
 
 def test_suite():
-    suite = FunctionalDocFileSuite("mruwidget.txt",
-            globs={'AvailableColors': AvailableColors()},
+    suite = doctest.DocFileSuite("mruwidget.txt",
+            globs={'AvailableColors': AvailableColors(),
+                   'getRootFolder': ZCFormLayer.getRootFolder},
             optionflags=doctest.NORMALIZE_WHITESPACE+doctest.ELLIPSIS,
             setUp=setUp,
             )

Modified: zc.form/trunk/src/zc/form/browser/tests.py
===================================================================
--- zc.form/trunk/src/zc/form/browser/tests.py	2011-09-23 08:17:01 UTC (rev 122901)
+++ zc.form/trunk/src/zc/form/browser/tests.py	2011-09-23 08:34:20 UTC (rev 122902)
@@ -17,14 +17,13 @@
 import unittest
 
 from zope.testing import module
-from zope.app.testing import placelesssetup
+import zope.component.testing
 import zope.traversing.adapters
 
 from zope.interface import implements
 from zope.schema.interfaces import ValidationError
 from zope.schema import TextLine, Int
 from zope.publisher.interfaces.browser import IBrowserRequest
-from zope.app.testing import ztapi
 from zope.formlib.textwidgets import TextWidget, IntWidget
 from zope.schema.interfaces import ITextLine, IInt
 from zope.formlib.interfaces import IInputWidget
@@ -40,15 +39,15 @@
 import zope.schema.interfaces
 import zope.publisher.interfaces.browser
 
-class TestUnionWidget(placelesssetup.PlacelessSetup, unittest.TestCase):
+class TestUnionWidget(zope.component.testing.PlacelessSetup, unittest.TestCase):
 
     def setUp(self):
         super(TestUnionWidget, self).setUp()
         # XXX cheating: should not rely on these. :-/
-        ztapi.provideView(
-            ITextLine, IBrowserRequest, IInputWidget, '', TextWidget)
-        ztapi.provideView(
-            IInt, IBrowserRequest, IInputWidget, '', IntWidget)
+        component.provideAdapter(
+            TextWidget, (ITextLine, IBrowserRequest), IInputWidget)
+        component.provideAdapter(
+            IntWidget, (IInt, IBrowserRequest), IInputWidget)
         from zc.form.browser.unionwidget import default_template
         component.provideAdapter(default_template, name='default')
         component.provideAdapter(
@@ -157,7 +156,7 @@
 
 
 def pageSetUp(test):
-    placelesssetup.setUp(test)
+    zope.component.testing.setUp(test)
     component.provideAdapter(
         zope.traversing.adapters.DefaultTraversable,
         [None],
@@ -168,10 +167,11 @@
     suite = unittest.makeSuite(TestUnionWidget)
     suite.addTest(doctest.DocFileSuite(
         'exceptionviews.txt',
-        setUp=placelesssetup.setUp, tearDown=placelesssetup.tearDown))
+        setUp=zope.component.testing.setUp,
+        tearDown=zope.component.testing.tearDown))
     suite.addTest(
         doctest.DocFileSuite(
             'combinationwidget.txt',
             setUp=pageSetUp,
-            tearDown=placelesssetup.tearDown),)
+            tearDown=zope.component.testing.tearDown),)
     return suite



More information about the checkins mailing list