Changeset 2210

Timestamp:

02/11/08 22:28:15 (3 months ago)

Author:

arj..@yirdis.nl

Message:

Added testcase that exposes bug #95

Files:

• gaphor/trunk/gaphor/diagram/diagramitem.py (modified) (1 diff)
• gaphor/trunk/gaphor/services/undomanager.py (modified) (4 diffs)
• gaphor/trunk/tests/test_association_undo.py (modified) (1 diff)

gaphor/trunk/gaphor/diagram/diagramitem.py

@@ -216 +216 @@
-        Remove the item from the canvas and set subject to None.
-        """
+        super(DiagramItem, self).unlink()
+        self.subject = None
-        if self.canvas:
-
-
-
-
-
-
-
+
+
+
+
+
-
-

gaphor/trunk/gaphor/services/undomanager.py

@@ -161 +161 @@
-        Add an action to undo. An action
-        """
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-    @component.adapter(TransactionCommit)
@@ -288 +286 @@
-    ##
-
-
+
+
-        self.add_undo_action(lambda: state.saveapply(*event));
-
@@ -303 +302 @@
-        state.observers.add(state.revert_handler)
-
-
+gaphas_
-
-    def _unregister_undo_handlers(self):
@@ -316 +315 @@
-        state.observers.discard(state.revert_handler)
-
-
+gaphas_
-
-

gaphor/trunk/tests/test_association_undo.py

@@ -123 +123 @@
-        #assert len(y_cons) == 0, y_cons
-
+    def testAssociationDelete(self):
+        factory = Application.get_service('element_factory')
+        undo_manager = Application.get_service('undo_manager')
+
+        diagram = factory.create(UML.Diagram)
+        solver = diagram.canvas.solver
+        
+        class1 = factory.create(UML.Class)
+        class1.name = 'class1'
+        classItem1 = diagram.create(items.ClassItem, subject=class1)
+
+        class2 = factory.create(UML.Class)
+        class2.name = 'class2'
+        classItem2 = diagram.create(items.ClassItem, subject=class2)
+        
+        assoc = diagram.create(items.AssociationItem)
+        assert assoc.subject is None
+
+        adapter = component.queryMultiAdapter((classItem1, assoc), IConnect)
+        assert adapter
+        adapter.connect(assoc.handles()[0])
+        
+        adapter = component.queryMultiAdapter((classItem2, assoc), IConnect)
+        assert adapter
+        adapter.connect(assoc.handles()[1])
+        
+        assoc_subject = assoc.subject
+        assert assoc.subject
+        assert assoc.head_end.subject
+        assert assoc.tail_end.subject
+        assert assoc.head.connected_to is classItem1
+        assert assoc.tail.connected_to is classItem2
+
+        former = (assoc.subject, assoc.head_end.subject, assoc.tail_end.subject)
+
+        assert len(solver._constraints) == 14, len(solver._constraints)
+
+        tx = transaction.Transaction()
+
+        assoc.unlink()
+        
+        tx.commit()
+
+        assert assoc.canvas is None
+        assert assoc.subject is None
+        assert assoc.head_end.subject is None
+        assert assoc.tail_end.subject is None
+        assert assoc.head.connected_to is None
+        assert assoc.tail.connected_to is None
+
+        assert undo_manager.can_undo()
+
+        print
+        print '-' * 80
+        print
+
+        undo_manager.undo_transaction()
+
+        print
+        print '-' * 80
+        print
+
+        assert not undo_manager.can_undo()
+
+        assert assoc.canvas
+        assert assoc.subject is assoc_subject
+        assert assoc.head_end.subject
+        assert assoc.tail_end.subject
+
+        assert len(solver._constraints) == 14, len(solver._constraints)
+        assert assoc.head.connected_to is classItem1, assoc.head.connected_to
+        assert assoc.tail.connected_to is classItem2, assoc.head.connected_to
+
-
-if __name__ == '__main__':