412215: [Refactoring Tests] The Component diagram tests should be refactored

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

19 files changed, 173 insertions, 542 deletions

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF
index 564c0397143..d85792e331b 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF
@@ -12,6 +12,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.uml.modelexplorer.tests;bundle-version="0.10.0",

  org.eclipse.papyrus.uml.diagram.activity.tests;bundle-version="0.10.0",

  org.eclipse.papyrus.uml.diagram.deployment.tests;bundle-version="0.10.0",

+ org.eclipse.papyrus.uml.diagram.component.tests;bundle-version="0.10.0",

  org.eclipse.papyrus.uml.diagram.pkg.tests;bundle-version="0.10.0",

  org.eclipse.papyrus.uml.diagram.usecase.tests;bundle-version="0.10.0",

  org.eclipse.papyrus.uml.diagram.dnd.tests;bundle-version="0.10.0",

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java
index 8ed18fc2ea7..43d0ef04a81 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java
@@ -82,11 +82,13 @@ public class AllTests {
 		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.activity.tests.AllTests.class));

 		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.pkg.tests.AllTests.class)); 

 		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.deployment.test.AllTests.class));

+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.component.test.AllTests.class));

+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.timing.tests.AllTests.class));

 		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.usecase.tests.AllTests.class)); 

 		

 		//---- deactivate during test refactoring

-		//suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.timing.tests.AllTests.class));

-		//suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.component.test.AllTests.class));

+		//

+		//

 		//

 		// ---- end deactivate

 		// suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.sequence.tests.AllTests.class));

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/org.eclipse.papyrus.uml.diagram.component.test.launch b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/org.eclipse.papyrus.uml.diagram.component.test.launch
index c8d4aee096c..827584baac8 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/org.eclipse.papyrus.uml.diagram.component.test.launch
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/org.eclipse.papyrus.uml.diagram.component.test.launch
@@ -31,7 +31,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms256m -Xmx1024m -XX:PermSize=256m  -XX:MaxPermSize=512m"/>

 <stringAttribute key="pde.version" value="3.3"/>

 <stringAttribute key="product" value="org.eclipse.platform.ide"/>

-<booleanAttribute key="run_in_ui_thread" value="false"/>

+<booleanAttribute key="run_in_ui_thread" value="true"/>

 <booleanAttribute key="show_selected_only" value="false"/>

 <booleanAttribute key="tracing" value="false"/>

 <booleanAttribute key="useCustomFeatures" value="false"/>

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/IComponentDiagramTestsConstants.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/IComponentDiagramTestsConstants.java
new file mode 100644
index 00000000000..eae256af3b3
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/IComponentDiagramTestsConstants.java
@@ -0,0 +1,22 @@
+/*****************************************************************************

+ * Copyright (c) 2013 CEA LIST.

+ *

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

+ /*****************************************************************************/

+package org.eclipse.papyrus.uml.diagram.component.test;

+

+public interface IComponentDiagramTestsConstants {

+

+	/** name of the test project */

+	public final String PROJECT_NAME = "ComponentDiagramTestProject";

+

+	/** name of the test model */

+	public final String FILE_NAME = "ComponentDiagramTest.di";

+}

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestCommentLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestCommentLink.java
deleted file mode 100644
index 0d22e11cc2a..00000000000
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestCommentLink.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.component.test.canonical;

-

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.gef.ConnectionEditPart;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.RequestConstants;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gef.requests.GroupRequest;

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

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

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

-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.gmf.runtime.notation.Diagram;

-import org.eclipse.papyrus.diagram.tests.canonical.TestLink;

-import org.eclipse.uml2.uml.Element;

-

-public abstract class TestCommentLink extends TestLink {

-

-	/**

-	 * Test view deletion.

-	 * 

-	 * @param type

-	 *        the type

-	 */

-	@Override

-	public void testViewDeletion(IElementType type) {

-		//DELETION OF THE VIEW

-		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, source.getSourceConnections().size() == 1);

-		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, ((Element)source.resolveSemanticElement()).getOwnedElements().size() == 0);//1

-		Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);

-		Command command = ((ConnectionEditPart)source.getSourceConnections().get(0)).getCommand(deleteViewRequest);

-		assertNotNull(VIEW_DELETION + COMMAND_NULL, command);

-		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, source.getSourceConnections().size() == 0);

-		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, ((Element)source.resolveSemanticElement()).getOwnedElements().size() == 0);//1

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(VIEW_DELETION + TEST_THE_UNDO, source.getSourceConnections().size() == 1);

-		assertTrue(VIEW_DELETION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(VIEW_DELETION + TEST_THE_UNDO, ((Element)source.resolveSemanticElement()).getOwnedElements().size() == 0);//1

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(VIEW_DELETION + TEST_THE_REDO, source.getSourceConnections().size() == 0);

-		assertTrue(VIEW_DELETION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(VIEW_DELETION + TEST_THE_REDO, ((Element)source.resolveSemanticElement()).getOwnedElements().size() == 0);//1

-

-	}

-

-	/**

-	 * Test destroy.

-	 * 

-	 * @param type

-	 *        the type

-	 */

-	@Override

-	public void testDestroy(IElementType type) {

-

-		//DESTROY SEMANTIC+ VIEW

-		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, source.getSourceConnections().size() == 1);

-		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, ((Element)source.resolveSemanticElement()).getOwnedElements().size() == 0);//1

-

-		Request deleteViewRequest = new EditCommandRequestWrapper(new DestroyElementRequest(false));

-		Command command = ((ConnectionEditPart)source.getSourceConnections().get(0)).getCommand(deleteViewRequest);

-		assertNotNull(DESTROY_DELETION + COMMAND_NULL, command);

-		assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, source.getSourceConnections().size() == 0);

-		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, ((Element)source.resolveSemanticElement()).getOwnedElements().size() == 0);

-

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, source.getSourceConnections().size() == 1);

-		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, ((Element)source.resolveSemanticElement()).getOwnedElements().size() == 0);//1

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(DESTROY_DELETION + TEST_THE_REDO, source.getSourceConnections().size() == 0);

-		assertTrue(DESTROY_DELETION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(DESTROY_DELETION + TEST_THE_REDO, ((Element)source.resolveSemanticElement()).getOwnedElements().size() == 0);

-	}

-

-	/**

-	 * Test drop.

-	 * 

-	 * @param type

-	 *        the type

-	 */

-	@Override

-	public void testDrop(IElementType type) {

-		//DROP

-

-		//it is impossible to drop but you can recreat the link between this element

-		assertTrue(DROP + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);

-		assertTrue(DROP + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(DROP + INITIALIZATION_TEST, ((Element)source.resolveSemanticElement()).getOwnedElements().size() == 0);//1

-		assertTrue(DROP + TEST_THE_REDO, ((Diagram)getRootView()).getEdges().size() == 0);

-	}

-

-	/**

-	 * Test to create a link.

-	 * 

-	 * @param linkType

-	 *        the type

-	 */

-	@Override

-	public void testToCreateALink(IElementType linkType) {

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);

-		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(CREATION + INITIALIZATION_TEST, ((Element)source.resolveSemanticElement()).getOwnedElements().size() == 0);

-

-		Command command = target.getCommand(createConnectionViewRequest(linkType, source, target));

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(CREATION + TEST_THE_EXECUTION, ((Diagram)getRootView()).getEdges().size() == 1);

-		assertTrue(CREATION + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(CREATION + TEST_THE_EXECUTION, ((Element)source.resolveSemanticElement()).getOwnedElements().size() == 0);//1

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(CREATION + TEST_THE_UNDO, getRootView().getChildren().size() == 4);

-		assertTrue(CREATION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(CREATION + TEST_THE_UNDO, ((Element)source.resolveSemanticElement()).getOwnedElements().size() == 0);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(CREATION + TEST_THE_REDO, ((Diagram)getRootView()).getEdges().size() == 1);

-		assertTrue(CREATION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(CREATION + TEST_THE_REDO, ((Element)source.resolveSemanticElement()).getOwnedElements().size() == 0);//1

-

-	}

-

-	@Override

-	public void installEnvironment(IElementType sourceType, IElementType targetType) {

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0);

-		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 0);

-

-		//create the source

-		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(sourceType, getDiagramEditPart().getDiagramPreferencesHint());

-		requestcreation.setLocation(new Point(100, 100));

-		Command command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-

-		//create the source player to test reconnect

-		requestcreation = CreateViewRequestFactory.getCreateShapeRequest(sourceType, getDiagramEditPart().getDiagramPreferencesHint());

-		requestcreation.setLocation(new Point(100, 300));

-		command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-

-		//create the target

-		requestcreation = CreateViewRequestFactory.getCreateShapeRequest(targetType, getDiagramEditPart().getDiagramPreferencesHint());

-		requestcreation.setLocation(new Point(300, 100));

-		command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-

-		//create the target player to test reconnect

-		requestcreation = CreateViewRequestFactory.getCreateShapeRequest(targetType, getDiagramEditPart().getDiagramPreferencesHint());

-		requestcreation.setLocation(new Point(300, 300));

-		command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-

-		source = (GraphicalEditPart)getDiagramEditPart().getChildren().get(0);

-		sourcePlayer = (GraphicalEditPart)getDiagramEditPart().getChildren().get(1);

-		target = (GraphicalEditPart)getDiagramEditPart().getChildren().get(2);

-		targetPlayer = (GraphicalEditPart)getDiagramEditPart().getChildren().get(3);

-

-	}

-

-	@Override

-	public void testTargetReconnectAMultiLink(IElementType type) {

-

-		//target reconnection

-		ReconnectRequest reconnectRequest = new ReconnectRequest();

-		assertTrue(THE_LINK_RECONNECT_EXISTS, (ConnectionEditPart)target.getTargetConnections().get(0) != null);

-		ConnectionEditPart binaryLink = (ConnectionEditPart)target.getTargetConnections().get(0);

-		reconnectRequest.setConnectionEditPart(binaryLink);

-		reconnectRequest.setTargetEditPart(targetPlayer);

-		reconnectRequest.setType(RequestConstants.REQ_RECONNECT_TARGET);

-

-		Command cmd = targetPlayer.getCommand(reconnectRequest);

-

-		assertTrue(RECONNECTION_TARGET + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, cmd.canExecute() == true);

-		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);

-		// EditorUtils.getTransactionalEditingDomain().getCommandStack().execute(cmd);

-		assertTrue(RECONNECTION_TARGET + TEST_THE_EXECUTION, ((Diagram)getRootView()).getEdges().size() == 1);

-		assertTrue(RECONNECTION_TARGET + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(LINK_EXISTS_RECONNECTION_ON_TARGET, binaryLink.getTarget().equals(targetPlayer));

-

-		//undo

-		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(LINK_EXISTS_RECONNECTION_ON_TARGET + TEST_THE_UNDO, binaryLink.getTarget().equals(target));

-

-		//redo

-		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(LINK_EXISTS_RECONNECTION_ON_TARGET + TEST_THE_REDO, binaryLink.getTarget().equals(targetPlayer));

-

-	}

-

-	@Override

-	public void testSourceReconnectAMultiLink(IElementType type) {

-

-	}

-

-	/**

-	 * test the drop of a link where the source and the target are the same objects

-	 * 

-	 * @param linkType

-	 * @param allowed

-	 */

-	@Override

-	protected void testToDropAlinkOnTheSame(IElementType linkType, boolean allowed) {

-

-	}

-

-	/**

-	 * test the creation of a link where the source and the target are the same objects

-	 * 

-	 * @param linkType

-	 * @param allowed

-	 */

-	@Override

-	protected void testToCreateAlinkOnTheSame(IElementType linkType, boolean allowed) {

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);

-		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);

-

-		Command command = target.getCommand(createConnectionViewRequest(linkType, source, source));

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == allowed);

-		if(allowed) {

-			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-			assertTrue(CREATION + INITIALIZATION_TEST, ((Diagram)getRootView()).getEdges().size() == 2);

-			assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);

-			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-			assertTrue(CREATION + TEST_THE_UNDO, getRootView().getChildren().size() == 4);

-			assertTrue(CREATION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 4);

-			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-			assertTrue(CREATION + TEST_THE_REDO, ((Diagram)getRootView()).getEdges().size() == 2);

-			assertTrue(CREATION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 4);

-		}

-

-	}

-}

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponenetDiagramChildNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponenetDiagramChildNode.java
index 8c88152690f..18db7c0e4d2 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponenetDiagramChildNode.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponenetDiagramChildNode.java
@@ -19,6 +19,7 @@ import org.eclipse.papyrus.commands.ICreationCommand;
 import org.eclipse.papyrus.diagram.tests.canonical.TestChildNode;

 import org.eclipse.papyrus.uml.diagram.component.CreateComponentDiagramCommand;

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

+import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;

 import org.eclipse.uml2.uml.UMLPackage;

 import org.junit.Test;

 

@@ -37,6 +38,16 @@ public class TestComponenetDiagramChildNode extends TestChildNode {
 	protected CreateViewRequest createViewRequestShapeContainer() {

 		return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Package_3200, getDiagramEditPart().getDiagramPreferencesHint());

 	}

+	

+	@Override

+	protected String getProjectName() {

+		return IComponentDiagramTestsConstants.PROJECT_NAME;

+	}

+

+	@Override

+	protected String getFileName() {

+		return IComponentDiagramTestsConstants.FILE_NAME;

+	}

 

 	/**

 	 * Test to manage i package.

@@ -85,5 +96,4 @@ public class TestComponenetDiagramChildNode extends TestChildNode {
 	public void testToManageConstraint() {

 		testToManageNode(UMLElementTypes.Constraint_3075, UMLPackage.eINSTANCE.getConstraint(), UMLElementTypes.Package_3076, true);

 	}

-

 }

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramCommentLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramCommentLink.java
index ad0d8f4b209..0a7f4228a81 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramCommentLink.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramCommentLink.java
@@ -13,8 +13,10 @@
 package org.eclipse.papyrus.uml.diagram.component.test.canonical;

 

 import org.eclipse.papyrus.commands.ICreationCommand;

+import org.eclipse.papyrus.diagram.tests.canonical.TestCommentLink;

 import org.eclipse.papyrus.uml.diagram.component.CreateComponentDiagramCommand;

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

+import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;

 import org.junit.Test;

 

 public class TestComponentDiagramCommentLink extends TestCommentLink {

@@ -24,6 +26,16 @@ public class TestComponentDiagramCommentLink extends TestCommentLink {
 		return new CreateComponentDiagramCommand();

 	}

 

+	@Override

+	protected String getProjectName() {

+		return IComponentDiagramTestsConstants.PROJECT_NAME;

+	}

+

+	@Override

+	protected String getFileName() {

+		return IComponentDiagramTestsConstants.FILE_NAME;

+	}

+	

 	/**

 	 * Test to manage Comment

 	 */

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramConstraintLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramConstraintLink.java
index f893af536d8..94685cbe958 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramConstraintLink.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramConstraintLink.java
@@ -13,8 +13,10 @@
 package org.eclipse.papyrus.uml.diagram.component.test.canonical;

 

 import org.eclipse.papyrus.commands.ICreationCommand;

+import org.eclipse.papyrus.diagram.tests.canonical.TestConstraintLink;

 import org.eclipse.papyrus.uml.diagram.component.CreateComponentDiagramCommand;

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

+import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;

 import org.junit.Test;

 

 public class TestComponentDiagramConstraintLink extends TestConstraintLink {

@@ -23,6 +25,16 @@ public class TestComponentDiagramConstraintLink extends TestConstraintLink {
 	protected ICreationCommand getDiagramCommandCreation() {

 		return new CreateComponentDiagramCommand();

 	}

+	

+	@Override

+	protected String getProjectName() {

+		return IComponentDiagramTestsConstants.PROJECT_NAME;

+	}

+

+	@Override

+	protected String getFileName() {

+		return IComponentDiagramTestsConstants.FILE_NAME;

+	}

 

 	/**

 	 * Test to manage Constraint

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramLink.java
index cdcb0ed25b8..c98da0503a4 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramLink.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramLink.java
@@ -16,6 +16,7 @@ import org.eclipse.papyrus.commands.ICreationCommand;
 import org.eclipse.papyrus.diagram.tests.canonical.TestLink;

 import org.eclipse.papyrus.uml.diagram.component.CreateComponentDiagramCommand;

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

+import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;

 import org.junit.Test;

 

 /**

@@ -27,6 +28,16 @@ public class TestComponentDiagramLink extends TestLink {
 	protected ICreationCommand getDiagramCommandCreation() {

 		return new CreateComponentDiagramCommand();

 	}

+	

+	@Override

+	protected String getProjectName() {

+		return IComponentDiagramTestsConstants.PROJECT_NAME;

+	}

+

+	@Override

+	protected String getFileName() {

+		return IComponentDiagramTestsConstants.FILE_NAME;

+	}

 

 	/**

 	 * Test to manage Abstraction

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramLinkOwnedBySource.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramLinkOwnedBySource.java
index b7ccd0eb580..2e2ab1a3b43 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramLinkOwnedBySource.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramLinkOwnedBySource.java
@@ -17,6 +17,7 @@ import org.eclipse.papyrus.commands.ICreationCommand;
 import org.eclipse.papyrus.diagram.tests.canonical.TestLinkOwnedBySource;

 import org.eclipse.papyrus.uml.diagram.component.CreateComponentDiagramCommand;

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

+import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;

 import org.junit.Test;

 

 /**

@@ -29,6 +30,16 @@ public class TestComponentDiagramLinkOwnedBySource extends TestLinkOwnedBySource
 		return new CreateComponentDiagramCommand();

 	}

 

+	@Override

+	protected String getProjectName() {

+		return IComponentDiagramTestsConstants.PROJECT_NAME;

+	}

+

+	@Override

+	protected String getFileName() {

+		return IComponentDiagramTestsConstants.FILE_NAME;

+	}

+	

 	/**

 	 * Test to manage Generalization

 	 */

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramTopNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramTopNode.java
index 9f33c81b4af..dd8030556a4 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramTopNode.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramTopNode.java
@@ -18,6 +18,7 @@ import org.eclipse.papyrus.commands.ICreationCommand;
 import org.eclipse.papyrus.diagram.tests.canonical.TestTopNode;

 import org.eclipse.papyrus.uml.diagram.component.CreateComponentDiagramCommand;

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

+import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;

 import org.eclipse.uml2.uml.UMLPackage;

 import org.junit.Test;

 

@@ -32,6 +33,16 @@ public class TestComponentDiagramTopNode extends TestTopNode {
 	}

 

 	@Override

+	protected String getProjectName() {

+		return IComponentDiagramTestsConstants.PROJECT_NAME;

+	}

+

+	@Override

+	protected String getFileName() {

+		return IComponentDiagramTestsConstants.FILE_NAME;

+	}

+	

+	@Override

 	protected CreateViewRequest createViewRequestShapeContainer() {

 		return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Package_3200, getDiagramEditPart().getDiagramPreferencesHint());

 	}

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestConstraintLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestConstraintLink.java
deleted file mode 100644
index fff49437a26..00000000000
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestConstraintLink.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation

- /*****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.component.test.canonical;

-

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.gef.ConnectionEditPart;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.RequestConstants;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gef.requests.GroupRequest;

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

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

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

-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.gmf.runtime.notation.Diagram;

-import org.eclipse.papyrus.diagram.tests.canonical.TestLink;

-import org.eclipse.uml2.uml.Element;

-

-public abstract class TestConstraintLink extends TestLink {

-

-	/**

-	 * Test view deletion.

-	 * 

-	 * @param type

-	 *        the type

-	 */

-	@Override

-	public void testViewDeletion(IElementType type) {

-		//DELETION OF THE VIEW

-		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, source.getSourceConnections().size() == 1);

-		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(VIEW_DELETION + INITIALIZATION_TEST, ((Element)source.resolveSemanticElement()).getOwnedElements().size() == 1);

-		Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);

-		Command command = ((ConnectionEditPart)source.getSourceConnections().get(0)).getCommand(deleteViewRequest);

-		assertNotNull(VIEW_DELETION + COMMAND_NULL, command);

-		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, source.getSourceConnections().size() == 0);

-		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, ((Element)source.resolveSemanticElement()).getOwnedElements().size() == 1);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(VIEW_DELETION + TEST_THE_UNDO, source.getSourceConnections().size() == 1);

-		assertTrue(VIEW_DELETION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(VIEW_DELETION + TEST_THE_UNDO, ((Element)source.resolveSemanticElement()).getOwnedElements().size() == 1);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(VIEW_DELETION + TEST_THE_REDO, source.getSourceConnections().size() == 0);

-		assertTrue(VIEW_DELETION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(VIEW_DELETION + TEST_THE_REDO, ((Element)source.resolveSemanticElement()).getOwnedElements().size() == 1);

-

-	}

-

-	/**

-	 * Test destroy.

-	 * 

-	 * @param type

-	 *        the type

-	 */

-	@Override

-	public void testDestroy(IElementType type) {

-

-		//DESTROY SEMANTIC+ VIEW

-		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, source.getSourceConnections().size() == 1);

-		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(DESTROY_DELETION + INITIALIZATION_TEST, ((Element)source.resolveSemanticElement()).getOwnedElements().size() == 1);

-

-		Request deleteViewRequest = new EditCommandRequestWrapper(new DestroyElementRequest(false));

-		Command command = ((ConnectionEditPart)source.getSourceConnections().get(0)).getCommand(deleteViewRequest);

-		assertNotNull(DESTROY_DELETION + COMMAND_NULL, command);

-		assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, source.getSourceConnections().size() == 0);

-		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, ((Element)source.resolveSemanticElement()).getOwnedElements().size() == 1);

-

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, source.getSourceConnections().size() == 1);

-		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(DESTROY_DELETION + TEST_THE_UNDO, ((Element)source.resolveSemanticElement()).getOwnedElements().size() == 1);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(DESTROY_DELETION + TEST_THE_REDO, source.getSourceConnections().size() == 0);

-		assertTrue(DESTROY_DELETION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(DESTROY_DELETION + TEST_THE_REDO, ((Element)source.resolveSemanticElement()).getOwnedElements().size() == 1);

-	}

-

-	/**

-	 * Test drop.

-	 * 

-	 * @param type

-	 *        the type

-	 */

-	@Override

-	public void testDrop(IElementType type) {

-		//DROP

-

-		//it is impossible to drop but you can recreat the link between this element

-		assertTrue(DROP + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);

-		assertTrue(DROP + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(DROP + INITIALIZATION_TEST, ((Element)source.resolveSemanticElement()).getOwnedElements().size() == 1);

-		assertTrue(DROP + TEST_THE_REDO, ((Diagram)getRootView()).getEdges().size() == 0);

-	}

-

-	/**

-	 * Test to create a link.

-	 * 

-	 * @param linkType

-	 *        the type

-	 */

-	@Override

-	public void testToCreateALink(IElementType linkType) {

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);

-		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(CREATION + INITIALIZATION_TEST, ((Element)source.resolveSemanticElement()).getOwnedElements().size() == 1);

-

-		Command command = target.getCommand(createConnectionViewRequest(linkType, source, target));

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-		assertTrue(CREATION + TEST_THE_EXECUTION, ((Diagram)getRootView()).getEdges().size() == 1);

-		assertTrue(CREATION + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(CREATION + TEST_THE_EXECUTION, ((Element)source.resolveSemanticElement()).getOwnedElements().size() == 1);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(CREATION + TEST_THE_UNDO, getRootView().getChildren().size() == 4);

-		assertTrue(CREATION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(CREATION + TEST_THE_UNDO, ((Element)source.resolveSemanticElement()).getOwnedElements().size() == 1);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(CREATION + TEST_THE_REDO, ((Diagram)getRootView()).getEdges().size() == 1);

-		assertTrue(CREATION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(CREATION + TEST_THE_REDO, ((Element)source.resolveSemanticElement()).getOwnedElements().size() == 1);

-

-	}

-

-	@Override

-	public void installEnvironment(IElementType sourceType, IElementType targetType) {

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0);

-		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 0);

-

-		//create the source

-		CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(sourceType, getDiagramEditPart().getDiagramPreferencesHint());

-		requestcreation.setLocation(new Point(100, 100));

-		Command command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-

-		//create the source player to test reconnect

-		requestcreation = CreateViewRequestFactory.getCreateShapeRequest(sourceType, getDiagramEditPart().getDiagramPreferencesHint());

-		requestcreation.setLocation(new Point(100, 300));

-		command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-

-		//create the target

-		requestcreation = CreateViewRequestFactory.getCreateShapeRequest(targetType, getDiagramEditPart().getDiagramPreferencesHint());

-		requestcreation.setLocation(new Point(300, 100));

-		command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-

-		//create the target player to test reconnect

-		requestcreation = CreateViewRequestFactory.getCreateShapeRequest(targetType, getDiagramEditPart().getDiagramPreferencesHint());

-		requestcreation.setLocation(new Point(300, 300));

-		command = getDiagramEditPart().getCommand(requestcreation);

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-		assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-

-		source = (GraphicalEditPart)getDiagramEditPart().getChildren().get(0);

-		sourcePlayer = (GraphicalEditPart)getDiagramEditPart().getChildren().get(1);

-		target = (GraphicalEditPart)getDiagramEditPart().getChildren().get(2);

-		targetPlayer = (GraphicalEditPart)getDiagramEditPart().getChildren().get(3);

-

-	}

-

-	@Override

-	public void testTargetReconnectAMultiLink(IElementType type) {

-

-		//target reconnection

-		ReconnectRequest reconnectRequest = new ReconnectRequest();

-		assertTrue(THE_LINK_RECONNECT_EXISTS, (ConnectionEditPart)target.getTargetConnections().get(0) != null);

-		ConnectionEditPart binaryLink = (ConnectionEditPart)target.getTargetConnections().get(0);

-		reconnectRequest.setConnectionEditPart(binaryLink);

-		reconnectRequest.setTargetEditPart(targetPlayer);

-		reconnectRequest.setType(RequestConstants.REQ_RECONNECT_TARGET);

-

-		Command cmd = targetPlayer.getCommand(reconnectRequest);

-

-		assertTrue(RECONNECTION_TARGET + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, cmd.canExecute() == true);

-		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);

-		// EditorUtils.getTransactionalEditingDomain().getCommandStack().execute(cmd);

-		assertTrue(RECONNECTION_TARGET + TEST_THE_EXECUTION, ((Diagram)getRootView()).getEdges().size() == 1);

-		assertTrue(RECONNECTION_TARGET + TEST_THE_EXECUTION, getRootSemanticModel().getOwnedElements().size() == 4);

-		assertTrue(LINK_EXISTS_RECONNECTION_ON_TARGET, binaryLink.getTarget().equals(targetPlayer));

-

-		//undo

-		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();

-		assertTrue(LINK_EXISTS_RECONNECTION_ON_TARGET + TEST_THE_UNDO, binaryLink.getTarget().equals(target));

-

-		//redo

-		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().redo();

-		assertTrue(LINK_EXISTS_RECONNECTION_ON_TARGET + TEST_THE_REDO, binaryLink.getTarget().equals(targetPlayer));

-

-	}

-

-	@Override

-	public void testSourceReconnectAMultiLink(IElementType type) {

-

-	}

-

-	/**

-	 * test the drop of a link where the source and the target are the same objects

-	 * 

-	 * @param linkType

-	 * @param allowed

-	 */

-	@Override

-	protected void testToDropAlinkOnTheSame(IElementType linkType, boolean allowed) {

-

-	}

-

-	/**

-	 * test the creation of a link where the source and the target are the same objects

-	 * 

-	 * @param linkType

-	 * @param allowed

-	 */

-	@Override

-	protected void testToCreateAlinkOnTheSame(IElementType linkType, boolean allowed) {

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 4);

-		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);

-

-		Command command = target.getCommand(createConnectionViewRequest(linkType, source, source));

-		assertNotNull(CREATION + COMMAND_NULL, command);

-		assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == allowed);

-		if(allowed) {

-			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-			assertTrue(CREATION + INITIALIZATION_TEST, ((Diagram)getRootView()).getEdges().size() == 2);

-			assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 4);

-			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-			assertTrue(CREATION + TEST_THE_UNDO, getRootView().getChildren().size() == 4);

-			assertTrue(CREATION + TEST_THE_UNDO, getRootSemanticModel().getOwnedElements().size() == 4);

-			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

-			assertTrue(CREATION + TEST_THE_REDO, ((Diagram)getRootView()).getEdges().size() == 2);

-			assertTrue(CREATION + TEST_THE_REDO, getRootSemanticModel().getOwnedElements().size() == 4);

-		}

-

-	}

-}

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load1000ComponentTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load1000ComponentTest.java
index 49c030051b1..a963968c443 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load1000ComponentTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load1000ComponentTest.java
@@ -18,6 +18,7 @@ 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.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;

 import org.eclipse.papyrus.uml.diagram.component.test.canonical.AbstractPapyrusTestCase;

 import org.junit.Test;

 

@@ -26,6 +27,16 @@ import org.junit.Test;
  */

 public class Load1000ComponentTest extends AbstractPapyrusTestCase {

 

+	@Override

+	protected String getProjectName() {

+		return IComponentDiagramTestsConstants.PROJECT_NAME;

+	}

+

+	@Override

+	protected String getFileName() {

+		return IComponentDiagramTestsConstants.FILE_NAME;

+	}

+	

 	/**

 	 * Test to create a Component.

 	 * 

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load100ComponentTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load100ComponentTest.java
index 0c949e6d90d..727637b9e0a 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load100ComponentTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load100ComponentTest.java
@@ -18,6 +18,7 @@ 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.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;

 import org.eclipse.papyrus.uml.diagram.component.test.canonical.AbstractPapyrusTestCase;

 import org.junit.Test;

 

@@ -26,6 +27,16 @@ import org.junit.Test;
  */

 public class Load100ComponentTest extends AbstractPapyrusTestCase {

 

+	@Override

+	protected String getProjectName() {

+		return IComponentDiagramTestsConstants.PROJECT_NAME;

+	}

+

+	@Override

+	protected String getFileName() {

+		return IComponentDiagramTestsConstants.FILE_NAME;

+	}

+	

 	/**

 	 * Test to create a Component.

 	 * 

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load10ComponentTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load10ComponentTest.java
index 57adce1abb5..30ec914f2fa 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load10ComponentTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load10ComponentTest.java
@@ -18,6 +18,7 @@ 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.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;

 import org.eclipse.papyrus.uml.diagram.component.test.canonical.AbstractPapyrusTestCase;

 import org.junit.Test;

 

@@ -26,6 +27,16 @@ import org.junit.Test;
  */

 public class Load10ComponentTest extends AbstractPapyrusTestCase {

 

+	@Override

+	protected String getProjectName() {

+		return IComponentDiagramTestsConstants.PROJECT_NAME;

+	}

+

+	@Override

+	protected String getFileName() {

+		return IComponentDiagramTestsConstants.FILE_NAME;

+	}

+	

 	/**

 	 * Test to create a Component.

 	 * 

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load200ComponentTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load200ComponentTest.java
index 230e6492322..4f3e4050779 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load200ComponentTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load200ComponentTest.java
@@ -18,6 +18,7 @@ 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.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;

 import org.eclipse.papyrus.uml.diagram.component.test.canonical.AbstractPapyrusTestCase;

 import org.junit.Test;

 

@@ -26,6 +27,16 @@ import org.junit.Test;
  */

 public class Load200ComponentTest extends AbstractPapyrusTestCase {

 

+	@Override

+	protected String getProjectName() {

+		return IComponentDiagramTestsConstants.PROJECT_NAME;

+	}

+

+	@Override

+	protected String getFileName() {

+		return IComponentDiagramTestsConstants.FILE_NAME;

+	}

+	

 	/**

 	 * Test to create a Component.

 	 * 

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load300ComponentTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load300ComponentTest.java
index 5f53243544f..8e7780c77ea 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load300ComponentTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load300ComponentTest.java
@@ -18,6 +18,7 @@ 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.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;

 import org.eclipse.papyrus.uml.diagram.component.test.canonical.AbstractPapyrusTestCase;

 import org.junit.Test;

 

@@ -26,6 +27,16 @@ import org.junit.Test;
  */

 public class Load300ComponentTest extends AbstractPapyrusTestCase {

 

+	@Override

+	protected String getProjectName() {

+		return IComponentDiagramTestsConstants.PROJECT_NAME;

+	}

+

+	@Override

+	protected String getFileName() {

+		return IComponentDiagramTestsConstants.FILE_NAME;

+	}

+	

 	/**

 	 * Test to create a Component.

 	 * 

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load400ComponentTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load400ComponentTest.java
index 3de72deb6d4..5ee2822d10f 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load400ComponentTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load400ComponentTest.java
@@ -18,6 +18,7 @@ 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.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;

 import org.eclipse.papyrus.uml.diagram.component.test.canonical.AbstractPapyrusTestCase;

 import org.junit.Test;

 

@@ -26,6 +27,16 @@ import org.junit.Test;
  */

 public class Load400ComponentTest extends AbstractPapyrusTestCase {

 

+	@Override

+	protected String getProjectName() {

+		return IComponentDiagramTestsConstants.PROJECT_NAME;

+	}

+

+	@Override

+	protected String getFileName() {

+		return IComponentDiagramTestsConstants.FILE_NAME;

+	}

+	

 	/**

 	 * Test to create a Component.

 	 * 

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load500ComponentTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load500ComponentTest.java
index 1a125296d8e..eaf7ee292fe 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load500ComponentTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load500ComponentTest.java
@@ -18,6 +18,7 @@ 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.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.component.test.IComponentDiagramTestsConstants;

 import org.eclipse.papyrus.uml.diagram.component.test.canonical.AbstractPapyrusTestCase;

 import org.junit.Test;

 

@@ -26,6 +27,16 @@ import org.junit.Test;
  */

 public class Load500ComponentTest extends AbstractPapyrusTestCase {

 

+	@Override

+	protected String getProjectName() {

+		return IComponentDiagramTestsConstants.PROJECT_NAME;

+	}

+

+	@Override

+	protected String getFileName() {

+		return IComponentDiagramTestsConstants.FILE_NAME;

+	}

+	

 	/**

 	 * Test to create a Component.

 	 *