[Checkins] SVN: zope.app.form/trunk/ Use zope.component.testing in favor of zope.app.testing where possible.
Hanno Schlichting
hannosch at hannosch.eu
Thu Dec 17 19:03:48 EST 2009
Log message for revision 106725:
Use zope.component.testing in favor of zope.app.testing where possible.
Changed:
U zope.app.form/trunk/CHANGES.txt
U zope.app.form/trunk/src/zope/app/form/browser/tests/test_add.py
U zope.app.form/trunk/src/zope/app/form/browser/tests/test_browserwidget.py
U zope.app.form/trunk/src/zope/app/form/browser/tests/test_choicecollections.py
U zope.app.form/trunk/src/zope/app/form/browser/tests/test_choicewidget.py
U zope.app.form/trunk/src/zope/app/form/browser/tests/test_directives.py
U zope.app.form/trunk/src/zope/app/form/browser/tests/test_editview.py
U zope.app.form/trunk/src/zope/app/form/browser/tests/test_form.py
U zope.app.form/trunk/src/zope/app/form/browser/tests/test_itemswidget.py
U zope.app.form/trunk/src/zope/app/form/browser/tests/test_objectwidget.py
U zope.app.form/trunk/src/zope/app/form/browser/tests/test_registrations.py
U zope.app.form/trunk/src/zope/app/form/browser/tests/test_sequencewidget.py
U zope.app.form/trunk/src/zope/app/form/browser/tests/test_source.py
U zope.app.form/trunk/src/zope/app/form/browser/tests/test_textwidget.py
U zope.app.form/trunk/src/zope/app/form/browser/tests/test_widgetdirective.py
U zope.app.form/trunk/src/zope/app/form/browser/widget.py
U zope.app.form/trunk/src/zope/app/form/tests/test_utility.py
U zope.app.form/trunk/src/zope/app/form/tests/test_widget.py
-=-
Modified: zope.app.form/trunk/CHANGES.txt
===================================================================
--- zope.app.form/trunk/CHANGES.txt 2009-12-17 23:24:55 UTC (rev 106724)
+++ zope.app.form/trunk/CHANGES.txt 2009-12-18 00:03:48 UTC (rev 106725)
@@ -5,6 +5,8 @@
3.11.0 (unreleased)
===================
+- Use zope.component.testing in favor of zope.app.testing where possible.
+
- Define dummy standard_macros for test purposes. This reduces the test
dependencies by zope.app.basicskin and zope.browserresource.
Modified: zope.app.form/trunk/src/zope/app/form/browser/tests/test_add.py
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/tests/test_add.py 2009-12-17 23:24:55 UTC (rev 106724)
+++ zope.app.form/trunk/src/zope/app/form/browser/tests/test_add.py 2009-12-18 00:03:48 UTC (rev 106725)
@@ -38,12 +38,21 @@
from zope.app.form.browser.metaconfigure import AddFormDirective
from zope.app.form.browser.submit import Update
from zope.app.testing import ztapi
-from zope.app.testing.placelesssetup import PlacelessSetup
# Foo needs to be imported as globals() are checked
from zope.app.form.browser.tests.test_editview import IFoo, IBar, Foo
from zope.app.form.browser.tests.test_editview import FooBarAdapter
+from zope.component.testing import PlacelessSetup as CAPlacelessSetup
+from zope.component.eventtesting import PlacelessSetup as EventPlacelessSetup
+
+class PlacelessSetup(CAPlacelessSetup, EventPlacelessSetup):
+
+ def setUp(self, doctesttest=None):
+ CAPlacelessSetup.setUp(self)
+ EventPlacelessSetup.setUp(self)
+
+
class Context(object):
def action(self, discriminator, callable, args=(), kw={}):
Modified: zope.app.form/trunk/src/zope/app/form/browser/tests/test_browserwidget.py
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/tests/test_browserwidget.py 2009-12-17 23:24:55 UTC (rev 106724)
+++ zope.app.form/trunk/src/zope/app/form/browser/tests/test_browserwidget.py 2009-12-18 00:03:48 UTC (rev 106725)
@@ -15,24 +15,17 @@
$Id$
"""
-import os
import unittest
-from zope.testing.doctestunit import DocTestSuite
+from zope.component.testing import PlacelessSetup
from zope.interface import Interface, implements
+from zope.publisher.browser import TestRequest
+from zope.schema import Text, Int
+from zope.testing.doctestunit import DocTestSuite
from zope.app.form.browser.widget import SimpleInputWidget
+from zope.app.form.browser.tests import support
from zope.app.form.interfaces import ConversionError
from zope.app.form.interfaces import WidgetInputError, MissingInputError
-from zope.app.testing.placelesssetup import PlacelessSetup
-from zope.i18n.interfaces import ITranslationDomain
-from zope.i18n.interfaces import INegotiator
-from zope.i18n.negotiator import negotiator
-from zope.i18n.gettextmessagecatalog import GettextMessageCatalog
-from zope.i18n.translationdomain import TranslationDomain
-from zope.publisher.browser import TestRequest
-from zope.schema import Text, Int
-from zope.app.form.browser.tests import support
-import zope.app.form.browser.tests
class BrowserWidgetTest(PlacelessSetup,
Modified: zope.app.form/trunk/src/zope/app/form/browser/tests/test_choicecollections.py
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/tests/test_choicecollections.py 2009-12-17 23:24:55 UTC (rev 106724)
+++ zope.app.form/trunk/src/zope/app/form/browser/tests/test_choicecollections.py 2009-12-18 00:03:48 UTC (rev 106725)
@@ -16,13 +16,13 @@
$Id$
"""
import unittest
+from zope.component.testing import PlacelessSetup
from zope.publisher.interfaces.browser import IBrowserRequest
from zope.publisher.browser import TestRequest
from zope.schema.interfaces import IList, IChoice, IIterableVocabulary
from zope.schema import Choice, List
from zope.app.testing import ztapi
-from zope.app.testing.placelesssetup import PlacelessSetup
from zope.app.form.interfaces import IInputWidget, IDisplayWidget
from zope.app.form.browser import CollectionDisplayWidget
from zope.app.form.browser import CollectionInputWidget
Modified: zope.app.form/trunk/src/zope/app/form/browser/tests/test_choicewidget.py
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/tests/test_choicewidget.py 2009-12-17 23:24:55 UTC (rev 106724)
+++ zope.app.form/trunk/src/zope/app/form/browser/tests/test_choicewidget.py 2009-12-18 00:03:48 UTC (rev 106725)
@@ -16,13 +16,13 @@
$Id$
"""
import unittest
+from zope.component.testing import PlacelessSetup
from zope.publisher.interfaces.browser import IBrowserRequest
from zope.publisher.browser import TestRequest
from zope.schema.interfaces import IChoice, IIterableVocabulary
from zope.schema import Choice
from zope.app.testing import ztapi
-from zope.app.testing.placelesssetup import PlacelessSetup
from zope.app.form.interfaces import IInputWidget, IDisplayWidget
from zope.app.form.browser import ChoiceDisplayWidget, ChoiceInputWidget
from zope.app.form.browser import ItemDisplayWidget, DropdownWidget
Modified: zope.app.form/trunk/src/zope/app/form/browser/tests/test_directives.py
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/tests/test_directives.py 2009-12-17 23:24:55 UTC (rev 106724)
+++ zope.app.form/trunk/src/zope/app/form/browser/tests/test_directives.py 2009-12-18 00:03:48 UTC (rev 106725)
@@ -19,17 +19,14 @@
from cStringIO import StringIO
from zope import component
+from zope.component.testing import PlacelessSetup
from zope.configuration.xmlconfig import xmlconfig, XMLConfig
from zope.traversing.interfaces import TraversalError
from zope.interface import Interface, implements
from zope.publisher.browser import TestRequest
from zope.schema import TextLine, Int
-import zope.component
-import zope.app.form.browser
-import zope.browsermenu
from zope.app.form.browser import TextWidget
-from zope.app.testing.placelesssetup import PlacelessSetup
from zope.app.form.tests import utils
template = """<configure
@@ -71,8 +68,11 @@
def setUp(self):
super(Test, self).setUp()
+ import zope.component
XMLConfig('meta.zcml', zope.component)()
+ import zope.app.form.browser
XMLConfig('meta.zcml', zope.app.form.browser)()
+ import zope.browsermenu
XMLConfig('meta.zcml', zope.browsermenu)()
from zope.traversing.adapters import DefaultTraversable
Modified: zope.app.form/trunk/src/zope/app/form/browser/tests/test_editview.py
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/tests/test_editview.py 2009-12-17 23:24:55 UTC (rev 106724)
+++ zope.app.form/trunk/src/zope/app/form/browser/tests/test_editview.py 2009-12-18 00:03:48 UTC (rev 106725)
@@ -17,16 +17,15 @@
"""
import unittest
+from zope.component.eventtesting import getEvents, clearEvents
+from zope.component.testing import PlacelessSetup
from zope.interface import Interface, implements
+from zope.location.interfaces import ILocation
from zope.publisher.browser import TestRequest
from zope.schema import TextLine, accessors
from zope.schema.interfaces import ITextLine
-from zope.component.interfaces import ComponentLookupError
-from zope.component.eventtesting import getEvents, clearEvents
-from zope.location.interfaces import ILocation
from zope.app.testing import ztapi
-from zope.app.testing.placelesssetup import PlacelessSetup
from zope.app.form.browser import TextWidget
from zope.app.form.browser.editview import EditView
Modified: zope.app.form/trunk/src/zope/app/form/browser/tests/test_form.py
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/tests/test_form.py 2009-12-17 23:24:55 UTC (rev 106724)
+++ zope.app.form/trunk/src/zope/app/form/browser/tests/test_form.py 2009-12-18 00:03:48 UTC (rev 106725)
@@ -13,26 +13,28 @@
##############################################################################
"""Tests for the ZCML Documentation Module
-$Id: tests.py 29269 2005-02-23 22:22:48Z srichter $
+$Id$
"""
-import os
import unittest
+
+from zope.schema.interfaces import ITextLine
from zope.testing import doctest, doctestunit
-from zope.app.testing import placelesssetup, ztapi
+from zope.component import testing
-from zope.schema.interfaces import ITextLine
+from zope.app.testing import ztapi
+
from zope.app.form.browser import TextWidget
from zope.app.form.interfaces import IInputWidget
def setUp(test):
- placelesssetup.setUp()
+ testing.setUp()
ztapi.browserViewProviding(ITextLine, TextWidget, IInputWidget)
def test_suite():
return unittest.TestSuite((
doctest.DocFileSuite('../form.txt',
- setUp=setUp, tearDown=placelesssetup.tearDown,
+ setUp=setUp, tearDown=testing.tearDown,
globs={'pprint': doctestunit.pprint},
optionflags=doctest.NORMALIZE_WHITESPACE),
))
Modified: zope.app.form/trunk/src/zope/app/form/browser/tests/test_itemswidget.py
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/tests/test_itemswidget.py 2009-12-17 23:24:55 UTC (rev 106724)
+++ zope.app.form/trunk/src/zope/app/form/browser/tests/test_itemswidget.py 2009-12-18 00:03:48 UTC (rev 106725)
@@ -17,12 +17,12 @@
"""
import unittest
+from zope.component.testing import PlacelessSetup
from zope.interface import Interface, implements
-from zope.schema import Choice, List, Set, TextLine, FrozenSet
-from zope.schema.vocabulary import SimpleVocabulary, SimpleTerm
from zope.publisher.browser import TestRequest
+from zope.schema import Choice, List, Set, FrozenSet
+from zope.schema.vocabulary import SimpleVocabulary, SimpleTerm
-from zope.app.form.interfaces import ConversionError
import zope.app.form.browser.itemswidgets
from zope.app.form.browser.itemswidgets import ItemsWidgetBase
from zope.app.form.browser.itemswidgets import ItemDisplayWidget
@@ -37,7 +37,6 @@
from zope.app.form.browser.itemswidgets import OrderedMultiSelectWidget
from zope.app.form.browser.itemswidgets import MultiCheckBoxWidget
from zope.app.form.browser.tests.support import VerifyResults
-from zope.app.testing.placelesssetup import PlacelessSetup
vocab = SimpleVocabulary(
[SimpleTerm(value, token, title) for value, token, title in (
Modified: zope.app.form/trunk/src/zope/app/form/browser/tests/test_objectwidget.py
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/tests/test_objectwidget.py 2009-12-17 23:24:55 UTC (rev 106724)
+++ zope.app.form/trunk/src/zope/app/form/browser/tests/test_objectwidget.py 2009-12-18 00:03:48 UTC (rev 106725)
@@ -17,16 +17,17 @@
"""
import unittest
import sys
-from zope.testing import doctest
-
-from zope.app.testing import ztapi, setup
+from zope.component import testing
from zope.interface import Interface, implements
-from zope.schema.interfaces import ITextLine
from zope.publisher.browser import TestRequest
from zope.schema import Object, TextLine
+from zope.schema.interfaces import ITextLine
+from zope.testing import doctest
+
+from zope.app.testing import ztapi
+
from zope.app.form.interfaces import IInputWidget, MissingInputError
from zope.app.form.browser import TextWidget, ObjectWidget
-from zope.interface.verify import verifyClass
from zope.app.form.browser.tests.test_browserwidget import BrowserWidgetTest
from zope.app.form.browser.interfaces import IWidgetInputErrorView
@@ -49,7 +50,8 @@
class ObjectWidgetTest(BrowserWidgetTest):
"""Documents and tests the object widget.
-
+
+ >>> from zope.interface.verify import verifyClass
>>> verifyClass(IInputWidget, ObjectWidget)
True
"""
@@ -134,14 +136,10 @@
return unittest.TestSuite((
unittest.makeSuite(ObjectWidgetTest),
doctest.DocFileSuite('../objectwidget.txt',
- setUp=setup.placelessSetUp,
- tearDown=setup.placelessTearDown),
+ setUp=testing.setUp,
+ tearDown=testing.tearDown),
doctest.DocTestSuite(),
))
if __name__=='__main__':
unittest.main(defaultTest='test_suite')
-
-# vim: set filetype=python ts=4 sw=4 et si
-
-
Modified: zope.app.form/trunk/src/zope/app/form/browser/tests/test_registrations.py
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/tests/test_registrations.py 2009-12-17 23:24:55 UTC (rev 106724)
+++ zope.app.form/trunk/src/zope/app/form/browser/tests/test_registrations.py 2009-12-18 00:03:48 UTC (rev 106725)
@@ -23,7 +23,7 @@
from zope.publisher.browser import TestRequest
from zope.testing.doctestunit import DocTestSuite
-from zope.app.testing import setup
+from zope.component import testing
# import all widgets (in this case, importing * is ok, since we
# absolutely know what we're importing)
from zope.app.form.browser import *
@@ -53,7 +53,7 @@
vocab = SampleVocabulary([])
def setUp(test):
- setup.placelessSetUp()
+ testing.setUp()
context = xmlconfig.file("tests/registerWidgets.zcml",
zope.app.form.browser)
@@ -218,7 +218,7 @@
"""
def test_suite():
- return DocTestSuite(setUp=setUp, tearDown=setup.placelessTearDown)
+ return DocTestSuite(setUp=setUp, tearDown=testing.tearDown)
if __name__=='__main__':
unittest.main(defaultTest='test_suite')
Modified: zope.app.form/trunk/src/zope/app/form/browser/tests/test_sequencewidget.py
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/tests/test_sequencewidget.py 2009-12-17 23:24:55 UTC (rev 106724)
+++ zope.app.form/trunk/src/zope/app/form/browser/tests/test_sequencewidget.py 2009-12-18 00:03:48 UTC (rev 106725)
@@ -16,12 +16,11 @@
$Id$
"""
import unittest
-from zope.testing import doctest
+from zope.interface import Interface, implements
from zope.schema import Tuple, List, TextLine
-from zope.schema.interfaces import ITextLine, ValidationError
+from zope.schema.interfaces import ITextLine
from zope.publisher.browser import TestRequest
-from zope.interface import Interface, implements
-from zope.interface.verify import verifyClass
+from zope.testing import doctest
from zope.app.testing import ztapi, setup
from zope.app.form.browser import TextWidget, ObjectWidget, DisplayWidget
@@ -70,7 +69,8 @@
class SequenceWidgetTest(SequenceWidgetTestHelper, BrowserWidgetTest):
"""Documents and tests the tuple and list (sequence) widgets.
-
+
+ >>> from zope.interface.verify import verifyClass
>>> verifyClass(IInputWidget, TupleSequenceWidget)
True
>>> verifyClass(IInputWidget, ListSequenceWidget)
Modified: zope.app.form/trunk/src/zope/app/form/browser/tests/test_source.py
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/tests/test_source.py 2009-12-17 23:24:55 UTC (rev 106724)
+++ zope.app.form/trunk/src/zope/app/form/browser/tests/test_source.py 2009-12-18 00:03:48 UTC (rev 106725)
@@ -15,13 +15,13 @@
$Id$
"""
-from zope.app.testing import placelesssetup
+from zope.component import testing
def test_suite():
from zope.testing import doctest
return doctest.DocFileSuite(
'../source.txt',
- setUp=placelesssetup.setUp, tearDown=placelesssetup.tearDown)
+ setUp=testing.setUp, tearDown=testing.tearDown)
if __name__ == '__main__':
import unittest
Modified: zope.app.form/trunk/src/zope/app/form/browser/tests/test_textwidget.py
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/tests/test_textwidget.py 2009-12-17 23:24:55 UTC (rev 106724)
+++ zope.app.form/trunk/src/zope/app/form/browser/tests/test_textwidget.py 2009-12-18 00:03:48 UTC (rev 106725)
@@ -18,6 +18,7 @@
import datetime
import unittest
from zope.testing import doctest
+from zope.component.testing import setUp, tearDown
from zope.interface.verify import verifyClass
from zope.schema import TextLine
from zope.publisher.browser import TestRequest
@@ -40,7 +41,6 @@
from zope.app.form.browser import DatetimeDisplayWidget
from zope.app.form.browser import URIDisplayWidget
-from zope.app.testing.placelesssetup import setUp, tearDown
from zope.app.form.browser.tests.test_browserwidget import BrowserWidgetTest
from zope.app.form.browser.tests.test_browserwidget \
import SimpleInputWidgetTest
Modified: zope.app.form/trunk/src/zope/app/form/browser/tests/test_widgetdirective.py
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/tests/test_widgetdirective.py 2009-12-17 23:24:55 UTC (rev 106724)
+++ zope.app.form/trunk/src/zope/app/form/browser/tests/test_widgetdirective.py 2009-12-18 00:03:48 UTC (rev 106725)
@@ -27,7 +27,7 @@
import zope.app.form.browser.interfaces
import zope.app.form.interfaces
from zope.app.form.tests import utils
-import zope.app.testing.placelesssetup
+import zope.component.testing
__docformat__ = "reStructuredText"
@@ -60,7 +60,7 @@
self.content = content
-class WidgetDirectiveTestCase(zope.app.testing.placelesssetup.PlacelessSetup,
+class WidgetDirectiveTestCase(zope.component.testing.PlacelessSetup,
unittest.TestCase):
def setUp(self):
Modified: zope.app.form/trunk/src/zope/app/form/browser/widget.py
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/widget.py 2009-12-17 23:24:55 UTC (rev 106724)
+++ zope.app.form/trunk/src/zope/app/form/browser/widget.py 2009-12-18 00:03:48 UTC (rev 106725)
@@ -538,14 +538,14 @@
def setUp():
- import zope.app.testing.placelesssetup
+ import zope.component.testing
global setUp
- setUp = zope.app.testing.placelesssetup.setUp
+ setUp = zope.component.testing.setUp
setUp()
def tearDown():
- import zope.app.testing.placelesssetup
+ import zope.component.testing
global tearDown
- tearDown = zope.app.testing.placelesssetup.tearDown
+ tearDown = zope.component.testing.tearDown
tearDown()
Modified: zope.app.form/trunk/src/zope/app/form/tests/test_utility.py
===================================================================
--- zope.app.form/trunk/src/zope/app/form/tests/test_utility.py 2009-12-17 23:24:55 UTC (rev 106724)
+++ zope.app.form/trunk/src/zope/app/form/tests/test_utility.py 2009-12-18 00:03:48 UTC (rev 106725)
@@ -19,13 +19,15 @@
from zope.testing import doctest
import zope.security.checker
from zope.interface import Interface, implements
+from zope.component import testing
from zope.component.interfaces import ComponentLookupError
from zope.publisher.browser import TestRequest, BrowserView
from zope.security.interfaces import ForbiddenAttribute, Unauthorized
from zope.schema import Field, Int, accessors
from zope.schema.interfaces import IField, IInt
-from zope.app.testing import ztapi, placelesssetup
+from zope.app.testing import ztapi
+
from zope.app.form import Widget
from zope.app.form.interfaces import IWidget, IInputWidget, IDisplayWidget
from zope.app.form.interfaces import ConversionError, InputErrors, WidgetsError
@@ -107,13 +109,13 @@
def setUp():
"""Setup for tests."""
- placelesssetup.setUp()
+ testing.setUp()
ztapi.browserView(IFoo, '', FooWidget, providing=IFooWidget)
ztapi.browserView(IBar, '', BarWidget, providing=IBarWidget)
-
+
def tearDown():
- placelesssetup.tearDown()
-
+ testing.tearDown()
+
def assertRaises(exceptionType, callable, *args):
try:
callable(*args)
@@ -1138,6 +1140,3 @@
def test_suite():
return doctest.DocTestSuite()
-
-if __name__=='__main__':
- main(defaultTest='test_suite')
Modified: zope.app.form/trunk/src/zope/app/form/tests/test_widget.py
===================================================================
--- zope.app.form/trunk/src/zope/app/form/tests/test_widget.py 2009-12-17 23:24:55 UTC (rev 106724)
+++ zope.app.form/trunk/src/zope/app/form/tests/test_widget.py 2009-12-18 00:03:48 UTC (rev 106725)
@@ -15,18 +15,15 @@
$Id$
"""
-from unittest import TestSuite, main, makeSuite
-from zope.testing.doctestunit import DocTestSuite
+from unittest import TestSuite, main
-from zope.interface.verify import verifyClass, verifyObject
+from zope.component.testing import setUp, tearDown
from zope.publisher.browser import TestRequest
-from zope.schema import Text
+from zope.testing.doctestunit import DocTestSuite
from zope.app.form import Widget
-from zope.app.form import CustomWidgetFactory
-from zope.app.form.interfaces import IWidget
-from zope.app.testing.placelesssetup import setUp, tearDown
+
class TestContext(object):
__name__ = 'Test'
title = 'My Test Context'
@@ -43,9 +40,12 @@
Widget implements IWidget:
+ >>> from zope.interface.verify import verifyClass
+ >>> from zope.app.form.interfaces import IWidget
>>> verifyClass(IWidget, Widget)
True
>>> widget = Widget(context, request)
+ >>> from zope.interface.verify import verifyObject
>>> verifyObject(IWidget, widget)
True
@@ -162,6 +162,7 @@
Test regular widget:
+ >>> from zope.app.form import CustomWidgetFactory
>>> factory = CustomWidgetFactory(FooWidget, bar='baz')
>>> widget = factory(context, request)
>>> isinstance(widget, FooWidget)
More information about the checkins
mailing list