[Zope3-checkins] CVS: Zope3/src/zope/app/event/tests -
test_directives.py:1.10.10.1 test_eventpublisher.py:1.4.24.1
test_logger.py:1.10.18.1 test_objectevent.py:1.3.52.1
Jim Fulton
jim at zope.com
Fri Sep 12 15:15:55 EDT 2003
Update of /cvs-repository/Zope3/src/zope/app/event/tests
In directory cvs.zope.org:/tmp/cvs-serv13470/src/zope/app/event/tests
Modified Files:
Tag: parentgeddon-branch
test_directives.py test_eventpublisher.py test_logger.py
test_objectevent.py
Log Message:
Can't have the tests passing, can we?
=== Zope3/src/zope/app/event/tests/test_directives.py 1.10 => 1.10.10.1 ===
--- Zope3/src/zope/app/event/tests/test_directives.py:1.10 Sun Aug 3 17:56:13 2003
+++ Zope3/src/zope/app/event/tests/test_directives.py Fri Sep 12 15:15:24 2003
@@ -25,8 +25,8 @@
from zope.exceptions import NotFoundError
from zope.app.event import globalUnsubscribe, publish
-from zope.app.event.objectevent import ObjectAddedEvent
-from zope.app.event.objectevent import ObjectRemovedEvent
+from zope.app.container.contained import ObjectAddedEvent
+from zope.app.container.contained import ObjectRemovedEvent
from zope.app.event.objectevent import ObjectModifiedEvent
from zope.app.event.tests.test_eventpublisher import DummyEvent
from zope.component.tests.placelesssetup import PlacelessSetup
@@ -56,15 +56,15 @@
<test:subscribe
subscriber="zope.app.event.tests.subscriber.subscriber"
event_types=
- "zope.app.interfaces.event.IObjectAddedEvent
- zope.app.interfaces.event.IObjectRemovedEvent"
+ "zope.app.interfaces.container.IObjectAddedEvent
+ zope.app.interfaces.container.IObjectRemovedEvent"
filter="zope.app.event.tests.subscriber.filter" />
</configure>'''
))
- publish(None, ObjectAddedEvent(None, 'foo'))
+ publish(None, ObjectAddedEvent(None, None, 'foo'))
self.assertEqual(subscriber.notified, 1)
- publish(None, ObjectRemovedEvent(object(), 'foo'))
+ publish(None, ObjectRemovedEvent(object(), None, 'foo'))
self.assertEqual(subscriber.notified, 2)
publish(None, ObjectModifiedEvent(None, 'foo'))
self.assertEqual(subscriber.notified, 2) # NB: no increase ;-)
=== Zope3/src/zope/app/event/tests/test_eventpublisher.py 1.4 => 1.4.24.1 ===
--- Zope3/src/zope/app/event/tests/test_eventpublisher.py:1.4 Sat Jun 7 02:37:25 2003
+++ Zope3/src/zope/app/event/tests/test_eventpublisher.py Fri Sep 12 15:15:24 2003
@@ -19,10 +19,12 @@
import unittest
-from zope.app.interfaces.event import IObjectEvent, IObjectAddedEvent
-from zope.app.interfaces.event import IObjectRemovedEvent
+from zope.app.interfaces.event 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.objectevent import ObjectAddedEvent, ObjectModifiedEvent
+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
@@ -44,7 +46,7 @@
def setUp(self):
PlacelessSetup.setUp(self)
self.service = GlobalEventPublisher()
- self.event = ObjectAddedEvent(None, '/foo')
+ self.event = ObjectAddedEvent(None, None, 'foo')
self.subscriber = DummySubscriber()
def testSubscribe1(self):
=== Zope3/src/zope/app/event/tests/test_logger.py 1.10 => 1.10.18.1 ===
--- Zope3/src/zope/app/event/tests/test_logger.py:1.10 Mon Jun 30 16:48:39 2003
+++ Zope3/src/zope/app/event/tests/test_logger.py Fri Sep 12 15:15:24 2003
@@ -23,7 +23,7 @@
from zope.app.services.servicenames import EventPublication
from zope.app.event import globalSubscribe, globalUnsubscribe, publish
-from zope.app.event.objectevent import ObjectAddedEvent
+from zope.app.container.contained import ObjectAddedEvent
from zope.app.event.globalservice import Logger
class DopeyHandler(logging.Handler):
@@ -73,7 +73,7 @@
self.assertEqual(result.name, "Event.Logger")
self.assertEqual(result.levelno, logging.INFO)
self.assertEqual(result.getMessage(),
- "zope.app.event.objectevent.ObjectAddedEvent: "
+ "zope.app.container.contained.ObjectAddedEvent: "
"[('_ObjectEvent__location', 'foo'), "
"('object', None)]\n")
self.assertEqual(result.exc_info, None)
@@ -90,7 +90,7 @@
self.assertEqual(result.name, "Event.Logger")
self.assertEqual(result.levelno, logging.CRITICAL)
self.assertEqual(result.getMessage(),
- "zope.app.event.objectevent.ObjectAddedEvent: "
+ "zope.app.container.contained.ObjectAddedEvent: "
"[('_ObjectEvent__location', 'foo'), "
"('object', None)]\n")
self.assertEqual(result.exc_info, None)
=== Zope3/src/zope/app/event/tests/test_objectevent.py 1.3 => 1.3.52.1 ===
--- Zope3/src/zope/app/event/tests/test_objectevent.py:1.3 Mon Dec 30 09:03:05 2002
+++ Zope3/src/zope/app/event/tests/test_objectevent.py Fri Sep 12 15:15:24 2003
@@ -19,18 +19,16 @@
import unittest
-from zope.app.event.objectevent import ObjectAddedEvent
from zope.app.event.objectevent import ObjectModifiedEvent
-from zope.app.event.objectevent import ObjectRemovedEvent
-from zope.app.event.objectevent import ObjectMovedEvent
from zope.app.event.objectevent import ObjectAnnotationsModifiedEvent
from zope.app.event.objectevent import ObjectContentModifiedEvent
-class TestObjectAddedEvent(unittest.TestCase):
+class TestObjectModifiedEvent(unittest.TestCase):
+
+ klass = ObjectModifiedEvent
location = '/some/location'
object = object()
- klass = ObjectAddedEvent
def setUp(self):
self.event = self.klass(self.object, self.location)
@@ -41,52 +39,17 @@
def testGetObject(self):
self.assertEqual(self.event.object, self.object)
-class TestObjectModifiedEvent(TestObjectAddedEvent):
-
- klass = ObjectModifiedEvent
-
-class TestObjectAnnotationsModifiedEvent(TestObjectAddedEvent):
+class TestObjectAnnotationsModifiedEvent(TestObjectModifiedEvent):
klass = ObjectAnnotationsModifiedEvent
-class TestObjectContentModifiedEvent(TestObjectAddedEvent):
+class TestObjectContentModifiedEvent(TestObjectModifiedEvent):
klass = ObjectContentModifiedEvent
-
-class TestObjectRemovedEvent(TestObjectAddedEvent):
-
-
- location = '/some/location'
-
- def setUp(self):
- self.event = ObjectRemovedEvent(self.object, self.location)
-
- def testGetLocation(self):
- self.assertEqual(self.event.location, self.location)
-
- def testGetObject(self):
- self.assertEqual(self.event.object, self.object)
-
-
-
-class TestObjectMovedEvent(TestObjectAddedEvent):
-
- from_location = '/some/other/location'
-
- def setUp(self):
- self.event = ObjectMovedEvent(self.object,
- self.from_location, self.location)
-
- def testFromLocation(self):
- self.assertEqual(self.event.fromLocation, self.from_location)
-
def test_suite():
return unittest.TestSuite((
- unittest.makeSuite(TestObjectAddedEvent),
unittest.makeSuite(TestObjectModifiedEvent),
unittest.makeSuite(TestObjectAnnotationsModifiedEvent),
unittest.makeSuite(TestObjectContentModifiedEvent),
- unittest.makeSuite(TestObjectRemovedEvent),
- unittest.makeSuite(TestObjectMovedEvent)
))
if __name__=='__main__':
More information about the Zope3-Checkins
mailing list