diff options
author | Hanno Schlichting <hanno@hannosch.eu> | 2009-12-16 00:48:29 +0000 |
---|---|---|
committer | Hanno Schlichting <hanno@hannosch.eu> | 2009-12-16 00:48:29 +0000 |
commit | 37e9f8b473a57c26d9148170400ade72c7154c9f (patch) | |
tree | 7d717bf1fdd6b16d8879db610dae7cf2e839d2e5 /src | |
parent | 72506e829eac5b2e1c2cc2edd319cb64cb69587b (diff) | |
download | zope-traversing-37e9f8b473a57c26d9148170400ade72c7154c9f.tar.gz |
Simplified test_dependencies module by using zope.configuration instead of zope.app.testing.functional.
Diffstat (limited to 'src')
-rw-r--r-- | src/zope/traversing/tests/ftest_zcml_dependencies.zcml | 9 | ||||
-rw-r--r-- | src/zope/traversing/tests/test_dependencies.py | 20 |
2 files changed, 8 insertions, 21 deletions
diff --git a/src/zope/traversing/tests/ftest_zcml_dependencies.zcml b/src/zope/traversing/tests/ftest_zcml_dependencies.zcml deleted file mode 100644 index 3214307..0000000 --- a/src/zope/traversing/tests/ftest_zcml_dependencies.zcml +++ /dev/null @@ -1,9 +0,0 @@ -<configure - xmlns="http://namespaces.zope.org/zope" - xmlns:webservice="http://namespaces.canonical.com/webservice"> - - <include package="zope.component" file="meta.zcml"/> - - <include package="zope.traversing"/> - -</configure> diff --git a/src/zope/traversing/tests/test_dependencies.py b/src/zope/traversing/tests/test_dependencies.py index a081bd2..14d5ba3 100644 --- a/src/zope/traversing/tests/test_dependencies.py +++ b/src/zope/traversing/tests/test_dependencies.py @@ -1,34 +1,30 @@ -import os import unittest import zope.component -from zope.app.testing import functional +from zope.configuration.xmlconfig import XMLConfig from zope.publisher.browser import TestRequest from zope.traversing.interfaces import ITraversable -import zope.traversing.namespace -TraversingLayer = functional.ZCMLLayer( - os.path.join(os.path.dirname(__file__), 'ftest_zcml_dependencies.zcml'), - __name__, 'TraversingLayer', allow_teardown=True) +class ZCMLDependencies(unittest.TestCase): + def test_zcml_can_load_with_only_zope_component_meta(self): + import zope.component + XMLConfig('meta.zcml', zope.component)() -class ZCMLDependencies(functional.BrowserTestCase): + import zope.traversing + XMLConfig('configure.zcml', zope.traversing)() - def test_zcml_can_load_with_only_zope_component_meta(self): - # this is just an example. It is supposed to show that the - # configure.zcml file has loaded successfully, with only loading the - # meta.zcml from zope.component. request = TestRequest() res = zope.component.getMultiAdapter( (self, request), ITraversable, 'lang') + import zope.traversing.namespace self.failUnless(isinstance(res, zope.traversing.namespace.lang)) self.failUnless(res.context is self) def test_suite(): suite = unittest.TestSuite() - ZCMLDependencies.layer = TraversingLayer suite.addTest(unittest.makeSuite(ZCMLDependencies)) return suite |