Merge pull request #2 from icemac/master

moved function tried to notify the wrong event

CHANGES.txt

@@ -9,7 +9,7 @@ CHANGES
   implementation of ``ObjectEvent`` is now in ``zope.interface``.
   Retained the dependency for the tests.
 
-- ...
+- Fixed: ``.moved`` tried to notify the wrong event.
 
 
 4.0.2 (2013-03-08)

src/zope/lifecycleevent/__init__.py

@@ -100,7 +100,7 @@ def __init__(self, object, oldParent, oldName, newParent, newName):
 
 
 def moved(object, oldParent, oldName, newParent, newName):
-    notify(ObjectCreatedEvent(object, oldParent, oldName, newParent, newName))
+    notify(ObjectMovedEvent(object, oldParent, oldName, newParent, newName))
 
 
 @implementer(IObjectAddedEvent)

src/zope/lifecycleevent/tests.py

@@ -262,6 +262,39 @@ def test_verifyObject(self):
         verifyObject(IObjectRemovedEvent, self._makeOne(ob, parent, 'new_name'))
 
 
+class DummySubscriber:
+
+    event = None
+
+    def __call__(self, event):
+        self.event = event
+
+
+class TestMoved(unittest.TestCase):
+    """Testing .moved()."""
+
+    def setUp(self):
+        from zope.event import subscribers
+        self._old_subscribers = subscribers[:]
+        subscribers[:] = [DummySubscriber()]
+
+    def tearDown(self):
+        from zope.event import subscribers
+        subscribers[:] = self._old_subscribers
+
+    def test_it(self):
+        from zope.lifecycleevent import moved, ObjectMovedEvent
+        from zope.event import subscribers
+        moved('object', 'oldParent', 'oldName', 'newParent', 'newName')
+        event = subscribers[0].event
+        self.assertTrue(isinstance(event, ObjectMovedEvent))
+        self.assertEqual(event.object, 'object')
+        self.assertEqual(event.oldParent, 'oldParent')
+        self.assertEqual(event.oldName, 'oldName')
+        self.assertEqual(event.newParent, 'newParent')
+        self.assertEqual(event.newName, 'newName')
+
+
 class Context:
     pass
 
@@ -276,6 +309,7 @@ def test_suite():
         unittest.makeSuite(TestObjectMovedEvent),
         unittest.makeSuite(TestObjectAddedEvent),
         unittest.makeSuite(TestObjectRemovedEvent),
+        unittest.makeSuite(TestMoved),
         doctest.DocFileSuite('README.txt',
                              tearDown=zope.component.testing.tearDown),
         ))