[Zope3-checkins] CVS: Zope3/src/zope/app/services/tests - placefulsetup.py:1.27.10.2 test_view.py:1.22.2.5

[Jim Fulton]

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

Modified Files:
      Tag: parentgeddon-branch
	placefulsetup.py test_view.py 
Log Message:
merged Folder and RootFolder

=== Zope3/src/zope/app/services/tests/placefulsetup.py 1.27.10.1 => 1.27.10.2 ===
--- Zope3/src/zope/app/services/tests/placefulsetup.py:1.27.10.1	Mon Sep  8 14:21:49 2003
+++ Zope3/src/zope/app/services/tests/placefulsetup.py	Fri Sep 12 16:46:28 2003
@@ -18,7 +18,7 @@
 from zope.app import zapi
 from zope.app.tests import setup
 from zope.app.tests.placelesssetup import PlacelessSetup
-from zope.app.content.folder import RootFolder
+from zope.app.content.folder import rootFolder
 
 class Place(object):
 
@@ -73,7 +73,7 @@
         return setup.createServiceManager(folder)
 
     def createRootFolder(self):
-        self.rootFolder = RootFolder()
+        self.rootFolder = rootFolder()
 
     # The following is a hook that some base classes might want to override.
     def getObjectHub(self):


=== Zope3/src/zope/app/services/tests/test_view.py 1.22.2.4 => 1.22.2.5 ===
--- Zope3/src/zope/app/services/tests/test_view.py:1.22.2.4	Fri Sep 12 16:42:19 2003
+++ Zope3/src/zope/app/services/tests/test_view.py	Fri Sep 12 16:46:28 2003
@@ -21,7 +21,7 @@
 from zope.interface import Interface, directlyProvides, implements
 from zope.interface.verify import verifyObject
 
-from zope.app.content.folder import RootFolder
+from zope.app.content.folder import rootFolder
 from zope.app.interfaces.services.view import IZPTTemplate
 from zope.app.services.service import ServiceManager
 from zope.app.services.servicenames import Views
@@ -234,7 +234,7 @@
 
     def setUp(self):
         PlacefulSetup.setUp(self)
-        self.rootFolder = RootFolder()
+        self.rootFolder = rootFolder()
         self.rootFolder.setSiteManager(PhonyServiceManager())
         default = traverse(self.rootFolder, '++etc++site/default')
         self.__template = PhonyTemplate()