[Zope3-checkins] CVS: Zope3/src/zope/app/publication/tests - test_zopepublication.py:1.16.2.4

[Jim Fulton]

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

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

=== Zope3/src/zope/app/publication/tests/test_zopepublication.py 1.16.2.3 => 1.16.2.4 ===
--- Zope3/src/zope/app/publication/tests/test_zopepublication.py:1.16.2.3	Fri Sep 12 15:15:32 2003
+++ Zope3/src/zope/app/publication/tests/test_zopepublication.py	Fri Sep 12 16:46:28 2003
@@ -37,7 +37,7 @@
 
 from zope.app.publication.zopepublication import ZopePublication
 
-from zope.app.content.folder import Folder, RootFolder
+from zope.app.content.folder import Folder, rootFolder
 
 from zope.component.interfaces import IServiceService
 
@@ -64,9 +64,9 @@
         app = getattr(root, ZopePublication.root_name, None)
 
         if app is None:
-            from zope.app.content.folder import RootFolder
+            from zope.app.content.folder import rootFolder
 
-            app = RootFolder()
+            app = rootFolder()
             root[ZopePublication.root_name] = app
 
             get_transaction().commit()
@@ -298,8 +298,7 @@
         from zope.app.interfaces.content.folder import IFolder
         from zope.security.checker import defineChecker, InterfaceChecker
         defineChecker(Folder, InterfaceChecker(IFolder))
-        defineChecker(RootFolder, InterfaceChecker(IFolder))
-
+        
         request.setViewType(IPresentation)
 
         publication = ZopePublication(self.db)