[Zope3-checkins] CVS: Zope3/src/zope/app/container/tests - test_objectcopier.py:1.9.24.3 test_objectmover.py:1.6.24.2

[Jim Fulton]

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

Modified Files:
      Tag: parentgeddon-branch
	test_objectcopier.py test_objectmover.py 
Log Message:
merged Folder and RootFolder

=== Zope3/src/zope/app/container/tests/test_objectcopier.py 1.9.24.2 => 1.9.24.3 ===
--- Zope3/src/zope/app/container/tests/test_objectcopier.py:1.9.24.2	Fri Sep 12 16:25:21 2003
+++ Zope3/src/zope/app/container/tests/test_objectcopier.py	Fri Sep 12 16:46:26 2003
@@ -43,7 +43,7 @@
         copier = getAdapter(file, IObjectCopier)
         copier.copyTo(container, 'file1')
         self.failUnless('file1' in container)
-        self.failUnless('file1-1' in container)
+        self.failUnless('file1-2' in container)
 
     def test_copytosamewithnewname(self):
         root = self.rootFolder


=== Zope3/src/zope/app/container/tests/test_objectmover.py 1.6.24.1 => 1.6.24.2 ===
--- Zope3/src/zope/app/container/tests/test_objectmover.py:1.6.24.1	Fri Sep 12 15:15:21 2003
+++ Zope3/src/zope/app/container/tests/test_objectmover.py	Fri Sep 12 16:46:26 2003
@@ -120,7 +120,7 @@
         source = traverse(root, '/folder1/folder1_1')
         mover = getAdapter(source, IObjectMover)
         mover.moveTo(target)
-        self.failUnless('folder1_1' in target)
+        self.failUnless('folder1_1-1' in target)
 
     def test_movefoldertosame2(self):
         root = self.rootFolder