[Zope3-checkins] CVS: Zope3/src/zope/app/services/tests - test_servicemanager.py:1.4 test_viewpackage.py:1.7

[Jim Fulton]

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

Modified Files:
	test_servicemanager.py test_viewpackage.py 
Log Message:
Renamed "packages" to "site-management folders".
Reanemd "view sub-packages" to "page folders".


=== Zope3/src/zope/app/services/tests/test_servicemanager.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/services/tests/test_servicemanager.py:1.3	Tue Mar 18 16:02:23 2003
+++ Zope3/src/zope/app/services/tests/test_servicemanager.py	Sun Mar 23 11:45:45 2003
@@ -153,7 +153,7 @@
 
         self.rootFolder.setServiceManager(ServiceManager())
         sm=getServiceManager(self.rootFolder)
-        default = cw(sm['default'], self.rootFolder, name='Packages')
+        default = cw(sm['default'], self.rootFolder, name='default')
         default.setObject('m1', Manager())
         manager = cw(default['m1'], default, name='m1')
         manager.new('zope.app.services.tests.sample1',
@@ -164,7 +164,7 @@
 
         self.folder1.setServiceManager(ServiceManager())
         sm2=getServiceManager(self.folder1)
-        default = cw(sm2['default'], self.folder1, name='Packages')
+        default = cw(sm2['default'], self.folder1, name='default')
         default.setObject('m1', Manager())
         manager = cw(default['m1'], default, name='m1')
         manager.new('zope.app.services.tests.sample1',


=== Zope3/src/zope/app/services/tests/test_viewpackage.py 1.6 => 1.7 ===
--- Zope3/src/zope/app/services/tests/test_viewpackage.py:1.6	Tue Mar 18 16:02:23 2003
+++ Zope3/src/zope/app/services/tests/test_viewpackage.py	Sun Mar 23 11:45:45 2003
@@ -18,7 +18,7 @@
 
 from unittest import TestCase, TestSuite, main, makeSuite
 from zope.app.services.tests.placefulsetup import PlacefulSetup
-from zope.app.services.viewpackage import ViewPackage
+from zope.app.services.pagefolder import PageFolder
 from zope.app.traversing import traverse
 from zope.app.services.zpt import ZPTTemplate
 from zope.app.services.view import ViewService
@@ -36,7 +36,7 @@
         self.buildFolders()
         self.rootFolder.setServiceManager(ServiceManager())
         default = traverse(self.rootFolder, '++etc++Services/default')
-        default.setObject('Views', ViewPackage())
+        default.setObject('Views', PageFolder())
         views = traverse(default, 'Views')
         views.forInterface = I
         views.factoryName = None
@@ -65,7 +65,7 @@
         self.assertEqual(configuration.attribute, None)
 
         self.assertRaises(TypeError,
-                          views.setObject, 'bar.html', ViewPackage())
+                          views.setObject, 'bar.html', PageFolder())
 
 
 def test_suite():