[Checkins] SVN: zope.traversing/trunk/ Simplified test_dependencies module by using zope.configuration instead of zope.app.testing.functional.

[Hanno Schlichting]

Log message for revision 106601:
  Simplified test_dependencies module by using zope.configuration instead of zope.app.testing.functional.
  

Changed:
  U   zope.traversing/trunk/CHANGES.txt
  U   zope.traversing/trunk/setup.py
  D   zope.traversing/trunk/src/zope/traversing/tests/ftest_zcml_dependencies.zcml
  U   zope.traversing/trunk/src/zope/traversing/tests/test_dependencies.py

-=-
Modified: zope.traversing/trunk/CHANGES.txt
===================================================================
--- zope.traversing/trunk/CHANGES.txt	2009-12-16 00:35:17 UTC (rev 106600)
+++ zope.traversing/trunk/CHANGES.txt	2009-12-16 00:48:29 UTC (rev 106601)
@@ -5,6 +5,9 @@
 3.10.0 (unreleased)
 -------------------
 
+- Simplified test_dependencies module by using zope.configuration instead of
+  zope.app.testing.functional.
+
 - Removed testing dependency on zope.app.publisher.
 
 - Replaced testing dependency on zope.app.security with zope.securitypolicy.

Modified: zope.traversing/trunk/setup.py
===================================================================
--- zope.traversing/trunk/setup.py	2009-12-16 00:35:17 UTC (rev 106600)
+++ zope.traversing/trunk/setup.py	2009-12-16 00:48:29 UTC (rev 106601)
@@ -42,6 +42,7 @@
                                   'zope.app.applicationcontrol>=3.5.0',
                                   'zope.browserpage',
                                   'zope.browserresource',
+                                  'zope.configuration',
                                   'zope.container',
                                   'zope.pagetemplate',
                                   'zope.principalregistry',

Deleted: zope.traversing/trunk/src/zope/traversing/tests/ftest_zcml_dependencies.zcml
===================================================================
--- zope.traversing/trunk/src/zope/traversing/tests/ftest_zcml_dependencies.zcml	2009-12-16 00:35:17 UTC (rev 106600)
+++ zope.traversing/trunk/src/zope/traversing/tests/ftest_zcml_dependencies.zcml	2009-12-16 00:48:29 UTC (rev 106601)
@@ -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>

Modified: zope.traversing/trunk/src/zope/traversing/tests/test_dependencies.py
===================================================================
--- zope.traversing/trunk/src/zope/traversing/tests/test_dependencies.py	2009-12-16 00:35:17 UTC (rev 106600)
+++ zope.traversing/trunk/src/zope/traversing/tests/test_dependencies.py	2009-12-16 00:48:29 UTC (rev 106601)
@@ -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