[Zope3-checkins] CVS: Zope3/src/zope/app/services/tests - placefulsetup.py:1.17 test_adapter.py:1.7 test_auth.py:1.12 test_cacheconfiguration.py:1.6 test_cachingservice.py:1.8 test_configurationregistry.py:1.4 test_connectionconfiguration.py:1.6 test_connectionservice.py:1.6 test_eventservice.py:1.19 test_module.py:1.5 test_pagefolder.py:1.3 test_serviceconfiguration.py:1.8 test_servicemanager.py:1.6 test_view.py:1.9
Jim Fulton
jim@zope.com
Sun, 23 Mar 2003 17:36:14 -0500
Update of /cvs-repository/Zope3/src/zope/app/services/tests
In directory cvs.zope.org:/tmp/cvs-serv15726/src/zope/app/services/tests
Modified Files:
placefulsetup.py test_adapter.py test_auth.py
test_cacheconfiguration.py test_cachingservice.py
test_configurationregistry.py test_connectionconfiguration.py
test_connectionservice.py test_eventservice.py test_module.py
test_pagefolder.py test_serviceconfiguration.py
test_servicemanager.py test_view.py
Log Message:
Renamed ++etc++Services to ++etc++site and renamed
++etc++ApplicationController to ++etc++process.
=== Zope3/src/zope/app/services/tests/placefulsetup.py 1.16 => 1.17 ===
--- Zope3/src/zope/app/services/tests/placefulsetup.py:1.16 Sun Mar 23 17:03:28 2003
+++ Zope3/src/zope/app/services/tests/placefulsetup.py Sun Mar 23 17:35:42 2003
@@ -165,7 +165,7 @@
folder = traverse(self.rootFolder, folder_path)
if not folder.hasServiceManager():
folder.setServiceManager(ServiceManager())
- sm = traverse(folder, '++etc++Services')
+ sm = traverse(folder, '++etc++site')
default = traverse(sm, 'default')
service_name = 'anEventService'
from zope.app.services.event import EventService
@@ -205,7 +205,7 @@
defineService(HubIds, IObjectHub)
- sm = traverse(root, '++etc++Services')
+ sm = traverse(root, '++etc++site')
default = traverse(sm, 'default')
default.setObject("myEventService", EventService())
default.setObject("myObjectHub", self.getObjectHub())
@@ -229,4 +229,4 @@
def createServiceManager(folder):
folder.setServiceManager(ServiceManager())
- return traverse(folder, "++etc++Services")
+ return traverse(folder, "++etc++site")
=== Zope3/src/zope/app/services/tests/test_adapter.py 1.6 => 1.7 ===
--- Zope3/src/zope/app/services/tests/test_adapter.py:1.6 Sun Mar 23 17:03:28 2003
+++ Zope3/src/zope/app/services/tests/test_adapter.py Sun Mar 23 17:35:42 2003
@@ -113,7 +113,7 @@
def test_queryAdapter_and_getAdapter(self):
service = self._service
- sm = traverse(self.rootFolder, '++etc++Services')
+ sm = traverse(self.rootFolder, '++etc++site')
configure = traverse(sm, 'default').getConfigurationManager()
configuration = Configuration()
@@ -151,7 +151,7 @@
# The same as above, but with a named adapter
service = self._service
- sm = traverse(self.rootFolder, '++etc++Services')
+ sm = traverse(self.rootFolder, '++etc++site')
configure = traverse(sm, 'default').getConfigurationManager()
configuration = Configuration()
@@ -203,7 +203,7 @@
self.buildFolders()
self.rootFolder.setServiceManager(ServiceManager())
- sm = traverse(self.rootFolder, '++etc++Services')
+ sm = traverse(self.rootFolder, '++etc++site')
configure = traverse(sm, 'default').getConfigurationManager()
configuration = Configuration()
=== Zope3/src/zope/app/services/tests/test_auth.py 1.11 => 1.12 ===
--- Zope3/src/zope/app/services/tests/test_auth.py:1.11 Sun Mar 23 17:03:28 2003
+++ Zope3/src/zope/app/services/tests/test_auth.py Sun Mar 23 17:35:42 2003
@@ -62,7 +62,7 @@
if not folder.hasServiceManager():
self.createServiceManager(folder)
- default = traverse(folder, '++etc++Services/default')
+ default = traverse(folder, '++etc++site/default')
key = default.setObject("AuthenticationService", AuthenticationService())
auth = traverse(default, key)
=== Zope3/src/zope/app/services/tests/test_cacheconfiguration.py 1.5 => 1.6 ===
--- Zope3/src/zope/app/services/tests/test_cacheconfiguration.py:1.5 Sun Mar 23 17:03:28 2003
+++ Zope3/src/zope/app/services/tests/test_cacheconfiguration.py Sun Mar 23 17:35:42 2003
@@ -105,20 +105,20 @@
self.rootFolder.setServiceManager(ServiceManager())
self.default = traverse(self.rootFolder,
- '++etc++Services/default')
+ '++etc++site/default')
self.default.setObject('cch', TestCache())
self.cch = traverse(self.default, 'cch')
self.cm = ZopeContainerAdapter(self.default.getConfigurationManager())
self.cm.setObject('', CacheConfiguration('cache_name',
- '/++etc++Services/default/cch'))
+ '/++etc++site/default/cch'))
self.config = traverse(self.default.getConfigurationManager(), '1')
self.default.setObject('cache_srv', CachingServiceStub())
self.service = traverse(self.default, 'cache_srv')
self.cm.setObject('', ServiceConfiguration('Caching',
- '/++etc++Services/default/cache_srv'))
+ '/++etc++site/default/cache_srv'))
traverse(self.default.getConfigurationManager(), '2').status = Active
def tearDown(self):
=== Zope3/src/zope/app/services/tests/test_cachingservice.py 1.7 => 1.8 ===
--- Zope3/src/zope/app/services/tests/test_cachingservice.py:1.7 Sun Mar 23 17:03:28 2003
+++ Zope3/src/zope/app/services/tests/test_cachingservice.py Sun Mar 23 17:35:42 2003
@@ -57,7 +57,7 @@
if not folder.hasServiceManager():
self.createServiceManager(folder)
- default = traverse(folder, '++etc++Services/default')
+ default = traverse(folder, '++etc++site/default')
key = default.setObject("myCachingService", CachingService())
service = traverse(default, key)
@@ -75,7 +75,7 @@
if not cname:
cname = name
default = traverse(self.rootFolder,
- folder +'/++etc++Services/default')
+ folder +'/++etc++site/default')
key = default.setObject(cname, cache)
cache = traverse(default, key)
configure = default.getConfigurationManager()
=== Zope3/src/zope/app/services/tests/test_configurationregistry.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/services/tests/test_configurationregistry.py:1.3 Tue Mar 18 16:02:23 2003
+++ Zope3/src/zope/app/services/tests/test_configurationregistry.py Sun Mar 23 17:35:42 2003
@@ -44,7 +44,7 @@
root = self.rootFolder
root.setServiceManager(ServiceManager())
- self.__default = traverse(root, "++etc++Services/default")
+ self.__default = traverse(root, "++etc++site/default")
self.__registry = ContextWrapper(ConfigurationRegistry(), root)
def __config(self, name):
=== Zope3/src/zope/app/services/tests/test_connectionconfiguration.py 1.5 => 1.6 ===
--- Zope3/src/zope/app/services/tests/test_connectionconfiguration.py:1.5 Sun Mar 23 17:03:28 2003
+++ Zope3/src/zope/app/services/tests/test_connectionconfiguration.py Sun Mar 23 17:35:42 2003
@@ -95,20 +95,20 @@
self.rootFolder.setServiceManager(ServiceManager())
self.default = traverse(self.rootFolder,
- '++etc++Services/default')
+ '++etc++site/default')
self.default.setObject('da', TestDA())
self.da = traverse(self.default, 'da')
self.cm = ZopeContainerAdapter(self.default.getConfigurationManager())
self.cm.setObject('', ConnectionConfiguration('conn_name',
- '/++etc++Services/default/da'))
+ '/++etc++site/default/da'))
self.config = traverse(self.default.getConfigurationManager(), '1')
self.default.setObject('conn_srv', ConnectionServiceStub())
self.service = traverse(self.default, 'conn_srv')
self.cm.setObject('', ServiceConfiguration('SQLDatabaseConnections',
- '/++etc++Services/default/conn_srv'))
+ '/++etc++site/default/conn_srv'))
traverse(self.default.getConfigurationManager(), '2').status = Active
def tearDown(self):
=== Zope3/src/zope/app/services/tests/test_connectionservice.py 1.5 => 1.6 ===
--- Zope3/src/zope/app/services/tests/test_connectionservice.py:1.5 Sun Mar 23 17:03:28 2003
+++ Zope3/src/zope/app/services/tests/test_connectionservice.py Sun Mar 23 17:35:42 2003
@@ -79,26 +79,26 @@
self.rootFolder.setServiceManager(ServiceManager())
self.default = traverse(self.rootFolder,
- '++etc++Services/default')
+ '++etc++site/default')
self.default.setObject('conn_srv', ConnectionServiceForTests())
self.service = traverse(self.default, 'conn_srv')
self.cm = ZopeContainerAdapter(self.default.getConfigurationManager())
self.cm.setObject('', ServiceConfiguration('SQLDatabaseConnections',
- '/++etc++Services/default/conn_srv'))
+ '/++etc++site/default/conn_srv'))
traverse(self.default.getConfigurationManager(), '1').status = Active
self.default.setObject('da1', DAStub(1))
self.default.setObject('da2', DAStub(2))
self.cm.setObject('', ConnectionConfiguration('conn1',
- '/++etc++Services/default/da1'))
+ '/++etc++site/default/da1'))
traverse(self.default.getConfigurationManager(), '2').status = Active
self.cm.setObject('', ConnectionConfiguration('conn2',
- '/++etc++Services/default/da2'))
+ '/++etc++site/default/da2'))
traverse(self.default.getConfigurationManager(), '3').status = Active
self.cm.setObject('', ConnectionConfiguration('conn3',
- '/++etc++Services/default/da1'))
+ '/++etc++site/default/da1'))
traverse(self.default.getConfigurationManager(), '4').status = Registered
# Now self.service has conn1 and conn2 available and knows about conn3
@@ -106,23 +106,23 @@
folder1 = traverse(self.rootFolder, 'folder1')
folder1.setServiceManager(ServiceManager())
- default1 = traverse(folder1, '++etc++Services/default')
+ default1 = traverse(folder1, '++etc++site/default')
default1.setObject('conn_srv1', ConnectionServiceForTests())
self.service1 = traverse(default1, 'conn_srv1')
cm1 = ZopeContainerAdapter(default1.getConfigurationManager())
cm1.setObject('', ServiceConfiguration('SQLDatabaseConnections',
- '/folder1/++etc++Services/default/conn_srv1'))
+ '/folder1/++etc++site/default/conn_srv1'))
traverse(default1.getConfigurationManager(), '1').status = Active
default1.setObject('da3', DAStub(3))
default1.setObject('da4', DAStub(4))
cm1.setObject('', ConnectionConfiguration('conn1',
- '/folder1/++etc++Services/default/da3'))
+ '/folder1/++etc++site/default/da3'))
traverse(default1.getConfigurationManager(), '2').status = Active
cm1.setObject('', ConnectionConfiguration('conn4',
- '/folder1/++etc++Services/default/da4'))
+ '/folder1/++etc++site/default/da4'))
traverse(default1.getConfigurationManager(), '3').status = Active
# Now self.service1 overrides conn1, adds new conn4 available, and
# inherits conn2 from self.service
=== Zope3/src/zope/app/services/tests/test_eventservice.py 1.18 => 1.19 ===
--- Zope3/src/zope/app/services/tests/test_eventservice.py:1.18 Sun Mar 23 17:03:28 2003
+++ Zope3/src/zope/app/services/tests/test_eventservice.py Sun Mar 23 17:35:42 2003
@@ -832,7 +832,7 @@
if not self.folder2.hasServiceManager():
self.folder2.setServiceManager(ServiceManager())
- sm = traverse(self.rootFolder, 'folder2/++etc++Services')
+ sm = traverse(self.rootFolder, 'folder2/++etc++site')
default = traverse(sm, 'default')
default.setObject("myEventService", service)
@@ -892,7 +892,7 @@
event_type=IObjectAddedEvent
)
- sm = traverse(self.rootFolder, "folder1/++etc++Services")
+ sm = traverse(self.rootFolder, "folder1/++etc++site")
configuration = sm.queryConfigurations(EventPublication).active()
configuration.status = Registered
publish(self.rootFolder, ObjectAddedEvent(None, '/foo'))
@@ -916,7 +916,7 @@
self.assertEqual(self.folder2Subscriber.notified, 0)
self.assertEqual(self.rootFolderSubscriber.notified, 1)
- sm = traverse(self.rootFolder, "folder2/++etc++Services")
+ sm = traverse(self.rootFolder, "folder2/++etc++site")
configuration = sm.queryConfigurations(EventSubscription).active()
# make sure it doesn't raise any errors
configuration.status = Registered
=== Zope3/src/zope/app/services/tests/test_module.py 1.4 => 1.5 ===
--- Zope3/src/zope/app/services/tests/test_module.py:1.4 Tue Mar 18 16:02:23 2003
+++ Zope3/src/zope/app/services/tests/test_module.py Sun Mar 23 17:35:42 2003
@@ -56,7 +56,7 @@
def test_resolve(self):
self.rootFolder.setServiceManager(ServiceManager())
- sm = traverse(self.rootFolder, "++etc++Services")
+ sm = traverse(self.rootFolder, "++etc++site")
default = traverse(sm, "default")
default.setObject('m1', Manager())
manager = traverse(default, "m1")
@@ -82,7 +82,7 @@
conn2 = db.open()
rootFolder2 = conn2.root()['Application']
- sm2 = traverse(rootFolder2, "++etc++Services")
+ sm2 = traverse(rootFolder2, "++etc++site")
C = sm2.resolve("zope.app.services.tests.sample1.C")
c = C(42)
=== Zope3/src/zope/app/services/tests/test_pagefolder.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/services/tests/test_pagefolder.py:1.2 Sun Mar 23 17:03:28 2003
+++ Zope3/src/zope/app/services/tests/test_pagefolder.py Sun Mar 23 17:35:42 2003
@@ -37,7 +37,7 @@
def test_setObject(self):
self.buildFolders()
self.rootFolder.setServiceManager(ServiceManager())
- default = traverse(self.rootFolder, '++etc++Services/default')
+ default = traverse(self.rootFolder, '++etc++site/default')
default.setObject('Views', PageFolder())
views = traverse(default, 'Views')
views.forInterface = I
@@ -49,7 +49,7 @@
configure = default.getConfigurationManager()
configuration = ServiceConfiguration(
'Views',
- '/++etc++Services/default/ViewService')
+ '/++etc++site/default/ViewService')
configure.setObject('', configuration)
configuration = traverse(configure, '1')
configuration.status = Active
=== Zope3/src/zope/app/services/tests/test_serviceconfiguration.py 1.7 => 1.8 ===
--- Zope3/src/zope/app/services/tests/test_serviceconfiguration.py:1.7 Sun Mar 23 17:03:28 2003
+++ Zope3/src/zope/app/services/tests/test_serviceconfiguration.py Sun Mar 23 17:35:42 2003
@@ -82,14 +82,14 @@
self.rootFolder.setServiceManager(ServiceManager())
defineService('test_service', ITestService)
default = traverse(self.rootFolder,
- '++etc++Services/default')
+ '++etc++site/default')
self.__default = default
default.setObject('c', TestService())
configuration = ServiceConfiguration(
- 'test_service', '/++etc++Services/default/c')
+ 'test_service', '/++etc++site/default/c')
self.__c = traverse(default, 'c')
self.__cm = ZopeContainerAdapter(default.getConfigurationManager())
@@ -156,7 +156,7 @@
TypeError,
ServiceConfiguration,
'test_service',
- '/++etc++Services/default/c2',
+ '/++etc++site/default/c2',
self.__default
)
=== Zope3/src/zope/app/services/tests/test_servicemanager.py 1.5 => 1.6 ===
--- Zope3/src/zope/app/services/tests/test_servicemanager.py:1.5 Sun Mar 23 17:03:28 2003
+++ Zope3/src/zope/app/services/tests/test_servicemanager.py Sun Mar 23 17:35:42 2003
@@ -55,14 +55,14 @@
def testGetService(self):
self.createServiceManager()
- sm = traverse(self.rootFolder, '++etc++Services')
+ sm = traverse(self.rootFolder, '++etc++site')
default = traverse(sm, 'default')
ts = TestService()
default.setObject('test_service1', ts)
configuration = ServiceConfiguration(
'test_service',
- '/++etc++Services/default/test_service1')
+ '/++etc++site/default/test_service1')
default.getConfigurationManager().setObject('', configuration)
traverse(default.getConfigurationManager(), '1').status = Active
@@ -74,21 +74,21 @@
def test_get(self):
self.createServiceManager()
- sm = traverse(self.rootFolder, '++etc++Services')
+ sm = traverse(self.rootFolder, '++etc++site')
default = sm.get('default')
self.assertEqual(default, sm.Packages['default'])
self.assertEqual(sm.get('spam'), None)
def testAddService(self):
self.createServiceManager()
- sm = traverse(self.rootFolder, '++etc++Services')
+ sm = traverse(self.rootFolder, '++etc++site')
default = traverse(sm, 'default')
ts1 = TestService()
default.setObject('test_service1', ts1)
configuration = ServiceConfiguration(
'test_service',
- '/++etc++Services/default/test_service1')
+ '/++etc++site/default/test_service1')
default.getConfigurationManager().setObject('', configuration)
traverse(default.getConfigurationManager(), '1').status = Active
@@ -96,7 +96,7 @@
default.setObject('test_service2', ts2)
configuration = ServiceConfiguration(
'test_service',
- '/++etc++Services/default/test_service2')
+ '/++etc++site/default/test_service2')
default.getConfigurationManager().setObject('', configuration)
traverse(default.getConfigurationManager(), '2').status = Registered
@@ -112,7 +112,7 @@
self.testGetService() # set up localservice
- sm = traverse(self.rootFolder, '++etc++Services')
+ sm = traverse(self.rootFolder, '++etc++site')
cm = traverse(sm, 'default').getConfigurationManager()
traverse(cm, '1').status = Unregistered
=== Zope3/src/zope/app/services/tests/test_view.py 1.8 => 1.9 ===
--- Zope3/src/zope/app/services/tests/test_view.py:1.8 Sun Mar 23 17:03:28 2003
+++ Zope3/src/zope/app/services/tests/test_view.py Sun Mar 23 17:35:42 2003
@@ -126,7 +126,7 @@
def test_queryView_and_getView(self):
service = self._service
- sm = traverse(self.rootFolder, '++etc++Services')
+ sm = traverse(self.rootFolder, '++etc++site')
configure = traverse(sm, 'default').getConfigurationManager()
configuration = Configuration()
@@ -161,7 +161,7 @@
self.buildFolders()
self.rootFolder.setServiceManager(ServiceManager())
- sm = traverse(self.rootFolder, '++etc++Services')
+ sm = traverse(self.rootFolder, '++etc++site')
configure = traverse(sm, 'default').getConfigurationManager()
configuration = Configuration()
@@ -228,7 +228,7 @@
PlacefulSetup.setUp(self)
self.rootFolder = RootFolder()
self.rootFolder.setServiceManager(PhonyServiceManager())
- default = traverse(self.rootFolder, '++etc++Services/default')
+ default = traverse(self.rootFolder, '++etc++site/default')
self.__template = PhonyTemplate()
default.setObject('t', self.__template)
@@ -236,7 +236,7 @@
configuration = ContextWrapper(
PageConfiguration(I1, 'test', 'zope.View',
"Foo.Bar.A",
- template='/++etc++Services/default/t',
+ template='/++etc++site/default/t',
),
self.rootFolder,
)
@@ -277,7 +277,7 @@
c = C()
request = TestRequest()
self.assertRaises(ConfigurationError, configuration.getView, c, request)
- configuration.template = '/++etc++Services/default/t'
+ configuration.template = '/++etc++site/default/t'
configuration.attribute = 'run'
self.assertRaises(ConfigurationError, configuration.getView, c, request)