[Checkins] SVN: GenericSetup/trunk/ - switched tests to layer based
ZCML setup
Yvo Schubbe
y.2006_ at wcm-solutions.de
Mon Nov 20 14:27:50 EST 2006
Log message for revision 71212:
- switched tests to layer based ZCML setup
Changed:
U GenericSetup/trunk/CHANGES.txt
U GenericSetup/trunk/MailHost/tests/test_exportimport.py
U GenericSetup/trunk/OFSP/tests/test_exportimport.py
U GenericSetup/trunk/PageTemplates/tests/test_exportimport.py
U GenericSetup/trunk/PluginIndexes/tests/test_exportimport.py
U GenericSetup/trunk/PythonScripts/tests/test_exportimport.py
U GenericSetup/trunk/ZCTextIndex/tests/test_exportimport.py
U GenericSetup/trunk/ZCatalog/tests/test_exportimport.py
U GenericSetup/trunk/components.py
U GenericSetup/trunk/testing.py
U GenericSetup/trunk/tests/common.py
U GenericSetup/trunk/tests/test_components.py
U GenericSetup/trunk/tests/test_registry.py
U GenericSetup/trunk/tests/test_rolemap.py
U GenericSetup/trunk/tests/test_tool.py
-=-
Modified: GenericSetup/trunk/CHANGES.txt
===================================================================
--- GenericSetup/trunk/CHANGES.txt 2006-11-20 19:27:05 UTC (rev 71211)
+++ GenericSetup/trunk/CHANGES.txt 2006-11-20 19:27:48 UTC (rev 71212)
@@ -2,6 +2,11 @@
GenericSetup 1.3-beta (unreleased)
+ - testing: The test base classes no longer set up any ZCML.
+ This change is not backwards compatible. If you are using these base
+ classes for testing custom handlers, you have to add the necessary ZCML
+ setup and tear down. Using test layers is recommended.
+
- Added support for importing/exporting Zope 3 component registries
by folding in Hanno Schlichting's GSLocalAddons product.
Modified: GenericSetup/trunk/MailHost/tests/test_exportimport.py
===================================================================
--- GenericSetup/trunk/MailHost/tests/test_exportimport.py 2006-11-20 19:27:05 UTC (rev 71211)
+++ GenericSetup/trunk/MailHost/tests/test_exportimport.py 2006-11-20 19:27:48 UTC (rev 71212)
@@ -18,9 +18,8 @@
import unittest
import Testing
-from Products.Five import zcml
-
from Products.GenericSetup.testing import BodyAdapterTestCase
+from Products.GenericSetup.testing import ExportImportZCMLLayer
_MAILHOST_BODY = """\
<?xml version="1.0"?>
@@ -31,6 +30,8 @@
class MailHostXMLAdapterTests(BodyAdapterTestCase):
+ layer = ExportImportZCMLLayer
+
def _getTargetClass(self):
from Products.GenericSetup.MailHost.exportimport \
import MailHostXMLAdapter
@@ -48,12 +49,9 @@
self.assertEqual(obj.smtp_uid, '')
def setUp(self):
- import Products.GenericSetup.MailHost
from Products.MailHost.MailHost import MailHost
BodyAdapterTestCase.setUp(self)
- zcml.load_config('configure.zcml', Products.GenericSetup.MailHost)
-
self._obj = MailHost('foo_mailhost')
self._BODY = _MAILHOST_BODY
@@ -64,4 +62,5 @@
))
if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
+ from Products.GenericSetup.testing import run
+ run(test_suite())
Modified: GenericSetup/trunk/OFSP/tests/test_exportimport.py
===================================================================
--- GenericSetup/trunk/OFSP/tests/test_exportimport.py 2006-11-20 19:27:05 UTC (rev 71211)
+++ GenericSetup/trunk/OFSP/tests/test_exportimport.py 2006-11-20 19:27:48 UTC (rev 71212)
@@ -18,9 +18,8 @@
import unittest
import Testing
-from Products.Five import zcml
-
from Products.GenericSetup.testing import BodyAdapterTestCase
+from Products.GenericSetup.testing import ExportImportZCMLLayer
_FOLDER_BODY = """\
<?xml version="1.0"?>
@@ -32,6 +31,8 @@
class FolderXMLAdapterTests(BodyAdapterTestCase):
+ layer = ExportImportZCMLLayer
+
def _getTargetClass(self):
from Products.GenericSetup.OFSP.exportimport import FolderXMLAdapter
@@ -45,12 +46,9 @@
self.assertEqual(obj.title, 'Foo')
def setUp(self):
- import Products.GenericSetup.OFSP
from OFS.Folder import Folder
BodyAdapterTestCase.setUp(self)
- zcml.load_config('configure.zcml', Products.GenericSetup.OFSP)
-
self._obj = Folder('foo_folder')
self._BODY = _FOLDER_BODY
@@ -61,4 +59,5 @@
))
if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
+ from Products.GenericSetup.testing import run
+ run(test_suite())
Modified: GenericSetup/trunk/PageTemplates/tests/test_exportimport.py
===================================================================
--- GenericSetup/trunk/PageTemplates/tests/test_exportimport.py 2006-11-20 19:27:05 UTC (rev 71211)
+++ GenericSetup/trunk/PageTemplates/tests/test_exportimport.py 2006-11-20 19:27:48 UTC (rev 71212)
@@ -18,11 +18,9 @@
import unittest
import Testing
-from Products.Five import zcml
-
from Products.GenericSetup.testing import BodyAdapterTestCase
+from Products.GenericSetup.testing import ExportImportZCMLLayer
-
_PAGETEMPLATE_BODY = """\
<html>
<div>Foo</div>
@@ -32,6 +30,8 @@
class ZopePageTemplateBodyAdapterTests(BodyAdapterTestCase):
+ layer = ExportImportZCMLLayer
+
def _getTargetClass(self):
from Products.GenericSetup.PageTemplates.exportimport \
import ZopePageTemplateBodyAdapter
@@ -42,13 +42,9 @@
obj.write(_PAGETEMPLATE_BODY)
def setUp(self):
- import Products.GenericSetup.PageTemplates
from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate
BodyAdapterTestCase.setUp(self)
- zcml.load_config('configure.zcml',
- Products.GenericSetup.PageTemplates)
-
self._obj = ZopePageTemplate('foo_template')
self._BODY = _PAGETEMPLATE_BODY
@@ -59,4 +55,5 @@
))
if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
+ from Products.GenericSetup.testing import run
+ run(test_suite())
Modified: GenericSetup/trunk/PluginIndexes/tests/test_exportimport.py
===================================================================
--- GenericSetup/trunk/PluginIndexes/tests/test_exportimport.py 2006-11-20 19:27:05 UTC (rev 71211)
+++ GenericSetup/trunk/PluginIndexes/tests/test_exportimport.py 2006-11-20 19:27:48 UTC (rev 71212)
@@ -18,8 +18,8 @@
import unittest
import Testing
-from Products.Five import zcml
from Products.GenericSetup.testing import NodeAdapterTestCase
+from Products.GenericSetup.testing import ExportImportZCMLLayer
_DATE_XML = """\
<index name="foo_date" meta_type="DateIndex">
@@ -70,6 +70,8 @@
class DateIndexNodeAdapterTests(NodeAdapterTestCase):
+ layer = ExportImportZCMLLayer
+
def _getTargetClass(self):
from Products.GenericSetup.PluginIndexes.exportimport \
import DateIndexNodeAdapter
@@ -77,19 +79,17 @@
return DateIndexNodeAdapter
def setUp(self):
- import Products.GenericSetup.PluginIndexes
from Products.PluginIndexes.DateIndex.DateIndex import DateIndex
NodeAdapterTestCase.setUp(self)
- zcml.load_config('configure.zcml',
- Products.GenericSetup.PluginIndexes)
-
self._obj = DateIndex('foo_date')
self._XML = _DATE_XML
class DateRangeIndexNodeAdapterTests(NodeAdapterTestCase):
+ layer = ExportImportZCMLLayer
+
def _getTargetClass(self):
from Products.GenericSetup.PluginIndexes.exportimport \
import DateRangeIndexNodeAdapter
@@ -100,20 +100,18 @@
obj._edit('bar', 'baz')
def setUp(self):
- import Products.GenericSetup.PluginIndexes
from Products.PluginIndexes.DateRangeIndex.DateRangeIndex \
import DateRangeIndex
NodeAdapterTestCase.setUp(self)
- zcml.load_config('configure.zcml',
- Products.GenericSetup.PluginIndexes)
-
self._obj = DateRangeIndex('foo_daterange')
self._XML = _DATERANGE_XML
class FieldIndexNodeAdapterTests(NodeAdapterTestCase):
+ layer = ExportImportZCMLLayer
+
def _getTargetClass(self):
from Products.GenericSetup.PluginIndexes.exportimport \
import PluggableIndexNodeAdapter
@@ -124,19 +122,17 @@
obj.indexed_attrs = ('bar',)
def setUp(self):
- import Products.GenericSetup.PluginIndexes
from Products.PluginIndexes.FieldIndex.FieldIndex import FieldIndex
NodeAdapterTestCase.setUp(self)
- zcml.load_config('configure.zcml',
- Products.GenericSetup.PluginIndexes)
-
self._obj = FieldIndex('foo_field')
self._XML = _FIELD_XML
class KeywordIndexNodeAdapterTests(NodeAdapterTestCase):
+ layer = ExportImportZCMLLayer
+
def _getTargetClass(self):
from Products.GenericSetup.PluginIndexes.exportimport \
import PluggableIndexNodeAdapter
@@ -147,20 +143,18 @@
obj.indexed_attrs = ('bar',)
def setUp(self):
- import Products.GenericSetup.PluginIndexes
from Products.PluginIndexes.KeywordIndex.KeywordIndex \
import KeywordIndex
NodeAdapterTestCase.setUp(self)
- zcml.load_config('configure.zcml',
- Products.GenericSetup.PluginIndexes)
-
self._obj = KeywordIndex('foo_keyword')
self._XML = _KEYWORD_XML
class PathIndexNodeAdapterTests(NodeAdapterTestCase):
+ layer = ExportImportZCMLLayer
+
def _getTargetClass(self):
from Products.GenericSetup.PluginIndexes.exportimport \
import PathIndexNodeAdapter
@@ -168,19 +162,17 @@
return PathIndexNodeAdapter
def setUp(self):
- import Products.GenericSetup.PluginIndexes
from Products.PluginIndexes.PathIndex.PathIndex import PathIndex
NodeAdapterTestCase.setUp(self)
- zcml.load_config('configure.zcml',
- Products.GenericSetup.PluginIndexes)
-
self._obj = PathIndex('foo_path')
self._XML = _PATH_XML
class VocabularyNodeAdapterTests(NodeAdapterTestCase):
+ layer = ExportImportZCMLLayer
+
def _getTargetClass(self):
from Products.GenericSetup.PluginIndexes.exportimport \
import VocabularyNodeAdapter
@@ -188,13 +180,9 @@
return VocabularyNodeAdapter
def setUp(self):
- import Products.GenericSetup.PluginIndexes
from Products.PluginIndexes.TextIndex.Vocabulary import Vocabulary
NodeAdapterTestCase.setUp(self)
- zcml.load_config('configure.zcml',
- Products.GenericSetup.PluginIndexes)
-
self._obj = Vocabulary('foo_vocabulary')
self._XML = _VOCABULARY_XML
@@ -204,6 +192,8 @@
class TextIndexNodeAdapterTests(NodeAdapterTestCase):
+ layer = ExportImportZCMLLayer
+
def _getTargetClass(self):
from Products.GenericSetup.PluginIndexes.exportimport \
import TextIndexNodeAdapter
@@ -211,13 +201,9 @@
return TextIndexNodeAdapter
def setUp(self):
- import Products.GenericSetup.PluginIndexes
from Products.PluginIndexes.TextIndex.TextIndex import TextIndex
NodeAdapterTestCase.setUp(self)
- zcml.load_config('configure.zcml',
- Products.GenericSetup.PluginIndexes)
-
self._obj = TextIndex('foo_text')
self._XML = _TEXT_XML
@@ -227,6 +213,8 @@
class FilteredSetNodeAdapterTests(NodeAdapterTestCase):
+ layer = ExportImportZCMLLayer
+
def _getTargetClass(self):
from Products.GenericSetup.PluginIndexes.exportimport \
import FilteredSetNodeAdapter
@@ -237,20 +225,18 @@
obj.setExpression('True')
def setUp(self):
- import Products.GenericSetup.PluginIndexes
from Products.PluginIndexes.TopicIndex.FilteredSet \
import PythonFilteredSet
NodeAdapterTestCase.setUp(self)
- zcml.load_config('configure.zcml',
- Products.GenericSetup.PluginIndexes)
-
self._obj = PythonFilteredSet('bar', '')
self._XML = _SET_XML
class TopicIndexNodeAdapterTests(NodeAdapterTestCase):
+ layer = ExportImportZCMLLayer
+
def _getTargetClass(self):
from Products.GenericSetup.PluginIndexes.exportimport \
import TopicIndexNodeAdapter
@@ -262,13 +248,9 @@
obj.addFilteredSet('baz', 'PythonFilteredSet', 'False')
def setUp(self):
- import Products.GenericSetup.PluginIndexes
from Products.PluginIndexes.TopicIndex.TopicIndex import TopicIndex
NodeAdapterTestCase.setUp(self)
- zcml.load_config('configure.zcml',
- Products.GenericSetup.PluginIndexes)
-
self._obj = TopicIndex('foo_topic')
self._XML = _TOPIC_XML
@@ -287,4 +269,5 @@
))
if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
+ from Products.GenericSetup.testing import run
+ run(test_suite())
Modified: GenericSetup/trunk/PythonScripts/tests/test_exportimport.py
===================================================================
--- GenericSetup/trunk/PythonScripts/tests/test_exportimport.py 2006-11-20 19:27:05 UTC (rev 71211)
+++ GenericSetup/trunk/PythonScripts/tests/test_exportimport.py 2006-11-20 19:27:48 UTC (rev 71212)
@@ -18,11 +18,9 @@
import unittest
import Testing
-from Products.Five import zcml
-
from Products.GenericSetup.testing import BodyAdapterTestCase
+from Products.GenericSetup.testing import ExportImportZCMLLayer
-
_PYTHONSCRIPT_BODY = """\
## Script (Python) "foo_script"
##bind container=container
@@ -38,6 +36,8 @@
class PythonScriptBodyAdapterTests(BodyAdapterTestCase):
+ layer = ExportImportZCMLLayer
+
def _getTargetClass(self):
from Products.GenericSetup.PythonScripts.exportimport \
import PythonScriptBodyAdapter
@@ -45,13 +45,9 @@
return PythonScriptBodyAdapter
def setUp(self):
- import Products.GenericSetup.PythonScripts
from Products.PythonScripts.PythonScript import PythonScript
BodyAdapterTestCase.setUp(self)
- zcml.load_config('configure.zcml',
- Products.GenericSetup.PythonScripts)
-
self._obj = PythonScript('foo_script')
self._BODY = _PYTHONSCRIPT_BODY
@@ -62,4 +58,5 @@
))
if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
+ from Products.GenericSetup.testing import run
+ run(test_suite())
Modified: GenericSetup/trunk/ZCTextIndex/tests/test_exportimport.py
===================================================================
--- GenericSetup/trunk/ZCTextIndex/tests/test_exportimport.py 2006-11-20 19:27:05 UTC (rev 71211)
+++ GenericSetup/trunk/ZCTextIndex/tests/test_exportimport.py 2006-11-20 19:27:48 UTC (rev 71212)
@@ -20,8 +20,8 @@
from Acquisition import Implicit
-from Products.Five import zcml
from Products.GenericSetup.testing import NodeAdapterTestCase
+from Products.GenericSetup.testing import ExportImportZCMLLayer
_PLEXICON_XML = """\
<object name="foo_plexicon" meta_type="ZCTextIndex Lexicon">
@@ -53,6 +53,8 @@
class ZCLexiconNodeAdapterTests(NodeAdapterTestCase):
+ layer = ExportImportZCMLLayer
+
def _getTargetClass(self):
from Products.GenericSetup.ZCTextIndex.exportimport \
import ZCLexiconNodeAdapter
@@ -66,18 +68,17 @@
obj._pipeline = (Splitter(), CaseNormalizer(), StopWordRemover())
def setUp(self):
- import Products.GenericSetup.ZCTextIndex
from Products.ZCTextIndex.ZCTextIndex import PLexicon
NodeAdapterTestCase.setUp(self)
- zcml.load_config('configure.zcml', Products.GenericSetup.ZCTextIndex)
-
self._obj = PLexicon('foo_plexicon')
self._XML = _PLEXICON_XML
class ZCTextIndexNodeAdapterTests(NodeAdapterTestCase):
+ layer = ExportImportZCMLLayer
+
def _getTargetClass(self):
from Products.GenericSetup.ZCTextIndex.exportimport \
import ZCTextIndexNodeAdapter
@@ -88,13 +89,10 @@
obj._indexed_attrs = ['foo_zctext', 'baz_zctext']
def setUp(self):
- import Products.GenericSetup.ZCTextIndex
from Products.ZCTextIndex.ZCTextIndex import PLexicon
from Products.ZCTextIndex.ZCTextIndex import ZCTextIndex
NodeAdapterTestCase.setUp(self)
- zcml.load_config('configure.zcml', Products.GenericSetup.ZCTextIndex)
-
catalog = DummyCatalog()
catalog.foo_plexicon = PLexicon('foo_plexicon')
extra = _extra()
@@ -112,4 +110,5 @@
))
if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
+ from Products.GenericSetup.testing import run
+ run(test_suite())
Modified: GenericSetup/trunk/ZCatalog/tests/test_exportimport.py
===================================================================
--- GenericSetup/trunk/ZCatalog/tests/test_exportimport.py 2006-11-20 19:27:05 UTC (rev 71211)
+++ GenericSetup/trunk/ZCatalog/tests/test_exportimport.py 2006-11-20 19:27:48 UTC (rev 71212)
@@ -19,12 +19,12 @@
from Testing import ZopeTestCase
ZopeTestCase.installProduct('ZCTextIndex', 1)
-from Products.Five import zcml
from zope.component import getMultiAdapter
from Products.GenericSetup.interfaces import IBody
from Products.GenericSetup.testing import BodyAdapterTestCase
from Products.GenericSetup.testing import DummySetupEnviron
+from Products.GenericSetup.testing import ExportImportZCMLLayer
class _extra:
@@ -99,6 +99,8 @@
class ZCatalogXMLAdapterTests(BodyAdapterTestCase):
+ layer = ExportImportZCMLLayer
+
def _getTargetClass(self):
from Products.GenericSetup.ZCatalog.exportimport \
import ZCatalogXMLAdapter
@@ -152,17 +154,9 @@
obj.addIndex('foo_text', 'TextIndex')
def setUp(self):
- import Products.GenericSetup.PluginIndexes
- import Products.GenericSetup.ZCatalog
- import Products.GenericSetup.ZCTextIndex
from Products.ZCatalog.ZCatalog import ZCatalog
BodyAdapterTestCase.setUp(self)
- zcml.load_config('configure.zcml',
- Products.GenericSetup.PluginIndexes)
- zcml.load_config('configure.zcml', Products.GenericSetup.ZCatalog)
- zcml.load_config('configure.zcml', Products.GenericSetup.ZCTextIndex)
-
self._obj = ZCatalog('foo_catalog')
self._BODY = _CATALOG_BODY % ('', '')
@@ -188,4 +182,5 @@
))
if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
+ from Products.GenericSetup.testing import run
+ run(test_suite())
Modified: GenericSetup/trunk/components.py
===================================================================
--- GenericSetup/trunk/components.py 2006-11-20 19:27:05 UTC (rev 71211)
+++ GenericSetup/trunk/components.py 2006-11-20 19:27:48 UTC (rev 71212)
@@ -19,9 +19,7 @@
from zope.component import adapts
from zope.component import getSiteManager
from zope.component.interfaces import IComponentRegistry
-from zope.interface import implements
-from interfaces import IBody
from interfaces import ISetupEnviron
from utils import XMLAdapterBase
from utils import exportObjects
Modified: GenericSetup/trunk/testing.py
===================================================================
--- GenericSetup/trunk/testing.py 2006-11-20 19:27:05 UTC (rev 71211)
+++ GenericSetup/trunk/testing.py 2006-11-20 19:27:48 UTC (rev 71212)
@@ -25,6 +25,7 @@
from zope.component import getMultiAdapter
from zope.interface import implements
from zope.interface.verify import verifyClass
+from zope.testing import testrunner
from zope.testing.cleanup import cleanUp
from interfaces import IBody
@@ -71,14 +72,7 @@
def _verifyImport(self, obj):
pass
- def setUp(self):
- zcml.load_config('meta.zcml', Products.Five)
- zcml.load_config('permissions.zcml', Products.Five)
- def tearDown(self):
- cleanUp()
-
-
class BodyAdapterTestCase(_AdapterTestCaseBase):
def test_z3interfaces(self):
@@ -141,3 +135,27 @@
adapted.node = parseString(self._XML).documentElement
self._verifyImport(self._obj)
self.assertEqual(adapted.node.toprettyxml(' '), self._XML)
+
+
+class ExportImportZCMLLayer:
+
+ @classmethod
+ def setUp(cls):
+ import Products.Five
+ import Products.GenericSetup
+
+ zcml.load_config('meta.zcml', Products.Five)
+ zcml.load_config('permissions.zcml', Products.Five)
+ zcml.load_config('traversing.zcml', Products.Five)
+ zcml.load_config('configure.zcml', Products.GenericSetup)
+
+ @classmethod
+ def tearDown(cls):
+ cleanUp()
+
+
+def run(test_suite):
+ options = testrunner.get_options()
+ options.resume_layer = None
+ options.resume_number = 0
+ testrunner.run_with_options(options, test_suite)
Modified: GenericSetup/trunk/tests/common.py
===================================================================
--- GenericSetup/trunk/tests/common.py 2006-11-20 19:27:05 UTC (rev 71211)
+++ GenericSetup/trunk/tests/common.py 2006-11-20 19:27:48 UTC (rev 71212)
@@ -23,7 +23,6 @@
from Testing.ZopeTestCase import ZopeTestCase
from zope.interface import implements
-from Products.Five import zcml
from Products.GenericSetup.interfaces import IExportContext
from Products.GenericSetup.interfaces import IImportContext
from Products.GenericSetup.testing import DummyLogger
@@ -50,23 +49,17 @@
class SecurityRequestTest(ZopeTestCase):
def setUp(self):
- import Products
- import zope.traversing
from AccessControl.SecurityManagement import newSecurityManager
ZopeTestCase.setUp(self)
- zcml.load_config('meta.zcml', Products.Five)
- zcml.load_config('traversing.zcml', Products.Five)
self.root = self.app
newSecurityManager(None, OmnipotentUser().__of__(self.app.acl_users))
def tearDown(self):
from AccessControl.SecurityManagement import noSecurityManager
- from zope.testing.cleanup import cleanUp
noSecurityManager()
ZopeTestCase.tearDown(self)
- cleanUp()
class DOMComparator:
Modified: GenericSetup/trunk/tests/test_components.py
===================================================================
--- GenericSetup/trunk/tests/test_components.py 2006-11-20 19:27:05 UTC (rev 71211)
+++ GenericSetup/trunk/tests/test_components.py 2006-11-20 19:27:48 UTC (rev 71212)
@@ -22,10 +22,10 @@
from Globals import InitializeClass
from OFS.SimpleItem import SimpleItem
-from Products.Five import zcml
from Products.Five.component import enableSite
from Products.Five.component.interfaces import IObjectManagerSite
from Products.GenericSetup.testing import BodyAdapterTestCase
+from Products.GenericSetup.testing import ExportImportZCMLLayer
from zope.app.component.hooks import setSite, clearSite, setHooks
from zope.component import getSiteManager
@@ -113,6 +113,8 @@
class ComponentRegistryXMLAdapterTests(ZopeTestCase, BodyAdapterTestCase):
+ layer = ExportImportZCMLLayer
+
def _getTargetClass(self):
from Products.GenericSetup.components import \
ComponentRegistryXMLAdapter
@@ -152,10 +154,7 @@
self.assertEquals(repr(util), repr(tool))
def afterSetUp(self):
- import Products.GenericSetup
-
BodyAdapterTestCase.setUp(self)
- zcml.load_config('configure.zcml', Products.GenericSetup)
# Create and enable a local component registry
createComponentRegistry(self.app)
@@ -195,4 +194,5 @@
))
if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
+ from Products.GenericSetup.testing import run
+ run(test_suite())
Modified: GenericSetup/trunk/tests/test_registry.py
===================================================================
--- GenericSetup/trunk/tests/test_registry.py 2006-11-20 19:27:05 UTC (rev 71211)
+++ GenericSetup/trunk/tests/test_registry.py 2006-11-20 19:27:48 UTC (rev 71212)
@@ -19,6 +19,7 @@
import Testing
from OFS.Folder import Folder
+from Products.GenericSetup.testing import ExportImportZCMLLayer
from Products.GenericSetup.tests.common import BaseRegistryTests
from Products.GenericSetup import EXTENSION
from zope.interface import Interface
@@ -52,6 +53,8 @@
, ConformsToIImportStepRegistry
):
+ layer = ExportImportZCMLLayer
+
def _getTargetClass( self ):
from Products.GenericSetup.registry import ImportStepRegistry
@@ -588,6 +591,8 @@
, ConformsToIExportStepRegistry
):
+ layer = ExportImportZCMLLayer
+
def _getTargetClass( self ):
from Products.GenericSetup.registry import ExportStepRegistry
@@ -827,6 +832,8 @@
, ConformsToIToolsetRegistry
):
+ layer = ExportImportZCMLLayer
+
def _getTargetClass( self ):
from Products.GenericSetup.registry import ToolsetRegistry
@@ -1165,4 +1172,5 @@
))
if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
+ from Products.GenericSetup.testing import run
+ run(test_suite())
Modified: GenericSetup/trunk/tests/test_rolemap.py
===================================================================
--- GenericSetup/trunk/tests/test_rolemap.py 2006-11-20 19:27:05 UTC (rev 71211)
+++ GenericSetup/trunk/tests/test_rolemap.py 2006-11-20 19:27:48 UTC (rev 71212)
@@ -20,6 +20,7 @@
from OFS.Folder import Folder
+from Products.GenericSetup.testing import ExportImportZCMLLayer
from common import BaseRegistryTests
from common import DummyExportContext
from common import DummyImportContext
@@ -27,6 +28,8 @@
class RolemapExportConfiguratorTests(BaseRegistryTests):
+ layer = ExportImportZCMLLayer
+
def _getTargetClass( self ):
from Products.GenericSetup.rolemap import RolemapExportConfigurator
@@ -169,6 +172,8 @@
class RolemapImportConfiguratorTests(BaseRegistryTests):
+ layer = ExportImportZCMLLayer
+
def _getTargetClass( self ):
from Products.GenericSetup.rolemap import RolemapImportConfigurator
@@ -366,6 +371,8 @@
class Test_exportRolemap( BaseRegistryTests ):
+ layer = ExportImportZCMLLayer
+
def test_unchanged( self ):
self.root.site = Folder( 'site' )
@@ -465,8 +472,11 @@
self._compareDOM( text, _UNACQUIRED_EXPORT )
self.assertEqual( content_type, 'text/xml' )
+
class Test_importRolemap( BaseRegistryTests ):
+ layer = ExportImportZCMLLayer
+
def test_empty_default_purge( self ):
self.root.site = Folder( id='site' )
@@ -789,4 +799,5 @@
))
if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
+ from Products.GenericSetup.testing import run
+ run(test_suite())
Modified: GenericSetup/trunk/tests/test_tool.py
===================================================================
--- GenericSetup/trunk/tests/test_tool.py 2006-11-20 19:27:05 UTC (rev 71211)
+++ GenericSetup/trunk/tests/test_tool.py 2006-11-20 19:27:48 UTC (rev 71212)
@@ -24,6 +24,7 @@
from OFS.Folder import Folder
from Products.GenericSetup import profile_registry
+from Products.GenericSetup.testing import ExportImportZCMLLayer
from common import DOMComparator
from common import DummyExportContext
@@ -40,6 +41,8 @@
, ConformsToISetupTool
):
+ layer = ExportImportZCMLLayer
+
_PROFILE_PATH = '/tmp/STT_test'
def setUp( self ):
@@ -734,6 +737,7 @@
return 'Exported properties'
+
class _ToolsetSetup( SecurityRequestTest ):
def _initSite( self ):
@@ -746,10 +750,13 @@
site._setObject('setup_tool', SetupTool('setup_tool'))
return site
+
class Test_exportToolset( _ToolsetSetup
, DOMComparator
):
+ layer = ExportImportZCMLLayer
+
def test_empty( self ):
from Products.GenericSetup.tool import TOOLSET_XML
@@ -787,8 +794,11 @@
self._compareDOM( text, _NORMAL_TOOLSET_XML )
self.assertEqual( content_type, 'text/xml' )
+
class Test_importToolset( _ToolsetSetup ):
+ layer = ExportImportZCMLLayer
+
def test_tool_ids( self ):
# The tool import mechanism used to rely on the fact that all tools
# have unique IDs set at the class level and that you can call their
@@ -1039,4 +1049,5 @@
))
if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
+ from Products.GenericSetup.testing import run
+ run(test_suite())
More information about the Checkins
mailing list