Changeset 2204

Timestamp:

02/06/08 23:32:44 (3 months ago)

Author:

arj..@yirdis.nl

Message:

Fixed bug in gaphor.UML.collection: should not call notify() anymore.

Files:

• gaphor/trunk/gaphor/UML/collection.py (modified) (2 diffs)
• gaphor/trunk/gaphor/UML/tests/test_properties.py (modified) (3 diffs)

gaphor/trunk/gaphor/UML/collection.py

@@ -4 +4 @@
-
-import inspect
+from zope import component
+from event import AssociationChangeEvent
-
-class CollectionError(Exception):
@@ -207 +209 @@
-            i2 = self.items.index(item2)
-            self.items[i1], self.items[i2] = self.items[i2], self.items[i1]
+
-            # send a notification that this list has changed
-self.property.notify(self.object
+component.handle(AssociationChangeEvent(self.object, self.property)
-            return True
-        except IndexError, ex:

gaphor/trunk/gaphor/UML/tests/test_properties.py

@@ -2 +2 @@
-
-import unittest
+from zope import component
+from gaphor.application import Application
-from gaphor.UML.properties import *
-from gaphor.UML.element import Element
+from gaphor.UML.event import AssociationChangeEvent
-
-class PropertiesTestCase(unittest.TestCase):
@@ -223 +226 @@
-        #assert len(a1._observers.get('__unlink__')) == 0
-        #assert len(b1._observers.get('__unlink__')) == 0
+
+    def test_association_swap(self):
+        class A(Element): pass
+        class B(Element): pass
+        class C(Element): pass
+
+        A.one = association('one', B, 0, '*')
+
+        a = A()
+        b1 = B()
+        b2 = B()
+
+        a.one = b1
+        a.one = b2
+        assert a.one.size() == 2
+        assert a.one[0] is b1
+        assert a.one[1] is b2
+
+        events = []
+        @component.adapter(AssociationChangeEvent)
+        def handler(event, events=events):
+            events.append(event)
+
+        Application.register_handler(handler)
+        try:
+            a.one.swap(b1, b2)
+            assert len(events) == 1
+            assert events[0].property is A.one
+            assert events[0].element is a
+        finally:
+            Application.unregister_handler(handler)
+
+        assert a.one.size() == 2
+        assert a.one[0] is b2
+        assert a.one[1] is b1
-
-    def test_association_unlink_1(self):
@@ -426 +464 @@
-
-    def test_derivedunion(self):
-        from zope import component
-        from gaphor.application import Application
-        from gaphor.UML.event import AssociationChangeEvent
-        
-        class A(Element):