[Zope3-checkins] CVS: Zope3/src/zope/app/event/tests -
placelesssetup.py:1.14 subscriber.py:1.4
test_directives.py:1.14 test_eventpublisher.py:1.9
test_globaleventchannel.py:1.6 test_logger.py:1.13
test_objectevent.py:1.6
Philipp von Weitershausen
philikon at philikon.de
Tue Mar 2 13:51:35 EST 2004
Update of /cvs-repository/Zope3/src/zope/app/event/tests
In directory cvs.zope.org:/tmp/cvs-serv7455/event/tests
Modified Files:
placelesssetup.py subscriber.py test_directives.py
test_eventpublisher.py test_globaleventchannel.py
test_logger.py test_objectevent.py
Log Message:
Moved event interfaces from zope.app.interfaces.event to
zope.app.event.interfaces.
=== Zope3/src/zope/app/event/tests/placelesssetup.py 1.13 => 1.14 ===
--- Zope3/src/zope/app/event/tests/placelesssetup.py:1.13 Mon Feb 9 04:07:44 2004
+++ Zope3/src/zope/app/event/tests/placelesssetup.py Tue Mar 2 13:50:59 2004
@@ -13,13 +13,11 @@
##############################################################################
"""Unit test logic for setting up and tearing down basic infrastructure
-
$Id$
"""
-
from zope.component import getServiceManager
from zope.app.services.servicenames import EventPublication
-from zope.app.interfaces.event import IPublisher, ISubscriber, IObjectEvent
+from zope.app.event.interfaces import IPublisher, ISubscriber, IObjectEvent
from zope.app.event.globalservice import eventPublisher
from zope.app.event.objectevent import objectEventNotifierInstance
from zope.interface import implements
=== Zope3/src/zope/app/event/tests/subscriber.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/event/tests/subscriber.py:1.3 Sat Jun 7 02:37:25 2003
+++ Zope3/src/zope/app/event/tests/subscriber.py Tue Mar 2 13:50:59 2004
@@ -15,11 +15,9 @@
This contains some dummy stuff to do with subscribing to event channels
that's useful in several test modules.
-Revision information:
$Id$
"""
-
-from zope.app.interfaces.event import IFilter, ISubscriber
+from zope.app.event.interfaces import IFilter, ISubscriber
from zope.interface import implements
class DummySubscriber:
=== Zope3/src/zope/app/event/tests/test_directives.py 1.13 => 1.14 ===
--- Zope3/src/zope/app/event/tests/test_directives.py:1.13 Thu Nov 27 08:59:18 2003
+++ Zope3/src/zope/app/event/tests/test_directives.py Tue Mar 2 13:50:59 2004
@@ -12,11 +12,8 @@
#
##############################################################################
"""
-
-Revision information:
$Id$
"""
-
from unittest import TestCase, main, makeSuite
from zope.configuration.xmlconfig import xmlconfig, XMLConfig
@@ -32,13 +29,13 @@
from zope.component.tests.placelesssetup import PlacelessSetup
from zope.component import getServiceManager
from zope.app.services.servicenames import EventPublication
-from zope.app.interfaces.event import IEvent
+from zope.app.event.interfaces import IEvent
class Test(PlacelessSetup, TestCase):
def setUp(self):
super(Test, self).setUp()
- from zope.app.interfaces.event import IPublisher
+ from zope.app.event.interfaces import IPublisher
getServiceManager(None).defineService(EventPublication, IPublisher)
from zope.app.event.globalservice import eventPublisher
getServiceManager(None).provideService(EventPublication, eventPublisher)
=== Zope3/src/zope/app/event/tests/test_eventpublisher.py 1.8 => 1.9 ===
--- Zope3/src/zope/app/event/tests/test_eventpublisher.py:1.8 Mon Feb 9 04:07:44 2004
+++ Zope3/src/zope/app/event/tests/test_eventpublisher.py Tue Mar 2 13:50:59 2004
@@ -12,22 +12,19 @@
#
##############################################################################
"""
-
-Revision information:
$Id$
"""
-
import unittest
-from zope.app.interfaces.event import IObjectEvent
+from zope.app.event.interfaces import IObjectEvent
from zope.app.interfaces.container import IObjectAddedEvent
from zope.app.interfaces.container import IObjectRemovedEvent
-from zope.app.interfaces.event import IObjectModifiedEvent
+from zope.app.event.interfaces import IObjectModifiedEvent
from zope.app.event.objectevent import ObjectModifiedEvent
from zope.app.container.contained import ObjectAddedEvent
from zope.app.event.globalservice import GlobalEventPublisher
from zope.exceptions import NotFoundError
-from zope.app.interfaces.event import IEvent
+from zope.app.event.interfaces import IEvent
from zope.component.tests.placelesssetup import PlacelessSetup
from zope.app.event.tests.subscriber import DummySubscriber, DummyFilter
=== Zope3/src/zope/app/event/tests/test_globaleventchannel.py 1.5 => 1.6 ===
--- Zope3/src/zope/app/event/tests/test_globaleventchannel.py:1.5 Thu Nov 27 08:59:18 2003
+++ Zope3/src/zope/app/event/tests/test_globaleventchannel.py Tue Mar 2 13:50:59 2004
@@ -15,12 +15,12 @@
$Id$
"""
-
from unittest import TestCase, TestSuite, main, makeSuite
-from zope.app.interfaces.event import IEvent, ISubscribingAware, ISubscriber
+
from zope.interface import Interface, implements
from zope.component.tests.placelesssetup import PlacelessSetup
from zope.component.tests.components import RecordingAdapter
+from zope.app.event.interfaces import IEvent, ISubscribingAware, ISubscriber
from zope.app.tests import ztapi
class ISomeEvent(IEvent):
=== Zope3/src/zope/app/event/tests/test_logger.py 1.12 => 1.13 ===
--- Zope3/src/zope/app/event/tests/test_logger.py:1.12 Thu Nov 27 08:59:18 2003
+++ Zope3/src/zope/app/event/tests/test_logger.py Tue Mar 2 13:50:59 2004
@@ -24,7 +24,8 @@
from zope.app.event import globalSubscribe, globalUnsubscribe, publish
from zope.app.container.contained import ObjectAddedEvent
-from zope.app.event.globalservice import Logger
+from zope.app.event.globalservice import Logger, eventPublisher
+from zope.app.event.interfaces import IPublisher
class DopeyHandler(logging.Handler):
@@ -41,9 +42,7 @@
def setUp(self):
super(TestLogger1, self).setUp()
- from zope.app.interfaces.event import IPublisher
getServiceManager(None).defineService(EventPublication, IPublisher)
- from zope.app.event.globalservice import eventPublisher
getServiceManager(None).provideService(EventPublication, eventPublisher)
# futz a handler in for testing
self.logger = logging.getLogger("Event.Logger")
=== Zope3/src/zope/app/event/tests/test_objectevent.py 1.5 => 1.6 ===
--- Zope3/src/zope/app/event/tests/test_objectevent.py:1.5 Mon Feb 9 04:07:44 2004
+++ Zope3/src/zope/app/event/tests/test_objectevent.py Tue Mar 2 13:50:59 2004
@@ -26,7 +26,7 @@
from zope.app.container.contained import Contained, ObjectRemovedEvent
from zope.app.interfaces.container import IContained, IObjectRemovedEvent
from zope.app.interfaces.container import IObjectEvent
-from zope.app.interfaces.event import ISubscriber
+from zope.app.event.interfaces import ISubscriber
from zope.app.container.sample import SampleContainer
from zope.app.tests.placelesssetup import setUp, tearDown
from zope.app.services.servicenames import Adapters, EventPublication
More information about the Zope3-Checkins
mailing list