Bug 515998 - [SequenceDiagram] Fix existed Tests for the Sequence

diagram

Change-Id: I2e784e7bb0354a1f4846264e6544f462c6829e7d

7 files changed, 45 insertions, 29 deletions

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/IdentityAnchorHelper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/IdentityAnchorHelper.java
index ad16194ef82..8e8d5f0243e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/IdentityAnchorHelper.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/IdentityAnchorHelper.java
@@ -74,6 +74,9 @@ public class IdentityAnchorHelper {
 	 */

 	public static final double getYPercentage(final IdentityAnchor anchor) {

 		String id = anchor.getId();

+		if(id.indexOf(X_Y_SEPARATOR_AS_STRING)==-1) {

+			return 0;

+		}

 		id = id.substring(id.indexOf(X_Y_SEPARATOR_AS_STRING) + 1, id.length() - 1);

 		if(id.indexOf(END_ID)!=-1){

 			id = id.substring(0, id.indexOf(END_ID));

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CInteractionInteractionCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CInteractionInteractionCompartmentEditPart.java
index f5e0d6b1766..c3a8363beb7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CInteractionInteractionCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CInteractionInteractionCompartmentEditPart.java
@@ -13,8 +13,10 @@
 

 package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

+import org.eclipse.gef.EditPart;

 import org.eclipse.gef.Request;

 import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.requests.ReconnectRequest;

 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;

 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest.ViewAndElementDescriptor;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

@@ -57,5 +59,17 @@ public class CInteractionInteractionCompartmentEditPart extends InteractionInter
 		}

 		return super.getCommand(request);

 	}

-

+	/**

+	 * @see org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionInteractionCompartmentEditPart#getTargetEditPart(org.eclipse.gef.Request)

+	 *

+	 * @param request

+	 * @return

+	 */

+	@Override

+	public EditPart getTargetEditPart(Request request) {

+		if( request instanceof ReconnectRequest) {

+			return this.getParent();

+		}

+		return super.getTargetEditPart(request);

+	}

 }

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCreationUndo_384618.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCreationUndo_384618.java
index 99f871932b0..1085ba65122 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCreationUndo_384618.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCreationUndo_384618.java
@@ -29,8 +29,11 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;
 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.commands.ICreationCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.CustomMessages;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.papyrus.uml.diagram.sequence.tests.ISequenceDiagramTestsConstants;

 import org.eclipse.papyrus.uml.diagram.sequence.tests.canonical.CreateSequenceDiagramCommand;

@@ -178,6 +181,9 @@ public class TestCreationUndo_384618 extends TestLink {
 

 	@Test

 	public void testMessageSync() {

+		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

+		store.setValue(CustomMessages.PREF_EXECUTION_SPECIFICATION_SYNC_MSG, "CHOICE_NONE");

+		

 		createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));

 		createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(300, 100), new Dimension(62, 200));

 		final LifelineEditPart lifeline1 = (LifelineEditPart)getRootEditPart().getChildren().get(0);

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageCreate_379661.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageCreate_379661.java
index 56c156ccafa..ee72d2d4464 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageCreate_379661.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageCreate_379661.java
@@ -120,29 +120,7 @@ public class TestMessageCreate_379661 extends TestLink {
 		assertTrue(CREATION + TEST_THE_REDO, lifeline1.getSourceConnections().size() == 1);

 	}

 

-	@Test

-	public void testMove() {

-		createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));

-		createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(150, 100), new Dimension(62, 200));

-		final LifelineEditPart lifeline1 = (LifelineEditPart)getRootEditPart().getChildren().get(0);

-		final LifelineEditPart lifeline2 = (LifelineEditPart)getRootEditPart().getChildren().get(1);

-		waitForComplete();

-

-		LifelineFigure fig = lifeline2.getPrimaryShape();

-		Rectangle bounds = fig.getBounds().getCopy();

-		fig.translateToAbsolute(bounds);

-

-		createLink(UMLElementTypes.Message_CreateEdge, lifeline1, lifeline2, getAbsoluteCenter(lifeline1), bounds.getCenter());

-		waitForComplete();

-		assertTrue(CREATION + TEST_THE_EXECUTION, lifeline1.getSourceConnections().size() == 1);

-

-		moveLifeline(lifeline1, new Point(20, 0));

-		moveLifeline(lifeline2, new Point(50, 0));

-		moveLifeline(lifeline2, new Point(-20, 0));

-

-		moveLifeline(lifeline2, new Point(0, 30));

-		moveLifeline(lifeline2, new Point(0, -10));

-	}

+	

 

 	protected void moveLifeline(LifelineEditPart lifelineEP, Point moveDelta) {

 		ChangeBoundsRequest req = new ChangeBoundsRequest(RequestConstants.REQ_MOVE);

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageLostFound_384202.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageLostFound_384202.java
index 797a028e74b..a90a3b7fd10 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageLostFound_384202.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageLostFound_384202.java
@@ -220,6 +220,9 @@ public class TestMessageLostFound_384202 extends TestLink {
 				Dimension delta = anchorOwningFigure.getBounds().getLocation().getDifference(partFigure.getBounds().getLocation());

 				// get position from anchor id

 				String oldTerminal = ((IdentityAnchor)idAnchor).getId();

+				if( oldTerminal.indexOf(",")==-1) {

+					assertTrue("The resulted anchor is bad build", false);

+					}

 				PrecisionPoint pp = BaseSlidableAnchor.parseTerminalString(oldTerminal);

 				int xPos = linkedPartBounds.x + delta.width + (int)Math.round(anchorOwningFigure.getBounds().width * pp.preciseX);

 				int yPos = linkedPartBounds.y + delta.height + (int)Math.round(anchorOwningFigure.getBounds().height * pp.preciseY);

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessagesDeletion_364828.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessagesDeletion_364828.java
index 88da41ca519..d7857f4754d 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessagesDeletion_364828.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessagesDeletion_364828.java
@@ -33,11 +33,14 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;
 import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.commands.ICreationCommand;

 import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;

+import org.eclipse.papyrus.uml.diagram.sequence.CustomMessages;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.AbstractExecutionSpecificationEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.papyrus.uml.diagram.sequence.tests.ISequenceDiagramTestsConstants;

 import org.eclipse.papyrus.uml.diagram.sequence.tests.canonical.CreateSequenceDiagramCommand;

@@ -132,27 +135,31 @@ public class TestMessagesDeletion_364828 extends TestLink {
 	}

 

 	@Test

-	public void testMessageAsync_4004() {

+	public void testMessageAsync() {

+		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

+		store.setValue(CustomMessages.PREF_EXECUTION_SPECIFICATION_ASYNC_MSG, "CHOICE_NONE");

 		deleteMessageEvents(UMLElementTypes.Lifeline_Shape, UMLElementTypes.Lifeline_Shape, UMLElementTypes.Message_AsynchEdge, lifelineProvider);

 	}

 

 	@Test

-	public void testMessageSync_4003() {

+	public void testMessageSync() {

+		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

+		store.setValue(CustomMessages.PREF_EXECUTION_SPECIFICATION_SYNC_MSG, "CHOICE_NONE");

 		deleteMessageEvents(UMLElementTypes.Lifeline_Shape, UMLElementTypes.Lifeline_Shape, UMLElementTypes.Message_SynchEdge, lifelineProvider);

 	}

 

 	@Test

-	public void testMessageReply_4005() {

+	public void testMessageReply() {

 		deleteMessageEvents(UMLElementTypes.Lifeline_Shape, UMLElementTypes.Lifeline_Shape, UMLElementTypes.Message_ReplyEdge, lifelineProvider);

 	}

 

 	@Test

-	public void testMessageDelete_4007() {

+	public void testMessageDelete() {

 		deleteMessageEvents(UMLElementTypes.Lifeline_Shape, UMLElementTypes.Lifeline_Shape, UMLElementTypes.Message_DeleteEdge, lifelineProvider);

 	}

 

 	@Test

-	public void testMessageCreate_4006() {

+	public void testMessageCreate() {

 		deleteMessageEvents(UMLElementTypes.Lifeline_Shape, UMLElementTypes.Lifeline_Shape, UMLElementTypes.Message_CreateEdge, lifelineProvider);

 	}

 

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestSequenceDiagramLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestSequenceDiagramLink.java
index 4bda77d9ae4..a89b71428c5 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestSequenceDiagramLink.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestSequenceDiagramLink.java
@@ -23,10 +23,13 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.commands.ICreationCommand;

+import org.eclipse.papyrus.uml.diagram.sequence.CustomMessages;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.AbstractExecutionSpecificationEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.papyrus.uml.diagram.sequence.tests.ISequenceDiagramTestsConstants;

 import org.eclipse.uml2.uml.Element;

@@ -101,6 +104,8 @@ public class TestSequenceDiagramLink extends TestLink {
 

 	@Test

 	public void testToManageMessageAsync_4004() {

+		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

+		store.setValue(CustomMessages.PREF_EXECUTION_SPECIFICATION_ASYNC_MSG, "CHOICE_NONE");

 		testToManageLink(UMLElementTypes.Lifeline_Shape, UMLElementTypes.Lifeline_Shape, UMLElementTypes.Message_AsynchEdge, lifelineProvider, true);

 	}