[Zope3-checkins] CVS: Zope3/src/zope/app/container/tests - test_icontainer.py:1.5.10.2 test_objectcopier.py:1.9.24.2

[Jim Fulton]

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

Modified Files:
      Tag: parentgeddon-branch
	test_icontainer.py test_objectcopier.py 
Log Message:
Got more tests passing

=== Zope3/src/zope/app/container/tests/test_icontainer.py 1.5.10.1 => 1.5.10.2 ===
--- Zope3/src/zope/app/container/tests/test_icontainer.py:1.5.10.1	Fri Sep 12 15:15:21 2003
+++ Zope3/src/zope/app/container/tests/test_icontainer.py	Fri Sep 12 16:25:21 2003
@@ -19,7 +19,7 @@
 from unittest import TestCase, main, makeSuite
 from zope.app.interfaces.container import IContainer
 from zope.interface.verify import verifyObject
-from zope.app.event.tests.placelesssetup import PlacelessSetup
+from zope.app.tests.placelesssetup import PlacelessSetup
 
 
 def DefaultTestData():
@@ -173,6 +173,7 @@
 
         foo = data[0][1]
         folder['foo'] = foo
+        name = 'foo'
 
         self.assertEquals(len(folder.keys()), 1)
         self.assertEquals(folder.keys()[0], 'foo')
@@ -182,7 +183,7 @@
         self.assertEquals(folder.items()[0], ('foo', foo))
         self.assertEquals(len(folder), 1)
 
-        self.failUnless(name in folder)
+        self.failUnless('foo' in folder)
         # Use an arbitrary id frpm the data set; don;t just use any id, since
         # there might be restrictions on their form
         self.failIf(data[6][0] in folder)


=== Zope3/src/zope/app/container/tests/test_objectcopier.py 1.9.24.1 => 1.9.24.2 ===
--- Zope3/src/zope/app/container/tests/test_objectcopier.py:1.9.24.1	Fri Sep 12 15:15:21 2003
+++ Zope3/src/zope/app/container/tests/test_objectcopier.py	Fri Sep 12 16:25:21 2003
@@ -23,6 +23,7 @@
 from zope.component import getAdapter, ComponentLookupError
 from zope.component.adapter import provideAdapter
 from zope.app.interfaces.copypastemove import IObjectCopier
+from zope.app.copypastemove import ObjectCopier
 from zope.app.interfaces.container import IContainer
 from zope.app.content.file import File
 from zope.app.container.sample import SampleContainer
@@ -33,9 +34,6 @@
         PlacefulSetup.setUp(self)
         PlacefulSetup.buildFolders(self)
         provideAdapter(None, IObjectCopier, ObjectCopier)
-        provideAdapter(IContainer, IPasteTarget, PasteTarget)
-        provideAdapter(IContainer, ICopySource, CopySource)
-        provideAdapter(IContainer, IPasteNamesChooser, PasteNamesChooser)
 
     def test_copytosame(self):
         root = self.rootFolder
@@ -45,7 +43,7 @@
         copier = getAdapter(file, IObjectCopier)
         copier.copyTo(container, 'file1')
         self.failUnless('file1' in container)
-        self.failUnless('copy_of_file1' in container)
+        self.failUnless('file1-1' in container)
 
     def test_copytosamewithnewname(self):
         root = self.rootFolder
@@ -92,8 +90,8 @@
         copier.copyTo(target, 'file1')
         self.failUnless('file1' in container)
         self.failUnless('file1' in target)
-        self.failUnless('copy_of_file1' in target)
-        self.failUnless('copy2_of_file1' in target)
+        self.failUnless('file1-2' in target)
+        self.failUnless('file1-3' in target)
 
     def test_copyable(self):
         root = self.rootFolder