[Zope3-checkins] CVS: Zope3/src/zope/app/event/tests - placelesssetup.py:1.9 test_directives.py:1.8 test_logger.py:1.8

[R. Sean Bowman]

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

Modified Files:
	placelesssetup.py test_directives.py test_logger.py 
Log Message:
changed EventDispatch to EventPublication, modified some zcml to be more
consistent with the new service names


=== Zope3/src/zope/app/event/tests/placelesssetup.py 1.8 => 1.9 ===
--- Zope3/src/zope/app/event/tests/placelesssetup.py:1.8	Fri Mar  7 19:51:41 2003
+++ Zope3/src/zope/app/event/tests/placelesssetup.py	Sat Mar  8 16:46:04 2003
@@ -18,7 +18,7 @@
 """
 
 from zope.component import getServiceManager
-from zope.app.services.servicenames import EventDispatch
+from zope.app.services.servicenames import EventPublication
 from zope.app.interfaces.event import IPublisher, ISubscriber
 from zope.app.event.globalservice import eventPublisher
 from zope.interface import Interface
@@ -50,8 +50,8 @@
         defineService = sm.defineService
         provideService = sm.provideService
 
-        defineService(EventDispatch, IPublisher)
-        provideService(EventDispatch, eventPublisher)
+        defineService(EventPublication, IPublisher)
+        provideService(EventPublication, eventPublisher)
 
         del events[:]
         eventPublisher.globalSubscribe(EventRecorder)


=== Zope3/src/zope/app/event/tests/test_directives.py 1.7 => 1.8 ===
--- Zope3/src/zope/app/event/tests/test_directives.py:1.7	Fri Mar  7 19:51:41 2003
+++ Zope3/src/zope/app/event/tests/test_directives.py	Sat Mar  8 16:46:04 2003
@@ -32,7 +32,7 @@
      import DummyEvent
 from zope.component.tests.placelesssetup import PlacelessSetup
 from zope.component import getServiceManager
-from zope.app.services.servicenames import EventDispatch
+from zope.app.services.servicenames import EventPublication
 from zope.configuration.tests.basetestdirectivesxml import makeconfig
 from zope.app.interfaces.event import IEvent
 
@@ -41,9 +41,9 @@
     def setUp(self):
         PlacelessSetup.setUp(self)
         from zope.app.interfaces.event import IPublisher
-        getServiceManager(None).defineService(EventDispatch, IPublisher)
+        getServiceManager(None).defineService(EventPublication, IPublisher)
         from zope.app.event.globalservice import eventPublisher
-        getServiceManager(None).provideService(EventDispatch, eventPublisher)
+        getServiceManager(None).provideService(EventPublication, eventPublisher)
 
     def testSubscribe(self):
         from zope.app.event.tests.subscriber import subscriber


=== Zope3/src/zope/app/event/tests/test_logger.py 1.7 => 1.8 ===
--- Zope3/src/zope/app/event/tests/test_logger.py:1.7	Fri Mar  7 19:51:41 2003
+++ Zope3/src/zope/app/event/tests/test_logger.py	Sat Mar  8 16:46:04 2003
@@ -20,7 +20,7 @@
 
 from zope.component.tests.placelesssetup import PlacelessSetup
 from zope.component import getServiceManager
-from zope.app.services.servicenames import EventDispatch
+from zope.app.services.servicenames import EventPublication
 
 from zope.app.event import globalSubscribe, globalUnsubscribe, publish
 from zope.app.event.objectevent import ObjectAddedEvent
@@ -42,9 +42,9 @@
     def setUp(self):
         PlacelessSetup.setUp(self)
         from zope.app.interfaces.event import IPublisher
-        getServiceManager(None).defineService(EventDispatch, IPublisher)
+        getServiceManager(None).defineService(EventPublication, IPublisher)
         from zope.app.event.globalservice import eventPublisher
-        getServiceManager(None).provideService(EventDispatch, eventPublisher)
+        getServiceManager(None).provideService(EventPublication, eventPublisher)
         # futz a handler in for testing
         self.logger = logging.getLogger("Event.Logger")
         self.oldlevel = self.logger.level