[z3-checkins] r17847 - z3/Five/branch/Five-1.1/tests

[efge at codespeak.net]

Author: efge
Date: Sun Sep 25 10:18:13 2005
New Revision: 17847

Modified:
   z3/Five/branch/Five-1.1/tests/event.txt
Log:
Merged 17846 from trunk:
Made doctest more explicit about events.


Modified: z3/Five/branch/Five-1.1/tests/event.txt
==============================================================================
--- z3/Five/branch/Five-1.1/tests/event.txt	(original)
+++ z3/Five/branch/Five-1.1/tests/event.txt	Sun Sep 25 10:18:13 2005
@@ -110,24 +110,29 @@
 
 the removed event...
 
-  >>> events[0].object == foo
+  >>> event = events[0]
+  >>> from zope.app.container.interfaces import IObjectRemovedEvent
+  >>> IObjectRemovedEvent.providedBy(event)
   True
-  >>> events[0].oldName
-  'foo'
-  >>> events[0].newName
-  >>> events[0].oldParent == folder
+  >>> event.object == foo
+  True
+  >>> event.oldName, event.newName
+  ('foo', None)
+  >>> event.oldParent == folder
+  True
+  >>> event.newParent is None
   True
-  >>> events[0].newParent
 
 and the moved event:
 
-  >>> events[1].oldName
-  'foo'
-  >>> events[1].newName
-  'bar'
-  >>> events[1].oldParent == folder
+  >>> event = events[1]
+  >>> event.object == foo
+  True
+  >>> event.oldName, event.newName
+  ('foo', 'bar')
+  >>> event.oldParent == folder
   True
-  >>> events[1].newParent == folder
+  >>> event.newParent == folder
   True
 
 Now clean up:
@@ -168,22 +173,26 @@
 
 a removed event...
 
-  >>> events[1].oldParent == folder1
+  >>> event = events[1]
+  >>> from zope.app.container.interfaces import IObjectRemovedEvent
+  >>> IObjectRemovedEvent.providedBy(event)
+  True
+  >>> event.oldParent == folder1
+  True
+  >>> event.newParent is None
   True
-  >>> events[1].newParent
 
 and a moved event:
 
-  >>> events[2].object == foo
+  >>> event = events[2]
+  >>> event.object == foo
   True
-  >>> events[2].oldParent == folder1
+  >>> event.oldName, event.newName
+  ('foo', 'foo')
+  >>> event.oldParent == folder1
   True
-  >>> events[2].newParent == folder2
+  >>> event.newParent == folder2
   True
-  >>> events[2].oldName
-  'foo'
-  >>> events[2].newName
-  'foo'
 
 Now clean up:
 
@@ -215,17 +224,24 @@
 
 a copied event...
 
+  >>> event = events[1]
+  >>> from zope.app.event.interfaces import IObjectCopiedEvent
+  >>> IObjectCopiedEvent.providedBy(event)
+  True
   >>> events[1].object == foo
   True
 
 and an added event:
 
-  >>> events[2].object == foo
+  >>> event = events[2]
+  >>> IObjectAddedEvent.providedBy(event)
   True
-  >>> events[2].newParent == folder1
+  >>> event.object == foo
   True
-  >>> events[2].newName
+  >>> event.newName
   'foo'
+  >>> event.newParent == folder1
+  True
 
 Now clean up: