[Zope3-checkins] CVS: Zope3/src/zope/app/http/tests - test_delete.py:1.6.22.1 test_put.py:1.5.22.1

[Jim Fulton]

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

Modified Files:
      Tag: parentgeddon-branch
	test_delete.py test_put.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/http/tests/test_delete.py 1.6 => 1.6.22.1 ===
--- Zope3/src/zope/app/http/tests/test_delete.py:1.6	Mon Jun 23 13:17:05 2003
+++ Zope3/src/zope/app/http/tests/test_delete.py	Mon Sep  8 14:21:39 2003
@@ -20,16 +20,16 @@
 import zope.app.http.delete
 from zope.publisher.browser import TestRequest
 from zope.app.interfaces.file import IWriteDirectory, IFileFactory
-from zope.app.interfaces.container import IZopeWriteContainer
+from zope.app.interfaces.container import IAddTarget, IRemoveSource
 from zope.app.tests.placelesssetup import PlacelessSetup
-from zope.app.context import ContextWrapper
 from zope.interface import implements
+from zope.app.container.contained import contained
 
 class Container:
 
-    implements(IWriteDirectory, IZopeWriteContainer, IFileFactory)
+    implements(IWriteDirectory, IRemoveSource, IFileFactory)
 
-    def __delitem__(self, name):
+    def removeObject(self, name):
         delattr(self, name)
 
 
@@ -38,7 +38,7 @@
     def test(self):
         container = Container()
         container.a = 'spam'
-        item = ContextWrapper(Container(), container, name='a')
+        item = contained(Container(), container, name='a')
 
         request = TestRequest()
         delete = zope.app.http.delete.DELETE(item, request)


=== Zope3/src/zope/app/http/tests/test_put.py 1.5 => 1.5.22.1 ===
--- Zope3/src/zope/app/http/tests/test_put.py:1.5	Mon Jun 23 13:17:05 2003
+++ Zope3/src/zope/app/http/tests/test_put.py	Mon Sep  8 14:21:39 2003
@@ -21,7 +21,7 @@
 import zope.app.http.put
 from zope.publisher.browser import TestRequest
 from zope.app.interfaces.file import IWriteFile, IWriteDirectory, IFileFactory
-from zope.app.interfaces.container import IZopeWriteContainer
+from zope.app.interfaces.container import IRemoveSource, IAddTarget
 from zope.app.tests.placelesssetup import PlacelessSetup
 from zope.interface import implements
 
@@ -39,7 +39,7 @@
 
 class Container:
 
-    implements(IWriteDirectory, IZopeWriteContainer, IFileFactory)
+    implements(IWriteDirectory, IRemoveSource, IAddTarget, IFileFactory)
 
     def setObject(self, name, object):
         setattr(self, name, object)