[Zope3-checkins] CVS: Zope3/src/zope/app/container/tests - test_zopecontainer.py:1.3

[Steve Alexander]

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

Modified Files:
	test_zopecontainer.py 
Log Message:
Made ContainerSized depend on IReadContainer not IContainer.

Made ZopeItemWriteContainerDecorator, and IItemWriteContainer and
IZopeItemWriteContainer interfaces to express the dependency that
writing to a ZopeContainer has on IItemContainer.

Added zcml to make these different kinds of decorators work.


=== Zope3/src/zope/app/container/tests/test_zopecontainer.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/container/tests/test_zopecontainer.py:1.2	Sun Jun 15 12:10:43 2003
+++ Zope3/src/zope/app/container/tests/test_zopecontainer.py	Sun Jun 15 12:38:29 2003
@@ -102,9 +102,9 @@
             ZopeReadContainerDecorator
         return ZopeReadContainerDecorator(container)
 
-class TestZopeWriteContainerDecorator(TestZopeItemContainerDecorator,
-                                      BaseTestIZopeWriteContainer):
-    # The ZopeWriteContainerDecorator depends on the container also being
+class TestZopeItemWriteContainerDecorator(TestZopeItemContainerDecorator,
+                                          BaseTestIZopeWriteContainer):
+    # The ZopeItemWriteContainerDecorator depends on the container also being
     # an IItemContainer. It needs this to get values that are to be deleted
     # so they can be sent in events.
     # So, this unit test tests that the decorator implementation properly
@@ -123,8 +123,8 @@
 
     def decorate(self, container):
         from zope.app.container.zopecontainer import \
-            ZopeWriteContainerDecorator
-        return ZopeWriteContainerDecorator(container)
+            ZopeItemWriteContainerDecorator
+        return ZopeItemWriteContainerDecorator(container)
 
     __newItem = {'A': C(), 'B':C()}
     def _sample_newItem(self):
@@ -135,7 +135,8 @@
         return self.__newItemHooked
 
 
-class TestZopeContainerDecorator(TestZopeWriteContainerDecorator):
+class TestZopeContainerDecorator(TestZopeItemWriteContainerDecorator,
+                                 TestZopeReadContainerDecorator):
 
     def decorate(self, container):
         from zope.app.container.zopecontainer import ZopeContainerDecorator
@@ -147,7 +148,7 @@
         makeSuite(TestZopeItemContainerDecorator),
         makeSuite(TestZopeSimpleReadContainerDecorator),
         makeSuite(TestZopeReadContainerDecorator),
-        makeSuite(TestZopeWriteContainerDecorator),
+        makeSuite(TestZopeItemWriteContainerDecorator),
         makeSuite(TestZopeContainerDecorator),
         ))