[Checkins] SVN: z3c.form/trunk/s inline all the current zope.app.testing setup and avoid dependency
Hano Schlichting
cvs-admin at zope.org
Tue May 22 16:58:54 UTC 2012
Log message for revision 126438:
inline all the current zope.app.testing setup and avoid dependency
Changed:
U z3c.form/trunk/setup.py
U z3c.form/trunk/src/z3c/form/testing.py
U z3c.form/trunk/src/z3c/form/tests/test_doc.py
-=-
Modified: z3c.form/trunk/setup.py
===================================================================
--- z3c.form/trunk/setup.py 2012-05-22 15:25:54 UTC (rev 126437)
+++ z3c.form/trunk/setup.py 2012-05-22 16:58:50 UTC (rev 126438)
@@ -84,7 +84,7 @@
'z3c.template >= 1.3',
'zc.sourcefactory',
'zope.app.container >= 3.7',
- 'zope.app.testing',
+ 'zope.password',
'zope.testing',
'ZODB3',
],
Modified: z3c.form/trunk/src/z3c/form/testing.py
===================================================================
--- z3c.form/trunk/src/z3c/form/testing.py 2012-05-22 15:25:54 UTC (rev 126437)
+++ z3c.form/trunk/src/z3c/form/testing.py 2012-05-22 16:58:50 UTC (rev 126438)
@@ -20,7 +20,6 @@
import zope.schema
from doctest import register_optionflag
-from zope.app.testing import setup
from zope.pagetemplate.interfaces import IPageTemplate
from zope.publisher.browser import TestRequest
from zope.schema.fieldproperty import FieldProperty
@@ -172,13 +171,71 @@
self.listOfObject = listOfObject
self.name = name
-#
-#
-#############################
def setUp(test):
- test.globs = {'root': setup.placefulSetUp(True)}
+ from zope.component.testing import setUp as co_setup
+ from zope.component.eventtesting import setUp as ev_setup
+ from zope.i18n.testing import setUp as i18n_setup
+ from zope.container.testing import setUp as con_setup
+ co_setup()
+ ev_setup()
+ con_setup()
+ i18n_setup()
+
+ from zope.password.testing import setUpPasswordManagers
+ from zope.traversing.browser.interfaces import IAbsoluteURL
+ from zope.traversing.browser.absoluteurl import AbsoluteURL
+
+ setUpPasswordManagers()
+ from zope.component import getGlobalSiteManager
+ from zope.interface import Interface
+ from zope.publisher.interfaces.browser import IDefaultBrowserLayer
+ gsm = getGlobalSiteManager()
+ gsm.registerAdapter(AbsoluteURL, (IDefaultBrowserLayer, ), IAbsoluteURL,
+ '', event=False)
+ gsm.registerAdapter(AbsoluteURL, (IDefaultBrowserLayer, ), Interface,
+ 'absolute_url', event=False)
+
+ from zope.security.testing import addCheckerPublic
+ addCheckerPublic()
+
+ from zope.security.management import newInteraction
+ newInteraction()
+
+ from zope.schema.vocabulary import setVocabularyRegistry
+ setVocabularyRegistry(None)
+
+ from zope.component import hooks
+ hooks.setHooks()
+
+ from zope.component import provideAdapter
+ from zope.annotation.attribute import AttributeAnnotations
+ provideAdapter(AttributeAnnotations)
+
+ from zope.traversing.interfaces import ITraversable
+ from zope.container.interfaces import ISimpleReadContainer
+ from zope.container.traversal import ContainerTraversable
+ from zope.traversing.testing import setUp
+ setUp()
+ provideAdapter(ContainerTraversable, (ISimpleReadContainer,), ITraversable)
+
+ from zope.site.site import SiteManagerAdapter
+ from zope.component.interfaces import IComponentLookup
+ from zope.interface import Interface
+ provideAdapter(SiteManagerAdapter, (Interface,), IComponentLookup)
+
+ from zope.site.folder import rootFolder
+ site = rootFolder()
+
+ from zope.site.site import LocalSiteManager
+ import zope.component.interfaces
+ if not zope.component.interfaces.ISite.providedBy(site):
+ site.setSiteManager(LocalSiteManager(site))
+ hooks.setSite(site)
+ test.globs = {'root': site}
+
+
def setUpZPT(suite):
setUp(suite)
Modified: z3c.form/trunk/src/z3c/form/tests/test_doc.py
===================================================================
--- z3c.form/trunk/src/z3c/form/tests/test_doc.py 2012-05-22 15:25:54 UTC (rev 126437)
+++ z3c.form/trunk/src/z3c/form/tests/test_doc.py 2012-05-22 16:58:50 UTC (rev 126438)
@@ -19,7 +19,6 @@
import unittest
from zope.testing import renormalizing
-from zope.app.testing import placelesssetup
from z3c.form import testing
from z3c.form import outputchecker
@@ -58,7 +57,7 @@
),
doctest.DocFileSuite(
'../datamanager.txt',
- setUp=placelesssetup.setUp, tearDown=placelesssetup.tearDown,
+ setUp=setUp, tearDown=testing.tearDown,
optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
checker=checker,
),
@@ -76,7 +75,7 @@
),
doctest.DocFileSuite(
'../value.txt',
- setUp=placelesssetup.setUp, tearDown=placelesssetup.tearDown,
+ setUp=setUp, tearDown=testing.tearDown,
optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
checker=checker,
),
More information about the checkins
mailing list