[Zope3-checkins] CVS: Zope3/src/zope/app/container/tests - test_objectmover.py:1.6.24.3 test_ordered.py:1.2.20.1

[Jim Fulton]

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

Modified Files:
      Tag: parentgeddon-branch
	test_objectmover.py test_ordered.py 
Log Message:
fixed bug in marking something a site

=== Zope3/src/zope/app/container/tests/test_objectmover.py 1.6.24.2 => 1.6.24.3 ===
--- Zope3/src/zope/app/container/tests/test_objectmover.py:1.6.24.2	Fri Sep 12 16:46:26 2003
+++ Zope3/src/zope/app/container/tests/test_objectmover.py	Fri Sep 12 17:22:35 2003
@@ -41,7 +41,7 @@
         file = traverse(root, 'folder1/file1')
         mover = getAdapter(file, IObjectMover)
         mover.moveTo(container, 'file1')
-        self.failUnless('file1' in container)
+        self.failUnless('file1-2' in container)
 
     def test_movetosamewithnewname(self):
         root = self.rootFolder
@@ -86,7 +86,7 @@
         mover.moveTo(target, 'file1')
         self.failIf('file1' in container)
         self.failUnless('file1' in target)
-        self.failUnless('copy_of_file1' in target)
+        self.failUnless('file1-2' in target)
 
     def test_moveable(self):
         root = self.rootFolder
@@ -120,7 +120,7 @@
         source = traverse(root, '/folder1/folder1_1')
         mover = getAdapter(source, IObjectMover)
         mover.moveTo(target)
-        self.failUnless('folder1_1-1' in target)
+        self.failUnless('folder1_1-2' in target)
 
     def test_movefoldertosame2(self):
         root = self.rootFolder
@@ -128,7 +128,7 @@
         source = traverse(root, '/folder1/folder1_1/folder1_1_1')
         mover = getAdapter(source, IObjectMover)
         mover.moveTo(target)
-        self.failUnless('folder1_1_1' in target)
+        self.failUnless('folder1_1_1-2' in target)
 
     def test_movefolderfromroot(self):
         root = self.rootFolder


=== Zope3/src/zope/app/container/tests/test_ordered.py 1.2 => 1.2.20.1 ===
--- Zope3/src/zope/app/container/tests/test_ordered.py:1.2	Mon Jun 23 18:46:15 2003
+++ Zope3/src/zope/app/container/tests/test_ordered.py	Fri Sep 12 17:22:35 2003
@@ -21,10 +21,12 @@
 from zope.interface import *
 from zope.testing.doctestunit import DocTestSuite
 from zope.interface import Interface
+from zope.app.tests.placelesssetup import setUp, tearDown
 
 def test_suite():
     suite = unittest.TestSuite()
-    suite.addTest(DocTestSuite("zope.app.container.ordered"))
+    suite.addTest(DocTestSuite("zope.app.container.ordered",
+                               setUp=setUp, tearDown=tearDown))
 
     return suite