Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian W. Damus2018-04-23 19:36:28 +0000
committerNicolas FAUVERGUE2018-05-29 13:30:23 +0000
commite65c18ff964d6407a3c750de581984eafd9044ee (patch)
tree5cf684ab932e46d69000886d5e9bf624e605f49f /tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests
parentc18fa4d3b4a2c896323a3be417f13c58541b2166 (diff)
downloadorg.eclipse.papyrus-e65c18ff964d6407a3c750de581984eafd9044ee.tar.gz
org.eclipse.papyrus-e65c18ff964d6407a3c750de581984eafd9044ee.tar.xz
org.eclipse.papyrus-e65c18ff964d6407a3c750de581984eafd9044ee.zip
Bug 533676: [Sequence Diagram] Validation should be triggered after
creation of CombinedFragment or InteractionOperand Add custom well-formedness rules to check that messages and execution specifications do not cross interaction operand boundaries. Ensure that re-sizing of an interaction operand triggers validation of that operand and the interaction fragments that it contains, plus any messages originating or terminating within it. Because the default operand of a new combined fragment is now resized upon creation, a new operand is likewise validated for its contents. Fix validation hook and diagnostician extension point schema definitions to match reality of the extension point implementations. Remove UI contributions for validation, to avoid workflow interrution. Validation framework is still slow, but less intrusive for the user. A preference may control the validation activation on user actions. Update the failing compilation on gmfdiag.common.tests. Add a preference to switch on or off the validation. Change-Id: Ic7d83eb18315ce714dc7c71bff38276f330ef260 Also-by: RĂ©mi Schnekenburger <rschnekenburger@eclipsesource.com> Signed-off-by: Christian W. Damus <give.a.damus@gmail.com>
Diffstat (limited to 'tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests')
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/tests/MasterSlaveNotationSyncTest.java8
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/tests/NotationSyncOverrideTest.java8
2 files changed, 8 insertions, 8 deletions
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/tests/MasterSlaveNotationSyncTest.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/tests/MasterSlaveNotationSyncTest.java
index 1f5e77d73af..ba02ecda633 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/tests/MasterSlaveNotationSyncTest.java
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/tests/MasterSlaveNotationSyncTest.java
@@ -74,9 +74,9 @@ public class MasterSlaveNotationSyncTest {
private DiagramEditPart master;
- private EditPart class1EP;
+ private GraphicalEditPart class1EP;
- private EditPart class2EP;
+ private GraphicalEditPart class2EP;
public MasterSlaveNotationSyncTest() {
super();
@@ -266,8 +266,8 @@ public class MasterSlaveNotationSyncTest {
class1_class2 = class1.getOwnedAttribute(null, class2).getAssociation();
master = editor.getActiveDiagramEditor().getDiagramEditPart();
- class1EP = editor.requireEditPart(master, class1);
- class2EP = editor.requireEditPart(master, class2);
+ class1EP = (GraphicalEditPart) editor.requireEditPart(master, class1);
+ class2EP = (GraphicalEditPart) editor.requireEditPart(master, class2);
}
DiagramEditPart activate(String diagramName) {
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/tests/NotationSyncOverrideTest.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/tests/NotationSyncOverrideTest.java
index 269fa55d580..08c64209ed4 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/tests/NotationSyncOverrideTest.java
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/tests/NotationSyncOverrideTest.java
@@ -58,7 +58,7 @@ public class NotationSyncOverrideTest {
private DiagramEditPart master;
- private EditPart class2EP;
+ private GraphicalEditPart class2EP;
public NotationSyncOverrideTest() {
super();
@@ -76,7 +76,7 @@ public class NotationSyncOverrideTest {
editor.move(class2EP, newBounds.getLocation());
- EditPart class2Slave = editor.requireEditPart(slave, class2);
+ GraphicalEditPart class2Slave = (GraphicalEditPart) editor.requireEditPart(slave, class2);
if (verificationPoint()) {
assertThat(getBounds(class2Slave), is(newBounds));
@@ -127,7 +127,7 @@ public class NotationSyncOverrideTest {
editor.resize(class2EP, newBounds.getSize());
- EditPart class2Slave = editor.requireEditPart(slave, class2);
+ GraphicalEditPart class2Slave = (GraphicalEditPart) editor.requireEditPart(slave, class2);
if (verificationPoint()) {
assertThat(getBounds(class2Slave), is(newBounds));
@@ -177,7 +177,7 @@ public class NotationSyncOverrideTest {
class2 = (Class) rootPackage.getOwnedType("Class2");
master = editor.getActiveDiagramEditor().getDiagramEditPart();
- class2EP = editor.requireEditPart(master, class2);
+ class2EP = (GraphicalEditPart) editor.requireEditPart(master, class2);
}
DiagramEditPart activate(String diagramName) {

Back to the top