[Checkins] SVN: zope.app.pagetemplate/trunk/src/zope/app/pagetemplate/tests/test_ Avoid some zope.app.testing dependencies

Hanno Schlichting hannosch at hannosch.eu
Wed Dec 16 15:51:46 EST 2009


Log message for revision 106658:
  Avoid some zope.app.testing dependencies
  

Changed:
  U   zope.app.pagetemplate/trunk/src/zope/app/pagetemplate/tests/test_binding.py
  U   zope.app.pagetemplate/trunk/src/zope/app/pagetemplate/tests/test_directives.py

-=-
Modified: zope.app.pagetemplate/trunk/src/zope/app/pagetemplate/tests/test_binding.py
===================================================================
--- zope.app.pagetemplate/trunk/src/zope/app/pagetemplate/tests/test_binding.py	2009-12-16 20:46:17 UTC (rev 106657)
+++ zope.app.pagetemplate/trunk/src/zope/app/pagetemplate/tests/test_binding.py	2009-12-16 20:51:45 UTC (rev 106658)
@@ -17,17 +17,26 @@
 """
 import unittest
 
-from zope.app.pagetemplate.tests.testpackage.content \
-     import Content, PTComponent
+from zope.component import provideAdapter
+from zope.component.testing import PlacelessSetup
+from zope.container.interfaces import ISimpleReadContainer
+from zope.container.traversal import ContainerTraversable
+from zope.traversing.interfaces import ITraversable
 
-from zope.app.testing import setup, placelesssetup
+from zope.app.pagetemplate.tests.testpackage.content import Content
+from zope.app.pagetemplate.tests.testpackage.content import PTComponent
 
+def setUpTraversal():
+    from zope.traversing.testing import setUp
+    setUp()
+    provideAdapter(ContainerTraversable, (ISimpleReadContainer,), ITraversable)
 
-class BindingTestCase(placelesssetup.PlacelessSetup, unittest.TestCase):
 
+class BindingTestCase(PlacelessSetup, unittest.TestCase):
+
     def setUp(self):
         super(BindingTestCase, self).setUp()
-        setup.setUpTraversal()
+        setUpTraversal()
 
     def test_binding(self):
         from zope.publisher.browser import TestRequest

Modified: zope.app.pagetemplate/trunk/src/zope/app/pagetemplate/tests/test_directives.py
===================================================================
--- zope.app.pagetemplate/trunk/src/zope/app/pagetemplate/tests/test_directives.py	2009-12-16 20:46:17 UTC (rev 106657)
+++ zope.app.pagetemplate/trunk/src/zope/app/pagetemplate/tests/test_directives.py	2009-12-16 20:51:45 UTC (rev 106658)
@@ -17,7 +17,7 @@
 """
 import unittest
 
-from zope.app.testing.placelesssetup import PlacelessSetup
+from zope.component.testing import PlacelessSetup
 
 template = """<configure 
    xmlns='http://namespaces.zope.org/zope'



More information about the checkins mailing list