[Checkins] SVN: zope.app.publication/branches/sylvain-testlayers/src/zope/app/publication/tests/ Replace zope.app.testing layer with one created with the help of zope.component.testlayer.

[Sylvain Viollon]

Log message for revision 110783:
  Replace zope.app.testing layer with one created with the help of zope.component.testlayer.
  

Changed:
  U   zope.app.publication/branches/sylvain-testlayers/src/zope/app/publication/tests/ftest_zcml_dependencies.zcml
  U   zope.app.publication/branches/sylvain-testlayers/src/zope/app/publication/tests/test_dependencies.py

-=-
Modified: zope.app.publication/branches/sylvain-testlayers/src/zope/app/publication/tests/ftest_zcml_dependencies.zcml
===================================================================
--- zope.app.publication/branches/sylvain-testlayers/src/zope/app/publication/tests/ftest_zcml_dependencies.zcml	2010-04-13 12:22:41 UTC (rev 110782)
+++ zope.app.publication/branches/sylvain-testlayers/src/zope/app/publication/tests/ftest_zcml_dependencies.zcml	2010-04-13 12:32:23 UTC (rev 110783)
@@ -5,6 +5,6 @@
     <include package="zope.app.publication" file="meta.zcml" />
     <include package="zope.app.publisher.browser" file="meta.zcml" />
 
-    <include package="zope.app.publication"/>
+    <include package="zope.app.publication" />
 
 </configure>

Modified: zope.app.publication/branches/sylvain-testlayers/src/zope/app/publication/tests/test_dependencies.py
===================================================================
--- zope.app.publication/branches/sylvain-testlayers/src/zope/app/publication/tests/test_dependencies.py	2010-04-13 12:22:41 UTC (rev 110782)
+++ zope.app.publication/branches/sylvain-testlayers/src/zope/app/publication/tests/test_dependencies.py	2010-04-13 12:32:23 UTC (rev 110783)
@@ -1,20 +1,20 @@
 import os
 import unittest
 
-from zope.interface import implements
+from zope.app.publication.traversers import SimpleComponentTraverser
 from zope.component import getMultiAdapter
-from zope.app.testing import functional
+from zope.component.testlayer import ZCMLFileLayer
+from zope.interface import implements
 from zope.publisher.browser import TestRequest
-
 from zope.publisher.interfaces.browser import IBrowserPublisher
-from zope.app.publication.traversers import SimpleComponentTraverser
 
-PublicationDependenciesLayer = functional.ZCMLLayer(
-    os.path.join(os.path.dirname(__file__), 'ftest_zcml_dependencies.zcml'),
-    __name__, 'PublicationDependenciesLayer', allow_teardown=True)
+import zope.app.publication.tests
 
 
-class ZCMLDependencies(functional.BrowserTestCase):
+class ZCMLDependencies(unittest.TestCase):
+    layer = ZCMLFileLayer(zope.app.publication.tests,
+                          zcml_file='ftest_zcml_dependencies.zcml',
+                          name='PublicationDependenciesLayer')
 
     def test_zcml_can_load_with_only_zope_component_meta(self):
         # this is just an example.  It is supposed to show that the
@@ -28,12 +28,9 @@
         self.failUnless(isinstance(res, SimpleComponentTraverser))
         self.failUnless(res.context is sample)
 
+
 def test_suite():
     suite = unittest.TestSuite()
-    ZCMLDependencies.layer = PublicationDependenciesLayer
     suite.addTest(unittest.makeSuite(ZCMLDependencies))
     return suite
 
-
-if __name__ == '__main__':
-    unittest.main()