[Zope3-checkins] CVS: Zope3/src/zope/app/services/tests - placefulsetup.py:1.10 test_eventservice.py:1.12

[R. Sean Bowman]

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

Modified Files:
	placefulsetup.py test_eventservice.py 
Log Message:
change service names: Events -> EventDispatch, Subscription ->
EventSubscription, ErrorReports -> ErrorLogging


=== Zope3/src/zope/app/services/tests/placefulsetup.py 1.9 => 1.10 ===
--- Zope3/src/zope/app/services/tests/placefulsetup.py:1.9	Mon Mar  3 18:16:14 2003
+++ Zope3/src/zope/app/services/tests/placefulsetup.py	Fri Mar  7 19:51:46 2003
@@ -19,7 +19,7 @@
 from zope import component as CA
 from zope.component.adapter import provideAdapter
 from zope.component.view import provideView
-from zope.app.services.servicenames import HubIds, Events, Subscription
+from zope.app.services.servicenames import HubIds, EventDispatch, EventSubscription
 from zope.publisher.interfaces.browser import IBrowserPresentation
 
 from zope.app.browser.absoluteurl import SiteAbsoluteURL, AbsoluteURL
@@ -160,7 +160,7 @@
 
     def createEventService(self, folder_path):
         """Create an event service in 'folder', and configure it for
-        Events and Subscription services."""
+        EventDispatch and EventSubscription services."""
         folder = traverse(self.rootFolder, folder_path)
         if not folder.hasServiceManager():
             folder.setServiceManager(ServiceManager())
@@ -171,12 +171,12 @@
         default.setObject(service_name, EventService())
 
         path = "%s/%s" % (getPhysicalPathString(default), service_name)
-        configuration = ServiceConfiguration(Events, path, self.rootFolder)
+        configuration = ServiceConfiguration(EventDispatch, path, self.rootFolder)
         default['configure'].setObject(
                 "%sEventsDir" % service_name, configuration)
         traverse(default, 'configure/1').status = Active
 
-        configuration = ServiceConfiguration(Subscription, path,
+        configuration = ServiceConfiguration(EventSubscription, path,
                                              self.rootFolder)
         default['configure'].setObject(
                 "%sSubscriptionServiceDir" % service_name, configuration)
@@ -197,9 +197,9 @@
         from zope.app.interfaces.services.hub import IObjectHub
         from zope.app.interfaces.services.event import ISubscriptionService
         from zope.app.services.event import EventService
-        defineService(Subscription, ISubscriptionService)
+        defineService(EventSubscription, ISubscriptionService)
 
-        # Events service already defined by
+        # EventDispatch service already defined by
         # zope.app.events.tests.PlacelessSetup
 
         defineService(HubIds, IObjectHub)
@@ -210,11 +210,11 @@
         default.setObject("myObjectHub", self.getObjectHub())
 
         path = "%s/Packages/default/myEventService" % getPhysicalPathString(sm)
-        configuration = ServiceConfiguration(Events, path, self.rootFolder)
+        configuration = ServiceConfiguration(EventDispatch, path, self.rootFolder)
         default['configure'].setObject("myEventServiceDir", configuration)
         traverse(default, 'configure/1').status = Active
 
-        configuration = ServiceConfiguration(Subscription, path,
+        configuration = ServiceConfiguration(EventSubscription, path,
                                              self.rootFolder)
         default['configure'].setObject(
                 "mySubscriptionServiceDir", configuration)


=== Zope3/src/zope/app/services/tests/test_eventservice.py 1.11 => 1.12 ===
--- Zope3/src/zope/app/services/tests/test_eventservice.py:1.11	Mon Mar  3 18:16:14 2003
+++ Zope3/src/zope/app/services/tests/test_eventservice.py	Fri Mar  7 19:51:46 2003
@@ -21,7 +21,7 @@
 from zope.interface import Interface
 from zope.app.services.service import ServiceManager, ServiceConfiguration
 from zope.component import getServiceManager
-from zope.app.services.servicenames import Events, Subscription
+from zope.app.services.servicenames import EventDispatch, EventSubscription
 from zope.app.services.event import EventService
 from zope.app.traversing import getPhysicalPathString, traverse
 from zope.exceptions import NotFoundError
@@ -812,11 +812,11 @@
         default.setObject("myEventService", service)
 
         path = "%s/Packages/default/myEventService" % getPhysicalPathString(sm)
-        configuration = ServiceConfiguration(Events, path)
+        configuration = ServiceConfiguration(EventDispatch, path)
         default['configure'].setObject("myEventServiceDir", configuration)
         traverse(default, 'configure/1').status = Active
 
-        configuration = ServiceConfiguration(Subscription, path)
+        configuration = ServiceConfiguration(EventSubscription, path)
         default['configure'].setObject("mySubscriptionServiceDir",
                                        configuration)
         traverse(
@@ -869,13 +869,13 @@
             )
 
         sm = traverse(self.rootFolder, "folder1/++etc++Services")
-        configuration = sm.queryConfigurations(Events).active()
+        configuration = sm.queryConfigurations(EventDispatch).active()
         configuration.status = Registered
         publish(self.rootFolder, ObjectAddedEvent(None, '/foo'))
         self.assertEqual(self.folder1Subscriber.notified, 1)
         self.assertEqual(self.folder1_1Subscriber.notified, 1)
 
-        configuration = sm.queryConfigurations(Subscription).active()
+        configuration = sm.queryConfigurations(EventSubscription).active()
         configuration.status = Registered
 
         publish(self.rootFolder, ObjectAddedEvent(None, '/foo'))
@@ -893,10 +893,10 @@
         self.assertEqual(self.rootFolderSubscriber.notified, 1)
 
         sm = traverse(self.rootFolder, "folder2/++etc++Services")
-        configuration = sm.queryConfigurations(Subscription).active()
+        configuration = sm.queryConfigurations(EventSubscription).active()
         # make sure it doesn't raise any errors
         configuration.status = Registered
-        configuration = sm.queryConfigurations(Events).active()
+        configuration = sm.queryConfigurations(EventDispatch).active()
         # make sure it doesn't raise any errors
         configuration.status = Registered