Bug 515998: [SequenceDiagram] Fix existed Tests for the Sequence diagram

https://bugs.eclipse.org/bugs/show_bug.cgi?id=515998


Change-Id: If105658e59faf0e5f0a4797de97663a65575723c
Signed-off-by: Fanch BONNABESSE <fanch.bonnabesse@all4tec.net>

5 files changed, 82 insertions, 95 deletions

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentKind_364710.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentKind_364710.java
index d38c8e63dbf..5d24742587f 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentKind_364710.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentKind_364710.java
@@ -37,12 +37,10 @@ import org.eclipse.papyrus.commands.ICreationCommand;
 import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.junit.framework.classification.FailingTest;
+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CCombinedFragmentEditPart;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentCombinedFragmentCompartmentEditPart;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart;
-import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConsiderIgnoreFragmentEditPart;
-import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CustomConsiderIgnoreFragmentEditPart;
-import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CustomContinuationEditPart;
+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ContinuationEditPart;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionOperandEditPart;
 import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;
 import org.eclipse.papyrus.uml.diagram.sequence.tests.ISequenceDiagramTestsConstants;
@@ -87,58 +85,56 @@ public class TestCombinedFragmentKind_364710 extends TestTopNode {
 		return ISequenceDiagramTestsConstants.FILE_NAME;
 	}
 
-	@FailingTest ("To be erased or rewritten to take new architecture into account")
 	@Test
 	public void testConsiderIgnoreFragment() {
 		createNode(UMLElementTypes.ConsiderIgnoreFragment_Shape, getRootEditPart(), new Point(10, 80), new Dimension(100, 100));
-		ConsiderIgnoreFragmentEditPart cep = (ConsiderIgnoreFragmentEditPart)getRootEditPart().getChildren().get(0);
-		final CombinedFragmentCombinedFragmentCompartmentEditPart cfp = (CombinedFragmentCombinedFragmentCompartmentEditPart)cep.getChildren().get(0);
+		CCombinedFragmentEditPart cep = (CCombinedFragmentEditPart) getRootEditPart().getChildren().get(0);
+		final CombinedFragmentCombinedFragmentCompartmentEditPart cfp = (CombinedFragmentCombinedFragmentCompartmentEditPart) cep.getChildren().get(0);
 
 		// add operand
 		createNode(UMLElementTypes.InteractionOperand_Shape, cfp, new Point(30, 100), new Dimension(100, 100));
 		assertTrue(CREATION + TEST_THE_EXECUTION, cfp.getChildren().size() == 2);
 
-		CombinedFragment cf = (CombinedFragment)cep.resolveSemanticElement();
+		CombinedFragment cf = (CombinedFragment) cep.resolveSemanticElement();
 		InteractionOperatorKind[] list = { InteractionOperatorKind.IGNORE_LITERAL, InteractionOperatorKind.CONSIDER_LITERAL };
-		for(int i = 0; i < list.length; i++) {
+		for (int i = 0; i < list.length; i++) {
 			changeOperatorKind(cep, cf, list[i]);
 			assertTrue(CHANGE_OPERATOR_KIND + TEST_THE_EXECUTION, cf.getInteractionOperator() == list[i]);
 		}
 	}
-	
-	@FailingTest ("To be erased or rewritten to take new architecture into account")
+
 	@Test
 	public void testCombinedFragment() {
 		createNode(UMLElementTypes.CombinedFragment_Shape, getRootEditPart(), new Point(10, 80), new Dimension(100, 100));
-		CombinedFragmentEditPart cep = (CombinedFragmentEditPart)getRootEditPart().getChildren().get(0);
-		final CombinedFragmentCombinedFragmentCompartmentEditPart cfp = (CombinedFragmentCombinedFragmentCompartmentEditPart)cep.getChildren().get(0);
+		CombinedFragmentEditPart cep = (CombinedFragmentEditPart) getRootEditPart().getChildren().get(0);
+		final CombinedFragmentCombinedFragmentCompartmentEditPart cfp = (CombinedFragmentCombinedFragmentCompartmentEditPart) cep.getChildren().get(0);
 
 		// add operand
 		createNode(UMLElementTypes.InteractionOperand_Shape, cfp, new Point(30, 100), new Dimension(100, 100));
-		assertEquals(CREATION + TEST_THE_EXECUTION,1, cfp.getChildren().size());
+		assertEquals(CREATION + TEST_THE_EXECUTION, 2, cfp.getChildren().size());
 
-		CombinedFragment cf = (CombinedFragment)cep.resolveSemanticElement();
-		InteractionOperatorKind[] list = { InteractionOperatorKind.ALT_LITERAL, InteractionOperatorKind.PAR_LITERAL, InteractionOperatorKind.STRICT_LITERAL, InteractionOperatorKind.CRITICAL_LITERAL, InteractionOperatorKind.ASSERT_LITERAL, InteractionOperatorKind.SEQ_LITERAL };
-		for(int i = 0; i < list.length; i++) {
+		CombinedFragment cf = (CombinedFragment) cep.resolveSemanticElement();
+		InteractionOperatorKind[] list = { InteractionOperatorKind.ALT_LITERAL, InteractionOperatorKind.PAR_LITERAL, InteractionOperatorKind.STRICT_LITERAL, InteractionOperatorKind.CRITICAL_LITERAL, InteractionOperatorKind.ASSERT_LITERAL,
+				InteractionOperatorKind.SEQ_LITERAL };
+		for (int i = 0; i < list.length; i++) {
 			changeOperatorKind(cep, cf, list[i]);
 		}
 	}
 
-	@FailingTest
 	@Test
 	public void testCombinedFragmentContinuation() throws CoreException {
 		createNode(UMLElementTypes.CombinedFragment_Shape, getRootEditPart(), new Point(10, 80), new Dimension(100, 100));
-		CombinedFragmentEditPart cep = (CombinedFragmentEditPart)getRootEditPart().getChildren().get(0);
-		final CombinedFragmentCombinedFragmentCompartmentEditPart cfp = (CombinedFragmentCombinedFragmentCompartmentEditPart)cep.getChildren().get(0);
+		CombinedFragmentEditPart cep = (CombinedFragmentEditPart) getRootEditPart().getChildren().get(0);
+		final CombinedFragmentCombinedFragmentCompartmentEditPart cfp = (CombinedFragmentCombinedFragmentCompartmentEditPart) cep.getChildren().get(0);
 
-		CombinedFragment cf = (CombinedFragment)cep.resolveSemanticElement();
+		CombinedFragment cf = (CombinedFragment) cep.resolveSemanticElement();
 		changeOperatorKind(cep, cf, InteractionOperatorKind.ALT_LITERAL);
-		
+
 		// add continuation
-		InteractionOperandEditPart op = (InteractionOperandEditPart)cfp.getChildren().get(0);
+		InteractionOperandEditPart op = (InteractionOperandEditPart) cfp.getChildren().get(0);
 		createNode(UMLElementTypes.Continuation_Shape, op, new Point(1, 1), new Dimension(20, 60));
 		assertTrue(CREATION + TEST_THE_EXECUTION, op.getChildren().size() == 2);
-		CustomContinuationEditPart ccep = (CustomContinuationEditPart)op.getChildren().get(1);
+		ContinuationEditPart ccep = (ContinuationEditPart) op.getChildren().get(1);
 		Continuation continuation = (Continuation) ccep.resolveSemanticElement();
 		changeContinuationSetting(ccep, continuation, false);
 
@@ -161,7 +157,7 @@ public class TestCombinedFragmentKind_364710 extends TestTopNode {
 		assertTrue(CHANGE_OPERATOR_KIND + TEST_THE_EXECUTION, cf.getInteractionOperator() == kind);
 	}
 
-	protected void changeContinuationSetting(CustomContinuationEditPart p, Continuation cf, Boolean isSetting) {
+	protected void changeContinuationSetting(ContinuationEditPart p, Continuation cf, Boolean isSetting) {
 		EAttribute feature = UMLPackage.eINSTANCE.getContinuation_Setting();
 		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(cf);
 		SetRequest request = new SetRequest(p.getEditingDomain(), cf, feature, isSetting);
@@ -174,7 +170,7 @@ public class TestCombinedFragmentKind_364710 extends TestTopNode {
 	}
 
 	public void createNode(IElementType type, EditPart parentPart, Point location, Dimension size) {
-		//CREATION
+		// CREATION
 		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getRootEditPart().getDiagramPreferencesHint());
 		requestcreation.setLocation(location);
 		requestcreation.setSize(size);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentOperand_364701.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentOperand_364701.java
index 1c1e2fe3ce7..29ccaf108d2 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentOperand_364701.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentOperand_364701.java
@@ -37,7 +37,6 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.papyrus.commands.ICreationCommand;
 import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;
-import org.eclipse.papyrus.junit.framework.classification.FailingTest;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentCombinedFragmentCompartmentEditPart;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionOperandEditPart;
@@ -72,7 +71,6 @@ public class TestCombinedFragmentOperand_364701 extends TestTopNode {
 		return ISequenceDiagramTestsConstants.FILE_NAME;
 	}
 
-	@FailingTest("To be erased or rewritten to take new architecture into account")
 	@Test
 	public void testOperandAddDelete() {
 		final CombinedFragmentCombinedFragmentCompartmentEditPart cfp = setupCombinedFragment();
@@ -80,13 +78,13 @@ public class TestCombinedFragmentOperand_364701 extends TestTopNode {
 		// add operand
 		{
 			createNode(UMLElementTypes.InteractionOperand_Shape, cfp, new Point(50, 100), new Dimension(100, 100));
-			assertEquals(CREATION + TEST_THE_EXECUTION,1, cfp.getChildren().size());
+			assertEquals(CREATION + TEST_THE_EXECUTION, 2, cfp.getChildren().size());
 
 			getDiagramCommandStack().undo();
-			assertEquals(CREATION + TEST_THE_UNDO,0, cfp.getChildren().size());
+			assertEquals(CREATION + TEST_THE_UNDO, 1, cfp.getChildren().size());
 
 			getDiagramCommandStack().redo();
-			assertEquals(CREATION + TEST_THE_REDO,1, cfp.getChildren().size());
+			assertEquals(CREATION + TEST_THE_REDO, 2, cfp.getChildren().size());
 		}
 
 		{ // delete operand
@@ -98,18 +96,18 @@ public class TestCombinedFragmentOperand_364701 extends TestTopNode {
 			assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
 			getEMFCommandStack().execute(new GEFtoEMFCommandWrapper(command));
 			waitForComplete();
-			assertEquals(DESTROY_DELETION + TEST_THE_EXECUTION,0, cfp.getChildren().size());
+			assertEquals(DESTROY_DELETION + TEST_THE_EXECUTION, 1, cfp.getChildren().size());
 
 			getEMFCommandStack().undo();
-			assertEquals(DESTROY_DELETION + TEST_THE_UNDO,1, cfp.getChildren().size());
+			assertEquals(DESTROY_DELETION + TEST_THE_UNDO, 2, cfp.getChildren().size());
 
 			getEMFCommandStack().redo();
-			assertEquals(DESTROY_DELETION + TEST_THE_REDO,0, cfp.getChildren().size());
+			assertEquals(DESTROY_DELETION + TEST_THE_REDO, 1, cfp.getChildren().size());
 		}
 		getEMFCommandStack().undo();
 
 		{ // delete view
-			assertEquals(VIEW_DELETION + INITIALIZATION_TEST,1, cfp.getChildren().size());
+			assertEquals(VIEW_DELETION + INITIALIZATION_TEST, 2, cfp.getChildren().size());
 			InteractionOperandEditPart op = (InteractionOperandEditPart) cfp.getChildren().get(0);
 			Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);
 			Command command = op.getCommand(deleteViewRequest);
@@ -118,13 +116,13 @@ public class TestCombinedFragmentOperand_364701 extends TestTopNode {
 			assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
 
 			getDiagramCommandStack().execute(command);
-			assertEquals(VIEW_DELETION + TEST_THE_EXECUTION,0, cfp.getChildren().size());
+			assertEquals(VIEW_DELETION + TEST_THE_EXECUTION, 1, cfp.getChildren().size());
 
 			getDiagramCommandStack().undo();
-			assertEquals(VIEW_DELETION + TEST_THE_UNDO,1, cfp.getChildren().size());
+			assertEquals(VIEW_DELETION + TEST_THE_UNDO, 2, cfp.getChildren().size());
 
 			getDiagramCommandStack().redo();
-			assertEquals(VIEW_DELETION + TEST_THE_REDO,0, cfp.getChildren().size());
+			assertEquals(VIEW_DELETION + TEST_THE_REDO, 1, cfp.getChildren().size());
 		}
 	}
 
@@ -132,11 +130,11 @@ public class TestCombinedFragmentOperand_364701 extends TestTopNode {
 		createNode(UMLElementTypes.CombinedFragment_Shape, getRootEditPart(), new Point(30, 80), new Dimension(100, 100));
 		CombinedFragmentEditPart cep = (CombinedFragmentEditPart) getRootEditPart().getChildren().get(0);
 		final CombinedFragmentCombinedFragmentCompartmentEditPart cfp = (CombinedFragmentCombinedFragmentCompartmentEditPart) cep.getChildren().get(0);
-		assertEquals(CREATION + INITIALIZATION_TEST,0, cfp.getChildren().size());
+		assertEquals(CREATION + INITIALIZATION_TEST, 1, cfp.getChildren().size());
 		return cfp;
 	}
 
-	
+
 	protected void resizeEast(IGraphicalEditPart op, Dimension deltaSize) {
 		Point p = getRight(op);
 		ChangeBoundsRequest req = new ChangeBoundsRequest(RequestConstants.REQ_RESIZE);
@@ -189,22 +187,22 @@ public class TestCombinedFragmentOperand_364701 extends TestTopNode {
 
 	private void manageResizeCommnad(IGraphicalEditPart op, Dimension deltaSize, Command c) {
 		assertNotNull(OPERAND_RESIZE + COMMAND_NULL, c);
-		assertTrue(OPERAND_RESIZE + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, c.canExecute() );
+		assertTrue(OPERAND_RESIZE + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, c.canExecute());
 		Rectangle before = getAbsoluteBounds(op);
 		getEMFCommandStack().execute(new GEFtoEMFCommandWrapper(c));
 		waitForComplete();
 
 		Rectangle after = getAbsoluteBounds(op);
-		assertEquals(OPERAND_RESIZE + TEST_THE_EXECUTION,deltaSize.width(), after.width() - before.width());
-		assertEquals(OPERAND_RESIZE + TEST_THE_EXECUTION,deltaSize.height(), after.height() - before.height());
+		assertEquals(OPERAND_RESIZE + TEST_THE_EXECUTION, deltaSize.width(), after.width() - before.width());
+		assertEquals(OPERAND_RESIZE + TEST_THE_EXECUTION, deltaSize.height(), after.height() - before.height());
 
 		getEMFCommandStack().undo();
 		waitForComplete();
-		assertEquals(OPERAND_RESIZE + TEST_THE_UNDO, before,getAbsoluteBounds(op));
+		assertEquals(OPERAND_RESIZE + TEST_THE_UNDO, before, getAbsoluteBounds(op));
 
 		getEMFCommandStack().redo();
 		waitForComplete();
-		assertEquals(OPERAND_RESIZE + TEST_THE_REDO, after,getAbsoluteBounds(op));
+		assertEquals(OPERAND_RESIZE + TEST_THE_REDO, after, getAbsoluteBounds(op));
 	}
 
 	public void createNode(IElementType type, EditPart parentPart, Point location, Dimension size) {
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 0fc18bd9231..6750d351bdf 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
@@ -31,7 +31,6 @@ 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.junit.framework.classification.FailingTest;
 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.preferences.CustomDiagramGeneralPreferencePage;
@@ -39,7 +38,6 @@ 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;
 import org.eclipse.papyrus.uml.diagram.sequence.tests.canonical.TestLink;
-import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -181,7 +179,6 @@ public class TestCreationUndo_384618 extends TestLink {
 		assertTrue(CREATION + TEST_THE_REDO, lifeline1.getSourceConnections().size() == 1);
 	}
 
-	@FailingTest("To be erased or rewritten to take new architecture into account")
 	@Test
 	public void testMessageSync() {
 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();
@@ -200,7 +197,7 @@ public class TestCreationUndo_384618 extends TestLink {
 		IGraphicalEditPart source = (IGraphicalEditPart) lifeline1.getChildren().get(1);
 		IGraphicalEditPart target = (IGraphicalEditPart) lifeline2.getChildren().get(1);
 
-		createLink(UMLElementTypes.Message_SynchEdge, source, target, getAbsoluteCenter(source), getAbsoluteCenter(target).translate(0, -28));
+		createLink(UMLElementTypes.Message_SynchEdge, source, target, getAbsoluteCenter(source), getAbsoluteCenter(target).translate(0, -1));
 		waitForComplete();
 		assertTrue(CREATION + TEST_THE_EXECUTION, source.getSourceConnections().size() == 1);
 
@@ -215,7 +212,6 @@ public class TestCreationUndo_384618 extends TestLink {
 	}
 
 	@Test
-	@Ignore
 	public void testMessageReply() {
 		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));
@@ -230,7 +226,7 @@ public class TestCreationUndo_384618 extends TestLink {
 		IGraphicalEditPart source = (IGraphicalEditPart) lifeline1;
 		IGraphicalEditPart target = (IGraphicalEditPart) lifeline2;
 
-		createLink(UMLElementTypes.Message_ReplyEdge, source, target, getAbsoluteCenter(source), getAbsoluteCenter(target).translate(0, -28));
+		createLink(UMLElementTypes.Message_ReplyEdge, source, target, getAbsoluteCenter(source), getAbsoluteCenter(target).translate(0, 1));
 		waitForComplete();
 		assertTrue(CREATION + TEST_THE_EXECUTION, source.getSourceConnections().size() == 1);
 
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 9c74eff1904..11f7a2c1abd 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
@@ -73,17 +73,16 @@ public class TestMessageLostFound_384202 extends TestLink {
 		return ISequenceDiagramTestsConstants.FILE_NAME;
 	}
 
-	@FailingTest ("To be erased or rewritten to take new architecture into account")
 	@Test
 	public void testMessageFound() {
 		createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
 
-		final LifelineEditPart lifeline1 = (LifelineEditPart)getRootEditPart().getChildren().get(0);
+		final LifelineEditPart lifeline1 = (LifelineEditPart) getRootEditPart().getChildren().get(0);
 
 		waitForComplete();
-		source = (GraphicalEditPart)getRootEditPart().getParent();
+		source = (GraphicalEditPart) getRootEditPart().getParent();
 
-		createLink(UMLElementTypes.Message_FoundEdge, source, lifeline1, getAbsoluteCenter(source), getAbsoluteCenter(lifeline1)); // new Point(100,0)
+		createLink(UMLElementTypes.Message_FoundEdge, source, lifeline1, getAbsoluteCenter(lifeline1).translate(100, 0), getAbsoluteCenter(lifeline1)); // new Point(100,0)
 		waitForComplete();
 		assertTrue(CREATION + TEST_THE_EXECUTION, source.getSourceConnections().size() == 1);
 
@@ -96,15 +95,14 @@ public class TestMessageLostFound_384202 extends TestLink {
 		assertTrue(CREATION + TEST_THE_REDO, source.getSourceConnections().size() == 1);
 	}
 
-	@FailingTest ("To be erased or rewritten to take new architecture into account")
 	@Test
 	public void testMessageLost() {
 		createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
 
-		final LifelineEditPart lifeline1 = (LifelineEditPart)getRootEditPart().getChildren().get(0);
+		final LifelineEditPart lifeline1 = (LifelineEditPart) getRootEditPart().getChildren().get(0);
 
 		waitForComplete();
-		target = (GraphicalEditPart)getRootEditPart().getParent();
+		target = (GraphicalEditPart) getRootEditPart().getParent();
 
 		createLink(UMLElementTypes.Message_LostEdge, lifeline1, target, getAbsoluteCenter(lifeline1), getAbsoluteCenter(target)); // getAbsoluteBounds(target).getBottomRight());
 		waitForComplete();
@@ -119,21 +117,21 @@ public class TestMessageLostFound_384202 extends TestLink {
 		assertTrue(CREATION + TEST_THE_REDO, lifeline1.getSourceConnections().size() == 1);
 	}
 
-	@FailingTest ("To be erased or rewritten to take new architecture into account")
+	@FailingTest("To be erased or rewritten to take new architecture into account")
 	@Test
 	public void testGeneralOrderingOnExecution() {
 		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);
-		final LifelineEditPart lifeline2 = (LifelineEditPart)getRootEditPart().getChildren().get(1);
+		final LifelineEditPart lifeline1 = (LifelineEditPart) getRootEditPart().getChildren().get(0);
+		final LifelineEditPart lifeline2 = (LifelineEditPart) getRootEditPart().getChildren().get(1);
 		waitForComplete();
 
 		createNode(UMLElementTypes.BehaviorExecutionSpecification_Shape, lifeline1, new Point(131, 140), new Dimension(20, 60));
 		createNode(UMLElementTypes.BehaviorExecutionSpecification_Shape, lifeline2, new Point(331, 200), new Dimension(20, 60));
 		waitForComplete();
 
-		IGraphicalEditPart source = (IGraphicalEditPart)lifeline1.getChildren().get(1);
-		IGraphicalEditPart target = (IGraphicalEditPart)lifeline2.getChildren().get(1);
+		IGraphicalEditPart source = (IGraphicalEditPart) lifeline1.getChildren().get(1);
+		IGraphicalEditPart target = (IGraphicalEditPart) lifeline2.getChildren().get(1);
 
 		createLink(UMLElementTypes.GeneralOrdering_Edge, source, target, getAbsoluteBounds(source).getTop(), getAbsoluteBounds(target).getTop());
 		waitForComplete();
@@ -149,17 +147,17 @@ public class TestMessageLostFound_384202 extends TestLink {
 
 	}
 
-	@FailingTest ("To be erased or rewritten to take new architecture into account")
+	@FailingTest("To be erased or rewritten to take new architecture into account")
 	@Test
 	public void testGeneralOrderingOnMessage() {
 		createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
 		createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(200, 100), new Dimension(62, 200));
 		createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(300, 100), new Dimension(62, 200));
 		createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(400, 100), new Dimension(62, 200));
-		final LifelineEditPart lifeline1 = (LifelineEditPart)getRootEditPart().getChildren().get(0);
-		final LifelineEditPart lifeline2 = (LifelineEditPart)getRootEditPart().getChildren().get(1);
-		final LifelineEditPart lifeline3 = (LifelineEditPart)getRootEditPart().getChildren().get(2);
-		final LifelineEditPart lifeline4 = (LifelineEditPart)getRootEditPart().getChildren().get(3);
+		final LifelineEditPart lifeline1 = (LifelineEditPart) getRootEditPart().getChildren().get(0);
+		final LifelineEditPart lifeline2 = (LifelineEditPart) getRootEditPart().getChildren().get(1);
+		final LifelineEditPart lifeline3 = (LifelineEditPart) getRootEditPart().getChildren().get(2);
+		final LifelineEditPart lifeline4 = (LifelineEditPart) getRootEditPart().getChildren().get(3);
 		waitForComplete();
 
 		createLink(UMLElementTypes.Message_AsynchEdge, lifeline1, lifeline2, getAbsoluteCenter(lifeline1).translate(0, -20), getAbsoluteCenter(lifeline2).translate(0, -20));
@@ -168,8 +166,8 @@ public class TestMessageLostFound_384202 extends TestLink {
 		assertTrue(CREATION + TEST_THE_EXECUTION, lifeline1.getSourceConnections().size() == 1);
 		assertTrue(CREATION + TEST_THE_EXECUTION, lifeline3.getSourceConnections().size() == 1);
 
-		AbstractMessageEditPart s = (AbstractMessageEditPart)lifeline1.getSourceConnections().get(0);
-		AbstractMessageEditPart t = (AbstractMessageEditPart)lifeline3.getSourceConnections().get(0);
+		AbstractMessageEditPart s = (AbstractMessageEditPart) lifeline1.getSourceConnections().get(0);
+		AbstractMessageEditPart t = (AbstractMessageEditPart) lifeline3.getSourceConnections().get(0);
 
 		createLink(UMLElementTypes.GeneralOrdering_Edge, lifeline1, lifeline3, getAbsoluteEdgeExtremity(s, true), getAbsoluteEdgeExtremity(t, true));
 		waitForComplete();
@@ -190,59 +188,59 @@ public class TestMessageLostFound_384202 extends TestLink {
 	 * Get the extremity of a connection edit part
 	 *
 	 * @param connection
-	 *        the connection edit part to find extremity
+	 *            the connection edit part to find extremity
 	 * @param isStart
-	 *        true to find the start, false for the end
+	 *            true to find the start, false for the end
 	 * @return connection's extremity in absolute coordinates or null
 	 */
 	public static Point getAbsoluteEdgeExtremity(ConnectionNodeEditPart connection, boolean isStart) {
 		Connection msgFigure = connection.getConnectionFigure();
-		if(connection.getNotationView() instanceof Edge) {
+		if (connection.getNotationView() instanceof Edge) {
 			// rather take up to date model information
-			Edge edge = (Edge)connection.getNotationView();
+			Edge edge = (Edge) connection.getNotationView();
 			Anchor idAnchor = null;
 			ConnectionAnchor conAnchor = null;
 			Object part = null;
-			if(isStart && connection.getSource() instanceof IGraphicalEditPart) {
+			if (isStart && connection.getSource() instanceof IGraphicalEditPart) {
 				View linkedFigure = edge.getSource();
 				// connection.getSource() may be not up to date, get part for linkedFigure
 				part = connection.getSource().getViewer().getEditPartRegistry().get(linkedFigure);
 				idAnchor = edge.getSourceAnchor();
 				conAnchor = msgFigure.getSourceAnchor();
-			} else if(!isStart && connection.getTarget() instanceof IGraphicalEditPart) {
+			} else if (!isStart && connection.getTarget() instanceof IGraphicalEditPart) {
 				View linkedFigure = edge.getTarget();
 				// connection.getTarget() may be not up to date, get part for linkedFigure
 				part = connection.getTarget().getViewer().getEditPartRegistry().get(linkedFigure);
 				idAnchor = edge.getTargetAnchor();
 				conAnchor = msgFigure.getTargetAnchor();
 			}
-			if(part instanceof IGraphicalEditPart && idAnchor instanceof IdentityAnchor && conAnchor != null) {
+			if (part instanceof IGraphicalEditPart && idAnchor instanceof IdentityAnchor && conAnchor != null) {
 				// take up to date bounds of the linked part in case it is moved
-				Rectangle linkedPartBounds = getAbsoluteBounds((IGraphicalEditPart)part);
+				Rectangle linkedPartBounds = getAbsoluteBounds((IGraphicalEditPart) part);
 
 				IFigure anchorOwningFigure = conAnchor.getOwner();
-				IFigure partFigure = ((IGraphicalEditPart)part).getFigure();
+				IFigure partFigure = ((IGraphicalEditPart) part).getFigure();
 				Dimension delta = anchorOwningFigure.getBounds().getLocation().getDifference(partFigure.getBounds().getLocation());
 				// get position from anchor id
-				String oldTerminal = ((IdentityAnchor)idAnchor).getId();
-				if( oldTerminal.indexOf(",")==-1) {
+				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);
+				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);
 				return new Point(xPos, yPos);
 			}
 		}
 		// can not get from model, rely on figure
-		if(msgFigure instanceof AbstractPointListShape) {
+		if (msgFigure instanceof AbstractPointListShape) {
 			Point extremity;
-			if(isStart) {
+			if (isStart) {
 				// start event of the message
-				extremity = ((AbstractPointListShape)msgFigure).getStart().getCopy();
+				extremity = ((AbstractPointListShape) msgFigure).getStart().getCopy();
 			} else {
 				// finish event of the message
-				extremity = ((AbstractPointListShape)msgFigure).getEnd().getCopy();
+				extremity = ((AbstractPointListShape) msgFigure).getEnd().getCopy();
 			}
 			msgFigure.getParent().translateToAbsolute(extremity);
 			return extremity;
@@ -260,7 +258,7 @@ public class TestMessageLostFound_384202 extends TestLink {
 	}
 
 	CreateConnectionViewRequest createConnectionViewRequest(IElementType type, EditPart source, EditPart target, Point sourcePoint, Point targetPoint) {
-		CreateConnectionViewRequest connectionRequest = CreateViewRequestFactory.getCreateConnectionRequest(type, ((IGraphicalEditPart)getDiagramEditPart()).getDiagramPreferencesHint());
+		CreateConnectionViewRequest connectionRequest = CreateViewRequestFactory.getCreateConnectionRequest(type, ((IGraphicalEditPart) getDiagramEditPart()).getDiagramPreferencesHint());
 		connectionRequest.setLocation(sourcePoint);
 
 		connectionRequest.setSourceEditPart(null);
@@ -283,7 +281,7 @@ public class TestMessageLostFound_384202 extends TestLink {
 	}
 
 	public void createNode(IElementType type, EditPart parentPart, Point location, Dimension size) {
-		//CREATION
+		// CREATION
 		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getRootEditPart().getDiagramPreferencesHint());
 		requestcreation.setLocation(location);
 		requestcreation.setSize(size);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestCombinedFragmentChildNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestCombinedFragmentChildNode.java
index b8da25a2b61..3db7aa4778b 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestCombinedFragmentChildNode.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestCombinedFragmentChildNode.java
@@ -57,14 +57,13 @@ public class TestCombinedFragmentChildNode extends TestChildNode {
 		return ISequenceDiagramTestsConstants.FILE_NAME;
 	}
 
-	@FailingTest ("To be erased or rewritten to take new architecture into account")
+	@FailingTest("To be erased or rewritten to take new architecture into account")
 	@Test
 	public void testToManageOperand() {
 		testToManageChildNode(UMLElementTypes.InteractionOperand_Shape, combinedFragmentProvider);
 	}
 
 	@Test
-	@FailingTest
 	public void testToManageContinuation() {
 		testToManageChildNode(UMLElementTypes.Continuation_Shape, operandProvider);
 	}
@@ -149,16 +148,16 @@ public class TestCombinedFragmentChildNode extends TestChildNode {
 	IChildTestProvider combinedFragmentProvider = new IChildTestProvider() {
 
 		public int getEditPartChildrenSize() {
-			return getParentEditPart().getChildren().size() ;
+			return getParentEditPart().getChildren().size();
 		}
 
 		public int getSemanticChildrenSize() {
 			CombinedFragment cf = ((CombinedFragment) getParentEditPart().getNotationView().getElement());
-			return cf.getOperands().size() ;
+			return cf.getOperands().size();
 		}
 
 		public int getViewChildrenSize() {
-			return getParentEditPart().getNotationView().getChildren().size() ;
+			return getParentEditPart().getNotationView().getChildren().size();
 		}
 
 		public Element getDropElement() {