533700: [SequenceDiagram] Clean-up dead code

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

Fix the Sequence Test bundle

Change-Id: I929c789d39fa85670c2d3b957a8334e17b3692b9
Signed-off-by: Camille Letavernier <cletavernier@eclipsesource.com>

2 files changed, 9 insertions, 13 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/TestCombinedFragmentName_382951.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentName_382951.java
index 82b08c7bade..02809488214 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentName_382951.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentName_382951.java
@@ -30,14 +30,11 @@ import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.papyrus.commands.ICreationCommand;
 import org.eclipse.papyrus.junit.framework.classification.FailingTest;
-import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.OLDCustomCombinedFragmentEditPart;
-import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart;
-import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CustomConsiderIgnoreFragmentEditPart;
+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CCombinedFragmentEditPart;
 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.TestTopNode;
-import org.eclipse.uml2.uml.CombinedFragment;
 import org.eclipse.uml2.uml.ConsiderIgnoreFragment;
 import org.junit.Test;
 
@@ -71,17 +68,16 @@ public class TestCombinedFragmentName_382951 extends TestTopNode {
 		return ISequenceDiagramTestsConstants.FILE_NAME;
 	}
 
-	
-@FailingTest
+	@FailingTest
 	@Test
 	public void testConsiderIgnoreFragment() {
 		IEclipsePreferences store = InstanceScope.INSTANCE.getNode(PREF_STORE);
 		store.putBoolean(CONSIDER_FRAGMENT_KEY, false);
 
 		createNode(UMLElementTypes.ConsiderIgnoreFragment_Shape, getRootEditPart(), new Point(10, 80), new Dimension(100, 100));
-		CustomConsiderIgnoreFragmentEditPart cep = (CustomConsiderIgnoreFragmentEditPart)getRootEditPart().getChildren().get(0);
-		ConsiderIgnoreFragment cf = (ConsiderIgnoreFragment)cep.resolveSemanticElement();
-		WrappingLabel label = cep.getTitleLabel();
+		CCombinedFragmentEditPart cep = (CCombinedFragmentEditPart) getRootEditPart().getChildren().get(0);
+		ConsiderIgnoreFragment cf = (ConsiderIgnoreFragment) cep.resolveSemanticElement();
+		WrappingLabel label = cep.getPrimaryShape().getTitleLabel();
 		assertFalse(TEST_THE_EXECUTION, label.isVisible());
 
 		store.putBoolean(CONSIDER_FRAGMENT_KEY, true);
@@ -90,7 +86,7 @@ public class TestCombinedFragmentName_382951 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/m7/TestExecutionSpecificationPosition_395462.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestExecutionSpecificationPosition_395462.java
index fb1b6d2a2c9..969c3f6ef63 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestExecutionSpecificationPosition_395462.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestExecutionSpecificationPosition_395462.java
@@ -53,7 +53,6 @@ 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.AbstractExecutionSpecificationEditPart;
-import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.OLDLifelineEditPart;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineNameEditPart;
 import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;
@@ -256,12 +255,11 @@ public class TestExecutionSpecificationPosition_395462 extends AbstractNodeTest
 		assertNotNull(PREPARE_MODEL, booksProperty);
 		// set represents;
 		setRepresents(host, booksProperty);
-		assertTrue(host instanceof OLDLifelineEditPart);
 		// create PartDecomposition
 		Rectangle bounds = getAbsoluteBounds(host);
 		LifelineEditPart lifeline = createLifeline(host, new Point(bounds.x + 40, bounds.y + 1), authorProperty);
 		assertNotNull(PREPARE_MODEL, lifeline);
-		assertTrue(((OLDLifelineEditPart) host).isInlineMode());
+		// assertTrue(((OLDLifelineEditPart) host).isInlineMode()); // No longer exists
 		Rectangle b1 = getAbsoluteBounds(lifeline);
 		AbstractExecutionSpecificationEditPart es = createExecutionSpecification(lifeline, b1.getCenter(), null);
 		assertNotNull(es);
@@ -298,6 +296,7 @@ public class TestExecutionSpecificationPosition_395462 extends AbstractNodeTest
 		final List<ElementListSelectionDialog> result = new ArrayList<ElementListSelectionDialog>();
 		Display.getCurrent().addFilter(SWT.Show, new Listener() {
 
+			@Override
 			public void handleEvent(Event event) {
 				if (event.widget instanceof Shell) {
 					final Shell shell = (Shell) event.widget;
@@ -333,6 +332,7 @@ public class TestExecutionSpecificationPosition_395462 extends AbstractNodeTest
 					result.add(dialog);
 					shell.getDisplay().syncExec(new Runnable() {
 
+						@Override
 						public void run() {
 							shell.dispose();
 						}