[Zope3-checkins] CVS: Zope3/src/zope/app/browser/content/tests - test_dtmlpageeval.py:1.6.8.1 test_zptpageeval.py:1.7.8.1

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/app/browser/content/tests
In directory cvs.zope.org:/tmp/cvs-serv20092/src/zope/app/browser/content/tests

Modified Files:
      Tag: parentgeddon-branch
	test_dtmlpageeval.py test_zptpageeval.py 
Log Message:
Checking in work in progress on parentgeddon-branch so Fred can help
me to get the tests passing.  Specific log entries will be provided
when we merge this into the head.


=== Zope3/src/zope/app/browser/content/tests/test_dtmlpageeval.py 1.6 => 1.6.8.1 ===
--- Zope3/src/zope/app/browser/content/tests/test_dtmlpageeval.py:1.6	Wed Aug  6 10:41:49 2003
+++ Zope3/src/zope/app/browser/content/tests/test_dtmlpageeval.py	Mon Sep  8 14:21:25 2003
@@ -17,8 +17,7 @@
 """
 from unittest import TestCase, main, makeSuite
 from zope.app.browser.content.dtmlpageeval import DTMLPageEval
-from zope.app.context import ContextWrapper
-
+from zope.app.container.contained import contained
 class Test(TestCase):
 
     def test(self):
@@ -45,7 +44,7 @@
                 setattr(self, name, value)
 
         request = Request()
-        template = ContextWrapper(Template(), folder)
+        template = contained(Template(), folder, 'foo')
 
         view = DTMLPageEval()
         # Do manually, since directive adds BrowserView as base class


=== Zope3/src/zope/app/browser/content/tests/test_zptpageeval.py 1.7 => 1.7.8.1 ===
--- Zope3/src/zope/app/browser/content/tests/test_zptpageeval.py:1.7	Wed Aug  6 10:41:49 2003
+++ Zope3/src/zope/app/browser/content/tests/test_zptpageeval.py	Mon Sep  8 14:21:25 2003
@@ -21,7 +21,7 @@
 from zope.testing.cleanup import CleanUp # Base class w registry cleanup
 
 from zope.app.browser.content.zpt import ZPTPageEval
-from zope.app.context import ContextWrapper
+from zope.app.container.contained import contained
 
 class Test(CleanUp, TestCase):
 
@@ -48,7 +48,7 @@
 
         request = Request()
 
-        template = ContextWrapper(Template(), folder)
+        template = contained(Template(), folder)
 
         view = ZPTPageEval()
         # Do manually, since directive adds BrowserView as base class