Changeset 2158

Timestamp:

10/05/07 07:25:28 (1 year ago)

Author:

arj..@yirdis.nl

Message:

identified (one) problem of ticket #77: undone constraint is not related to handle on undo event.

Files:

• gaphor/trunk/tests/test_association_undo.py (modified) (4 diffs)

gaphor/trunk/tests/test_association_undo.py

@@ -28 +28 @@
-
-        diagram = factory.create(UML.Diagram)
+        solver = diagram.canvas.solver
-        
-        class1 = factory.create(UML.Class)
@@ -54 +55 @@
-        former = (assoc.subject, assoc.head_end.subject, assoc.tail_end.subject)
-        
+        # Also check solver state:
+        x_cons = list(solver.constraints_with_variable(assoc.handles()[1].x))
+        y_cons = list(solver.constraints_with_variable(assoc.handles()[1].y))
+
+        assert len(solver._constraints) == 14, len(solver._constraints)
+        #assert len(x_cons) == 1, x_cons
+        #assert len(y_cons) == 1, y_cons
+
-        tx = transaction.Transaction()
-        
@@ -65 +74 @@
-        assert assoc.head_end.subject is None
-        assert assoc.tail_end.subject is None
+
+        # Also check solver state:
+        x_cons = list(solver.constraints_with_variable(assoc.handles()[1].x))
+        y_cons = list(solver.constraints_with_variable(assoc.handles()[1].y))
+
+        assert len(solver._constraints) == 13, len(solver._constraints)
+        #assert len(x_cons) == 0, x_cons
+        #assert len(y_cons) == 0, y_cons
-
-        undo_manager = Application.get_service('undo_manager')
@@ -78 +95 @@
-        assert assoc.tail_end.subject is former[2]
-
+        # Also check solver state:
+        x_cons = list(solver.constraints_with_variable(assoc.handles()[1].x))
+        y_cons = list(solver.constraints_with_variable(assoc.handles()[1].y))
+
+        assert len(solver._constraints) == 14, len(solver._constraints)
+        assert len(x_cons) == 0, x_cons
+        assert len(y_cons) == 0, y_cons
+
+
+        # Disconnect again:
+
+        adapter = component.queryMultiAdapter((classItem2, assoc), IConnect)
+        assert adapter
+        adapter.disconnect(assoc.handles()[1])
-        
+        assert assoc.subject is None
+        assert assoc.head_end.subject is None
+        assert assoc.tail_end.subject is None
+
+        # Also check solver state:
+        x_cons = list(solver.constraints_with_variable(assoc.handles()[1].x))
+        y_cons = list(solver.constraints_with_variable(assoc.handles()[1].y))
+
+        # Ah hah! the constraint is not disconnected again!
+        # (Added to solver, not to Handle I guess)
+        assert len(solver._constraints) == 13, len(solver._constraints)
+        #assert len(x_cons) == 0, x_cons
+        #assert len(y_cons) == 0, y_cons
+
-
-if __name__ == '__main__':