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

[Sidnei da Silva]

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

Modified Files:
      Tag: paris-copypasterename-branch
	placelesssetup.py test_directives.py test_logger.py 
Log Message:
Updating from HEAD to make sure everything still works before merging

=== Zope3/src/zope/app/event/tests/placelesssetup.py 1.4 => 1.4.2.1 ===
--- Zope3/src/zope/app/event/tests/placelesssetup.py:1.4	Mon Jan 27 13:51:01 2003
+++ Zope3/src/zope/app/event/tests/placelesssetup.py	Tue Feb 11 09:41:14 2003
@@ -18,6 +18,7 @@
 """
 
 from zope.component import getServiceManager
+from zope.component.servicenames import Events
 from zope.app.interfaces.event import IPublisher, ISubscriber
 from zope.app.event.globalservice import eventPublisher
 from zope.interface import Interface
@@ -49,8 +50,8 @@
         defineService = sm.defineService
         provideService = sm.provideService
 
-        defineService("Events", IPublisher)
-        provideService("Events", eventPublisher)
+        defineService(Events, IPublisher)
+        provideService(Events, eventPublisher)
 
         del events[:]
         eventPublisher.globalSubscribe(EventRecorder)


=== Zope3/src/zope/app/event/tests/test_directives.py 1.3 => 1.3.4.1 ===
--- Zope3/src/zope/app/event/tests/test_directives.py:1.3	Mon Dec 30 09:03:05 2002
+++ Zope3/src/zope/app/event/tests/test_directives.py	Tue Feb 11 09:41:14 2003
@@ -32,6 +32,7 @@
      import DummyEvent
 from zope.component.tests.placelesssetup import PlacelessSetup
 from zope.component import getServiceManager
+from zope.component.servicenames import Events
 from zope.configuration.tests.basetestdirectivesxml import makeconfig
 from zope.app.interfaces.event import IEvent
 
@@ -40,9 +41,9 @@
     def setUp(self):
         PlacelessSetup.setUp(self)
         from zope.app.interfaces.event import IPublisher
-        getServiceManager(None).defineService("Events", IPublisher)
+        getServiceManager(None).defineService(Events, IPublisher)
         from zope.app.event.globalservice import eventPublisher
-        getServiceManager(None).provideService("Events", eventPublisher)
+        getServiceManager(None).provideService(Events, eventPublisher)
 
     def testSubscribe(self):
         from zope.app.event.tests.subscriber import subscriber


=== Zope3/src/zope/app/event/tests/test_logger.py 1.3 => 1.3.4.1 ===
--- Zope3/src/zope/app/event/tests/test_logger.py:1.3	Mon Dec 30 09:03:05 2002
+++ Zope3/src/zope/app/event/tests/test_logger.py	Tue Feb 11 09:41:14 2003
@@ -20,6 +20,7 @@
 
 from zope.component.tests.placelesssetup import PlacelessSetup
 from zope.component import getServiceManager
+from zope.component.servicenames import Events
 
 from zope.app.event import globalSubscribe, globalUnsubscribe, publish
 from zope.app.event.objectevent import ObjectAddedEvent
@@ -41,9 +42,9 @@
     def setUp(self):
         PlacelessSetup.setUp(self)
         from zope.app.interfaces.event import IPublisher
-        getServiceManager(None).defineService("Events", IPublisher)
+        getServiceManager(None).defineService(Events, IPublisher)
         from zope.app.event.globalservice import eventPublisher
-        getServiceManager(None).provideService("Events", eventPublisher)
+        getServiceManager(None).provideService(Events, eventPublisher)
         # futz a handler in for testing
         self.logger = logging.getLogger("Event.Logger")
         self.oldlevel = self.logger.level