[Checkins] SVN: zope.app.publication/branches/sylvain-testlayers/s Try to remove more tests dependencies by changing test layer.

[Sylvain Viollon]

Log message for revision 110788:
  Try to remove more tests dependencies by changing test layer.
  

Changed:
  U   zope.app.publication/branches/sylvain-testlayers/setup.py
  U   zope.app.publication/branches/sylvain-testlayers/src/zope/app/publication/testing.py
  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_functional.py

-=-
Modified: zope.app.publication/branches/sylvain-testlayers/setup.py
===================================================================
--- zope.app.publication/branches/sylvain-testlayers/setup.py	2010-04-13 12:59:23 UTC (rev 110787)
+++ zope.app.publication/branches/sylvain-testlayers/setup.py	2010-04-13 13:03:24 UTC (rev 110788)
@@ -54,6 +54,7 @@
     extras_require = dict(
         test=['zope.app.testing',
               'zope.app.zcmlfiles>=3.5.4',
+              'zope.app.wsgi',
               'zope.principalregistry',
               'zope.applicationcontrol>=3.5.0',
               'zope.site',

Modified: zope.app.publication/branches/sylvain-testlayers/src/zope/app/publication/testing.py
===================================================================
--- zope.app.publication/branches/sylvain-testlayers/src/zope/app/publication/testing.py	2010-04-13 12:59:23 UTC (rev 110787)
+++ zope.app.publication/branches/sylvain-testlayers/src/zope/app/publication/testing.py	2010-04-13 13:03:24 UTC (rev 110788)
@@ -18,10 +18,8 @@
 
 __docformat__ = "reStructuredText"
 
-import os
-from zope.app.testing.functional import ZCMLLayer
+from zope.component.testlayer import ZCMLFileLayer
+import zope.app.publication
 
-PublicationLayer = ZCMLLayer(
-    os.path.join(os.path.split(__file__)[0], 'ftesting.zcml'),
-    __name__, 'PublicationLayer', allow_teardown=True)
+PublicationLayer = ZCMLFileLayer(zope.app.publication, name='PublicationLayer')
 

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:59:23 UTC (rev 110787)
+++ zope.app.publication/branches/sylvain-testlayers/src/zope/app/publication/tests/ftest_zcml_dependencies.zcml	2010-04-13 13:03:24 UTC (rev 110788)
@@ -3,7 +3,7 @@
 
     <include package="zope.component" file="meta.zcml"/>
     <include package="zope.app.publication" file="meta.zcml" />
-    <include package="zope.app.publisher.browser" file="meta.zcml" />
+    <include package="zope.browserpage" file="meta.zcml" />
 
     <include package="zope.app.publication" />
 

Modified: zope.app.publication/branches/sylvain-testlayers/src/zope/app/publication/tests/test_functional.py
===================================================================
--- zope.app.publication/branches/sylvain-testlayers/src/zope/app/publication/tests/test_functional.py	2010-04-13 12:59:23 UTC (rev 110787)
+++ zope.app.publication/branches/sylvain-testlayers/src/zope/app/publication/tests/test_functional.py	2010-04-13 13:03:24 UTC (rev 110788)
@@ -18,9 +18,10 @@
 
 import re
 import unittest
+
 from zope.testing import renormalizing
-from zope.app.testing import functional
 from zope.app.publication.testing import PublicationLayer
+from zope.testing import doctest
 
 
 checker = renormalizing.RENormalizing([
@@ -29,20 +30,19 @@
 
 
 def test_suite():
-    methodnotallowed = functional.FunctionalDocFileSuite(
+    methodnotallowed = doctest.DocFileSuite(
         '../methodnotallowed.txt')
     methodnotallowed.layer = PublicationLayer
-    httpfactory = functional.FunctionalDocFileSuite(
+    httpfactory = doctest.DocFileSuite(
         '../httpfactory.txt', checker=checker)
     httpfactory.layer = PublicationLayer
-    site = functional.FunctionalDocFileSuite(
+    site = doctest.DocFileSuite(
         '../site.txt')
     site.layer = PublicationLayer
     return unittest.TestSuite((
         methodnotallowed,
         httpfactory,
-        site,
-        ))
+        site,))
 
 if __name__ == '__main__':
     unittest.main(defaultTest='test_suite')