diff options
Diffstat (limited to 'tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/AbstractTestMultiLink.java')
| -rw-r--r-- | tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/AbstractTestMultiLink.java | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/AbstractTestMultiLink.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/AbstractTestMultiLink.java index 44902c02ebd..d6c72a7a8fc 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/AbstractTestMultiLink.java +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/AbstractTestMultiLink.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2010 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
@@ -42,8 +42,8 @@ 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.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;
-import org.eclipse.papyrus.diagram.common.command.wrappers.GEFtoEMFCommandWrapper;
+import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;
+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
import org.eclipse.uml2.uml.Element;
import org.eclipse.uml2.uml.Relationship;
@@ -212,7 +212,7 @@ public abstract class AbstractTestMultiLink extends AbstractPapyrusTestCase { assertTrue(DROP +INITIALIZATION_TEST,((Diagram)getRootView()).getEdges().size()==0);
assertTrue(DROP +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().get(5) instanceof Relationship);
Relationship relationship=(Relationship)getRootSemanticModel().getOwnedElements().get(5);
-
+
//DO
DropObjectsRequest dropObjectsRequest= new DropObjectsRequest();
@@ -255,21 +255,21 @@ public abstract class AbstractTestMultiLink extends AbstractPapyrusTestCase { //test to create the branch for dependency to node
- Command cmd = target.getCommand(createConnectionViewRequest(branchType, binaryLink, thirdPlayer));
+ Command cmd = target.getCommand(createConnectionViewRequest(branchType, binaryLink, thirdPlayer));
assertTrue(CONTAINER_CREATION+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,cmd.canExecute()==true);
- getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);
+ getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);
// EditorUtils.getTransactionalEditingDomain().getCommandStack().execute(cmd);
assertTrue(CREATION +TEST_THE_EXECUTION,((Diagram)getRootView()).getEdges().size()==3);
assertTrue(CREATION +TEST_THE_EXECUTION,getRootSemanticModel().getOwnedElements().size()==6);
-
+
//Undo
- getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();
+ getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();
assertTrue(CREATION +TEST_THE_UNDO,((Diagram)getRootView()).getEdges().size()==1);
assertTrue(CREATION +TEST_THE_UNDO,getRootSemanticModel().getOwnedElements().size()==6);
-
-
+
+
//redo
- getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().redo();
+ getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().redo();
assertTrue(CREATION +TEST_THE_REDO,((Diagram)getRootView()).getEdges().size()==3);
assertTrue(CREATION +TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==6);
assertTrue(CREATION +TEST_THE_REDO,getDiagramEditPart().getChildren().get(5)!=null);
@@ -277,25 +277,25 @@ public abstract class AbstractTestMultiLink extends AbstractPapyrusTestCase { //test to create the branch from node to multidependency
if(flow){
- cmd = linkNode.getCommand(createConnectionViewRequest(branchType, fourthPlayer,linkNode));
+ cmd = linkNode.getCommand(createConnectionViewRequest(branchType, fourthPlayer,linkNode));
}
else{//test to create the branch from multidependency to node
- cmd = linkNode.getCommand(createConnectionViewRequest(branchType,linkNode, fourthPlayer));
+ cmd = linkNode.getCommand(createConnectionViewRequest(branchType,linkNode, fourthPlayer));
}
assertTrue(CONTAINER_CREATION+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,cmd.canExecute()==true);
- getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);
+ getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);
assertTrue(CREATION +TEST_THE_EXECUTION,((Diagram)getRootView()).getEdges().size()==4);
assertTrue(CREATION +TEST_THE_EXECUTION,getRootSemanticModel().getOwnedElements().size()==6);
-
+
//undo
- getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();
+ getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();
assertTrue(CREATION +TEST_THE_UNDO,((Diagram)getRootView()).getEdges().size()==3);
assertTrue(CREATION +TEST_THE_UNDO,getRootSemanticModel().getOwnedElements().size()==6);
-
+
//redo
- getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().redo();
+ getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().redo();
assertTrue(CREATION +TEST_THE_REDO,((Diagram)getRootView()).getEdges().size()==4);
assertTrue(CREATION +TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==6);
}
@@ -312,23 +312,23 @@ public abstract class AbstractTestMultiLink extends AbstractPapyrusTestCase { reconnectRequest.setTargetEditPart(guestPlayer);
reconnectRequest.setType(RequestConstants.REQ_RECONNECT_TARGET);
- Command cmd = guestPlayer.getCommand(reconnectRequest);
+ Command cmd = guestPlayer.getCommand(reconnectRequest);
assertTrue(RECONNECTION_TARGET+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,cmd.canExecute()==true);
- getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);
+ getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);
// EditorUtils.getTransactionalEditingDomain().getCommandStack().execute(cmd);
assertTrue(RECONNECTION_TARGET+TEST_THE_EXECUTION,((Diagram)getRootView()).getEdges().size()==4);
assertTrue(RECONNECTION_TARGET +TEST_THE_EXECUTION,getRootSemanticModel().getOwnedElements().size()==6);
assertTrue(BRANCH_EXISTS_RECONNECTION_ON_TARGET,branch.getTarget().equals(guestPlayer));
-
+
//undo
getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();
assertTrue(BRANCH_EXISTS_RECONNECTION_ON_TARGET+ TEST_THE_UNDO,branch.getTarget().equals(target));
-
+
//redo
getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().redo();
assertTrue(BRANCH_EXISTS_RECONNECTION_ON_TARGET+ TEST_THE_REDO,branch.getTarget().equals(guestPlayer));
-
+
getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();
@@ -344,26 +344,26 @@ public abstract class AbstractTestMultiLink extends AbstractPapyrusTestCase { reconnectRequest.setTargetEditPart(guestPlayer);
reconnectRequest.setType(RequestConstants.REQ_RECONNECT_SOURCE);
- Command cmd = guestPlayer.getCommand(reconnectRequest);
+ Command cmd = guestPlayer.getCommand(reconnectRequest);
assertTrue(RECONNECTION_SOURCE+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,cmd.canExecute()==true);
- getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);
+ getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);
assertTrue(RECONNECTION_SOURCE+TEST_THE_EXECUTION,((Diagram)getRootView()).getEdges().size()==4);
assertTrue(RECONNECTION_SOURCE +TEST_THE_EXECUTION,getRootSemanticModel().getOwnedElements().size()==6);
assertTrue(BRANCH_EXISTS_RECONNECTION_ON_SOURCE+TEST_THE_EXECUTION,branch.getSource().equals(guestPlayer));
-
+
getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();
assertTrue(BRANCH_EXISTS_RECONNECTION_ON_SOURCE+ TEST_THE_UNDO,branch.getSource().equals(source));
-
+
getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().redo();
assertTrue(BRANCH_EXISTS_RECONNECTION_ON_SOURCE+TEST_THE_REDO,branch.getSource().equals(guestPlayer));
-
+
getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();
}
public CreateConnectionViewRequest createConnectionViewRequest(IElementType type , EditPart source, EditPart target){
CreateConnectionViewRequest connectionRequest = CreateViewRequestFactory.getCreateConnectionRequest(type,((IGraphicalEditPart) getDiagramEditPart())
- .getDiagramPreferencesHint());
+ .getDiagramPreferencesHint());
connectionRequest.setSourceEditPart(null);
connectionRequest.setTargetEditPart(source);
@@ -450,7 +450,7 @@ public abstract class AbstractTestMultiLink extends AbstractPapyrusTestCase { public void installbinaryLink(IElementType type) {
//binaryLink
- Command command = target.getCommand(createConnectionViewRequest(type, source, target));
+ Command command = target.getCommand(createConnectionViewRequest(type, source, target));
assertTrue(CONTAINER_CREATION+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);
diagramEditor.getEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(command));
|