diff options
| author | ytanguy | 2011-07-06 11:15:42 +0000 |
|---|---|---|
| committer | ytanguy | 2011-07-06 11:15:42 +0000 |
| commit | 3d47305b9efde841d918f67242685a4bf04078f6 (patch) | |
| tree | a02654bfca10b62ea8ce29d7be497583414c5b3c | |
| parent | 3729d94ea41823a76bb3b4abcc17f7389793dacd (diff) | |
| download | org.eclipse.papyrus-3d47305b9efde841d918f67242685a4bf04078f6.tar.gz org.eclipse.papyrus-3d47305b9efde841d918f67242685a4bf04078f6.tar.xz org.eclipse.papyrus-3d47305b9efde841d918f67242685a4bf04078f6.zip | |
NEW - bug 349792: [SysML Block Definition Diagram] JUnit tests for the Block Definition Diagram
https://bugs.eclipse.org/bugs/show_bug.cgi?id=349792
91 files changed, 4784 insertions, 1530 deletions
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/AbstractTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/AbstractTest.java index e4f17e73e6f..92d85de54fc 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/AbstractTest.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/AbstractTest.java @@ -51,6 +51,7 @@ public abstract class AbstractTest { // Open the EmptyModel.di file with Papyrus (assumed to be the default editor for "di" files here).
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
editor = page.openEditor(new FileEditorInput(emptyModel_di), editorID);
+
}
@AfterClass
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/TestNodeCreationOnDiagram.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/TestNodeCreationOnDiagram.java index 50ccaf9bbe3..b3ed7fe81e7 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/TestNodeCreationOnDiagram.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/TestNodeCreationOnDiagram.java @@ -1,7 +1,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.AbstractTest;
import org.junit.Test;
@@ -13,146 +13,146 @@ public class TestNodeCreationOnDiagram extends AbstractTest { @Test
public void testCreationActorInDiagram() throws Exception {
- createFromPalette("blockdefinition.tool.actor", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.actor", getDiagramView(), true);
}
@Test
public void testCreationBlockInDiagram() throws Exception {
- createFromPalette("blockdefinition.tool.block", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.block", getDiagramView(), true);
}
@Test
public void testCreationCommentInDiagram() throws Exception {
- createFromPalette("blockdefinition.tool.comment", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.comment", getDiagramView(), true);
}
@Test
public void testCreationConstraintBlockInDiagram() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", getDiagramView(), true);
}
@Test
public void testCreationConstraintInDiagram() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.constraint", getDiagramView(), true);
}
@Test
public void testCreationConstraintPropertyInDiagram() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", getDiagramView(), false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", getDiagramView(), false);
}
@Test
public void testCreationDataTypeInDiagram() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.datatype", getDiagramView(), true);
}
@Test
public void testCreationDimensionInDiagram() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.dimension", getDiagramView(), true);
}
@Test
public void testCreationEnumerationInDiagram() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.enumeration", getDiagramView(), true);
}
@Test
public void testCreationEnumerationLiteralInDiagram() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", getDiagramView(), false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", getDiagramView(), false);
}
@Test
public void testCreationFlowPortInDiagram() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", getDiagramView(), false);
+ createNodeFromPalette("blockdefinition.tool.flowport", getDiagramView(), false);
}
@Test
public void testCreationFlowPropertyInDiagram() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", getDiagramView(), false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", getDiagramView(), false);
}
@Test
public void testCreationFlowSpecificationInDiagram() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", getDiagramView(), true);
}
@Test
public void testCreationInstanceSpecificationInDiagram() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", getDiagramView(), true);
}
@Test
public void testCreationInterfaceInDiagram() throws Exception {
- createFromPalette("blockdefinition.tool.interface", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.interface", getDiagramView(), true);
}
@Test
public void testCreationModelInDiagram() throws Exception {
- createFromPalette("blockdefinition.tool.model", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.model", getDiagramView(), true);
}
@Test
public void testCreationOperationInDiagram() throws Exception {
- createFromPalette("blockdefinition.tool.operation", getDiagramView(), false);
+ createNodeFromPalette("blockdefinition.tool.operation", getDiagramView(), false);
}
@Test
public void testCreationPackageInDiagram() throws Exception {
- createFromPalette("blockdefinition.tool.package", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.package", getDiagramView(), true);
}
@Test
public void testCreationPartInDiagram() throws Exception {
- createFromPalette("blockdefinition.tool.part", getDiagramView(), false);
+ createNodeFromPalette("blockdefinition.tool.part", getDiagramView(), false);
}
@Test
public void testCreationPortInDiagram() throws Exception {
- createFromPalette("blockdefinition.tool.port", getDiagramView(), false);
+ createNodeFromPalette("blockdefinition.tool.port", getDiagramView(), false);
}
@Test
public void testCreationPrimitiveTypeInDiagram() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", getDiagramView(), true);
}
@Test
public void testCreationPropertyInDiagram() throws Exception {
- createFromPalette("blockdefinition.tool.property", getDiagramView(), false);
+ createNodeFromPalette("blockdefinition.tool.property", getDiagramView(), false);
}
@Test
public void testCreationReceptionInDiagram() throws Exception {
- createFromPalette("blockdefinition.tool.reception", getDiagramView(), false);
+ createNodeFromPalette("blockdefinition.tool.reception", getDiagramView(), false);
}
@Test
public void testCreationReferenceInDiagram() throws Exception {
- createFromPalette("blockdefinition.tool.reference", getDiagramView(), false);
+ createNodeFromPalette("blockdefinition.tool.reference", getDiagramView(), false);
}
@Test
public void testCreationSignalInDiagram() throws Exception {
- createFromPalette("blockdefinition.tool.signal", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.signal", getDiagramView(), true);
}
@Test
public void testCreationSlotInDiagram() throws Exception {
- createFromPalette("blockdefinition.tool.slot", getDiagramView(), false);
+ createNodeFromPalette("blockdefinition.tool.slot", getDiagramView(), false);
}
@Test
public void testCreationUnitInDiagram() throws Exception {
- createFromPalette("blockdefinition.tool.unit", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.unit", getDiagramView(), true);
}
@Test
public void testCreationValueInDiagram() throws Exception {
- createFromPalette("blockdefinition.tool.value", getDiagramView(), false);
+ createNodeFromPalette("blockdefinition.tool.value", getDiagramView(), false);
}
@Test
public void testCreationValueTypeInDiagram() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.valuetype", getDiagramView(), true);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnActor.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnActor.java index b2e044f3652..9561ca10a62 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnActor.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnActor.java @@ -2,14 +2,11 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.custom; import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.createGraphicalNode;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.AbstractTest;
-import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
import org.junit.BeforeClass;
@@ -41,146 +38,146 @@ public class TestNodeCreationOnActor extends AbstractTest { @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, false);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, false);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, false);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, false);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, false);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, false);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, false);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, false);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, false);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, false);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, false);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, false);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, false);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, false);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, false);
}
@Test
public void createPart() throws Exception {
- createFromPalette("blockdefinition.tool.part", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, false);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, false);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, false);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, false);
}
@Test
public void createReference() throws Exception {
- createFromPalette("blockdefinition.tool.reference", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, false);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, false);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, false);
}
@Test
public void createValue() throws Exception {
- createFromPalette("blockdefinition.tool.value", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, false);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnBlock.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnBlock.java index 4b2805a8739..09ce652e639 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnBlock.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnBlock.java @@ -2,7 +2,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.custom; import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.createGraphicalNode;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
@@ -39,146 +39,146 @@ public class TestNodeCreationOnBlock extends AbstractTest { @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, false);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, false);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, false);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, false);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, false);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, false);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, false);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, false);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, true);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, false);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, false);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, false);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, false);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, false);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, false);
}
@Test
public void createPart() throws Exception {
- createFromPalette("blockdefinition.tool.part", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, true);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, false);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, false);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, false);
}
@Test
public void createReference() throws Exception {
- createFromPalette("blockdefinition.tool.reference", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, false);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, false);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, false);
}
@Test
public void createValue() throws Exception {
- createFromPalette("blockdefinition.tool.value", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, false);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnBlockConstraintCompartment.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnBlockConstraintCompartment.java index 7db6597ef22..b91aae39791 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnBlockConstraintCompartment.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnBlockConstraintCompartment.java @@ -2,7 +2,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.custom; import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.changeVisibility;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
import org.eclipse.gmf.runtime.notation.View;
@@ -21,7 +21,7 @@ public class TestNodeCreationOnBlockConstraintCompartment extends AbstractTest { @BeforeClass
public static void prepareContainerForTest() throws Exception {
try {
- createFromPalette("blockdefinition.tool.block", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.block", getDiagramView(), true);
View blockView = ViewUtil.getChildBySemanticHint(getDiagramView(), SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID);
containerView = ViewUtil.getChildBySemanticHint(blockView, SysMLGraphicalTypes.COMPARTMENT_SYSML_CONSTRAINT_AS_LIST_ID);
@@ -41,149 +41,149 @@ public class TestNodeCreationOnBlockConstraintCompartment extends AbstractTest { @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, false);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, false);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, false);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, true);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, false);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, true);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, false);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, false);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, false);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, false);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, false);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, false);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, false);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, false);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, false);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, false);
}
@Test
public void createPart() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.part", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, false);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, false);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, false);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, false);
}
@Test
public void createReference() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.reference", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, false);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, false);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, false);
}
@Test
public void createValue() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.value", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, false);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnBlockFlowPortCompartment.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnBlockFlowPortCompartment.java index d47a86a81e8..f38fe725d51 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnBlockFlowPortCompartment.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnBlockFlowPortCompartment.java @@ -2,7 +2,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.custom; import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.changeVisibility;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
import org.eclipse.gmf.runtime.notation.View;
@@ -21,7 +21,7 @@ public class TestNodeCreationOnBlockFlowPortCompartment extends AbstractTest { @BeforeClass
public static void prepareContainerForTest() throws Exception {
try {
- createFromPalette("blockdefinition.tool.block", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.block", getDiagramView(), true);
View blockView = ViewUtil.getChildBySemanticHint(getDiagramView(), SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID);
containerView = ViewUtil.getChildBySemanticHint(blockView, SysMLGraphicalTypes.COMPARTMENT_SYSML_FLOWPORT_AS_LIST_ID);
@@ -41,149 +41,149 @@ public class TestNodeCreationOnBlockFlowPortCompartment extends AbstractTest { @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, false);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, false);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, false);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, false);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, false);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, false);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, false);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, false);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, true);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, false);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, false);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, false);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, false);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, false);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, false);
}
@Test
public void createPart() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.part", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, false);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, false);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, false);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, false);
}
@Test
public void createReference() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.reference", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, false);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, false);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, false);
}
@Test
public void createValue() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.value", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, false);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnBlockOperationCompartment.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnBlockOperationCompartment.java index 25efa0a7dcb..1ded921c3ea 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnBlockOperationCompartment.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnBlockOperationCompartment.java @@ -2,7 +2,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.custom; import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.changeVisibility;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
import org.eclipse.gmf.runtime.notation.View;
@@ -22,7 +22,7 @@ public class TestNodeCreationOnBlockOperationCompartment extends AbstractTest { @BeforeClass
public static void prepareContainerForTest() throws Exception {
try {
- createFromPalette("blockdefinition.tool.block", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.block", getDiagramView(), true);
View blockView = ViewUtil.getChildBySemanticHint(getDiagramView(), SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID);
containerView = ViewUtil.getChildBySemanticHint(blockView, UMLGraphicalTypes.COMPARTMENT_UML_OPERATION_AS_LIST_ID);
@@ -42,149 +42,149 @@ public class TestNodeCreationOnBlockOperationCompartment extends AbstractTest { @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, false);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, false);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, false);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, false);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, false);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, false);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, false);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, false);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, false);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, false);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, false);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, false);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, false);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, true);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, false);
}
@Test
public void createPart() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.part", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, false);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, false);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, false);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, true);
}
@Test
public void createReference() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.reference", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, false);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, false);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, false);
}
@Test
public void createValue() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.value", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, false);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnBlockPartCompartment.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnBlockPartCompartment.java index d4730791ded..211d3bb7022 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnBlockPartCompartment.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnBlockPartCompartment.java @@ -2,7 +2,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.custom; import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.changeVisibility;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
import org.eclipse.gmf.runtime.notation.View;
@@ -21,7 +21,7 @@ public class TestNodeCreationOnBlockPartCompartment extends AbstractTest { @BeforeClass
public static void prepareContainerForTest() throws Exception {
try {
- createFromPalette("blockdefinition.tool.block", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.block", getDiagramView(), true);
View blockView = ViewUtil.getChildBySemanticHint(getDiagramView(), SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID);
containerView = ViewUtil.getChildBySemanticHint(blockView, SysMLGraphicalTypes.COMPARTMENT_SYSML_PART_AS_LIST_ID);
@@ -41,149 +41,149 @@ public class TestNodeCreationOnBlockPartCompartment extends AbstractTest { @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, false);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, false);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, false);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, false);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, false);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, false);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, false);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, false);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, false);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, false);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, false);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, false);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, false);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, false);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, false);
}
@Test
public void createPart() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.part", containerView, true, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, true, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, false);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, false);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, false);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, false);
}
@Test
public void createReference() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.reference", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, false);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, false);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, false);
}
@Test
public void createValue() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.value", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, false);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnBlockPortCompartment.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnBlockPortCompartment.java index 82cac10610a..c5bed8534b7 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnBlockPortCompartment.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnBlockPortCompartment.java @@ -2,7 +2,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.custom; import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.changeVisibility;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
import org.eclipse.gmf.runtime.notation.View;
@@ -22,7 +22,7 @@ public class TestNodeCreationOnBlockPortCompartment extends AbstractTest { @BeforeClass
public static void prepareContainerForTest() throws Exception {
try {
- createFromPalette("blockdefinition.tool.block", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.block", getDiagramView(), true);
View blockView = ViewUtil.getChildBySemanticHint(getDiagramView(), SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID);
containerView = ViewUtil.getChildBySemanticHint(blockView, UMLGraphicalTypes.COMPARTMENT_UML_PORT_AS_LIST_ID);
@@ -42,149 +42,149 @@ public class TestNodeCreationOnBlockPortCompartment extends AbstractTest { @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, false);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, false);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, false);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, false);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, false);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, false);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, false);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, false);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, false);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, false);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, false);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, false);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, false);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, false);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, false);
}
@Test
public void createPart() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.part", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, true);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, false);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, false);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, false);
}
@Test
public void createReference() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.reference", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, false);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, false);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, false);
}
@Test
public void createValue() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.value", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, false);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnBlockPropertyCompartment.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnBlockPropertyCompartment.java index cab8203e745..64f4d41493a 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnBlockPropertyCompartment.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnBlockPropertyCompartment.java @@ -2,7 +2,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.custom; import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.changeVisibility;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
import org.eclipse.gmf.runtime.notation.View;
@@ -21,7 +21,7 @@ public class TestNodeCreationOnBlockPropertyCompartment extends AbstractTest { @BeforeClass
public static void prepareContainerForTest() throws Exception {
try {
- createFromPalette("blockdefinition.tool.block", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.block", getDiagramView(), true);
View blockView = ViewUtil.getChildBySemanticHint(getDiagramView(), SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID);
containerView = ViewUtil.getChildBySemanticHint(blockView, SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID);
@@ -41,149 +41,149 @@ public class TestNodeCreationOnBlockPropertyCompartment extends AbstractTest { @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, false);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, false);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, false);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, false);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, false);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, false);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, false);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, false);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, true);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, false);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, false);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, false);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, false);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, false);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, false);
}
@Test
public void createPart() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.part", containerView, true, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, true, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, true);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, false);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, true);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, false);
}
@Test
public void createReference() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.reference", containerView, true, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, true, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, false);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, false);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, false);
}
@Test
public void createValue() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.value", containerView, true, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, true, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, false);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnBlockReferenceCompartment.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnBlockReferenceCompartment.java index 510e0bc4b45..9c959d85297 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnBlockReferenceCompartment.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnBlockReferenceCompartment.java @@ -2,7 +2,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.custom; import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.changeVisibility;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
import org.eclipse.gmf.runtime.notation.View;
@@ -21,7 +21,7 @@ public class TestNodeCreationOnBlockReferenceCompartment extends AbstractTest { @BeforeClass
public static void prepareContainerForTest() throws Exception {
try {
- createFromPalette("blockdefinition.tool.block", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.block", getDiagramView(), true);
View blockView = ViewUtil.getChildBySemanticHint(getDiagramView(), SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID);
containerView = ViewUtil.getChildBySemanticHint(blockView, SysMLGraphicalTypes.COMPARTMENT_SYSML_REFERENCE_AS_LIST_ID);
@@ -41,149 +41,149 @@ public class TestNodeCreationOnBlockReferenceCompartment extends AbstractTest { @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, false);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, false);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, false);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, false);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, false);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, false);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, false);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, false);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, false);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, false);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, false);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, false);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, false);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, false);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, false);
}
@Test
public void createPart() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.part", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, false);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, false);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, false);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, false);
}
@Test
public void createReference() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.reference", containerView, true, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, true, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, false);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, false);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, false);
}
@Test
public void createValue() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.value", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, false);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnBlockValueCompartment.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnBlockValueCompartment.java index 8324379613c..fa5abbbbe11 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnBlockValueCompartment.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnBlockValueCompartment.java @@ -2,7 +2,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.custom; import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.changeVisibility;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
import org.eclipse.gmf.runtime.notation.View;
@@ -21,7 +21,7 @@ public class TestNodeCreationOnBlockValueCompartment extends AbstractTest { @BeforeClass
public static void prepareContainerForTest() throws Exception {
try {
- createFromPalette("blockdefinition.tool.block", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.block", getDiagramView(), true);
View blockView = ViewUtil.getChildBySemanticHint(getDiagramView(), SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID);
containerView = ViewUtil.getChildBySemanticHint(blockView, SysMLGraphicalTypes.COMPARTMENT_SYSML_VALUE_AS_LIST_ID);
@@ -41,149 +41,149 @@ public class TestNodeCreationOnBlockValueCompartment extends AbstractTest { @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, false);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, false);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, false);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, false);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, false);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, false);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, false);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, false);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, false);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, false);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, false);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, false);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, false);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, false);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, false);
}
@Test
public void createPart() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.part", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, false);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, false);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, false);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, false);
}
@Test
public void createReference() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.reference", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, false);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, false);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, false);
}
@Test
public void createValue() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.value", containerView, true, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, true, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, false);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnConstraintBlock.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnConstraintBlock.java index 8d6296cf25e..86db8903754 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnConstraintBlock.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnConstraintBlock.java @@ -2,7 +2,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.custom; import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.createGraphicalNode;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
import org.eclipse.gmf.runtime.notation.View;
@@ -26,7 +26,7 @@ public class TestNodeCreationOnConstraintBlock extends AbstractTest { // force inherited provider loading...
createGraphicalNode(UMLElementTypes.PACKAGE, ElementTypes.PACKAGE.getSemanticHint(), getDiagramView());
- createFromPalette("blockdefinition.tool.constraintblock", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", getDiagramView(), true);
containerView = ViewUtil.getChildBySemanticHint(getDiagramView(), SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCK_AS_CLASSIFIER_ID);
if(containerView == null) {
@@ -40,146 +40,146 @@ public class TestNodeCreationOnConstraintBlock extends AbstractTest { @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, false);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, false);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, false);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, false);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, false);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, false);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, false);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, false);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, false);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, false);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, false);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, false);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, false);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, false);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, false);
}
@Test
public void createPart() throws Exception {
- createFromPalette("blockdefinition.tool.part", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, false);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, false);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, false);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, false);
}
@Test
public void createReference() throws Exception {
- createFromPalette("blockdefinition.tool.reference", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, false);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, false);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, false);
}
@Test
public void createValue() throws Exception {
- createFromPalette("blockdefinition.tool.value", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, false);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnConstraintBlockConstraintCompartment.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnConstraintBlockConstraintCompartment.java index efdac3e550e..909884f72a2 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnConstraintBlockConstraintCompartment.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnConstraintBlockConstraintCompartment.java @@ -2,7 +2,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.custom; import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.changeVisibility;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
import org.eclipse.gmf.runtime.notation.View;
@@ -21,7 +21,7 @@ public class TestNodeCreationOnConstraintBlockConstraintCompartment extends Abst @BeforeClass
public static void prepareContainerForTest() throws Exception {
try {
- createFromPalette("blockdefinition.tool.constraintblock", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", getDiagramView(), true);
View blockView = ViewUtil.getChildBySemanticHint(getDiagramView(), SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCK_AS_CLASSIFIER_ID);
containerView = ViewUtil.getChildBySemanticHint(blockView, SysMLGraphicalTypes.COMPARTMENT_SYSML_CONSTRAINT_AS_LIST_ID);
@@ -41,149 +41,149 @@ public class TestNodeCreationOnConstraintBlockConstraintCompartment extends Abst @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, false);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, false);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, false);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, true);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, false);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, true);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, false);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, false);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, false);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, false);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, false);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, false);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, false);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, false);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, false);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, false);
}
@Test
public void createPart() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.part", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, false);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, false);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, false);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, false);
}
@Test
public void createReference() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.reference", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, false);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, false);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, false);
}
@Test
public void createValue() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.value", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, false);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnConstraintBlockParameterCompartment.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnConstraintBlockParameterCompartment.java index c85d4ed1219..67506200c10 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnConstraintBlockParameterCompartment.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnConstraintBlockParameterCompartment.java @@ -2,7 +2,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.custom; import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.changeVisibility;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
import org.eclipse.gmf.runtime.notation.View;
@@ -21,7 +21,7 @@ public class TestNodeCreationOnConstraintBlockParameterCompartment extends Abstr @BeforeClass
public static void prepareContainerForTest() throws Exception {
try {
- createFromPalette("blockdefinition.tool.constraintblock", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", getDiagramView(), true);
View blockView = ViewUtil.getChildBySemanticHint(getDiagramView(), SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCK_AS_CLASSIFIER_ID);
containerView = ViewUtil.getChildBySemanticHint(blockView, SysMLGraphicalTypes.COMPARTMENT_SYSML_PARAMETER_AS_LIST_ID);
@@ -41,149 +41,149 @@ public class TestNodeCreationOnConstraintBlockParameterCompartment extends Abstr @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, false);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, false);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, false);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, false);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, false);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, false);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, false);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, false);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, false);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, false);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, false);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, false);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, false);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, false);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, false);
}
@Test
public void createPart() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.part", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, false);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, false);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, true);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, false);
}
@Test
public void createReference() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.reference", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, false);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, false);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, false);
}
@Test
public void createValue() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.value", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, false);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnDataType.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnDataType.java index dd6712b487a..ae40e1b756a 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnDataType.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnDataType.java @@ -2,7 +2,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.custom; import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.createGraphicalNode;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
import org.eclipse.gmf.runtime.notation.View;
@@ -26,7 +26,7 @@ public class TestNodeCreationOnDataType extends AbstractTest { // force inherited provider loading...
createGraphicalNode(UMLElementTypes.PACKAGE, ElementTypes.PACKAGE.getSemanticHint(), getDiagramView());
- createFromPalette("blockdefinition.tool.datatype", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.datatype", getDiagramView(), true);
containerView = ViewUtil.getChildBySemanticHint(getDiagramView(), UMLGraphicalTypes.SHAPE_UML_DATATYPE_AS_CLASSIFIER_ID);
if(containerView == null) {
@@ -40,146 +40,146 @@ public class TestNodeCreationOnDataType extends AbstractTest { @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, false);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, false);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, false);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, false);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, false);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, false);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, false);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, false);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, false);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, false);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, false);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, false);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, false);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, false);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, false);
}
@Test
public void createPart() throws Exception {
- createFromPalette("blockdefinition.tool.part", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, false);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, false);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, false);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, false);
}
@Test
public void createReference() throws Exception {
- createFromPalette("blockdefinition.tool.reference", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, false);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, false);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, false);
}
@Test
public void createValue() throws Exception {
- createFromPalette("blockdefinition.tool.value", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, false);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnDataTypeOperationCompartment.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnDataTypeOperationCompartment.java index e7f77822851..45a795d5e58 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnDataTypeOperationCompartment.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnDataTypeOperationCompartment.java @@ -2,7 +2,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.custom; import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.changeVisibility;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
import org.eclipse.gmf.runtime.notation.View;
@@ -21,7 +21,7 @@ public class TestNodeCreationOnDataTypeOperationCompartment extends AbstractTest @BeforeClass
public static void prepareContainerForTest() throws Exception {
try {
- createFromPalette("blockdefinition.tool.datatype", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.datatype", getDiagramView(), true);
View blockView = ViewUtil.getChildBySemanticHint(getDiagramView(), UMLGraphicalTypes.SHAPE_UML_DATATYPE_AS_CLASSIFIER_ID);
containerView = ViewUtil.getChildBySemanticHint(blockView, UMLGraphicalTypes.COMPARTMENT_UML_OPERATION_AS_LIST_ID);
@@ -41,149 +41,149 @@ public class TestNodeCreationOnDataTypeOperationCompartment extends AbstractTest @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, false);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, false);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, false);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, false);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, false);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, false);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, false);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, false);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, false);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, false);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, false);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, false);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, false);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, true);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, false);
}
@Test
public void createPart() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.part", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, false);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, false);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, false);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, false);
}
@Test
public void createReference() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.reference", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, false);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, false);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, false);
}
@Test
public void createValue() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.value", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, false);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnDataTypePropertyCompartment.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnDataTypePropertyCompartment.java index 3889931e2de..b2553e654d8 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnDataTypePropertyCompartment.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnDataTypePropertyCompartment.java @@ -2,7 +2,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.custom; import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.changeVisibility;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
import org.eclipse.gmf.runtime.notation.View;
@@ -21,7 +21,7 @@ public class TestNodeCreationOnDataTypePropertyCompartment extends AbstractTest @BeforeClass
public static void prepareContainerForTest() throws Exception {
try {
- createFromPalette("blockdefinition.tool.datatype", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.datatype", getDiagramView(), true);
View blockView = ViewUtil.getChildBySemanticHint(getDiagramView(), UMLGraphicalTypes.SHAPE_UML_DATATYPE_AS_CLASSIFIER_ID);
containerView = ViewUtil.getChildBySemanticHint(blockView, UMLGraphicalTypes.COMPARTMENT_UML_PROPERTY_AS_LIST_ID);
@@ -41,149 +41,149 @@ public class TestNodeCreationOnDataTypePropertyCompartment extends AbstractTest @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, false);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, false);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, false);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, false);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, false);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, false);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, false);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, false);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, false);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, false);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, false);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, false);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, false);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, false);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, false);
}
@Test
public void createPart() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.part", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, false);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, false);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, true);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, false);
}
@Test
public void createReference() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.reference", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, false);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, false);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, false);
}
@Test
public void createValue() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.value", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, false);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnDimension.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnDimension.java index 84f828773fa..ee4c99c173c 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnDimension.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnDimension.java @@ -2,7 +2,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.custom; import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.createGraphicalNode;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
import org.eclipse.gmf.runtime.notation.View;
@@ -26,7 +26,7 @@ public class TestNodeCreationOnDimension extends AbstractTest { // force inherited provider loading...
createGraphicalNode(UMLElementTypes.PACKAGE, ElementTypes.PACKAGE.getSemanticHint(), getDiagramView());
- createFromPalette("blockdefinition.tool.dimension", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.dimension", getDiagramView(), true);
containerView = ViewUtil.getChildBySemanticHint(getDiagramView(), SysMLGraphicalTypes.SHAPE_SYSML_DIMENSION_AS_CLASSIFIER_ID);
if(containerView == null) {
@@ -40,146 +40,146 @@ public class TestNodeCreationOnDimension extends AbstractTest { @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, false);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, false);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, false);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, false);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, false);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, false);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, false);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, false);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, false);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, false);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, false);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, false);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, false);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, false);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, false);
}
@Test
public void createPart() throws Exception {
- createFromPalette("blockdefinition.tool.part", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, false);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, false);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, false);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, false);
}
@Test
public void createReference() throws Exception {
- createFromPalette("blockdefinition.tool.reference", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, false);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, false);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, false);
}
@Test
public void createValue() throws Exception {
- createFromPalette("blockdefinition.tool.value", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, false);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnEnumeration.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnEnumeration.java index 1babe1270f5..fb4cba2493d 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnEnumeration.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnEnumeration.java @@ -2,7 +2,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.custom; import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.createGraphicalNode;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
import org.eclipse.gmf.runtime.notation.View;
@@ -26,7 +26,7 @@ public class TestNodeCreationOnEnumeration extends AbstractTest { // force inherited provider loading...
createGraphicalNode(UMLElementTypes.PACKAGE, ElementTypes.PACKAGE.getSemanticHint(), getDiagramView());
- createFromPalette("blockdefinition.tool.enumeration", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.enumeration", getDiagramView(), true);
containerView = ViewUtil.getChildBySemanticHint(getDiagramView(), UMLGraphicalTypes.SHAPE_UML_ENUMERATION_AS_CLASSIFIER_ID);
if(containerView == null) {
@@ -40,146 +40,146 @@ public class TestNodeCreationOnEnumeration extends AbstractTest { @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, false);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, false);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, false);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, false);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, false);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, false);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, false);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, false);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, false);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, false);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, false);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, false);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, false);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, false);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, false);
}
@Test
public void createPart() throws Exception {
- createFromPalette("blockdefinition.tool.part", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, false);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, false);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, false);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, false);
}
@Test
public void createReference() throws Exception {
- createFromPalette("blockdefinition.tool.reference", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, false);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, false);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, false);
}
@Test
public void createValue() throws Exception {
- createFromPalette("blockdefinition.tool.value", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, false);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnEnumerationLiteralCompartment.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnEnumerationLiteralCompartment.java index f0c9a455207..85ab7bc2131 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnEnumerationLiteralCompartment.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnEnumerationLiteralCompartment.java @@ -2,7 +2,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.custom; import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.changeVisibility;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
import org.eclipse.gmf.runtime.notation.View;
@@ -21,7 +21,7 @@ public class TestNodeCreationOnEnumerationLiteralCompartment extends AbstractTes @BeforeClass
public static void prepareContainerForTest() throws Exception {
try {
- createFromPalette("blockdefinition.tool.enumeration", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.enumeration", getDiagramView(), true);
View blockView = ViewUtil.getChildBySemanticHint(getDiagramView(), UMLGraphicalTypes.SHAPE_UML_ENUMERATION_AS_CLASSIFIER_ID);
containerView = ViewUtil.getChildBySemanticHint(blockView, UMLGraphicalTypes.COMPARTMENT_UML_ENUMERATIONLITERAL_AS_LIST_ID);
@@ -41,149 +41,149 @@ public class TestNodeCreationOnEnumerationLiteralCompartment extends AbstractTes @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, false);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, false);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, false);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, false);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, false);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, false);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, false);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, false);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, true);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, false);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, false);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, false);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, false);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, false);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, false);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, false);
}
@Test
public void createPart() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.part", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, false);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, false);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, false);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, false);
}
@Test
public void createReference() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.reference", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, false);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, false);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, false);
}
@Test
public void createValue() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.value", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, false);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnFlowSpecification.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnFlowSpecification.java index c57af5a940d..88c38b2784b 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnFlowSpecification.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnFlowSpecification.java @@ -2,7 +2,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.custom; import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.createGraphicalNode;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
import org.eclipse.gmf.runtime.notation.View;
@@ -26,7 +26,7 @@ public class TestNodeCreationOnFlowSpecification extends AbstractTest { // force inherited provider loading...
createGraphicalNode(UMLElementTypes.PACKAGE, ElementTypes.PACKAGE.getSemanticHint(), getDiagramView());
- createFromPalette("blockdefinition.tool.flowspecification", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", getDiagramView(), true);
containerView = ViewUtil.getChildBySemanticHint(getDiagramView(), SysMLGraphicalTypes.SHAPE_SYSML_FLOWSPECIFICATION_AS_CLASSIFIER_ID);
if(containerView == null) {
@@ -40,146 +40,146 @@ public class TestNodeCreationOnFlowSpecification extends AbstractTest { @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, false);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, false);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, false);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, false);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, false);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, false);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, false);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, false);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, false);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, false);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, false);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, false);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, false);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, false);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, false);
}
@Test
public void createPart() throws Exception {
- createFromPalette("blockdefinition.tool.part", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, false);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, false);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, false);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, false);
}
@Test
public void createReference() throws Exception {
- createFromPalette("blockdefinition.tool.reference", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, false);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, false);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, false);
}
@Test
public void createValue() throws Exception {
- createFromPalette("blockdefinition.tool.value", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, false);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnFlowSpecificationFlowCompartment.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnFlowSpecificationFlowCompartment.java index 5b537f2c0c0..23630419d68 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnFlowSpecificationFlowCompartment.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnFlowSpecificationFlowCompartment.java @@ -2,7 +2,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.custom; import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.changeVisibility;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
import org.eclipse.gmf.runtime.notation.View;
@@ -21,7 +21,7 @@ public class TestNodeCreationOnFlowSpecificationFlowCompartment extends Abstract @BeforeClass
public static void prepareContainerForTest() throws Exception {
try {
- createFromPalette("blockdefinition.tool.flowspecification", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", getDiagramView(), true);
View blockView = ViewUtil.getChildBySemanticHint(getDiagramView(), SysMLGraphicalTypes.SHAPE_SYSML_FLOWSPECIFICATION_AS_CLASSIFIER_ID);
containerView = ViewUtil.getChildBySemanticHint(blockView, SysMLGraphicalTypes.COMPARTMENT_SYSML_FLOWPROPERTY_AS_LIST_ID);
@@ -41,149 +41,149 @@ public class TestNodeCreationOnFlowSpecificationFlowCompartment extends Abstract @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, false);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, false);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, false);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, false);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, false);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, false);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, false);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, false);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, false);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, true);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, false);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, false);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, false);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, false);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, false);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, false);
}
@Test
public void createPart() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.part", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, false);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, false);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, false);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, false);
}
@Test
public void createReference() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.reference", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, false);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, false);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, false);
}
@Test
public void createValue() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.value", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, false);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnInterface.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnInterface.java index 78017e3ee4e..a1c853a9010 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnInterface.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnInterface.java @@ -2,7 +2,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.custom; import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.createGraphicalNode;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
import org.eclipse.gmf.runtime.notation.View;
@@ -26,7 +26,7 @@ public class TestNodeCreationOnInterface extends AbstractTest { // force inherited provider loading...
createGraphicalNode(UMLElementTypes.PACKAGE, ElementTypes.PACKAGE.getSemanticHint(), getDiagramView());
- createFromPalette("blockdefinition.tool.interface", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.interface", getDiagramView(), true);
containerView = ViewUtil.getChildBySemanticHint(getDiagramView(), UMLGraphicalTypes.SHAPE_UML_INTERFACE_AS_CLASSIFIER_ID);
if(containerView == null) {
@@ -40,146 +40,146 @@ public class TestNodeCreationOnInterface extends AbstractTest { @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, false);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, false);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, false);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, false);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, false);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, false);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, false);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, false);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, false);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, false);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, false);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, false);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, false);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, false);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, false);
}
@Test
public void createPart() throws Exception {
- createFromPalette("blockdefinition.tool.part", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, false);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, false);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, false);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, false);
}
@Test
public void createReference() throws Exception {
- createFromPalette("blockdefinition.tool.reference", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, false);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, false);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, false);
}
@Test
public void createValue() throws Exception {
- createFromPalette("blockdefinition.tool.value", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, false);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnInterfaceOperationCompartment.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnInterfaceOperationCompartment.java index dbff20e1bbb..3c7544ddc6d 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnInterfaceOperationCompartment.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnInterfaceOperationCompartment.java @@ -2,7 +2,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.custom; import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.changeVisibility;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
import org.eclipse.gmf.runtime.notation.View;
@@ -21,7 +21,7 @@ public class TestNodeCreationOnInterfaceOperationCompartment extends AbstractTes @BeforeClass
public static void prepareContainerForTest() throws Exception {
try {
- createFromPalette("blockdefinition.tool.interface", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.interface", getDiagramView(), true);
View blockView = ViewUtil.getChildBySemanticHint(getDiagramView(), UMLGraphicalTypes.SHAPE_UML_INTERFACE_AS_CLASSIFIER_ID);
containerView = ViewUtil.getChildBySemanticHint(blockView, UMLGraphicalTypes.COMPARTMENT_UML_OPERATION_AS_LIST_ID);
@@ -41,149 +41,149 @@ public class TestNodeCreationOnInterfaceOperationCompartment extends AbstractTes @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, false);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, false);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, false);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, false);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, false);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, false);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, false);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, false);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, false);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, false);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, false);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, false);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, false);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, true);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, false);
}
@Test
public void createPart() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.part", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, false);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, false);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, false);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, true);
}
@Test
public void createReference() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.reference", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, false);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, false);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, false);
}
@Test
public void createValue() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.value", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, false);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnInterfacePropertyCompartment.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnInterfacePropertyCompartment.java index 15e7eaf3290..2a6a3c82a2a 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnInterfacePropertyCompartment.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnInterfacePropertyCompartment.java @@ -2,7 +2,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.custom; import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.changeVisibility;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
import org.eclipse.gmf.runtime.notation.View;
@@ -21,7 +21,7 @@ public class TestNodeCreationOnInterfacePropertyCompartment extends AbstractTest @BeforeClass
public static void prepareContainerForTest() throws Exception {
try {
- createFromPalette("blockdefinition.tool.interface", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.interface", getDiagramView(), true);
View blockView = ViewUtil.getChildBySemanticHint(getDiagramView(), UMLGraphicalTypes.SHAPE_UML_INTERFACE_AS_CLASSIFIER_ID);
containerView = ViewUtil.getChildBySemanticHint(blockView, UMLGraphicalTypes.COMPARTMENT_UML_PROPERTY_AS_LIST_ID);
@@ -41,149 +41,149 @@ public class TestNodeCreationOnInterfacePropertyCompartment extends AbstractTest @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, false);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, false);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, false);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, false);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, false);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, false);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, false);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, false);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, false);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, false);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, false);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, false);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, false);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, false);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, false);
}
@Test
public void createPart() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.part", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, false);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, false);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, true);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, false);
}
@Test
public void createReference() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.reference", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, false);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, false);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, false);
}
@Test
public void createValue() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.value", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, false);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnPrimitiveType.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnPrimitiveType.java index 5a9140c85cb..c88fba0def3 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnPrimitiveType.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnPrimitiveType.java @@ -2,7 +2,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.custom; import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.createGraphicalNode;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
import org.eclipse.gmf.runtime.notation.View;
@@ -26,7 +26,7 @@ public class TestNodeCreationOnPrimitiveType extends AbstractTest { // force inherited provider loading...
createGraphicalNode(UMLElementTypes.PACKAGE, ElementTypes.PACKAGE.getSemanticHint(), getDiagramView());
- createFromPalette("blockdefinition.tool.primitivetype", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", getDiagramView(), true);
containerView = ViewUtil.getChildBySemanticHint(getDiagramView(), UMLGraphicalTypes.SHAPE_UML_PRIMITIVETYPE_AS_CLASSIFIER_ID);
if(containerView == null) {
@@ -40,146 +40,146 @@ public class TestNodeCreationOnPrimitiveType extends AbstractTest { @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, false);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, false);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, false);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, false);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, false);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, false);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, false);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, false);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, false);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, false);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, false);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, false);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, false);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, false);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, false);
}
@Test
public void createPart() throws Exception {
- createFromPalette("blockdefinition.tool.part", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, false);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, false);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, false);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, false);
}
@Test
public void createReference() throws Exception {
- createFromPalette("blockdefinition.tool.reference", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, false);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, false);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, false);
}
@Test
public void createValue() throws Exception {
- createFromPalette("blockdefinition.tool.value", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, false);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnSignal.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnSignal.java index 4f814687b60..55f3b840a56 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnSignal.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnSignal.java @@ -2,7 +2,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.custom; import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.createGraphicalNode;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
import org.eclipse.gmf.runtime.notation.View;
@@ -26,7 +26,7 @@ public class TestNodeCreationOnSignal extends AbstractTest { // force inherited provider loading...
createGraphicalNode(UMLElementTypes.PACKAGE, ElementTypes.PACKAGE.getSemanticHint(), getDiagramView());
- createFromPalette("blockdefinition.tool.signal", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.signal", getDiagramView(), true);
containerView = ViewUtil.getChildBySemanticHint(getDiagramView(), UMLGraphicalTypes.SHAPE_UML_SIGNAL_AS_CLASSIFIER_ID);
if(containerView == null) {
@@ -40,146 +40,146 @@ public class TestNodeCreationOnSignal extends AbstractTest { @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, false);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, false);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, false);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, false);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, false);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, false);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, false);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, false);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, false);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, false);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, false);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, false);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, false);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, false);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, false);
}
@Test
public void createPart() throws Exception {
- createFromPalette("blockdefinition.tool.part", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, false);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, false);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, false);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, false);
}
@Test
public void createReference() throws Exception {
- createFromPalette("blockdefinition.tool.reference", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, false);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, false);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, false);
}
@Test
public void createValue() throws Exception {
- createFromPalette("blockdefinition.tool.value", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, false);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnSignalPropertyCompartment.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnSignalPropertyCompartment.java index 23afb0df1bb..363bea53aa5 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnSignalPropertyCompartment.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnSignalPropertyCompartment.java @@ -2,7 +2,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.custom; import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.changeVisibility;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
import org.eclipse.gmf.runtime.notation.View;
@@ -21,7 +21,7 @@ public class TestNodeCreationOnSignalPropertyCompartment extends AbstractTest { @BeforeClass
public static void prepareContainerForTest() throws Exception {
try {
- createFromPalette("blockdefinition.tool.signal", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.signal", getDiagramView(), true);
View blockView = ViewUtil.getChildBySemanticHint(getDiagramView(), UMLGraphicalTypes.SHAPE_UML_SIGNAL_AS_CLASSIFIER_ID);
containerView = ViewUtil.getChildBySemanticHint(blockView, UMLGraphicalTypes.COMPARTMENT_UML_PROPERTY_AS_LIST_ID);
@@ -41,149 +41,149 @@ public class TestNodeCreationOnSignalPropertyCompartment extends AbstractTest { @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, false);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, false);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, false);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, false);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, false);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, false);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, false);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, false);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, false);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, false);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, false);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, false);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, false);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, false);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, false);
}
@Test
public void createPart() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.part", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, false);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, false);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, true);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, false);
}
@Test
public void createReference() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.reference", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, false);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, false);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, false);
}
@Test
public void createValue() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.value", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, false);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnUnit.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnUnit.java index 2c0fcb712b6..05bed977ea7 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnUnit.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnUnit.java @@ -2,7 +2,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.custom; import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.createGraphicalNode;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
import org.eclipse.gmf.runtime.notation.View;
@@ -26,7 +26,7 @@ public class TestNodeCreationOnUnit extends AbstractTest { // force inherited provider loading...
createGraphicalNode(UMLElementTypes.PACKAGE, ElementTypes.PACKAGE.getSemanticHint(), getDiagramView());
- createFromPalette("blockdefinition.tool.unit", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.unit", getDiagramView(), true);
containerView = ViewUtil.getChildBySemanticHint(getDiagramView(), SysMLGraphicalTypes.SHAPE_SYSML_UNIT_AS_CLASSIFIER_ID);
if(containerView == null) {
@@ -40,146 +40,146 @@ public class TestNodeCreationOnUnit extends AbstractTest { @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, false);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, false);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, false);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, false);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, false);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, false);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, false);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, false);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, false);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, false);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, false);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, false);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, false);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, false);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, false);
}
@Test
public void createPart() throws Exception {
- createFromPalette("blockdefinition.tool.part", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, false);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, false);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, false);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, false);
}
@Test
public void createReference() throws Exception {
- createFromPalette("blockdefinition.tool.reference", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, false);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, false);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, false);
}
@Test
public void createValue() throws Exception {
- createFromPalette("blockdefinition.tool.value", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, false);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnValueType.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnValueType.java index e5354fab1ab..df765d6b6b4 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnValueType.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnValueType.java @@ -2,7 +2,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.custom; import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.createGraphicalNode;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
import org.eclipse.gmf.runtime.notation.View;
@@ -26,7 +26,7 @@ public class TestNodeCreationOnValueType extends AbstractTest { // force inherited provider loading...
createGraphicalNode(UMLElementTypes.PACKAGE, ElementTypes.PACKAGE.getSemanticHint(), getDiagramView());
- createFromPalette("blockdefinition.tool.valuetype", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.valuetype", getDiagramView(), true);
containerView = ViewUtil.getChildBySemanticHint(getDiagramView(), SysMLGraphicalTypes.SHAPE_SYSML_VALUETYPE_AS_CLASSIFIER_ID);
if(containerView == null) {
@@ -40,146 +40,146 @@ public class TestNodeCreationOnValueType extends AbstractTest { @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, false);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, false);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, false);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, false);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, false);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, false);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, false);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, false);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, false);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, false);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, false);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, false);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, false);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, false);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, false);
}
@Test
public void createPart() throws Exception {
- createFromPalette("blockdefinition.tool.part", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, false);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, false);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, false);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, false);
}
@Test
public void createReference() throws Exception {
- createFromPalette("blockdefinition.tool.reference", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, false);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, false);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, false);
}
@Test
public void createValue() throws Exception {
- createFromPalette("blockdefinition.tool.value", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, false);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnValueTypeOperationCompartment.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnValueTypeOperationCompartment.java index 38827f61247..f200a2c9a23 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnValueTypeOperationCompartment.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnValueTypeOperationCompartment.java @@ -2,7 +2,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.custom; import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.changeVisibility;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
import org.eclipse.gmf.runtime.notation.View;
@@ -22,7 +22,7 @@ public class TestNodeCreationOnValueTypeOperationCompartment extends AbstractTes @BeforeClass
public static void prepareContainerForTest() throws Exception {
try {
- createFromPalette("blockdefinition.tool.valuetype", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.valuetype", getDiagramView(), true);
View blockView = ViewUtil.getChildBySemanticHint(getDiagramView(), SysMLGraphicalTypes.SHAPE_SYSML_VALUETYPE_AS_CLASSIFIER_ID);
containerView = ViewUtil.getChildBySemanticHint(blockView, UMLGraphicalTypes.COMPARTMENT_UML_OPERATION_AS_LIST_ID);
@@ -42,149 +42,149 @@ public class TestNodeCreationOnValueTypeOperationCompartment extends AbstractTes @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, false);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, false);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, false);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, false);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, false);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, false);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, false);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, false);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, false);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, false);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, false);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, false);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, false);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, true);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, false);
}
@Test
public void createPart() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.part", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, false);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, false);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, false);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, false);
}
@Test
public void createReference() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.reference", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, false);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, false);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, false);
}
@Test
public void createValue() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.value", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, false);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnValueTypePropertyCompartment.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnValueTypePropertyCompartment.java index d420e1a20a1..aa52708b19c 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnValueTypePropertyCompartment.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/custom/TestNodeCreationOnValueTypePropertyCompartment.java @@ -2,7 +2,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.custom; import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.changeVisibility;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
import org.eclipse.gmf.runtime.notation.View;
@@ -22,7 +22,7 @@ public class TestNodeCreationOnValueTypePropertyCompartment extends AbstractTest @BeforeClass
public static void prepareContainerForTest() throws Exception {
try {
- createFromPalette("blockdefinition.tool.valuetype", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.valuetype", getDiagramView(), true);
View blockView = ViewUtil.getChildBySemanticHint(getDiagramView(), SysMLGraphicalTypes.SHAPE_SYSML_VALUETYPE_AS_CLASSIFIER_ID);
containerView = ViewUtil.getChildBySemanticHint(blockView, UMLGraphicalTypes.COMPARTMENT_UML_PROPERTY_AS_LIST_ID);
@@ -42,149 +42,149 @@ public class TestNodeCreationOnValueTypePropertyCompartment extends AbstractTest @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, false);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, false);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, false);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, false);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, false);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, false);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, false);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, false);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, false);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, false);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, false);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, false);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, false);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, false);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, false);
}
@Test
public void createPart() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.part", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, false);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, false);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, true);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, false);
}
@Test
public void createReference() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.reference", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, false);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, false);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, false);
}
@Test
public void createValue() throws Exception {
// Do not execute as this requires user interaction (dialog)
- createFromPalette("blockdefinition.tool.value", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, false);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnComment.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnComment.java index cf360cf0dc6..773795116da 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnComment.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnComment.java @@ -2,7 +2,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.inherit import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.createGraphicalNode;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
@@ -38,146 +38,146 @@ public class TestNodeCreationOnComment extends AbstractTest { @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, false);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, false);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, false);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, false);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, false);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, false);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, false);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, false);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, false);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, false);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, false);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, false);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, false);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, false);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, false);
}
@Test
public void createPart() throws Exception {
- createFromPalette("blockdefinition.tool.part", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, false);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, false);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, false);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, false);
}
@Test
public void createReference() throws Exception {
- createFromPalette("blockdefinition.tool.reference", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, false);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, false);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, false);
}
@Test
public void createValue() throws Exception {
- createFromPalette("blockdefinition.tool.value", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, false);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnCommentCN.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnCommentCN.java index d1b586ad447..fb489f47419 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnCommentCN.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnCommentCN.java @@ -3,7 +3,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.inherit import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.changeVisibility;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.createGraphicalNode;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
import org.eclipse.gmf.runtime.notation.View;
@@ -47,146 +47,146 @@ public class TestNodeCreationOnCommentCN extends AbstractTest { @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, false);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, false);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, false);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, false);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, false);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, false);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, false);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, false);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, false);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, false);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, false);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, false);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, false);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, false);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, false);
}
@Test
public void createPart() throws Exception {
- createFromPalette("blockdefinition.tool.part", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, false);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, false);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, false);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, false);
}
@Test
public void createReference() throws Exception {
- createFromPalette("blockdefinition.tool.reference", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, false);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, false);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, false);
}
@Test
public void createValue() throws Exception {
- createFromPalette("blockdefinition.tool.value", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, false);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnConstraint.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnConstraint.java index c29eff8fbae..6ddf2aa3f95 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnConstraint.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnConstraint.java @@ -2,7 +2,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.inherit import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.createGraphicalNode;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
@@ -38,146 +38,146 @@ public class TestNodeCreationOnConstraint extends AbstractTest { @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, false);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, false);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, false);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, false);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, false);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, false);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, false);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, false);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, false);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, false);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, false);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, false);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, false);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, false);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, false);
}
@Test
public void createPart() throws Exception {
- createFromPalette("blockdefinition.tool.part", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, false);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, false);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, false);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, false);
}
@Test
public void createReference() throws Exception {
- createFromPalette("blockdefinition.tool.reference", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, false);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, false);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, false);
}
@Test
public void createValue() throws Exception {
- createFromPalette("blockdefinition.tool.value", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, false);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnConstraintCN.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnConstraintCN.java index 92a59804769..6994b202d85 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnConstraintCN.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnConstraintCN.java @@ -3,7 +3,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.inherit import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.changeVisibility;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.createGraphicalNode;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
import org.eclipse.gmf.runtime.notation.View;
@@ -47,146 +47,146 @@ public class TestNodeCreationOnConstraintCN extends AbstractTest { @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, false);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, false);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, false);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, false);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, false);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, false);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, false);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, false);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, false);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, false);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, false);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, false);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, false);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, false);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, false);
}
@Test
public void createPart() throws Exception {
- createFromPalette("blockdefinition.tool.part", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, false);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, false);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, false);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, false);
}
@Test
public void createReference() throws Exception {
- createFromPalette("blockdefinition.tool.reference", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, false);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, false);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, false);
}
@Test
public void createValue() throws Exception {
- createFromPalette("blockdefinition.tool.value", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, false);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnInstanceSpecification.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnInstanceSpecification.java index 4e7e60f59b1..98ca9b077af 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnInstanceSpecification.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnInstanceSpecification.java @@ -2,7 +2,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.inherit import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.createGraphicalNode;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
@@ -38,146 +38,146 @@ public class TestNodeCreationOnInstanceSpecification extends AbstractTest { @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, false);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, false);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, false);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, false);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, false);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, false);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, false);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, false);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, false);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, false);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, false);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, false);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, false);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, false);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, false);
}
@Test
public void createPart() throws Exception {
- createFromPalette("blockdefinition.tool.part", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, false);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, false);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, false);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, false);
}
@Test
public void createReference() throws Exception {
- createFromPalette("blockdefinition.tool.reference", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, false);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, false);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, false);
}
@Test
public void createValue() throws Exception {
- createFromPalette("blockdefinition.tool.value", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, false);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnInstanceSpecificationCN.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnInstanceSpecificationCN.java index f8c4ce59a81..99e63b23578 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnInstanceSpecificationCN.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnInstanceSpecificationCN.java @@ -3,7 +3,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.inherit import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.changeVisibility;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.createGraphicalNode;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
import org.eclipse.gmf.runtime.notation.View;
@@ -47,146 +47,146 @@ public class TestNodeCreationOnInstanceSpecificationCN extends AbstractTest { @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, false);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, false);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, false);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, false);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, false);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, false);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, false);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, false);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, false);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, false);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, false);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, false);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, false);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, false);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, false);
}
@Test
public void createPart() throws Exception {
- createFromPalette("blockdefinition.tool.part", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, false);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, false);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, false);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, false);
}
@Test
public void createReference() throws Exception {
- createFromPalette("blockdefinition.tool.reference", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, false);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, false);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, false);
}
@Test
public void createValue() throws Exception {
- createFromPalette("blockdefinition.tool.value", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, false);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnInstanceSpecificationCompartment.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnInstanceSpecificationCompartment.java index c1e639dc924..d3548efe9d6 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnInstanceSpecificationCompartment.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnInstanceSpecificationCompartment.java @@ -2,7 +2,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.inherit import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.changeVisibility;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
import org.eclipse.gmf.runtime.notation.View;
@@ -22,10 +22,10 @@ public class TestNodeCreationOnInstanceSpecificationCompartment extends Abstract public static void prepareContainerForTest() throws Exception {
try {
// force custom provider loading...
- createFromPalette("blockdefinition.tool.block", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.block", getDiagramView(), true);
//
- createFromPalette("blockdefinition.tool.instancespecification", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", getDiagramView(), true);
View nodeView = ViewUtil.getChildBySemanticHint(getDiagramView(), ElementTypes.INSTANCE_SPECIFICATION.getSemanticHint());
containerView = ViewUtil.getChildBySemanticHint(nodeView, ElementTypes.INSTANCE_SPECIFICATION_COMPARTMENT_SLOT_HINT);
@@ -46,146 +46,146 @@ public class TestNodeCreationOnInstanceSpecificationCompartment extends Abstract @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, false);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, false);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, false);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, false);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, false);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, false);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, false);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, false);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, false);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, false);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, false);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, false);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, false);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, false);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, false);
}
@Test
public void createPart() throws Exception {
- createFromPalette("blockdefinition.tool.part", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, false);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, false);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, false);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, false);
}
@Test
public void createReference() throws Exception {
- createFromPalette("blockdefinition.tool.reference", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, false);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, true);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, false);
}
@Test
public void createValue() throws Exception {
- createFromPalette("blockdefinition.tool.value", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, false);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnInstanceSpecificationCompartmentCN.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnInstanceSpecificationCompartmentCN.java index 696c9cdd2f3..7fd958318a3 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnInstanceSpecificationCompartmentCN.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnInstanceSpecificationCompartmentCN.java @@ -2,7 +2,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.inherit import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.changeVisibility;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
import org.eclipse.gmf.runtime.notation.View;
@@ -22,10 +22,10 @@ public class TestNodeCreationOnInstanceSpecificationCompartmentCN extends Abstra public static void prepareContainerForTest() throws Exception {
try {
// force custom provider loading...
- createFromPalette("blockdefinition.tool.block", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.block", getDiagramView(), true);
//
- createFromPalette("blockdefinition.tool.model", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.model", getDiagramView(), true);
View topNodeView = ViewUtil.getChildBySemanticHint(getDiagramView(), ElementTypes.MODEL.getSemanticHint());
View topNodeCompartmentView = ViewUtil.getChildBySemanticHint(topNodeView, ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT);
@@ -34,7 +34,7 @@ public class TestNodeCreationOnInstanceSpecificationCompartmentCN extends Abstra changeVisibility(topNodeCompartmentView);
}
- createFromPalette("blockdefinition.tool.instancespecification", topNodeCompartmentView, true);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", topNodeCompartmentView, true);
View childNodeView = ViewUtil.getChildBySemanticHint(topNodeCompartmentView, ElementTypes.INSTANCE_SPECIFICATION_CN.getSemanticHint());
containerView = ViewUtil.getChildBySemanticHint(childNodeView, ElementTypes.INSTANCE_SPECIFICATION_CN_COMPARTMENT_SLOT_HINT);
@@ -54,146 +54,146 @@ public class TestNodeCreationOnInstanceSpecificationCompartmentCN extends Abstra @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, false);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, false);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, false);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, false);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, false);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, false);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, false);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, false);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, false);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, false);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, false);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, false);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, false);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, false);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, false);
}
@Test
public void createPart() throws Exception {
- createFromPalette("blockdefinition.tool.part", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, false);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, false);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, false);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, false);
}
@Test
public void createReference() throws Exception {
- createFromPalette("blockdefinition.tool.reference", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, false);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, true);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, false);
}
@Test
public void createValue() throws Exception {
- createFromPalette("blockdefinition.tool.value", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, false);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnModel.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnModel.java index 45768e51851..ae06f21b22c 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnModel.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnModel.java @@ -2,7 +2,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.inherit import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.createGraphicalNode;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
@@ -38,146 +38,146 @@ public class TestNodeCreationOnModel extends AbstractTest { @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, false);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, false);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, false);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, false);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, false);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, false);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, false);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, false);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, false);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, false);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, false);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, false);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, false);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, false);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, false);
}
@Test
public void createPart() throws Exception {
- createFromPalette("blockdefinition.tool.part", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, false);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, false);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, false);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, false);
}
@Test
public void createReference() throws Exception {
- createFromPalette("blockdefinition.tool.reference", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, false);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, false);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, false);
}
@Test
public void createValue() throws Exception {
- createFromPalette("blockdefinition.tool.value", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, false);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnModelCN.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnModelCN.java index 072142fc73e..17b2b420c89 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnModelCN.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnModelCN.java @@ -3,7 +3,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.inherit import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.changeVisibility;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.createGraphicalNode;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
import org.eclipse.gmf.runtime.notation.View;
@@ -47,146 +47,146 @@ public class TestNodeCreationOnModelCN extends AbstractTest { @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, false);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, false);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, false);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, false);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, false);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, false);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, false);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, false);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, false);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, false);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, false);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, false);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, false);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, false);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, false);
}
@Test
public void createPart() throws Exception {
- createFromPalette("blockdefinition.tool.part", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, false);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, false);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, false);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, false);
}
@Test
public void createReference() throws Exception {
- createFromPalette("blockdefinition.tool.reference", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, false);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, false);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, false);
}
@Test
public void createValue() throws Exception {
- createFromPalette("blockdefinition.tool.value", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, false);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnModelCompartment.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnModelCompartment.java index ddbd8f7c06f..4d90e58f55f 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnModelCompartment.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnModelCompartment.java @@ -2,7 +2,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.inherit import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.changeVisibility;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
import org.eclipse.gmf.runtime.notation.View;
@@ -22,10 +22,10 @@ public class TestNodeCreationOnModelCompartment extends AbstractTest { public static void prepareContainerForTest() throws Exception {
try {
// force custom provider loading...
- createFromPalette("blockdefinition.tool.block", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.block", getDiagramView(), true);
//
- createFromPalette("blockdefinition.tool.model", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.model", getDiagramView(), true);
View nodeView = ViewUtil.getChildBySemanticHint(getDiagramView(), ElementTypes.MODEL.getSemanticHint());
containerView = ViewUtil.getChildBySemanticHint(nodeView, ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT);
@@ -46,146 +46,146 @@ public class TestNodeCreationOnModelCompartment extends AbstractTest { @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, true);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, true);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, true);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, true);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, true);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, true);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, true);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, true);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, false);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, true);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, true);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, true);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, true);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, false);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, true);
}
@Test
public void createPart() throws Exception {
- createFromPalette("blockdefinition.tool.part", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, false);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, true);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, false);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, false);
}
@Test
public void createReference() throws Exception {
- createFromPalette("blockdefinition.tool.reference", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, true);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, false);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, true);
}
@Test
public void createValue() throws Exception {
- createFromPalette("blockdefinition.tool.value", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, true);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnModelCompartmentCN.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnModelCompartmentCN.java index 00bbe93bb70..2cd056491d4 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnModelCompartmentCN.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnModelCompartmentCN.java @@ -2,7 +2,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.inherit import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.changeVisibility;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
import org.eclipse.gmf.runtime.notation.View;
@@ -22,10 +22,10 @@ public class TestNodeCreationOnModelCompartmentCN extends AbstractTest { public static void prepareContainerForTest() throws Exception {
try {
// force custom provider loading...
- createFromPalette("blockdefinition.tool.block", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.block", getDiagramView(), true);
//
- createFromPalette("blockdefinition.tool.model", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.model", getDiagramView(), true);
View topNodeView = ViewUtil.getChildBySemanticHint(getDiagramView(), ElementTypes.MODEL.getSemanticHint());
View topNodeCompartmentView = ViewUtil.getChildBySemanticHint(topNodeView, ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT);
@@ -34,7 +34,7 @@ public class TestNodeCreationOnModelCompartmentCN extends AbstractTest { changeVisibility(topNodeCompartmentView);
}
- createFromPalette("blockdefinition.tool.model", topNodeCompartmentView, true);
+ createNodeFromPalette("blockdefinition.tool.model", topNodeCompartmentView, true);
View childNodeView = ViewUtil.getChildBySemanticHint(topNodeCompartmentView, ElementTypes.MODEL_CN.getSemanticHint());
containerView = ViewUtil.getChildBySemanticHint(childNodeView, ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT);
@@ -54,146 +54,146 @@ public class TestNodeCreationOnModelCompartmentCN extends AbstractTest { @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, true);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, true);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, true);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, true);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, true);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, true);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, true);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, true);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, false);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, true);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, true);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, true);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, true);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, false);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, true);
}
@Test
public void createPart() throws Exception {
- createFromPalette("blockdefinition.tool.part", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, false);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, true);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, false);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, false);
}
@Test
public void createReference() throws Exception {
- createFromPalette("blockdefinition.tool.reference", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, true);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, false);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, true);
}
@Test
public void createValue() throws Exception {
- createFromPalette("blockdefinition.tool.value", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, true);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnPackage.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnPackage.java index 57142fcad10..7f580759ce0 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnPackage.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnPackage.java @@ -2,7 +2,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.inherit import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.createGraphicalNode;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
@@ -38,146 +38,146 @@ public class TestNodeCreationOnPackage extends AbstractTest { @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, false);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, false);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, false);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, false);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, false);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, false);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, false);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, false);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, false);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, false);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, false);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, false);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, false);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, false);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, false);
}
@Test
public void createPart() throws Exception {
- createFromPalette("blockdefinition.tool.part", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, false);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, false);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, false);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, false);
}
@Test
public void createReference() throws Exception {
- createFromPalette("blockdefinition.tool.reference", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, false);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, false);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, false);
}
@Test
public void createValue() throws Exception {
- createFromPalette("blockdefinition.tool.value", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, false);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnPackageCN.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnPackageCN.java index 8b32a5e2ac8..b816fd58e23 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnPackageCN.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnPackageCN.java @@ -3,7 +3,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.inherit import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.changeVisibility;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.createGraphicalNode;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
import org.eclipse.gmf.runtime.notation.View;
@@ -47,146 +47,146 @@ public class TestNodeCreationOnPackageCN extends AbstractTest { @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, false);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, false);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, false);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, false);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, false);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, false);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, false);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, false);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, false);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, false);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, false);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, false);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, false);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, false);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, false);
}
@Test
public void createPart() throws Exception {
- createFromPalette("blockdefinition.tool.part", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, false);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, false);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, false);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, false);
}
@Test
public void createReference() throws Exception {
- createFromPalette("blockdefinition.tool.reference", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, false);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, false);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, false);
}
@Test
public void createValue() throws Exception {
- createFromPalette("blockdefinition.tool.value", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, false);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnPackageCompartment.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnPackageCompartment.java index a501a983547..725b05985c7 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnPackageCompartment.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnPackageCompartment.java @@ -2,7 +2,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.inherit import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.changeVisibility;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
import org.eclipse.gmf.runtime.notation.View;
@@ -22,10 +22,10 @@ public class TestNodeCreationOnPackageCompartment extends AbstractTest { public static void prepareContainerForTest() throws Exception {
try {
// force custom provider loading...
- createFromPalette("blockdefinition.tool.block", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.block", getDiagramView(), true);
//
- createFromPalette("blockdefinition.tool.package", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.package", getDiagramView(), true);
View nodeView = ViewUtil.getChildBySemanticHint(getDiagramView(), ElementTypes.PACKAGE.getSemanticHint());
containerView = ViewUtil.getChildBySemanticHint(nodeView, ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT);
@@ -46,146 +46,146 @@ public class TestNodeCreationOnPackageCompartment extends AbstractTest { @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, true);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, true);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, true);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, true);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, true);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, true);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, true);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, true);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, false);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, true);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, true);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, true);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, true);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, false);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, true);
}
@Test
public void createPart() throws Exception {
- createFromPalette("blockdefinition.tool.part", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, false);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, true);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, false);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, false);
}
@Test
public void createReference() throws Exception {
- createFromPalette("blockdefinition.tool.reference", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, true);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, false);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, true);
}
@Test
public void createValue() throws Exception {
- createFromPalette("blockdefinition.tool.value", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, true);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnPackageCompartmentCN.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnPackageCompartmentCN.java index 19af2e33870..a5ff2fb0354 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnPackageCompartmentCN.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/inherited/TestNodeCreationOnPackageCompartmentCN.java @@ -2,7 +2,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.inherit import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.changeVisibility;
-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createFromPalette;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createNodeFromPalette;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
import org.eclipse.gmf.runtime.notation.View;
@@ -22,10 +22,10 @@ public class TestNodeCreationOnPackageCompartmentCN extends AbstractTest { public static void prepareContainerForTest() throws Exception {
try {
// force custom provider loading...
- createFromPalette("blockdefinition.tool.block", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.block", getDiagramView(), true);
//
- createFromPalette("blockdefinition.tool.package", getDiagramView(), true);
+ createNodeFromPalette("blockdefinition.tool.package", getDiagramView(), true);
View topNodeView = ViewUtil.getChildBySemanticHint(getDiagramView(), ElementTypes.PACKAGE.getSemanticHint());
View topNodeCompartmentView = ViewUtil.getChildBySemanticHint(topNodeView, ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT);
@@ -34,7 +34,7 @@ public class TestNodeCreationOnPackageCompartmentCN extends AbstractTest { changeVisibility(topNodeCompartmentView);
}
- createFromPalette("blockdefinition.tool.package", topNodeCompartmentView, true);
+ createNodeFromPalette("blockdefinition.tool.package", topNodeCompartmentView, true);
View childNodeView = ViewUtil.getChildBySemanticHint(topNodeCompartmentView, ElementTypes.PACKAGE_CN.getSemanticHint());
containerView = ViewUtil.getChildBySemanticHint(childNodeView, ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT);
@@ -54,146 +54,146 @@ public class TestNodeCreationOnPackageCompartmentCN extends AbstractTest { @Test
public void createActor() throws Exception {
- createFromPalette("blockdefinition.tool.actor", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.actor", containerView, true);
}
@Test
public void createBlock() throws Exception {
- createFromPalette("blockdefinition.tool.block", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.block", containerView, true);
}
@Test
public void createComment() throws Exception {
- createFromPalette("blockdefinition.tool.comment", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.comment", containerView, true);
}
@Test
public void createConstraint() throws Exception {
- createFromPalette("blockdefinition.tool.constraint", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.constraint", containerView, true);
}
@Test
public void createConstraintBlock() throws Exception {
- createFromPalette("blockdefinition.tool.constraintblock", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.constraintblock", containerView, true);
}
@Test
public void createConstraintProperty() throws Exception {
- createFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.constraintproperty", containerView, false);
}
@Test
public void createDataType() throws Exception {
- createFromPalette("blockdefinition.tool.datatype", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.datatype", containerView, true);
}
@Test
public void createDimension() throws Exception {
- createFromPalette("blockdefinition.tool.dimension", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.dimension", containerView, true);
}
@Test
public void createEnumeration() throws Exception {
- createFromPalette("blockdefinition.tool.enumeration", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.enumeration", containerView, true);
}
@Test
public void createEnumerationLiteral() throws Exception {
- createFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.enumerationliteral", containerView, false);
}
@Test
public void createFlowPort() throws Exception {
- createFromPalette("blockdefinition.tool.flowport", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowport", containerView, false);
}
@Test
public void createFlowProperty() throws Exception {
- createFromPalette("blockdefinition.tool.flowproperty", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.flowproperty", containerView, false);
}
@Test
public void createFlowSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.flowspecification", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.flowspecification", containerView, true);
}
@Test
public void createInstanceSpecification() throws Exception {
- createFromPalette("blockdefinition.tool.instancespecification", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.instancespecification", containerView, true);
}
@Test
public void createInterface() throws Exception {
- createFromPalette("blockdefinition.tool.interface", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.interface", containerView, true);
}
@Test
public void createModel() throws Exception {
- createFromPalette("blockdefinition.tool.model", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.model", containerView, true);
}
@Test
public void createOperation() throws Exception {
- createFromPalette("blockdefinition.tool.operation", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.operation", containerView, false);
}
@Test
public void createPackage() throws Exception {
- createFromPalette("blockdefinition.tool.package", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.package", containerView, true);
}
@Test
public void createPart() throws Exception {
- createFromPalette("blockdefinition.tool.part", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.part", containerView, false);
}
@Test
public void createPort() throws Exception {
- createFromPalette("blockdefinition.tool.port", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.port", containerView, false);
}
@Test
public void createPrimitiveType() throws Exception {
- createFromPalette("blockdefinition.tool.primitivetype", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.primitivetype", containerView, true);
}
@Test
public void createProperty() throws Exception {
- createFromPalette("blockdefinition.tool.property", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.property", containerView, false);
}
@Test
public void createReception() throws Exception {
- createFromPalette("blockdefinition.tool.reception", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reception", containerView, false);
}
@Test
public void createReference() throws Exception {
- createFromPalette("blockdefinition.tool.reference", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.reference", containerView, false);
}
@Test
public void createSignal() throws Exception {
- createFromPalette("blockdefinition.tool.signal", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.signal", containerView, true);
}
@Test
public void createSlot() throws Exception {
- createFromPalette("blockdefinition.tool.slot", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.slot", containerView, false);
}
@Test
public void createUnit() throws Exception {
- createFromPalette("blockdefinition.tool.unit", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.unit", containerView, true);
}
@Test
public void createValue() throws Exception {
- createFromPalette("blockdefinition.tool.value", containerView, false);
+ createNodeFromPalette("blockdefinition.tool.value", containerView, false);
}
@Test
public void createValueType() throws Exception {
- createFromPalette("blockdefinition.tool.valuetype", containerView, true);
+ createNodeFromPalette("blockdefinition.tool.valuetype", containerView, true);
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/AbstractLinkCreationForSourcesTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/AbstractLinkCreationForSourcesTest.java new file mode 100644 index 00000000000..e35bc87ab5f --- /dev/null +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/AbstractLinkCreationForSourcesTest.java @@ -0,0 +1,226 @@ +package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link;
+
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createEdgeFromPalette;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.junit.Test;
+
+/**
+ * JUnit tests for Dependency creation test (via palette tools).
+ */
+public class AbstractLinkCreationForSourcesTest extends AbstractLinkPrepareTest {
+
+ public static String toolID;
+
+ @Test
+ public void createLinkWithSourceActor() throws Exception {
+ View sourceView = actorSourceView;
+ createEdgeFromPalette(toolID, sourceView, null, isCreationAllowed.get(sourceView));
+ }
+
+ @Test
+ public void createLinkWithSourceBlock() throws Exception {
+ View sourceView = blockSourceView;
+ createEdgeFromPalette(toolID, sourceView, null, isCreationAllowed.get(sourceView));
+ }
+
+ @Test
+ public void createLinkWithSourceConstraintBlock() throws Exception {
+ View sourceView = constraintBlockSourceView;
+ createEdgeFromPalette(toolID, sourceView, null, isCreationAllowed.get(sourceView));
+ }
+
+ @Test
+ public void createLinkWithSourceDataType() throws Exception {
+ View sourceView = dataTypeSourceView;
+ createEdgeFromPalette(toolID, sourceView, null, isCreationAllowed.get(sourceView));
+ }
+
+ @Test
+ public void createLinkWithSourceDimension() throws Exception {
+ View sourceView = dimensionSourceView;
+ createEdgeFromPalette(toolID, sourceView, null, isCreationAllowed.get(sourceView));
+ }
+
+ @Test
+ public void createLinkWithSourceEnumeration() throws Exception {
+ View sourceView = enumerationSourceView;
+ createEdgeFromPalette(toolID, sourceView, null, isCreationAllowed.get(sourceView));
+ }
+
+ @Test
+ public void createLinkWithSourceFlowSpecification() throws Exception {
+ View sourceView = flowSpecificationSourceView;
+ createEdgeFromPalette(toolID, sourceView, null, isCreationAllowed.get(sourceView));
+ }
+
+ @Test
+ public void createLinkWithSourceInterface() throws Exception {
+ View sourceView = interfaceSourceView;
+ createEdgeFromPalette(toolID, sourceView, null, isCreationAllowed.get(sourceView));
+ }
+
+ @Test
+ public void createLinkWithSourcePrimitiveType() throws Exception {
+ View sourceView = primitiveTypeSourceView;
+ createEdgeFromPalette(toolID, sourceView, null, isCreationAllowed.get(sourceView));
+ }
+
+ @Test
+ public void createLinkWithSourceSignal() throws Exception {
+ View sourceView = signalSourceView;
+ createEdgeFromPalette(toolID, sourceView, null, isCreationAllowed.get(sourceView));
+ }
+
+ @Test
+ public void createLinkWithSourceUnit() throws Exception {
+ View sourceView = unitSourceView;
+ createEdgeFromPalette(toolID, sourceView, null, isCreationAllowed.get(sourceView));
+ }
+
+ @Test
+ public void createLinkWithSourceValueType() throws Exception {
+ View sourceView = valueTypeSourceView;
+ createEdgeFromPalette(toolID, sourceView, null, isCreationAllowed.get(sourceView));
+ }
+
+ @Test
+ public void createLinkWithSourceComment() throws Exception {
+ View sourceView = commentSourceView;
+ createEdgeFromPalette(toolID, sourceView, null, isCreationAllowed.get(sourceView));
+ }
+
+ @Test
+ public void createLinkWithSourceCommentCN() throws Exception {
+ View sourceView = commentCNSourceView;
+ createEdgeFromPalette(toolID, sourceView, null, isCreationAllowed.get(sourceView));
+ }
+
+ @Test
+ public void createLinkWithSourceConstraint() throws Exception {
+ View sourceView = constraintSourceView;
+ createEdgeFromPalette(toolID, sourceView, null, isCreationAllowed.get(sourceView));
+ }
+
+ @Test
+ public void createLinkWithSourceConstraintCN() throws Exception {
+ View sourceView = constraintCNSourceView;
+ createEdgeFromPalette(toolID, sourceView, null, isCreationAllowed.get(sourceView));
+ }
+
+ @Test
+ public void createLinkWithSourceInstanceSpec() throws Exception {
+ View sourceView = instanceSpecSourceView;
+ createEdgeFromPalette(toolID, sourceView, null, isCreationAllowed.get(sourceView));
+ }
+
+ @Test
+ public void createLinkWithSourceInstanceSpecCN() throws Exception {
+ View sourceView = instanceSpecCNSourceView;
+ createEdgeFromPalette(toolID, sourceView, null, isCreationAllowed.get(sourceView));
+ }
+
+ @Test
+ public void createLinkWithSourceModel() throws Exception {
+ View sourceView = modelSourceView;
+ createEdgeFromPalette(toolID, sourceView, null, isCreationAllowed.get(sourceView));
+ }
+
+ @Test
+ public void createLinkWithSourceModelCN() throws Exception {
+ View sourceView = modelCNSourceView;
+ createEdgeFromPalette(toolID, sourceView, null, isCreationAllowed.get(sourceView));
+ }
+
+ @Test
+ public void createLinkWithSourcePackage() throws Exception {
+ View sourceView = packageSourceView;
+ createEdgeFromPalette(toolID, sourceView, null, isCreationAllowed.get(sourceView));
+ }
+
+ @Test
+ public void createLinkWithSourcePackageCN() throws Exception {
+ View sourceView = packageCNSourceView;
+ createEdgeFromPalette(toolID, sourceView, null, isCreationAllowed.get(sourceView));
+ }
+
+ // Test child label nodes
+
+ @Test
+ public void createLinkWithSourceSlot() throws Exception {
+ View sourceView = slotSourceView;
+ createEdgeFromPalette(toolID, sourceView, null, isCreationAllowed.get(sourceView));
+ }
+
+ @Test
+ public void createLinkWithSourceProperty() throws Exception {
+ View sourceView = propertySourceView;
+ createEdgeFromPalette(toolID, sourceView, null, isCreationAllowed.get(sourceView));
+ }
+
+ @Test
+ public void createLinkWithSourcePort() throws Exception {
+ View sourceView = portSourceView;
+ createEdgeFromPalette(toolID, sourceView, null, isCreationAllowed.get(sourceView));
+ }
+
+ @Test
+ public void createLinkWithSourceFlowPort() throws Exception {
+ View sourceView = flowportSourceView;
+ createEdgeFromPalette(toolID, sourceView, null, isCreationAllowed.get(sourceView));
+ }
+
+ @Test
+ public void createLinkWithSourcePart() throws Exception {
+ View sourceView = partSourceView;
+ createEdgeFromPalette(toolID, sourceView, null, isCreationAllowed.get(sourceView));
+ }
+
+ @Test
+ public void createLinkWithSourceReference() throws Exception {
+ View sourceView = referenceSourceView;
+ createEdgeFromPalette(toolID, sourceView, null, isCreationAllowed.get(sourceView));
+ }
+
+ @Test
+ public void createLinkWithSourceValue() throws Exception {
+ View sourceView = valueSourceView;
+ createEdgeFromPalette(toolID, sourceView, null, isCreationAllowed.get(sourceView));
+ }
+
+ @Test
+ public void createLinkWithSourceOperation() throws Exception {
+ View sourceView = operationSourceView;
+ createEdgeFromPalette(toolID, sourceView, null, isCreationAllowed.get(sourceView));
+ }
+
+ @Test
+ public void createLinkWithSourceReception() throws Exception {
+ View sourceView = receptionSourceView;
+ createEdgeFromPalette(toolID, sourceView, null, isCreationAllowed.get(sourceView));
+ }
+
+ @Test
+ public void createLinkWithSourceConstraintCLN() throws Exception {
+ View sourceView = constraintCLNSourceView;
+ createEdgeFromPalette(toolID, sourceView, null, isCreationAllowed.get(sourceView));
+ }
+
+ @Test
+ public void createLinkWithSourceConstraintProperty() throws Exception {
+ View sourceView = constraintPropertySourceView;
+ createEdgeFromPalette(toolID, sourceView, null, isCreationAllowed.get(sourceView));
+ }
+
+ @Test
+ public void createLinkWithSourceFlowProperty() throws Exception {
+ View sourceView = flowPropertySourceView;
+ createEdgeFromPalette(toolID, sourceView, null, isCreationAllowed.get(sourceView));
+ }
+
+ @Test
+ public void createLinkWithSourceEnumerationLiteral() throws Exception {
+ View sourceView = enumerationLiteralSourceView;
+ createEdgeFromPalette(toolID, sourceView, null, isCreationAllowed.get(sourceView));
+ }
+}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/AbstractLinkCreationFromElementTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/AbstractLinkCreationFromElementTest.java new file mode 100644 index 00000000000..4e10ab6ed93 --- /dev/null +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/AbstractLinkCreationFromElementTest.java @@ -0,0 +1,227 @@ +package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link;
+
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createEdgeFromPalette;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.junit.Test;
+
+/**
+ * JUnit tests for Link creation with Block source (via palette tools).
+ */
+public class AbstractLinkCreationFromElementTest extends AbstractLinkPrepareTest {
+
+ public static String toolID;
+ public static View sourceView;
+
+ @Test
+ public void createLinkWithTargetActor() throws Exception {
+ View targetView = actorTargetView;
+ createEdgeFromPalette(toolID, sourceView, targetView, isCreationAllowed.get(targetView));
+ }
+
+ @Test
+ public void createLinkWithTargetBlock() throws Exception {
+ View targetView = blockTargetView;
+ createEdgeFromPalette(toolID, sourceView, targetView, isCreationAllowed.get(targetView));
+ }
+
+ @Test
+ public void createLinkWithTargetConstraintBlock() throws Exception {
+ View targetView = constraintBlockTargetView;
+ createEdgeFromPalette(toolID, sourceView, targetView, isCreationAllowed.get(targetView));
+ }
+
+ @Test
+ public void createLinkWithTargetDataType() throws Exception {
+ View targetView = dataTypeTargetView;
+ createEdgeFromPalette(toolID, sourceView, targetView, isCreationAllowed.get(targetView));
+ }
+
+ @Test
+ public void createLinkWithTargetDimension() throws Exception {
+ View targetView = dimensionTargetView;
+ createEdgeFromPalette(toolID, sourceView, targetView, isCreationAllowed.get(targetView));
+ }
+
+ @Test
+ public void createLinkWithTargetEnumeration() throws Exception {
+ View targetView = enumerationTargetView;
+ createEdgeFromPalette(toolID, sourceView, targetView, isCreationAllowed.get(targetView));
+ }
+
+ @Test
+ public void createLinkWithTargetFlowSpecification() throws Exception {
+ View targetView = flowSpecificationTargetView;
+ createEdgeFromPalette(toolID, sourceView, targetView, isCreationAllowed.get(targetView));
+ }
+
+ @Test
+ public void createLinkWithTargetInterface() throws Exception {
+ View targetView = interfaceTargetView;
+ createEdgeFromPalette(toolID, sourceView, targetView, isCreationAllowed.get(targetView));
+ }
+
+ @Test
+ public void createLinkWithTargetPrimitiveType() throws Exception {
+ View targetView = primitiveTypeTargetView;
+ createEdgeFromPalette(toolID, sourceView, targetView, isCreationAllowed.get(targetView));
+ }
+
+ @Test
+ public void createLinkWithTargetSignal() throws Exception {
+ View targetView = signalTargetView;
+ createEdgeFromPalette(toolID, sourceView, targetView, isCreationAllowed.get(targetView));
+ }
+
+ @Test
+ public void createLinkWithTargetUnit() throws Exception {
+ View targetView = unitTargetView;
+ createEdgeFromPalette(toolID, sourceView, targetView, isCreationAllowed.get(targetView));
+ }
+
+ @Test
+ public void createLinkWithTargetValueType() throws Exception {
+ View targetView = valueTypeTargetView;
+ createEdgeFromPalette(toolID, sourceView, targetView, isCreationAllowed.get(targetView));
+ }
+
+ @Test
+ public void createLinkWithTargetComment() throws Exception {
+ View targetView = commentTargetView;
+ createEdgeFromPalette(toolID, sourceView, targetView, isCreationAllowed.get(targetView));
+ }
+
+ @Test
+ public void createLinkWithTargetCommentCN() throws Exception {
+ View targetView = commentCNTargetView;
+ createEdgeFromPalette(toolID, sourceView, targetView, isCreationAllowed.get(targetView));
+ }
+
+ @Test
+ public void createLinkWithTargetConstraint() throws Exception {
+ View targetView = constraintTargetView;
+ createEdgeFromPalette(toolID, sourceView, targetView, isCreationAllowed.get(targetView));
+ }
+
+ @Test
+ public void createLinkWithTargetConstraintCN() throws Exception {
+ View targetView = constraintCNTargetView;
+ createEdgeFromPalette(toolID, sourceView, targetView, isCreationAllowed.get(targetView));
+ }
+
+ @Test
+ public void createLinkWithTargetInstanceSpec() throws Exception {
+ View targetView = instanceSpecTargetView;
+ createEdgeFromPalette(toolID, sourceView, targetView, isCreationAllowed.get(targetView));
+ }
+
+ @Test
+ public void createLinkWithTargetInstanceSpecCN() throws Exception {
+ View targetView = instanceSpecCNTargetView;
+ createEdgeFromPalette(toolID, sourceView, targetView, isCreationAllowed.get(targetView));
+ }
+
+ @Test
+ public void createLinkWithTargetModel() throws Exception {
+ View targetView = modelTargetView;
+ createEdgeFromPalette(toolID, sourceView, targetView, isCreationAllowed.get(targetView));
+ }
+
+ @Test
+ public void createLinkWithTargetModelCN() throws Exception {
+ View targetView = modelCNTargetView;
+ createEdgeFromPalette(toolID, sourceView, targetView, isCreationAllowed.get(targetView));
+ }
+
+ @Test
+ public void createLinkWithTargetPackage() throws Exception {
+ View targetView = packageTargetView;
+ createEdgeFromPalette(toolID, sourceView, targetView, isCreationAllowed.get(targetView));
+ }
+
+ @Test
+ public void createLinkWithTargetPackageCN() throws Exception {
+ View targetView = packageCNTargetView;
+ createEdgeFromPalette(toolID, sourceView, targetView, isCreationAllowed.get(targetView));
+ }
+
+ // Test child label nodes
+
+ @Test
+ public void createLinkWithTargetSlot() throws Exception {
+ View targetView = slotTargetView;
+ createEdgeFromPalette(toolID, sourceView, targetView, isCreationAllowed.get(targetView));
+ }
+
+ @Test
+ public void createLinkWithTargetProperty() throws Exception {
+ View targetView = propertyTargetView;
+ createEdgeFromPalette(toolID, sourceView, targetView, isCreationAllowed.get(targetView));
+ }
+
+ @Test
+ public void createLinkWithTargetPort() throws Exception {
+ View targetView = portTargetView;
+ createEdgeFromPalette(toolID, sourceView, targetView, isCreationAllowed.get(targetView));
+ }
+
+ @Test
+ public void createLinkWithTargetFlowPort() throws Exception {
+ View targetView = flowportTargetView;
+ createEdgeFromPalette(toolID, sourceView, targetView, isCreationAllowed.get(targetView));
+ }
+
+ @Test
+ public void createLinkWithTargetPart() throws Exception {
+ View targetView = partTargetView;
+ createEdgeFromPalette(toolID, sourceView, targetView, isCreationAllowed.get(targetView));
+ }
+
+ @Test
+ public void createLinkWithTargetReference() throws Exception {
+ View targetView = referenceTargetView;
+ createEdgeFromPalette(toolID, sourceView, targetView, isCreationAllowed.get(targetView));
+ }
+
+ @Test
+ public void createLinkWithTargetValue() throws Exception {
+ View targetView = valueTargetView;
+ createEdgeFromPalette(toolID, sourceView, targetView, isCreationAllowed.get(targetView));
+ }
+
+ @Test
+ public void createLinkWithTargetOperation() throws Exception {
+ View targetView = operationTargetView;
+ createEdgeFromPalette(toolID, sourceView, targetView, isCreationAllowed.get(targetView));
+ }
+
+ @Test
+ public void createLinkWithTargetReception() throws Exception {
+ View targetView = receptionTargetView;
+ createEdgeFromPalette(toolID, sourceView, targetView, isCreationAllowed.get(targetView));
+ }
+
+ @Test
+ public void createLinkWithTargetConstraintCLN() throws Exception {
+ View targetView = constraintCLNTargetView;
+ createEdgeFromPalette(toolID, sourceView, targetView, isCreationAllowed.get(targetView));
+ }
+
+ @Test
+ public void createLinkWithTargetConstraintProperty() throws Exception {
+ View targetView = constraintPropertyTargetView;
+ createEdgeFromPalette(toolID, sourceView, targetView, isCreationAllowed.get(targetView));
+ }
+
+ @Test
+ public void createLinkWithTargetFlowProperty() throws Exception {
+ View targetView = flowPropertyTargetView;
+ createEdgeFromPalette(toolID, sourceView, targetView, isCreationAllowed.get(targetView));
+ }
+
+ @Test
+ public void createLinkWithTargetEnumerationLiteral() throws Exception {
+ View targetView = enumerationLiteralTargetView;
+ createEdgeFromPalette(toolID, sourceView, targetView, isCreationAllowed.get(targetView));
+ }
+}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/AbstractLinkPrepareTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/AbstractLinkPrepareTest.java new file mode 100644 index 00000000000..53af967ccea --- /dev/null +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/AbstractLinkPrepareTest.java @@ -0,0 +1,181 @@ +package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link;
+
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.createGraphicalNode;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.AbstractTest;
+import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
+import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
+import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
+import org.junit.BeforeClass;
+
+/**
+ * JUnit tests for Dependency creation test (via palette tools).
+ */
+public class AbstractLinkPrepareTest extends AbstractTest {
+
+ public static String toolID;
+
+ // Custom nodes
+ public static View actorSourceView, actorTargetView;
+ public static View blockSourceView, blockTargetView;
+ public static View constraintBlockSourceView, constraintBlockTargetView;
+ public static View dataTypeSourceView, dataTypeTargetView;
+ public static View dimensionSourceView, dimensionTargetView;
+ public static View enumerationSourceView, enumerationTargetView;
+ public static View flowSpecificationSourceView, flowSpecificationTargetView;
+ public static View interfaceSourceView, interfaceTargetView;
+ public static View primitiveTypeSourceView, primitiveTypeTargetView;
+ public static View signalSourceView, signalTargetView;
+ public static View unitSourceView, unitTargetView;
+ public static View valueTypeSourceView, valueTypeTargetView;
+
+ // Custom child label nodes
+ public static View propertySourceView, propertyTargetView;
+ public static View portSourceView, portTargetView;
+ public static View flowportSourceView, flowportTargetView;
+ public static View partSourceView, partTargetView;
+ public static View referenceSourceView, referenceTargetView;
+ public static View valueSourceView, valueTargetView;
+ public static View operationSourceView, operationTargetView;
+ public static View receptionSourceView, receptionTargetView;
+ public static View constraintCLNSourceView, constraintCLNTargetView;
+ public static View constraintPropertySourceView, constraintPropertyTargetView;
+ public static View flowPropertySourceView, flowPropertyTargetView;
+ public static View enumerationLiteralSourceView, enumerationLiteralTargetView;
+
+ // Inherited nodes
+ public static View commentSourceView, commentTargetView, commentCNSourceView, commentCNTargetView;
+ public static View constraintSourceView, constraintTargetView, constraintCNSourceView, constraintCNTargetView;
+ public static View instanceSpecSourceView, instanceSpecTargetView, instanceSpecCNSourceView, instanceSpecCNTargetView;
+ public static View modelSourceView, modelTargetView, modelCNSourceView, modelCNTargetView;
+ public static View packageSourceView, packageTargetView, packageCNSourceView, packageCNTargetView;
+
+ // Inherited child label nodes
+ public static View slotSourceView, slotTargetView;
+
+ public static Map<View, Boolean> isCreationAllowed = new HashMap<View, Boolean>();
+
+ @BeforeClass
+ public static void prepareInheritedNodes() throws Exception {
+ View container = createGraphicalNode(UMLElementTypes.PACKAGE, ElementTypes.PACKAGE.getSemanticHint(), getDiagramView());
+ View containerCpt = ViewUtil.getChildBySemanticHint(container, ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT);
+
+ // Prepare elements for link creation tests
+ commentSourceView = createGraphicalNode(UMLElementTypes.COMMENT, ElementTypes.COMMENT.getSemanticHint(), getDiagramView());
+ commentTargetView = createGraphicalNode(UMLElementTypes.COMMENT, ElementTypes.COMMENT.getSemanticHint(), getDiagramView());
+ commentCNSourceView = createGraphicalNode(UMLElementTypes.COMMENT, ElementTypes.COMMENT_CN.getSemanticHint(), containerCpt);
+ commentCNTargetView = createGraphicalNode(UMLElementTypes.COMMENT, ElementTypes.COMMENT_CN.getSemanticHint(), containerCpt);
+
+ constraintSourceView = createGraphicalNode(UMLElementTypes.CONSTRAINT, ElementTypes.CONSTRAINT.getSemanticHint(), getDiagramView());
+ constraintTargetView = createGraphicalNode(UMLElementTypes.CONSTRAINT, ElementTypes.CONSTRAINT.getSemanticHint(), getDiagramView());
+ constraintCNSourceView = createGraphicalNode(UMLElementTypes.CONSTRAINT, ElementTypes.CONSTRAINT_CN.getSemanticHint(), containerCpt);
+ constraintCNTargetView = createGraphicalNode(UMLElementTypes.CONSTRAINT, ElementTypes.CONSTRAINT_CN.getSemanticHint(), containerCpt);
+
+ instanceSpecSourceView = createGraphicalNode(UMLElementTypes.INSTANCE_SPECIFICATION, ElementTypes.INSTANCE_SPECIFICATION.getSemanticHint(), getDiagramView());
+ instanceSpecTargetView = createGraphicalNode(UMLElementTypes.INSTANCE_SPECIFICATION, ElementTypes.INSTANCE_SPECIFICATION.getSemanticHint(), getDiagramView());
+ instanceSpecCNSourceView = createGraphicalNode(UMLElementTypes.INSTANCE_SPECIFICATION, ElementTypes.INSTANCE_SPECIFICATION_CN.getSemanticHint(), containerCpt);
+ instanceSpecCNTargetView = createGraphicalNode(UMLElementTypes.INSTANCE_SPECIFICATION, ElementTypes.INSTANCE_SPECIFICATION_CN.getSemanticHint(), containerCpt);
+
+ modelSourceView = createGraphicalNode(UMLElementTypes.MODEL, ElementTypes.MODEL.getSemanticHint(), getDiagramView());
+ modelTargetView = createGraphicalNode(UMLElementTypes.MODEL, ElementTypes.MODEL.getSemanticHint(), getDiagramView());
+ modelCNSourceView = createGraphicalNode(UMLElementTypes.MODEL, ElementTypes.MODEL_CN.getSemanticHint(), containerCpt);
+ modelCNTargetView = createGraphicalNode(UMLElementTypes.MODEL, ElementTypes.MODEL_CN.getSemanticHint(), containerCpt);
+
+ packageSourceView = createGraphicalNode(UMLElementTypes.PACKAGE, ElementTypes.PACKAGE.getSemanticHint(), getDiagramView());
+ packageTargetView = createGraphicalNode(UMLElementTypes.PACKAGE, ElementTypes.PACKAGE.getSemanticHint(), getDiagramView());
+ packageCNSourceView = createGraphicalNode(UMLElementTypes.PACKAGE, ElementTypes.PACKAGE_CN.getSemanticHint(), containerCpt);
+ packageCNTargetView = createGraphicalNode(UMLElementTypes.PACKAGE, ElementTypes.PACKAGE_CN.getSemanticHint(), containerCpt);
+
+ // Prepare child nodes
+ View slotSourceCpt = ViewUtil.getChildBySemanticHint(instanceSpecSourceView, ElementTypes.INSTANCE_SPECIFICATION_COMPARTMENT_SLOT_HINT);
+ View slotTargetCpt = ViewUtil.getChildBySemanticHint(instanceSpecTargetView, ElementTypes.INSTANCE_SPECIFICATION_COMPARTMENT_SLOT_HINT);
+
+ slotSourceView = createGraphicalNode(UMLElementTypes.SLOT, ElementTypes.INSTANCE_SPECIFICATION_SLOT_CLN.getSemanticHint(), slotSourceCpt);
+ slotTargetView = createGraphicalNode(UMLElementTypes.SLOT, ElementTypes.INSTANCE_SPECIFICATION_SLOT_CLN.getSemanticHint(), slotTargetCpt);
+ }
+
+ @BeforeClass
+ public static void prepareCustomNodes() throws Exception {
+ // Prepare elements for link creation tests
+ actorSourceView = createGraphicalNode(UMLElementTypes.ACTOR, UMLGraphicalTypes.SHAPE_UML_ACTOR_AS_CLASSIFIER_ID, getDiagramView());
+ actorTargetView = createGraphicalNode(UMLElementTypes.ACTOR, UMLGraphicalTypes.SHAPE_UML_ACTOR_AS_CLASSIFIER_ID, getDiagramView());
+ blockSourceView = createGraphicalNode(SysMLElementTypes.BLOCK, SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID, getDiagramView());
+ blockTargetView = createGraphicalNode(SysMLElementTypes.BLOCK, SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID, getDiagramView());
+ constraintBlockSourceView = createGraphicalNode(SysMLElementTypes.CONSTRAINT_BLOCK, SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCK_AS_CLASSIFIER_ID, getDiagramView());
+ constraintBlockTargetView = createGraphicalNode(SysMLElementTypes.CONSTRAINT_BLOCK, SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCK_AS_CLASSIFIER_ID, getDiagramView());
+ dataTypeSourceView = createGraphicalNode(UMLElementTypes.DATA_TYPE, UMLGraphicalTypes.SHAPE_UML_DATATYPE_AS_CLASSIFIER_ID, getDiagramView());
+ dataTypeTargetView = createGraphicalNode(UMLElementTypes.DATA_TYPE, UMLGraphicalTypes.SHAPE_UML_DATATYPE_AS_CLASSIFIER_ID, getDiagramView());
+ dimensionSourceView = createGraphicalNode(SysMLElementTypes.DIMENSION, SysMLGraphicalTypes.SHAPE_SYSML_DIMENSION_AS_CLASSIFIER_ID, getDiagramView());
+ dimensionTargetView = createGraphicalNode(SysMLElementTypes.DIMENSION, SysMLGraphicalTypes.SHAPE_SYSML_DIMENSION_AS_CLASSIFIER_ID, getDiagramView());
+ enumerationSourceView = createGraphicalNode(UMLElementTypes.ENUMERATION, UMLGraphicalTypes.SHAPE_UML_ENUMERATION_AS_CLASSIFIER_ID, getDiagramView());
+ enumerationTargetView = createGraphicalNode(UMLElementTypes.ENUMERATION, UMLGraphicalTypes.SHAPE_UML_ENUMERATION_AS_CLASSIFIER_ID, getDiagramView());
+ flowSpecificationSourceView = createGraphicalNode(SysMLElementTypes.FLOW_SPECIFICATION, SysMLGraphicalTypes.SHAPE_SYSML_FLOWSPECIFICATION_AS_CLASSIFIER_ID, getDiagramView());
+ flowSpecificationTargetView = createGraphicalNode(SysMLElementTypes.FLOW_SPECIFICATION, SysMLGraphicalTypes.SHAPE_SYSML_FLOWSPECIFICATION_AS_CLASSIFIER_ID, getDiagramView());
+ interfaceSourceView = createGraphicalNode(UMLElementTypes.INTERFACE, UMLGraphicalTypes.SHAPE_UML_INTERFACE_AS_CLASSIFIER_ID, getDiagramView());
+ interfaceTargetView = createGraphicalNode(UMLElementTypes.INTERFACE, UMLGraphicalTypes.SHAPE_UML_INTERFACE_AS_CLASSIFIER_ID, getDiagramView());
+ primitiveTypeSourceView = createGraphicalNode(UMLElementTypes.PRIMITIVE_TYPE, UMLGraphicalTypes.SHAPE_UML_PRIMITIVETYPE_AS_CLASSIFIER_ID, getDiagramView());
+ primitiveTypeTargetView = createGraphicalNode(UMLElementTypes.PRIMITIVE_TYPE, UMLGraphicalTypes.SHAPE_UML_PRIMITIVETYPE_AS_CLASSIFIER_ID, getDiagramView());
+ signalSourceView = createGraphicalNode(UMLElementTypes.SIGNAL, UMLGraphicalTypes.SHAPE_UML_SIGNAL_AS_CLASSIFIER_ID, getDiagramView());
+ signalTargetView = createGraphicalNode(UMLElementTypes.SIGNAL, UMLGraphicalTypes.SHAPE_UML_SIGNAL_AS_CLASSIFIER_ID, getDiagramView());
+ unitSourceView = createGraphicalNode(SysMLElementTypes.UNIT, SysMLGraphicalTypes.SHAPE_SYSML_UNIT_AS_CLASSIFIER_ID, getDiagramView());
+ unitTargetView = createGraphicalNode(SysMLElementTypes.UNIT, SysMLGraphicalTypes.SHAPE_SYSML_UNIT_AS_CLASSIFIER_ID, getDiagramView());
+ valueTypeSourceView = createGraphicalNode(SysMLElementTypes.VALUE_TYPE, SysMLGraphicalTypes.SHAPE_SYSML_VALUETYPE_AS_CLASSIFIER_ID, getDiagramView());
+ valueTypeTargetView = createGraphicalNode(SysMLElementTypes.VALUE_TYPE, SysMLGraphicalTypes.SHAPE_SYSML_VALUETYPE_AS_CLASSIFIER_ID, getDiagramView());
+
+ // Prepare child nodes
+
+ // TODO : Add Port / FlowPort as AffixedNode
+
+ View propertySourceCpt = ViewUtil.getChildBySemanticHint(blockSourceView, SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID);
+ View propertyTargetCpt = ViewUtil.getChildBySemanticHint(blockTargetView, SysMLGraphicalTypes.COMPARTMENT_SYSML_PROPERTY_AS_LIST_ID);
+
+ propertySourceView = createGraphicalNode(UMLElementTypes.PROPERTY, UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_LABEL_ID, propertySourceCpt);
+ propertyTargetView = createGraphicalNode(UMLElementTypes.PROPERTY, UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_LABEL_ID, propertyTargetCpt);
+ portSourceView = createGraphicalNode(UMLElementTypes.PORT, UMLGraphicalTypes.SHAPE_UML_PORT_AS_LABEL_ID, propertySourceCpt);
+ portTargetView = createGraphicalNode(UMLElementTypes.PORT, UMLGraphicalTypes.SHAPE_UML_PORT_AS_LABEL_ID, propertyTargetCpt);
+ flowportSourceView = createGraphicalNode(SysMLElementTypes.FLOW_PORT, SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_LABEL_ID, propertySourceCpt);
+ flowportTargetView = createGraphicalNode(SysMLElementTypes.FLOW_PORT, SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_LABEL_ID, propertyTargetCpt);
+ partSourceView = createGraphicalNode(SysMLElementTypes.PART_PROPERTY, SysMLGraphicalTypes.SHAPE_SYSML_PART_AS_LABEL_ID, propertySourceCpt);
+ partTargetView = createGraphicalNode(SysMLElementTypes.PART_PROPERTY, SysMLGraphicalTypes.SHAPE_SYSML_PART_AS_LABEL_ID, propertyTargetCpt);
+ referenceSourceView = createGraphicalNode(SysMLElementTypes.REFERENCE_PROPERTY, SysMLGraphicalTypes.SHAPE_SYSML_REFERENCE_AS_LABEL_ID, propertySourceCpt);
+ referenceTargetView = createGraphicalNode(SysMLElementTypes.REFERENCE_PROPERTY, SysMLGraphicalTypes.SHAPE_SYSML_REFERENCE_AS_LABEL_ID, propertyTargetCpt);
+ valueSourceView = createGraphicalNode(SysMLElementTypes.VALUE_PROPERTY, SysMLGraphicalTypes.SHAPE_SYSML_VALUE_AS_LABEL_ID, propertySourceCpt);
+ valueTargetView = createGraphicalNode(SysMLElementTypes.VALUE_PROPERTY, SysMLGraphicalTypes.SHAPE_SYSML_VALUE_AS_LABEL_ID, propertyTargetCpt);
+
+ View operationSourceCpt = ViewUtil.getChildBySemanticHint(blockSourceView, UMLGraphicalTypes.COMPARTMENT_UML_OPERATION_AS_LIST_ID);
+ View operationTargetCpt = ViewUtil.getChildBySemanticHint(blockTargetView, UMLGraphicalTypes.COMPARTMENT_UML_OPERATION_AS_LIST_ID);
+
+ operationSourceView = createGraphicalNode(UMLElementTypes.OPERATION, UMLGraphicalTypes.SHAPE_UML_OPERATION_AS_LABEL_ID, operationSourceCpt);
+ operationTargetView = createGraphicalNode(UMLElementTypes.OPERATION, UMLGraphicalTypes.SHAPE_UML_OPERATION_AS_LABEL_ID, operationTargetCpt);
+ receptionSourceView = createGraphicalNode(UMLElementTypes.RECEPTION, UMLGraphicalTypes.SHAPE_UML_RECEPTION_AS_LABEL_ID, operationSourceCpt);
+ receptionTargetView = createGraphicalNode(UMLElementTypes.RECEPTION, UMLGraphicalTypes.SHAPE_UML_RECEPTION_AS_LABEL_ID, operationTargetCpt);
+
+ View constraintSourceCpt = ViewUtil.getChildBySemanticHint(blockSourceView, SysMLGraphicalTypes.COMPARTMENT_SYSML_CONSTRAINT_AS_LIST_ID);
+ View constraintTargetCpt = ViewUtil.getChildBySemanticHint(blockTargetView, SysMLGraphicalTypes.COMPARTMENT_SYSML_CONSTRAINT_AS_LIST_ID);
+
+ constraintCLNSourceView = createGraphicalNode(UMLElementTypes.CONSTRAINT, UMLGraphicalTypes.SHAPE_UML_CONSTRAINT_AS_LABEL_ID, constraintSourceCpt);
+ constraintCLNTargetView = createGraphicalNode(UMLElementTypes.CONSTRAINT, UMLGraphicalTypes.SHAPE_UML_CONSTRAINT_AS_LABEL_ID, constraintTargetCpt);
+ constraintPropertySourceView = createGraphicalNode(SysMLElementTypes.CONSTRAINT_PROPERTY, SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTPROPERTY_AS_LABEL_ID, constraintSourceCpt);
+ constraintPropertyTargetView = createGraphicalNode(SysMLElementTypes.CONSTRAINT_PROPERTY, SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTPROPERTY_AS_LABEL_ID, constraintTargetCpt);
+
+ View flowPropertySourceCpt = ViewUtil.getChildBySemanticHint(flowSpecificationSourceView, SysMLGraphicalTypes.COMPARTMENT_SYSML_FLOWPROPERTY_AS_LIST_ID);
+ View flowPropertyTargetCpt = ViewUtil.getChildBySemanticHint(flowSpecificationTargetView, SysMLGraphicalTypes.COMPARTMENT_SYSML_FLOWPROPERTY_AS_LIST_ID);
+
+ flowPropertySourceView = createGraphicalNode(SysMLElementTypes.FLOW_PROPERTY, SysMLGraphicalTypes.SHAPE_SYSML_FLOWPROPERTY_AS_LABEL_ID, flowPropertySourceCpt);
+ flowPropertyTargetView = createGraphicalNode(SysMLElementTypes.FLOW_PROPERTY, SysMLGraphicalTypes.SHAPE_SYSML_FLOWPROPERTY_AS_LABEL_ID, flowPropertyTargetCpt);
+
+ View enumLiteralSourceCpt = ViewUtil.getChildBySemanticHint(enumerationSourceView, UMLGraphicalTypes.COMPARTMENT_UML_ENUMERATIONLITERAL_AS_LIST_ID);
+ View enumLiteralTargetCpt = ViewUtil.getChildBySemanticHint(enumerationTargetView, UMLGraphicalTypes.COMPARTMENT_UML_ENUMERATIONLITERAL_AS_LIST_ID);
+
+ enumerationLiteralSourceView = createGraphicalNode(UMLElementTypes.ENUMERATION_LITERAL, UMLGraphicalTypes.SHAPE_UML_ENUMERATIONLITERAL_AS_LABEL_ID, enumLiteralSourceCpt);
+ enumerationLiteralTargetView = createGraphicalNode(UMLElementTypes.ENUMERATION_LITERAL, UMLGraphicalTypes.SHAPE_UML_ENUMERATIONLITERAL_AS_LABEL_ID, enumLiteralTargetCpt);
+ }
+}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/TestLinkCreationCommentConstraintForSources.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/TestLinkCreationCommentConstraintForSources.java new file mode 100644 index 00000000000..dc84a517937 --- /dev/null +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/TestLinkCreationCommentConstraintForSources.java @@ -0,0 +1,64 @@ +package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link;
+
+import java.util.HashMap;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.junit.BeforeClass;
+
+/**
+ * JUnit tests for Comment-Constraint link creation test (via palette tools).
+ */
+public class TestLinkCreationCommentConstraintForSources extends AbstractLinkCreationForSourcesTest {
+
+ @BeforeClass
+ public static void initToolID() throws Exception {
+ toolID = "blockdefinition.tool.comment_constraint_link";
+ }
+
+ @BeforeClass
+ public static void initExpectedResults() throws Exception {
+
+ // Initialize source creation results
+ isCreationAllowed = new HashMap<View, Boolean>();
+ isCreationAllowed.put(actorSourceView, false);
+ isCreationAllowed.put(blockSourceView, false);
+ isCreationAllowed.put(constraintBlockSourceView, false);
+ isCreationAllowed.put(dataTypeSourceView, false);
+ isCreationAllowed.put(dimensionSourceView, false);
+ isCreationAllowed.put(enumerationSourceView, false);
+ isCreationAllowed.put(flowSpecificationSourceView, false);
+ isCreationAllowed.put(interfaceSourceView, false);
+ isCreationAllowed.put(primitiveTypeSourceView, false);
+ isCreationAllowed.put(signalSourceView, false);
+ isCreationAllowed.put(unitSourceView, false);
+ isCreationAllowed.put(valueTypeSourceView, false);
+
+ isCreationAllowed.put(commentSourceView, true);
+ isCreationAllowed.put(commentCNSourceView, true);
+ isCreationAllowed.put(constraintSourceView, true);
+ isCreationAllowed.put(constraintCNSourceView, true);
+ isCreationAllowed.put(instanceSpecSourceView, false);
+ isCreationAllowed.put(instanceSpecCNSourceView, false);
+ isCreationAllowed.put(modelSourceView, false);
+ isCreationAllowed.put(modelCNSourceView, false);
+ isCreationAllowed.put(packageSourceView, false);
+ isCreationAllowed.put(packageCNSourceView, false);
+
+ isCreationAllowed.put(slotSourceView, false);
+
+ isCreationAllowed.put(propertySourceView, false);
+ isCreationAllowed.put(portSourceView, false);
+ isCreationAllowed.put(flowportSourceView, false);
+ isCreationAllowed.put(partSourceView, false);
+ isCreationAllowed.put(referenceSourceView, false);
+ isCreationAllowed.put(valueSourceView, false);
+ isCreationAllowed.put(operationSourceView, false);
+ isCreationAllowed.put(receptionSourceView, false);
+ isCreationAllowed.put(constraintCLNSourceView, false);
+ isCreationAllowed.put(constraintPropertySourceView, false);
+ isCreationAllowed.put(flowPropertySourceView, false);
+ isCreationAllowed.put(enumerationLiteralSourceView, false);
+
+ }
+
+}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/TestLinkCreationCommentConstraintFromComment.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/TestLinkCreationCommentConstraintFromComment.java new file mode 100644 index 00000000000..d3474525388 --- /dev/null +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/TestLinkCreationCommentConstraintFromComment.java @@ -0,0 +1,69 @@ +package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link;
+
+import java.util.HashMap;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.junit.BeforeClass;
+
+/**
+ * JUnit tests for Comment-Constraint link creation test (via palette tools).
+ */
+public class TestLinkCreationCommentConstraintFromComment extends AbstractLinkCreationFromElementTest {
+
+ @BeforeClass
+ public static void initSource() throws Exception {
+ sourceView = commentSourceView;
+ }
+
+ @BeforeClass
+ public static void initToolID() throws Exception {
+ toolID = "blockdefinition.tool.comment_constraint_link";
+ }
+
+ @BeforeClass
+ public static void initExpectedResults() throws Exception {
+
+ // Initialize source creation results
+ isCreationAllowed = new HashMap<View, Boolean>();
+ isCreationAllowed.put(actorTargetView, true);
+ isCreationAllowed.put(blockTargetView, true);
+ isCreationAllowed.put(constraintBlockTargetView, true);
+ isCreationAllowed.put(dataTypeTargetView, true);
+ isCreationAllowed.put(dimensionTargetView, true);
+ isCreationAllowed.put(enumerationTargetView, true);
+ isCreationAllowed.put(flowSpecificationTargetView, true);
+ isCreationAllowed.put(interfaceTargetView, true);
+ isCreationAllowed.put(primitiveTypeTargetView, true);
+ isCreationAllowed.put(signalTargetView, true);
+ isCreationAllowed.put(unitTargetView, true);
+ isCreationAllowed.put(valueTypeTargetView, true);
+
+ isCreationAllowed.put(commentTargetView, true);
+ isCreationAllowed.put(commentCNTargetView, true);
+ isCreationAllowed.put(constraintTargetView, true);
+ isCreationAllowed.put(constraintCNTargetView, true);
+ isCreationAllowed.put(instanceSpecTargetView, true);
+ isCreationAllowed.put(instanceSpecCNTargetView, true);
+ isCreationAllowed.put(modelTargetView, true);
+ isCreationAllowed.put(modelCNTargetView, true);
+ isCreationAllowed.put(packageTargetView, true);
+ isCreationAllowed.put(packageCNTargetView, true);
+
+ isCreationAllowed.put(slotTargetView, false);
+
+ isCreationAllowed.put(propertyTargetView, false);
+ isCreationAllowed.put(portTargetView, false);
+ isCreationAllowed.put(flowportTargetView, false);
+ isCreationAllowed.put(partTargetView, false);
+ isCreationAllowed.put(referenceTargetView, false);
+ isCreationAllowed.put(valueTargetView, false);
+ isCreationAllowed.put(operationTargetView, false);
+ isCreationAllowed.put(receptionTargetView, false);
+ isCreationAllowed.put(constraintCLNTargetView, false);
+ isCreationAllowed.put(constraintPropertyTargetView, false);
+ isCreationAllowed.put(flowPropertyTargetView, false);
+ isCreationAllowed.put(enumerationLiteralTargetView, false);
+
+ }
+
+}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/TestLinkCreationCommentConstraintFromConstraint.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/TestLinkCreationCommentConstraintFromConstraint.java new file mode 100644 index 00000000000..247e8c6f433 --- /dev/null +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/TestLinkCreationCommentConstraintFromConstraint.java @@ -0,0 +1,69 @@ +package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link;
+
+import java.util.HashMap;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.junit.BeforeClass;
+
+/**
+ * JUnit tests for Comment-Constraint link creation test (via palette tools).
+ */
+public class TestLinkCreationCommentConstraintFromConstraint extends AbstractLinkCreationFromElementTest {
+
+ @BeforeClass
+ public static void initSource() throws Exception {
+ sourceView = constraintSourceView;
+ }
+
+ @BeforeClass
+ public static void initToolID() throws Exception {
+ toolID = "blockdefinition.tool.comment_constraint_link";
+ }
+
+ @BeforeClass
+ public static void initExpectedResults() throws Exception {
+
+ // Initialize source creation results
+ isCreationAllowed = new HashMap<View, Boolean>();
+ isCreationAllowed.put(actorTargetView, true);
+ isCreationAllowed.put(blockTargetView, true);
+ isCreationAllowed.put(constraintBlockTargetView, true);
+ isCreationAllowed.put(dataTypeTargetView, true);
+ isCreationAllowed.put(dimensionTargetView, true);
+ isCreationAllowed.put(enumerationTargetView, true);
+ isCreationAllowed.put(flowSpecificationTargetView, true);
+ isCreationAllowed.put(interfaceTargetView, true);
+ isCreationAllowed.put(primitiveTypeTargetView, true);
+ isCreationAllowed.put(signalTargetView, true);
+ isCreationAllowed.put(unitTargetView, true);
+ isCreationAllowed.put(valueTypeTargetView, true);
+
+ isCreationAllowed.put(commentTargetView, true);
+ isCreationAllowed.put(commentCNTargetView, true);
+ isCreationAllowed.put(constraintTargetView, true);
+ isCreationAllowed.put(constraintCNTargetView, true);
+ isCreationAllowed.put(instanceSpecTargetView, true);
+ isCreationAllowed.put(instanceSpecCNTargetView, true);
+ isCreationAllowed.put(modelTargetView, true);
+ isCreationAllowed.put(modelCNTargetView, true);
+ isCreationAllowed.put(packageTargetView, true);
+ isCreationAllowed.put(packageCNTargetView, true);
+
+ isCreationAllowed.put(slotTargetView, false);
+
+ isCreationAllowed.put(propertyTargetView, false);
+ isCreationAllowed.put(portTargetView, false);
+ isCreationAllowed.put(flowportTargetView, false);
+ isCreationAllowed.put(partTargetView, false);
+ isCreationAllowed.put(referenceTargetView, false);
+ isCreationAllowed.put(valueTargetView, false);
+ isCreationAllowed.put(operationTargetView, false);
+ isCreationAllowed.put(receptionTargetView, false);
+ isCreationAllowed.put(constraintCLNTargetView, false);
+ isCreationAllowed.put(constraintPropertyTargetView, false);
+ isCreationAllowed.put(flowPropertyTargetView, false);
+ isCreationAllowed.put(enumerationLiteralTargetView, false);
+
+ }
+
+}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/TestLinkCreationDependencyForSources.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/TestLinkCreationDependencyForSources.java new file mode 100644 index 00000000000..070158e5cb0 --- /dev/null +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/TestLinkCreationDependencyForSources.java @@ -0,0 +1,64 @@ +package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link;
+
+import java.util.HashMap;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.junit.BeforeClass;
+
+/**
+ * JUnit tests for Dependency creation test (via palette tools).
+ */
+public class TestLinkCreationDependencyForSources extends AbstractLinkCreationForSourcesTest {
+
+ @BeforeClass
+ public static void initToolID() throws Exception {
+ toolID = "blockdefinition.tool.dependency";
+ }
+
+ @BeforeClass
+ public static void initExpectedResults() throws Exception {
+
+ // Initialize source creation results
+ isCreationAllowed = new HashMap<View, Boolean>();
+ isCreationAllowed.put(actorSourceView, true);
+ isCreationAllowed.put(blockSourceView, true);
+ isCreationAllowed.put(constraintBlockSourceView, true);
+ isCreationAllowed.put(dataTypeSourceView, true);
+ isCreationAllowed.put(dimensionSourceView, true);
+ isCreationAllowed.put(enumerationSourceView, true);
+ isCreationAllowed.put(flowSpecificationSourceView, true);
+ isCreationAllowed.put(interfaceSourceView, true);
+ isCreationAllowed.put(primitiveTypeSourceView, true);
+ isCreationAllowed.put(signalSourceView, true);
+ isCreationAllowed.put(unitSourceView, true);
+ isCreationAllowed.put(valueTypeSourceView, true);
+
+ isCreationAllowed.put(commentSourceView, false);
+ isCreationAllowed.put(commentCNSourceView, false);
+ isCreationAllowed.put(constraintSourceView, true);
+ isCreationAllowed.put(constraintCNSourceView, true);
+ isCreationAllowed.put(instanceSpecSourceView, true);
+ isCreationAllowed.put(instanceSpecCNSourceView, true);
+ isCreationAllowed.put(modelSourceView, true);
+ isCreationAllowed.put(modelCNSourceView, true);
+ isCreationAllowed.put(packageSourceView, true);
+ isCreationAllowed.put(packageCNSourceView, true);
+
+ isCreationAllowed.put(slotSourceView, false);
+
+ isCreationAllowed.put(propertySourceView, false);
+ isCreationAllowed.put(portSourceView, false);
+ isCreationAllowed.put(flowportSourceView, false);
+ isCreationAllowed.put(partSourceView, false);
+ isCreationAllowed.put(referenceSourceView, false);
+ isCreationAllowed.put(valueSourceView, false);
+ isCreationAllowed.put(operationSourceView, false);
+ isCreationAllowed.put(receptionSourceView, false);
+ isCreationAllowed.put(constraintCLNSourceView, false);
+ isCreationAllowed.put(constraintPropertySourceView, false);
+ isCreationAllowed.put(flowPropertySourceView, false);
+ isCreationAllowed.put(enumerationLiteralSourceView, false);
+
+ }
+
+}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/TestLinkCreationDependencyFromBlock.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/TestLinkCreationDependencyFromBlock.java new file mode 100644 index 00000000000..b8584a38c4b --- /dev/null +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/TestLinkCreationDependencyFromBlock.java @@ -0,0 +1,69 @@ +package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link;
+
+import java.util.HashMap;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.junit.BeforeClass;
+
+/**
+ * JUnit tests for Dependency creation test (via palette tools).
+ */
+public class TestLinkCreationDependencyFromBlock extends AbstractLinkCreationFromElementTest {
+
+ @BeforeClass
+ public static void initSource() throws Exception {
+ sourceView = blockSourceView;
+ }
+
+ @BeforeClass
+ public static void initToolID() throws Exception {
+ toolID = "blockdefinition.tool.dependency";
+ }
+
+ @BeforeClass
+ public static void initExpectedResults() throws Exception {
+
+ // Initialize source creation results
+ isCreationAllowed = new HashMap<View, Boolean>();
+ isCreationAllowed.put(actorTargetView, true);
+ isCreationAllowed.put(blockTargetView, true);
+ isCreationAllowed.put(constraintBlockTargetView, true);
+ isCreationAllowed.put(dataTypeTargetView, true);
+ isCreationAllowed.put(dimensionTargetView, true);
+ isCreationAllowed.put(enumerationTargetView, true);
+ isCreationAllowed.put(flowSpecificationTargetView, true);
+ isCreationAllowed.put(interfaceTargetView, true);
+ isCreationAllowed.put(primitiveTypeTargetView, true);
+ isCreationAllowed.put(signalTargetView, true);
+ isCreationAllowed.put(unitTargetView, true);
+ isCreationAllowed.put(valueTypeTargetView, true);
+
+ isCreationAllowed.put(commentTargetView, false);
+ isCreationAllowed.put(commentCNTargetView, false);
+ isCreationAllowed.put(constraintTargetView, true);
+ isCreationAllowed.put(constraintCNTargetView, true);
+ isCreationAllowed.put(instanceSpecTargetView, true);
+ isCreationAllowed.put(instanceSpecCNTargetView, true);
+ isCreationAllowed.put(modelTargetView, true);
+ isCreationAllowed.put(modelCNTargetView, true);
+ isCreationAllowed.put(packageTargetView, true);
+ isCreationAllowed.put(packageCNTargetView, true);
+
+ isCreationAllowed.put(slotTargetView, false);
+
+ isCreationAllowed.put(propertyTargetView, false);
+ isCreationAllowed.put(portTargetView, false);
+ isCreationAllowed.put(flowportTargetView, false);
+ isCreationAllowed.put(partTargetView, false);
+ isCreationAllowed.put(referenceTargetView, false);
+ isCreationAllowed.put(valueTargetView, false);
+ isCreationAllowed.put(operationTargetView, false);
+ isCreationAllowed.put(receptionTargetView, false);
+ isCreationAllowed.put(constraintCLNTargetView, false);
+ isCreationAllowed.put(constraintPropertyTargetView, false);
+ isCreationAllowed.put(flowPropertyTargetView, false);
+ isCreationAllowed.put(enumerationLiteralTargetView, false);
+
+ }
+
+}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/TestLinkCreationGeneralizationForSources.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/TestLinkCreationGeneralizationForSources.java new file mode 100644 index 00000000000..a4a99ce033b --- /dev/null +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/TestLinkCreationGeneralizationForSources.java @@ -0,0 +1,64 @@ +package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link;
+
+import java.util.HashMap;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.junit.BeforeClass;
+
+/**
+ * JUnit tests for Generalization creation test (via palette tools).
+ */
+public class TestLinkCreationGeneralizationForSources extends AbstractLinkCreationForSourcesTest {
+
+ @BeforeClass
+ public static void initToolID() throws Exception {
+ toolID = "blockdefinition.tool.generalization";
+ }
+
+ @BeforeClass
+ public static void initExpectedResults() throws Exception {
+
+ // Initialize source creation results
+ isCreationAllowed = new HashMap<View, Boolean>();
+ isCreationAllowed.put(actorSourceView, true);
+ isCreationAllowed.put(blockSourceView, true);
+ isCreationAllowed.put(constraintBlockSourceView, true);
+ isCreationAllowed.put(dataTypeSourceView, true);
+ isCreationAllowed.put(dimensionSourceView, false);
+ isCreationAllowed.put(enumerationSourceView, true);
+ isCreationAllowed.put(flowSpecificationSourceView, true);
+ isCreationAllowed.put(interfaceSourceView, true);
+ isCreationAllowed.put(primitiveTypeSourceView, true);
+ isCreationAllowed.put(signalSourceView, true);
+ isCreationAllowed.put(unitSourceView, false);
+ isCreationAllowed.put(valueTypeSourceView, true);
+
+ isCreationAllowed.put(commentSourceView, false);
+ isCreationAllowed.put(commentCNSourceView, false);
+ isCreationAllowed.put(constraintSourceView, false);
+ isCreationAllowed.put(constraintCNSourceView, false);
+ isCreationAllowed.put(instanceSpecSourceView, false);
+ isCreationAllowed.put(instanceSpecCNSourceView, false);
+ isCreationAllowed.put(modelSourceView, false);
+ isCreationAllowed.put(modelCNSourceView, false);
+ isCreationAllowed.put(packageSourceView, false);
+ isCreationAllowed.put(packageCNSourceView, false);
+
+ isCreationAllowed.put(slotSourceView, false);
+
+ isCreationAllowed.put(propertySourceView, false);
+ isCreationAllowed.put(portSourceView, false);
+ isCreationAllowed.put(flowportSourceView, false);
+ isCreationAllowed.put(partSourceView, false);
+ isCreationAllowed.put(referenceSourceView, false);
+ isCreationAllowed.put(valueSourceView, false);
+ isCreationAllowed.put(operationSourceView, false);
+ isCreationAllowed.put(receptionSourceView, false);
+ isCreationAllowed.put(constraintCLNSourceView, false);
+ isCreationAllowed.put(constraintPropertySourceView, false);
+ isCreationAllowed.put(flowPropertySourceView, false);
+ isCreationAllowed.put(enumerationLiteralSourceView, false);
+
+ }
+
+}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/TestLinkCreationGeneralizationFromBlock.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/TestLinkCreationGeneralizationFromBlock.java new file mode 100644 index 00000000000..664a341923b --- /dev/null +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/TestLinkCreationGeneralizationFromBlock.java @@ -0,0 +1,103 @@ +package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link;
+
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.createGraphicalNode;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.createEdgeFromPalette;
+
+import java.util.HashMap;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
+import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+
+/**
+ * JUnit tests for Dependency creation test (via palette tools).
+ */
+public class TestLinkCreationGeneralizationFromBlock extends AbstractLinkCreationFromElementTest {
+
+ @BeforeClass
+ public static void initSource() throws Exception {
+ sourceView = blockSourceView;
+ }
+
+ @BeforeClass
+ public static void initToolID() throws Exception {
+ toolID = "blockdefinition.tool.generalization";
+ }
+
+ @BeforeClass
+ public static void initExpectedResults() throws Exception {
+
+ // Initialize source creation results
+ isCreationAllowed = new HashMap<View, Boolean>();
+ isCreationAllowed.put(actorTargetView, true);
+ isCreationAllowed.put(blockTargetView, true);
+ isCreationAllowed.put(constraintBlockTargetView, true);
+ isCreationAllowed.put(dataTypeTargetView, true);
+ isCreationAllowed.put(dimensionTargetView, false);
+ isCreationAllowed.put(enumerationTargetView, true);
+ isCreationAllowed.put(flowSpecificationTargetView, true);
+ isCreationAllowed.put(interfaceTargetView, true);
+ isCreationAllowed.put(primitiveTypeTargetView, true);
+ isCreationAllowed.put(signalTargetView, true);
+ isCreationAllowed.put(unitTargetView, false);
+ isCreationAllowed.put(valueTypeTargetView, true);
+
+ isCreationAllowed.put(commentTargetView, false);
+ isCreationAllowed.put(commentCNTargetView, false);
+ isCreationAllowed.put(constraintTargetView, false);
+ isCreationAllowed.put(constraintCNTargetView, false);
+ isCreationAllowed.put(instanceSpecTargetView, false);
+ isCreationAllowed.put(instanceSpecCNTargetView, false);
+ isCreationAllowed.put(modelTargetView, false);
+ isCreationAllowed.put(modelCNTargetView, false);
+ isCreationAllowed.put(packageTargetView, false);
+ isCreationAllowed.put(packageCNTargetView, false);
+
+ isCreationAllowed.put(slotTargetView, false);
+
+ isCreationAllowed.put(propertyTargetView, false);
+ isCreationAllowed.put(portTargetView, false);
+ isCreationAllowed.put(flowportTargetView, false);
+ isCreationAllowed.put(partTargetView, false);
+ isCreationAllowed.put(referenceTargetView, false);
+ isCreationAllowed.put(valueTargetView, false);
+ isCreationAllowed.put(operationTargetView, false);
+ isCreationAllowed.put(receptionTargetView, false);
+ isCreationAllowed.put(constraintCLNTargetView, false);
+ isCreationAllowed.put(constraintPropertyTargetView, false);
+ isCreationAllowed.put(flowPropertyTargetView, false);
+ isCreationAllowed.put(enumerationLiteralTargetView, false);
+
+ }
+
+ @Ignore("UML Rules not implemented.")
+ @Test
+ public void verifyUMLRulesForGeneralization() throws Exception {
+ // TODO : check the spec. and decide which rule should be verified by
+ // construction (tested here).
+ // ex.: generalization link from Class to Interface should probably not be allowed.
+ }
+
+ @Ignore("SysML Rule not implemented.")
+ @Test
+ public void onlyBlockCanSpecializeBlock() throws Exception {
+ // [8] Any classifier which specializes a Block must also have the Block stereotype applied.
+ }
+
+ @Test
+ public void createGeneralizationWithCycleIsForbidden() throws Exception {
+ createEdgeFromPalette(toolID, blockSourceView, blockSourceView, false);
+ }
+
+ @Test
+ public void createGeneralizationWithIndirectCycleIsForbidden() throws Exception {
+ View intermediate = createGraphicalNode(SysMLElementTypes.BLOCK, SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID, getDiagramView());
+ createEdgeFromPalette(toolID, blockSourceView, intermediate, true);
+ createEdgeFromPalette(toolID, intermediate, blockTargetView, true);
+ createEdgeFromPalette(toolID, blockTargetView, blockSourceView, false);
+ }
+}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/TestLinkCreationInterfaceRealizationForSources.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/TestLinkCreationInterfaceRealizationForSources.java new file mode 100644 index 00000000000..3f2a0a7785b --- /dev/null +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/TestLinkCreationInterfaceRealizationForSources.java @@ -0,0 +1,64 @@ +package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link;
+
+import java.util.HashMap;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.junit.BeforeClass;
+
+/**
+ * JUnit tests for InterfaceRealization creation test (via palette tools).
+ */
+public class TestLinkCreationInterfaceRealizationForSources extends AbstractLinkCreationForSourcesTest {
+
+ @BeforeClass
+ public static void initToolID() throws Exception {
+ toolID = "blockdefinition.tool.interfacerealization";
+ }
+
+ @BeforeClass
+ public static void initExpectedResults() throws Exception {
+
+ // Initialize source creation results (must be a BehavioredClassifier)
+ isCreationAllowed = new HashMap<View, Boolean>();
+ isCreationAllowed.put(actorSourceView, true);
+ isCreationAllowed.put(blockSourceView, true);
+ isCreationAllowed.put(constraintBlockSourceView, true);
+ isCreationAllowed.put(dataTypeSourceView, false);
+ isCreationAllowed.put(dimensionSourceView, false);
+ isCreationAllowed.put(enumerationSourceView, false);
+ isCreationAllowed.put(flowSpecificationSourceView, false);
+ isCreationAllowed.put(interfaceSourceView, false);
+ isCreationAllowed.put(primitiveTypeSourceView, false);
+ isCreationAllowed.put(signalSourceView, false);
+ isCreationAllowed.put(unitSourceView, false);
+ isCreationAllowed.put(valueTypeSourceView, false);
+
+ isCreationAllowed.put(commentSourceView, false);
+ isCreationAllowed.put(commentCNSourceView, false);
+ isCreationAllowed.put(constraintSourceView, false);
+ isCreationAllowed.put(constraintCNSourceView, false);
+ isCreationAllowed.put(instanceSpecSourceView, false);
+ isCreationAllowed.put(instanceSpecCNSourceView, false);
+ isCreationAllowed.put(modelSourceView, false);
+ isCreationAllowed.put(modelCNSourceView, false);
+ isCreationAllowed.put(packageSourceView, false);
+ isCreationAllowed.put(packageCNSourceView, false);
+
+ isCreationAllowed.put(slotSourceView, false);
+
+ isCreationAllowed.put(propertySourceView, false);
+ isCreationAllowed.put(portSourceView, false);
+ isCreationAllowed.put(flowportSourceView, false);
+ isCreationAllowed.put(partSourceView, false);
+ isCreationAllowed.put(referenceSourceView, false);
+ isCreationAllowed.put(valueSourceView, false);
+ isCreationAllowed.put(operationSourceView, false);
+ isCreationAllowed.put(receptionSourceView, false);
+ isCreationAllowed.put(constraintCLNSourceView, false);
+ isCreationAllowed.put(constraintPropertySourceView, false);
+ isCreationAllowed.put(flowPropertySourceView, false);
+ isCreationAllowed.put(enumerationLiteralSourceView, false);
+
+ }
+
+}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/TestLinkCreationInterfaceRealizationFromBlock.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/TestLinkCreationInterfaceRealizationFromBlock.java new file mode 100644 index 00000000000..c76aadd432f --- /dev/null +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/TestLinkCreationInterfaceRealizationFromBlock.java @@ -0,0 +1,69 @@ +package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link;
+
+import java.util.HashMap;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.junit.BeforeClass;
+
+/**
+ * JUnit tests for InterfaceRealization creation test (via palette tools).
+ */
+public class TestLinkCreationInterfaceRealizationFromBlock extends AbstractLinkCreationFromElementTest {
+
+ @BeforeClass
+ public static void initSource() throws Exception {
+ sourceView = blockSourceView;
+ }
+
+ @BeforeClass
+ public static void initToolID() throws Exception {
+ toolID = "blockdefinition.tool.interfacerealization";
+ }
+
+ @BeforeClass
+ public static void initExpectedResults() throws Exception {
+
+ // Initialize source creation results (must be an Interface)
+ isCreationAllowed = new HashMap<View, Boolean>();
+ isCreationAllowed.put(actorTargetView, false);
+ isCreationAllowed.put(blockTargetView, false);
+ isCreationAllowed.put(constraintBlockTargetView, false);
+ isCreationAllowed.put(dataTypeTargetView, false);
+ isCreationAllowed.put(dimensionTargetView, false);
+ isCreationAllowed.put(enumerationTargetView, false);
+ isCreationAllowed.put(flowSpecificationTargetView, true); // TODO : Verify if SysML provide a rule to forbid this
+ isCreationAllowed.put(interfaceTargetView, true);
+ isCreationAllowed.put(primitiveTypeTargetView, false);
+ isCreationAllowed.put(signalTargetView, false);
+ isCreationAllowed.put(unitTargetView, false);
+ isCreationAllowed.put(valueTypeTargetView, false);
+
+ isCreationAllowed.put(commentTargetView, false);
+ isCreationAllowed.put(commentCNTargetView, false);
+ isCreationAllowed.put(constraintTargetView, false);
+ isCreationAllowed.put(constraintCNTargetView, false);
+ isCreationAllowed.put(instanceSpecTargetView, false);
+ isCreationAllowed.put(instanceSpecCNTargetView, false);
+ isCreationAllowed.put(modelTargetView, false);
+ isCreationAllowed.put(modelCNTargetView, false);
+ isCreationAllowed.put(packageTargetView, false);
+ isCreationAllowed.put(packageCNTargetView, false);
+
+ isCreationAllowed.put(slotTargetView, false);
+
+ isCreationAllowed.put(propertyTargetView, false);
+ isCreationAllowed.put(portTargetView, false);
+ isCreationAllowed.put(flowportTargetView, false);
+ isCreationAllowed.put(partTargetView, false);
+ isCreationAllowed.put(referenceTargetView, false);
+ isCreationAllowed.put(valueTargetView, false);
+ isCreationAllowed.put(operationTargetView, false);
+ isCreationAllowed.put(receptionTargetView, false);
+ isCreationAllowed.put(constraintCLNTargetView, false);
+ isCreationAllowed.put(constraintPropertyTargetView, false);
+ isCreationAllowed.put(flowPropertyTargetView, false);
+ isCreationAllowed.put(enumerationLiteralTargetView, false);
+
+ }
+
+}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/TestLinkCreationUsageForSources.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/TestLinkCreationUsageForSources.java new file mode 100644 index 00000000000..ba17e8bef1e --- /dev/null +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/TestLinkCreationUsageForSources.java @@ -0,0 +1,64 @@ +package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link;
+
+import java.util.HashMap;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.junit.BeforeClass;
+
+/**
+ * JUnit tests for Usage creation test (via palette tools).
+ */
+public class TestLinkCreationUsageForSources extends AbstractLinkCreationForSourcesTest {
+
+ @BeforeClass
+ public static void initToolID() throws Exception {
+ toolID = "blockdefinition.tool.usage";
+ }
+
+ @BeforeClass
+ public static void initExpectedResults() throws Exception {
+
+ // Initialize source creation results
+ isCreationAllowed = new HashMap<View, Boolean>();
+ isCreationAllowed.put(actorSourceView, true);
+ isCreationAllowed.put(blockSourceView, true);
+ isCreationAllowed.put(constraintBlockSourceView, true);
+ isCreationAllowed.put(dataTypeSourceView, true);
+ isCreationAllowed.put(dimensionSourceView, true);
+ isCreationAllowed.put(enumerationSourceView, true);
+ isCreationAllowed.put(flowSpecificationSourceView, true);
+ isCreationAllowed.put(interfaceSourceView, true);
+ isCreationAllowed.put(primitiveTypeSourceView, true);
+ isCreationAllowed.put(signalSourceView, true);
+ isCreationAllowed.put(unitSourceView, true);
+ isCreationAllowed.put(valueTypeSourceView, true);
+
+ isCreationAllowed.put(commentSourceView, false);
+ isCreationAllowed.put(commentCNSourceView, false);
+ isCreationAllowed.put(constraintSourceView, true);
+ isCreationAllowed.put(constraintCNSourceView, true);
+ isCreationAllowed.put(instanceSpecSourceView, true);
+ isCreationAllowed.put(instanceSpecCNSourceView, true);
+ isCreationAllowed.put(modelSourceView, true);
+ isCreationAllowed.put(modelCNSourceView, true);
+ isCreationAllowed.put(packageSourceView, true);
+ isCreationAllowed.put(packageCNSourceView, true);
+
+ isCreationAllowed.put(slotSourceView, false);
+
+ isCreationAllowed.put(propertySourceView, false);
+ isCreationAllowed.put(portSourceView, false);
+ isCreationAllowed.put(flowportSourceView, false);
+ isCreationAllowed.put(partSourceView, false);
+ isCreationAllowed.put(referenceSourceView, false);
+ isCreationAllowed.put(valueSourceView, false);
+ isCreationAllowed.put(operationSourceView, false);
+ isCreationAllowed.put(receptionSourceView, false);
+ isCreationAllowed.put(constraintCLNSourceView, false);
+ isCreationAllowed.put(constraintPropertySourceView, false);
+ isCreationAllowed.put(flowPropertySourceView, false);
+ isCreationAllowed.put(enumerationLiteralSourceView, false);
+
+ }
+
+}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/TestLinkCreationUsageFromBlock.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/TestLinkCreationUsageFromBlock.java new file mode 100644 index 00000000000..21def095f16 --- /dev/null +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/TestLinkCreationUsageFromBlock.java @@ -0,0 +1,69 @@ +package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link;
+
+import java.util.HashMap;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.junit.BeforeClass;
+
+/**
+ * JUnit tests for Usage creation test (via palette tools).
+ */
+public class TestLinkCreationUsageFromBlock extends AbstractLinkCreationFromElementTest {
+
+ @BeforeClass
+ public static void initSource() throws Exception {
+ sourceView = blockSourceView;
+ }
+
+ @BeforeClass
+ public static void initToolID() throws Exception {
+ toolID = "blockdefinition.tool.usage";
+ }
+
+ @BeforeClass
+ public static void initExpectedResults() throws Exception {
+
+ // Initialize source creation results
+ isCreationAllowed = new HashMap<View, Boolean>();
+ isCreationAllowed.put(actorTargetView, true);
+ isCreationAllowed.put(blockTargetView, true);
+ isCreationAllowed.put(constraintBlockTargetView, true);
+ isCreationAllowed.put(dataTypeTargetView, true);
+ isCreationAllowed.put(dimensionTargetView, true);
+ isCreationAllowed.put(enumerationTargetView, true);
+ isCreationAllowed.put(flowSpecificationTargetView, true);
+ isCreationAllowed.put(interfaceTargetView, true);
+ isCreationAllowed.put(primitiveTypeTargetView, true);
+ isCreationAllowed.put(signalTargetView, true);
+ isCreationAllowed.put(unitTargetView, true);
+ isCreationAllowed.put(valueTypeTargetView, true);
+
+ isCreationAllowed.put(commentTargetView, false);
+ isCreationAllowed.put(commentCNTargetView, false);
+ isCreationAllowed.put(constraintTargetView, true);
+ isCreationAllowed.put(constraintCNTargetView, true);
+ isCreationAllowed.put(instanceSpecTargetView, true);
+ isCreationAllowed.put(instanceSpecCNTargetView, true);
+ isCreationAllowed.put(modelTargetView, true);
+ isCreationAllowed.put(modelCNTargetView, true);
+ isCreationAllowed.put(packageTargetView, true);
+ isCreationAllowed.put(packageCNTargetView, true);
+
+ isCreationAllowed.put(slotTargetView, false);
+
+ isCreationAllowed.put(propertyTargetView, false);
+ isCreationAllowed.put(portTargetView, false);
+ isCreationAllowed.put(flowportTargetView, false);
+ isCreationAllowed.put(partTargetView, false);
+ isCreationAllowed.put(referenceTargetView, false);
+ isCreationAllowed.put(valueTargetView, false);
+ isCreationAllowed.put(operationTargetView, false);
+ isCreationAllowed.put(receptionTargetView, false);
+ isCreationAllowed.put(constraintCLNTargetView, false);
+ isCreationAllowed.put(constraintPropertyTargetView, false);
+ isCreationAllowed.put(flowPropertyTargetView, false);
+ isCreationAllowed.put(enumerationLiteralTargetView, false);
+
+ }
+
+}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/association/TestLinkCreationAssociationCompositeDirectedForSources.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/association/TestLinkCreationAssociationCompositeDirectedForSources.java new file mode 100644 index 00000000000..57d6fe4c4da --- /dev/null +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/association/TestLinkCreationAssociationCompositeDirectedForSources.java @@ -0,0 +1,65 @@ +package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.association;
+
+import java.util.HashMap;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.AbstractLinkCreationForSourcesTest;
+import org.junit.BeforeClass;
+
+/**
+ * JUnit tests for Association creation test (via palette tools).
+ */
+public class TestLinkCreationAssociationCompositeDirectedForSources extends AbstractLinkCreationForSourcesTest {
+
+ @BeforeClass
+ public static void initToolID() throws Exception {
+ toolID = "blockdefinition.tool.association_composite_directed";
+ }
+
+ @BeforeClass
+ public static void initExpectedResults() throws Exception {
+
+ // Initialize source creation results
+ isCreationAllowed = new HashMap<View, Boolean>();
+ isCreationAllowed.put(actorSourceView, false);
+ isCreationAllowed.put(blockSourceView, true);
+ isCreationAllowed.put(constraintBlockSourceView, true);
+ isCreationAllowed.put(dataTypeSourceView, true);
+ isCreationAllowed.put(dimensionSourceView, false);
+ isCreationAllowed.put(enumerationSourceView, true);
+ isCreationAllowed.put(flowSpecificationSourceView, true);
+ isCreationAllowed.put(interfaceSourceView, true);
+ isCreationAllowed.put(primitiveTypeSourceView, true);
+ isCreationAllowed.put(signalSourceView, true);
+ isCreationAllowed.put(unitSourceView, false);
+ isCreationAllowed.put(valueTypeSourceView, true);
+
+ isCreationAllowed.put(commentSourceView, false);
+ isCreationAllowed.put(commentCNSourceView, false);
+ isCreationAllowed.put(constraintSourceView, false);
+ isCreationAllowed.put(constraintCNSourceView, false);
+ isCreationAllowed.put(instanceSpecSourceView, false);
+ isCreationAllowed.put(instanceSpecCNSourceView, false);
+ isCreationAllowed.put(modelSourceView, false);
+ isCreationAllowed.put(modelCNSourceView, false);
+ isCreationAllowed.put(packageSourceView, false);
+ isCreationAllowed.put(packageCNSourceView, false);
+
+ isCreationAllowed.put(slotSourceView, false);
+
+ isCreationAllowed.put(propertySourceView, false);
+ isCreationAllowed.put(portSourceView, false);
+ isCreationAllowed.put(flowportSourceView, false);
+ isCreationAllowed.put(partSourceView, false);
+ isCreationAllowed.put(referenceSourceView, false);
+ isCreationAllowed.put(valueSourceView, false);
+ isCreationAllowed.put(operationSourceView, false);
+ isCreationAllowed.put(receptionSourceView, false);
+ isCreationAllowed.put(constraintCLNSourceView, false);
+ isCreationAllowed.put(constraintPropertySourceView, false);
+ isCreationAllowed.put(flowPropertySourceView, false);
+ isCreationAllowed.put(enumerationLiteralSourceView, false);
+
+ }
+
+}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/association/TestLinkCreationAssociationCompositeDirectedFromBlock.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/association/TestLinkCreationAssociationCompositeDirectedFromBlock.java new file mode 100644 index 00000000000..302cf6fb20a --- /dev/null +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/association/TestLinkCreationAssociationCompositeDirectedFromBlock.java @@ -0,0 +1,69 @@ +package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.association;
+
+import java.util.HashMap;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.AbstractLinkCreationFromElementTest;
+import org.junit.BeforeClass;
+
+/**
+ * JUnit tests for Association creation test (via palette tools).
+ */
+public class TestLinkCreationAssociationCompositeDirectedFromBlock extends AbstractLinkCreationFromElementTest {
+
+ @BeforeClass
+ public static void initSource() throws Exception {
+ sourceView = blockSourceView;
+ }
+
+ @BeforeClass
+ public static void initToolID() throws Exception {
+ toolID = "blockdefinition.tool.association_composite_directed";
+ }
+
+ @BeforeClass
+ public static void initExpectedResults() throws Exception {
+
+ // Initialize source creation results
+ isCreationAllowed = new HashMap<View, Boolean>();
+ isCreationAllowed.put(actorTargetView, true);
+ isCreationAllowed.put(blockTargetView, true);
+ isCreationAllowed.put(constraintBlockTargetView, true);
+ isCreationAllowed.put(dataTypeTargetView, true);
+ isCreationAllowed.put(dimensionTargetView, false);
+ isCreationAllowed.put(enumerationTargetView, true);
+ isCreationAllowed.put(flowSpecificationTargetView, true);
+ isCreationAllowed.put(interfaceTargetView, true);
+ isCreationAllowed.put(primitiveTypeTargetView, true);
+ isCreationAllowed.put(signalTargetView, true);
+ isCreationAllowed.put(unitTargetView, false);
+ isCreationAllowed.put(valueTypeTargetView, true);
+
+ isCreationAllowed.put(commentTargetView, false);
+ isCreationAllowed.put(commentCNTargetView, false);
+ isCreationAllowed.put(constraintTargetView, false);
+ isCreationAllowed.put(constraintCNTargetView, false);
+ isCreationAllowed.put(instanceSpecTargetView, false);
+ isCreationAllowed.put(instanceSpecCNTargetView, false);
+ isCreationAllowed.put(modelTargetView, false);
+ isCreationAllowed.put(modelCNTargetView, false);
+ isCreationAllowed.put(packageTargetView, false);
+ isCreationAllowed.put(packageCNTargetView, false);
+
+ isCreationAllowed.put(slotTargetView, false);
+
+ isCreationAllowed.put(propertyTargetView, false);
+ isCreationAllowed.put(portTargetView, false);
+ isCreationAllowed.put(flowportTargetView, false);
+ isCreationAllowed.put(partTargetView, false);
+ isCreationAllowed.put(referenceTargetView, false);
+ isCreationAllowed.put(valueTargetView, false);
+ isCreationAllowed.put(operationTargetView, false);
+ isCreationAllowed.put(receptionTargetView, false);
+ isCreationAllowed.put(constraintCLNTargetView, false);
+ isCreationAllowed.put(constraintPropertyTargetView, false);
+ isCreationAllowed.put(flowPropertyTargetView, false);
+ isCreationAllowed.put(enumerationLiteralTargetView, false);
+
+ }
+}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/association/TestLinkCreationAssociationCompositeForSources.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/association/TestLinkCreationAssociationCompositeForSources.java new file mode 100644 index 00000000000..1dced96efd4 --- /dev/null +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/association/TestLinkCreationAssociationCompositeForSources.java @@ -0,0 +1,65 @@ +package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.association;
+
+import java.util.HashMap;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.AbstractLinkCreationForSourcesTest;
+import org.junit.BeforeClass;
+
+/**
+ * JUnit tests for Association creation test (via palette tools).
+ */
+public class TestLinkCreationAssociationCompositeForSources extends AbstractLinkCreationForSourcesTest {
+
+ @BeforeClass
+ public static void initToolID() throws Exception {
+ toolID = "blockdefinition.tool.association_composite";
+ }
+
+ @BeforeClass
+ public static void initExpectedResults() throws Exception {
+
+ // Initialize source creation results
+ isCreationAllowed = new HashMap<View, Boolean>();
+ isCreationAllowed.put(actorSourceView, false);
+ isCreationAllowed.put(blockSourceView, true);
+ isCreationAllowed.put(constraintBlockSourceView, true);
+ isCreationAllowed.put(dataTypeSourceView, true);
+ isCreationAllowed.put(dimensionSourceView, false);
+ isCreationAllowed.put(enumerationSourceView, true);
+ isCreationAllowed.put(flowSpecificationSourceView, true);
+ isCreationAllowed.put(interfaceSourceView, true);
+ isCreationAllowed.put(primitiveTypeSourceView, true);
+ isCreationAllowed.put(signalSourceView, true);
+ isCreationAllowed.put(unitSourceView, false);
+ isCreationAllowed.put(valueTypeSourceView, true);
+
+ isCreationAllowed.put(commentSourceView, false);
+ isCreationAllowed.put(commentCNSourceView, false);
+ isCreationAllowed.put(constraintSourceView, false);
+ isCreationAllowed.put(constraintCNSourceView, false);
+ isCreationAllowed.put(instanceSpecSourceView, false);
+ isCreationAllowed.put(instanceSpecCNSourceView, false);
+ isCreationAllowed.put(modelSourceView, false);
+ isCreationAllowed.put(modelCNSourceView, false);
+ isCreationAllowed.put(packageSourceView, false);
+ isCreationAllowed.put(packageCNSourceView, false);
+
+ isCreationAllowed.put(slotSourceView, false);
+
+ isCreationAllowed.put(propertySourceView, false);
+ isCreationAllowed.put(portSourceView, false);
+ isCreationAllowed.put(flowportSourceView, false);
+ isCreationAllowed.put(partSourceView, false);
+ isCreationAllowed.put(referenceSourceView, false);
+ isCreationAllowed.put(valueSourceView, false);
+ isCreationAllowed.put(operationSourceView, false);
+ isCreationAllowed.put(receptionSourceView, false);
+ isCreationAllowed.put(constraintCLNSourceView, false);
+ isCreationAllowed.put(constraintPropertySourceView, false);
+ isCreationAllowed.put(flowPropertySourceView, false);
+ isCreationAllowed.put(enumerationLiteralSourceView, false);
+
+ }
+
+}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/association/TestLinkCreationAssociationCompositeFromBlock.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/association/TestLinkCreationAssociationCompositeFromBlock.java new file mode 100644 index 00000000000..f46bfac07a8 --- /dev/null +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/association/TestLinkCreationAssociationCompositeFromBlock.java @@ -0,0 +1,69 @@ +package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.association;
+
+import java.util.HashMap;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.AbstractLinkCreationFromElementTest;
+import org.junit.BeforeClass;
+
+/**
+ * JUnit tests for Association creation test (via palette tools).
+ */
+public class TestLinkCreationAssociationCompositeFromBlock extends AbstractLinkCreationFromElementTest {
+
+ @BeforeClass
+ public static void initSource() throws Exception {
+ sourceView = blockSourceView;
+ }
+
+ @BeforeClass
+ public static void initToolID() throws Exception {
+ toolID = "blockdefinition.tool.association_composite";
+ }
+
+ @BeforeClass
+ public static void initExpectedResults() throws Exception {
+
+ // Initialize source creation results
+ isCreationAllowed = new HashMap<View, Boolean>();
+ isCreationAllowed.put(actorTargetView, false);
+ isCreationAllowed.put(blockTargetView, true);
+ isCreationAllowed.put(constraintBlockTargetView, true);
+ isCreationAllowed.put(dataTypeTargetView, true);
+ isCreationAllowed.put(dimensionTargetView, false);
+ isCreationAllowed.put(enumerationTargetView, true);
+ isCreationAllowed.put(flowSpecificationTargetView, true);
+ isCreationAllowed.put(interfaceTargetView, true);
+ isCreationAllowed.put(primitiveTypeTargetView, true);
+ isCreationAllowed.put(signalTargetView, true);
+ isCreationAllowed.put(unitTargetView, false);
+ isCreationAllowed.put(valueTypeTargetView, true);
+
+ isCreationAllowed.put(commentTargetView, false);
+ isCreationAllowed.put(commentCNTargetView, false);
+ isCreationAllowed.put(constraintTargetView, false);
+ isCreationAllowed.put(constraintCNTargetView, false);
+ isCreationAllowed.put(instanceSpecTargetView, false);
+ isCreationAllowed.put(instanceSpecCNTargetView, false);
+ isCreationAllowed.put(modelTargetView, false);
+ isCreationAllowed.put(modelCNTargetView, false);
+ isCreationAllowed.put(packageTargetView, false);
+ isCreationAllowed.put(packageCNTargetView, false);
+
+ isCreationAllowed.put(slotTargetView, false);
+
+ isCreationAllowed.put(propertyTargetView, false);
+ isCreationAllowed.put(portTargetView, false);
+ isCreationAllowed.put(flowportTargetView, false);
+ isCreationAllowed.put(partTargetView, false);
+ isCreationAllowed.put(referenceTargetView, false);
+ isCreationAllowed.put(valueTargetView, false);
+ isCreationAllowed.put(operationTargetView, false);
+ isCreationAllowed.put(receptionTargetView, false);
+ isCreationAllowed.put(constraintCLNTargetView, false);
+ isCreationAllowed.put(constraintPropertyTargetView, false);
+ isCreationAllowed.put(flowPropertyTargetView, false);
+ isCreationAllowed.put(enumerationLiteralTargetView, false);
+
+ }
+}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/association/TestLinkCreationAssociationNoneDirectedForSources.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/association/TestLinkCreationAssociationNoneDirectedForSources.java new file mode 100644 index 00000000000..65ee45f5f6f --- /dev/null +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/association/TestLinkCreationAssociationNoneDirectedForSources.java @@ -0,0 +1,65 @@ +package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.association;
+
+import java.util.HashMap;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.AbstractLinkCreationForSourcesTest;
+import org.junit.BeforeClass;
+
+/**
+ * JUnit tests for Association creation test (via palette tools).
+ */
+public class TestLinkCreationAssociationNoneDirectedForSources extends AbstractLinkCreationForSourcesTest {
+
+ @BeforeClass
+ public static void initToolID() throws Exception {
+ toolID = "blockdefinition.tool.association_none_directed";
+ }
+
+ @BeforeClass
+ public static void initExpectedResults() throws Exception {
+
+ // Initialize source creation results
+ isCreationAllowed = new HashMap<View, Boolean>();
+ isCreationAllowed.put(actorSourceView, false);
+ isCreationAllowed.put(blockSourceView, true);
+ isCreationAllowed.put(constraintBlockSourceView, true);
+ isCreationAllowed.put(dataTypeSourceView, true);
+ isCreationAllowed.put(dimensionSourceView, false);
+ isCreationAllowed.put(enumerationSourceView, true);
+ isCreationAllowed.put(flowSpecificationSourceView, true);
+ isCreationAllowed.put(interfaceSourceView, true);
+ isCreationAllowed.put(primitiveTypeSourceView, true);
+ isCreationAllowed.put(signalSourceView, true);
+ isCreationAllowed.put(unitSourceView, false);
+ isCreationAllowed.put(valueTypeSourceView, true);
+
+ isCreationAllowed.put(commentSourceView, false);
+ isCreationAllowed.put(commentCNSourceView, false);
+ isCreationAllowed.put(constraintSourceView, false);
+ isCreationAllowed.put(constraintCNSourceView, false);
+ isCreationAllowed.put(instanceSpecSourceView, false);
+ isCreationAllowed.put(instanceSpecCNSourceView, false);
+ isCreationAllowed.put(modelSourceView, false);
+ isCreationAllowed.put(modelCNSourceView, false);
+ isCreationAllowed.put(packageSourceView, false);
+ isCreationAllowed.put(packageCNSourceView, false);
+
+ isCreationAllowed.put(slotSourceView, false);
+
+ isCreationAllowed.put(propertySourceView, false);
+ isCreationAllowed.put(portSourceView, false);
+ isCreationAllowed.put(flowportSourceView, false);
+ isCreationAllowed.put(partSourceView, false);
+ isCreationAllowed.put(referenceSourceView, false);
+ isCreationAllowed.put(valueSourceView, false);
+ isCreationAllowed.put(operationSourceView, false);
+ isCreationAllowed.put(receptionSourceView, false);
+ isCreationAllowed.put(constraintCLNSourceView, false);
+ isCreationAllowed.put(constraintPropertySourceView, false);
+ isCreationAllowed.put(flowPropertySourceView, false);
+ isCreationAllowed.put(enumerationLiteralSourceView, false);
+
+ }
+
+}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/association/TestLinkCreationAssociationNoneDirectedFromBlock.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/association/TestLinkCreationAssociationNoneDirectedFromBlock.java new file mode 100644 index 00000000000..14e1f2b89e7 --- /dev/null +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/association/TestLinkCreationAssociationNoneDirectedFromBlock.java @@ -0,0 +1,69 @@ +package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.association;
+
+import java.util.HashMap;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.AbstractLinkCreationFromElementTest;
+import org.junit.BeforeClass;
+
+/**
+ * JUnit tests for Association creation test (via palette tools).
+ */
+public class TestLinkCreationAssociationNoneDirectedFromBlock extends AbstractLinkCreationFromElementTest {
+
+ @BeforeClass
+ public static void initSource() throws Exception {
+ sourceView = blockSourceView;
+ }
+
+ @BeforeClass
+ public static void initToolID() throws Exception {
+ toolID = "blockdefinition.tool.association_none_directed";
+ }
+
+ @BeforeClass
+ public static void initExpectedResults() throws Exception {
+
+ // Initialize source creation results
+ isCreationAllowed = new HashMap<View, Boolean>();
+ isCreationAllowed.put(actorTargetView, true);
+ isCreationAllowed.put(blockTargetView, true);
+ isCreationAllowed.put(constraintBlockTargetView, true);
+ isCreationAllowed.put(dataTypeTargetView, true);
+ isCreationAllowed.put(dimensionTargetView, false);
+ isCreationAllowed.put(enumerationTargetView, true);
+ isCreationAllowed.put(flowSpecificationTargetView, true);
+ isCreationAllowed.put(interfaceTargetView, true);
+ isCreationAllowed.put(primitiveTypeTargetView, true);
+ isCreationAllowed.put(signalTargetView, true);
+ isCreationAllowed.put(unitTargetView, false);
+ isCreationAllowed.put(valueTypeTargetView, true);
+
+ isCreationAllowed.put(commentTargetView, false);
+ isCreationAllowed.put(commentCNTargetView, false);
+ isCreationAllowed.put(constraintTargetView, false);
+ isCreationAllowed.put(constraintCNTargetView, false);
+ isCreationAllowed.put(instanceSpecTargetView, false);
+ isCreationAllowed.put(instanceSpecCNTargetView, false);
+ isCreationAllowed.put(modelTargetView, false);
+ isCreationAllowed.put(modelCNTargetView, false);
+ isCreationAllowed.put(packageTargetView, false);
+ isCreationAllowed.put(packageCNTargetView, false);
+
+ isCreationAllowed.put(slotTargetView, false);
+
+ isCreationAllowed.put(propertyTargetView, false);
+ isCreationAllowed.put(portTargetView, false);
+ isCreationAllowed.put(flowportTargetView, false);
+ isCreationAllowed.put(partTargetView, false);
+ isCreationAllowed.put(referenceTargetView, false);
+ isCreationAllowed.put(valueTargetView, false);
+ isCreationAllowed.put(operationTargetView, false);
+ isCreationAllowed.put(receptionTargetView, false);
+ isCreationAllowed.put(constraintCLNTargetView, false);
+ isCreationAllowed.put(constraintPropertyTargetView, false);
+ isCreationAllowed.put(flowPropertyTargetView, false);
+ isCreationAllowed.put(enumerationLiteralTargetView, false);
+
+ }
+}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/association/TestLinkCreationAssociationNoneForSources.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/association/TestLinkCreationAssociationNoneForSources.java new file mode 100644 index 00000000000..0b4abce9a9a --- /dev/null +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/association/TestLinkCreationAssociationNoneForSources.java @@ -0,0 +1,65 @@ +package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.association;
+
+import java.util.HashMap;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.AbstractLinkCreationForSourcesTest;
+import org.junit.BeforeClass;
+
+/**
+ * JUnit tests for Association creation test (via palette tools).
+ */
+public class TestLinkCreationAssociationNoneForSources extends AbstractLinkCreationForSourcesTest {
+
+ @BeforeClass
+ public static void initToolID() throws Exception {
+ toolID = "blockdefinition.tool.association_none";
+ }
+
+ @BeforeClass
+ public static void initExpectedResults() throws Exception {
+
+ // Initialize source creation results
+ isCreationAllowed = new HashMap<View, Boolean>();
+ isCreationAllowed.put(actorSourceView, false);
+ isCreationAllowed.put(blockSourceView, true);
+ isCreationAllowed.put(constraintBlockSourceView, true);
+ isCreationAllowed.put(dataTypeSourceView, true);
+ isCreationAllowed.put(dimensionSourceView, false);
+ isCreationAllowed.put(enumerationSourceView, true);
+ isCreationAllowed.put(flowSpecificationSourceView, true);
+ isCreationAllowed.put(interfaceSourceView, true);
+ isCreationAllowed.put(primitiveTypeSourceView, true);
+ isCreationAllowed.put(signalSourceView, true);
+ isCreationAllowed.put(unitSourceView, false);
+ isCreationAllowed.put(valueTypeSourceView, true);
+
+ isCreationAllowed.put(commentSourceView, false);
+ isCreationAllowed.put(commentCNSourceView, false);
+ isCreationAllowed.put(constraintSourceView, false);
+ isCreationAllowed.put(constraintCNSourceView, false);
+ isCreationAllowed.put(instanceSpecSourceView, false);
+ isCreationAllowed.put(instanceSpecCNSourceView, false);
+ isCreationAllowed.put(modelSourceView, false);
+ isCreationAllowed.put(modelCNSourceView, false);
+ isCreationAllowed.put(packageSourceView, false);
+ isCreationAllowed.put(packageCNSourceView, false);
+
+ isCreationAllowed.put(slotSourceView, false);
+
+ isCreationAllowed.put(propertySourceView, false);
+ isCreationAllowed.put(portSourceView, false);
+ isCreationAllowed.put(flowportSourceView, false);
+ isCreationAllowed.put(partSourceView, false);
+ isCreationAllowed.put(referenceSourceView, false);
+ isCreationAllowed.put(valueSourceView, false);
+ isCreationAllowed.put(operationSourceView, false);
+ isCreationAllowed.put(receptionSourceView, false);
+ isCreationAllowed.put(constraintCLNSourceView, false);
+ isCreationAllowed.put(constraintPropertySourceView, false);
+ isCreationAllowed.put(flowPropertySourceView, false);
+ isCreationAllowed.put(enumerationLiteralSourceView, false);
+
+ }
+
+}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/association/TestLinkCreationAssociationNoneFromBlock.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/association/TestLinkCreationAssociationNoneFromBlock.java new file mode 100644 index 00000000000..19026a01da3 --- /dev/null +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/association/TestLinkCreationAssociationNoneFromBlock.java @@ -0,0 +1,69 @@ +package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.association;
+
+import java.util.HashMap;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.AbstractLinkCreationFromElementTest;
+import org.junit.BeforeClass;
+
+/**
+ * JUnit tests for Association creation test (via palette tools).
+ */
+public class TestLinkCreationAssociationNoneFromBlock extends AbstractLinkCreationFromElementTest {
+
+ @BeforeClass
+ public static void initSource() throws Exception {
+ sourceView = blockSourceView;
+ }
+
+ @BeforeClass
+ public static void initToolID() throws Exception {
+ toolID = "blockdefinition.tool.association_none";
+ }
+
+ @BeforeClass
+ public static void initExpectedResults() throws Exception {
+
+ // Initialize source creation results
+ isCreationAllowed = new HashMap<View, Boolean>();
+ isCreationAllowed.put(actorTargetView, false);
+ isCreationAllowed.put(blockTargetView, true);
+ isCreationAllowed.put(constraintBlockTargetView, true);
+ isCreationAllowed.put(dataTypeTargetView, true);
+ isCreationAllowed.put(dimensionTargetView, false);
+ isCreationAllowed.put(enumerationTargetView, true);
+ isCreationAllowed.put(flowSpecificationTargetView, true);
+ isCreationAllowed.put(interfaceTargetView, true);
+ isCreationAllowed.put(primitiveTypeTargetView, true);
+ isCreationAllowed.put(signalTargetView, true);
+ isCreationAllowed.put(unitTargetView, false);
+ isCreationAllowed.put(valueTypeTargetView, true);
+
+ isCreationAllowed.put(commentTargetView, false);
+ isCreationAllowed.put(commentCNTargetView, false);
+ isCreationAllowed.put(constraintTargetView, false);
+ isCreationAllowed.put(constraintCNTargetView, false);
+ isCreationAllowed.put(instanceSpecTargetView, false);
+ isCreationAllowed.put(instanceSpecCNTargetView, false);
+ isCreationAllowed.put(modelTargetView, false);
+ isCreationAllowed.put(modelCNTargetView, false);
+ isCreationAllowed.put(packageTargetView, false);
+ isCreationAllowed.put(packageCNTargetView, false);
+
+ isCreationAllowed.put(slotTargetView, false);
+
+ isCreationAllowed.put(propertyTargetView, false);
+ isCreationAllowed.put(portTargetView, false);
+ isCreationAllowed.put(flowportTargetView, false);
+ isCreationAllowed.put(partTargetView, false);
+ isCreationAllowed.put(referenceTargetView, false);
+ isCreationAllowed.put(valueTargetView, false);
+ isCreationAllowed.put(operationTargetView, false);
+ isCreationAllowed.put(receptionTargetView, false);
+ isCreationAllowed.put(constraintCLNTargetView, false);
+ isCreationAllowed.put(constraintPropertyTargetView, false);
+ isCreationAllowed.put(flowPropertyTargetView, false);
+ isCreationAllowed.put(enumerationLiteralTargetView, false);
+
+ }
+}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/association/TestLinkCreationAssociationSharedDirectedForSources.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/association/TestLinkCreationAssociationSharedDirectedForSources.java new file mode 100644 index 00000000000..71f5e7114d3 --- /dev/null +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/association/TestLinkCreationAssociationSharedDirectedForSources.java @@ -0,0 +1,65 @@ +package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.association;
+
+import java.util.HashMap;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.AbstractLinkCreationForSourcesTest;
+import org.junit.BeforeClass;
+
+/**
+ * JUnit tests for Association creation test (via palette tools).
+ */
+public class TestLinkCreationAssociationSharedDirectedForSources extends AbstractLinkCreationForSourcesTest {
+
+ @BeforeClass
+ public static void initToolID() throws Exception {
+ toolID = "blockdefinition.tool.association_shared_directed";
+ }
+
+ @BeforeClass
+ public static void initExpectedResults() throws Exception {
+
+ // Initialize source creation results
+ isCreationAllowed = new HashMap<View, Boolean>();
+ isCreationAllowed.put(actorSourceView, false);
+ isCreationAllowed.put(blockSourceView, true);
+ isCreationAllowed.put(constraintBlockSourceView, true);
+ isCreationAllowed.put(dataTypeSourceView, true);
+ isCreationAllowed.put(dimensionSourceView, false);
+ isCreationAllowed.put(enumerationSourceView, true);
+ isCreationAllowed.put(flowSpecificationSourceView, true);
+ isCreationAllowed.put(interfaceSourceView, true);
+ isCreationAllowed.put(primitiveTypeSourceView, true);
+ isCreationAllowed.put(signalSourceView, true);
+ isCreationAllowed.put(unitSourceView, false);
+ isCreationAllowed.put(valueTypeSourceView, true);
+
+ isCreationAllowed.put(commentSourceView, false);
+ isCreationAllowed.put(commentCNSourceView, false);
+ isCreationAllowed.put(constraintSourceView, false);
+ isCreationAllowed.put(constraintCNSourceView, false);
+ isCreationAllowed.put(instanceSpecSourceView, false);
+ isCreationAllowed.put(instanceSpecCNSourceView, false);
+ isCreationAllowed.put(modelSourceView, false);
+ isCreationAllowed.put(modelCNSourceView, false);
+ isCreationAllowed.put(packageSourceView, false);
+ isCreationAllowed.put(packageCNSourceView, false);
+
+ isCreationAllowed.put(slotSourceView, false);
+
+ isCreationAllowed.put(propertySourceView, false);
+ isCreationAllowed.put(portSourceView, false);
+ isCreationAllowed.put(flowportSourceView, false);
+ isCreationAllowed.put(partSourceView, false);
+ isCreationAllowed.put(referenceSourceView, false);
+ isCreationAllowed.put(valueSourceView, false);
+ isCreationAllowed.put(operationSourceView, false);
+ isCreationAllowed.put(receptionSourceView, false);
+ isCreationAllowed.put(constraintCLNSourceView, false);
+ isCreationAllowed.put(constraintPropertySourceView, false);
+ isCreationAllowed.put(flowPropertySourceView, false);
+ isCreationAllowed.put(enumerationLiteralSourceView, false);
+
+ }
+
+}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/association/TestLinkCreationAssociationSharedDirectedFromBlock.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/association/TestLinkCreationAssociationSharedDirectedFromBlock.java new file mode 100644 index 00000000000..f1c53e73e2f --- /dev/null +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/association/TestLinkCreationAssociationSharedDirectedFromBlock.java @@ -0,0 +1,69 @@ +package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.association;
+
+import java.util.HashMap;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.AbstractLinkCreationFromElementTest;
+import org.junit.BeforeClass;
+
+/**
+ * JUnit tests for Association creation test (via palette tools).
+ */
+public class TestLinkCreationAssociationSharedDirectedFromBlock extends AbstractLinkCreationFromElementTest {
+
+ @BeforeClass
+ public static void initSource() throws Exception {
+ sourceView = blockSourceView;
+ }
+
+ @BeforeClass
+ public static void initToolID() throws Exception {
+ toolID = "blockdefinition.tool.association_shared_directed";
+ }
+
+ @BeforeClass
+ public static void initExpectedResults() throws Exception {
+
+ // Initialize source creation results
+ isCreationAllowed = new HashMap<View, Boolean>();
+ isCreationAllowed.put(actorTargetView, true);
+ isCreationAllowed.put(blockTargetView, true);
+ isCreationAllowed.put(constraintBlockTargetView, true);
+ isCreationAllowed.put(dataTypeTargetView, true);
+ isCreationAllowed.put(dimensionTargetView, false);
+ isCreationAllowed.put(enumerationTargetView, true);
+ isCreationAllowed.put(flowSpecificationTargetView, true);
+ isCreationAllowed.put(interfaceTargetView, true);
+ isCreationAllowed.put(primitiveTypeTargetView, true);
+ isCreationAllowed.put(signalTargetView, true);
+ isCreationAllowed.put(unitTargetView, false);
+ isCreationAllowed.put(valueTypeTargetView, true);
+
+ isCreationAllowed.put(commentTargetView, false);
+ isCreationAllowed.put(commentCNTargetView, false);
+ isCreationAllowed.put(constraintTargetView, false);
+ isCreationAllowed.put(constraintCNTargetView, false);
+ isCreationAllowed.put(instanceSpecTargetView, false);
+ isCreationAllowed.put(instanceSpecCNTargetView, false);
+ isCreationAllowed.put(modelTargetView, false);
+ isCreationAllowed.put(modelCNTargetView, false);
+ isCreationAllowed.put(packageTargetView, false);
+ isCreationAllowed.put(packageCNTargetView, false);
+
+ isCreationAllowed.put(slotTargetView, false);
+
+ isCreationAllowed.put(propertyTargetView, false);
+ isCreationAllowed.put(portTargetView, false);
+ isCreationAllowed.put(flowportTargetView, false);
+ isCreationAllowed.put(partTargetView, false);
+ isCreationAllowed.put(referenceTargetView, false);
+ isCreationAllowed.put(valueTargetView, false);
+ isCreationAllowed.put(operationTargetView, false);
+ isCreationAllowed.put(receptionTargetView, false);
+ isCreationAllowed.put(constraintCLNTargetView, false);
+ isCreationAllowed.put(constraintPropertyTargetView, false);
+ isCreationAllowed.put(flowPropertyTargetView, false);
+ isCreationAllowed.put(enumerationLiteralTargetView, false);
+
+ }
+}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/association/TestLinkCreationAssociationSharedForSources.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/association/TestLinkCreationAssociationSharedForSources.java new file mode 100644 index 00000000000..088213739fb --- /dev/null +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/association/TestLinkCreationAssociationSharedForSources.java @@ -0,0 +1,65 @@ +package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.association;
+
+import java.util.HashMap;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.AbstractLinkCreationForSourcesTest;
+import org.junit.BeforeClass;
+
+/**
+ * JUnit tests for Association creation test (via palette tools).
+ */
+public class TestLinkCreationAssociationSharedForSources extends AbstractLinkCreationForSourcesTest {
+
+ @BeforeClass
+ public static void initToolID() throws Exception {
+ toolID = "blockdefinition.tool.association_shared";
+ }
+
+ @BeforeClass
+ public static void initExpectedResults() throws Exception {
+
+ // Initialize source creation results
+ isCreationAllowed = new HashMap<View, Boolean>();
+ isCreationAllowed.put(actorSourceView, false);
+ isCreationAllowed.put(blockSourceView, true);
+ isCreationAllowed.put(constraintBlockSourceView, true);
+ isCreationAllowed.put(dataTypeSourceView, true);
+ isCreationAllowed.put(dimensionSourceView, false);
+ isCreationAllowed.put(enumerationSourceView, true);
+ isCreationAllowed.put(flowSpecificationSourceView, true);
+ isCreationAllowed.put(interfaceSourceView, true);
+ isCreationAllowed.put(primitiveTypeSourceView, true);
+ isCreationAllowed.put(signalSourceView, true);
+ isCreationAllowed.put(unitSourceView, false);
+ isCreationAllowed.put(valueTypeSourceView, true);
+
+ isCreationAllowed.put(commentSourceView, false);
+ isCreationAllowed.put(commentCNSourceView, false);
+ isCreationAllowed.put(constraintSourceView, false);
+ isCreationAllowed.put(constraintCNSourceView, false);
+ isCreationAllowed.put(instanceSpecSourceView, false);
+ isCreationAllowed.put(instanceSpecCNSourceView, false);
+ isCreationAllowed.put(modelSourceView, false);
+ isCreationAllowed.put(modelCNSourceView, false);
+ isCreationAllowed.put(packageSourceView, false);
+ isCreationAllowed.put(packageCNSourceView, false);
+
+ isCreationAllowed.put(slotSourceView, false);
+
+ isCreationAllowed.put(propertySourceView, false);
+ isCreationAllowed.put(portSourceView, false);
+ isCreationAllowed.put(flowportSourceView, false);
+ isCreationAllowed.put(partSourceView, false);
+ isCreationAllowed.put(referenceSourceView, false);
+ isCreationAllowed.put(valueSourceView, false);
+ isCreationAllowed.put(operationSourceView, false);
+ isCreationAllowed.put(receptionSourceView, false);
+ isCreationAllowed.put(constraintCLNSourceView, false);
+ isCreationAllowed.put(constraintPropertySourceView, false);
+ isCreationAllowed.put(flowPropertySourceView, false);
+ isCreationAllowed.put(enumerationLiteralSourceView, false);
+
+ }
+
+}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/association/TestLinkCreationAssociationSharedFromBlock.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/association/TestLinkCreationAssociationSharedFromBlock.java new file mode 100644 index 00000000000..7204d3a9a24 --- /dev/null +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/creation/link/association/TestLinkCreationAssociationSharedFromBlock.java @@ -0,0 +1,69 @@ +package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.association;
+
+import java.util.HashMap;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.AbstractLinkCreationFromElementTest;
+import org.junit.BeforeClass;
+
+/**
+ * JUnit tests for Association creation test (via palette tools).
+ */
+public class TestLinkCreationAssociationSharedFromBlock extends AbstractLinkCreationFromElementTest {
+
+ @BeforeClass
+ public static void initSource() throws Exception {
+ sourceView = blockSourceView;
+ }
+
+ @BeforeClass
+ public static void initToolID() throws Exception {
+ toolID = "blockdefinition.tool.association_shared";
+ }
+
+ @BeforeClass
+ public static void initExpectedResults() throws Exception {
+
+ // Initialize source creation results
+ isCreationAllowed = new HashMap<View, Boolean>();
+ isCreationAllowed.put(actorTargetView, false);
+ isCreationAllowed.put(blockTargetView, true);
+ isCreationAllowed.put(constraintBlockTargetView, true);
+ isCreationAllowed.put(dataTypeTargetView, true);
+ isCreationAllowed.put(dimensionTargetView, false);
+ isCreationAllowed.put(enumerationTargetView, true);
+ isCreationAllowed.put(flowSpecificationTargetView, true);
+ isCreationAllowed.put(interfaceTargetView, true);
+ isCreationAllowed.put(primitiveTypeTargetView, true);
+ isCreationAllowed.put(signalTargetView, true);
+ isCreationAllowed.put(unitTargetView, false);
+ isCreationAllowed.put(valueTypeTargetView, true);
+
+ isCreationAllowed.put(commentTargetView, false);
+ isCreationAllowed.put(commentCNTargetView, false);
+ isCreationAllowed.put(constraintTargetView, false);
+ isCreationAllowed.put(constraintCNTargetView, false);
+ isCreationAllowed.put(instanceSpecTargetView, false);
+ isCreationAllowed.put(instanceSpecCNTargetView, false);
+ isCreationAllowed.put(modelTargetView, false);
+ isCreationAllowed.put(modelCNTargetView, false);
+ isCreationAllowed.put(packageTargetView, false);
+ isCreationAllowed.put(packageCNTargetView, false);
+
+ isCreationAllowed.put(slotTargetView, false);
+
+ isCreationAllowed.put(propertyTargetView, false);
+ isCreationAllowed.put(portTargetView, false);
+ isCreationAllowed.put(flowportTargetView, false);
+ isCreationAllowed.put(partTargetView, false);
+ isCreationAllowed.put(referenceTargetView, false);
+ isCreationAllowed.put(valueTargetView, false);
+ isCreationAllowed.put(operationTargetView, false);
+ isCreationAllowed.put(receptionTargetView, false);
+ isCreationAllowed.put(constraintCLNTargetView, false);
+ isCreationAllowed.put(constraintPropertyTargetView, false);
+ isCreationAllowed.put(flowPropertyTargetView, false);
+ isCreationAllowed.put(enumerationLiteralTargetView, false);
+
+ }
+}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/delete/TestLinkBasicDeleteFromDiagram.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/delete/TestLinkBasicDeleteFromDiagram.java new file mode 100644 index 00000000000..3fd8583fd2e --- /dev/null +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/delete/TestLinkBasicDeleteFromDiagram.java @@ -0,0 +1,121 @@ +package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.delete;
+
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.createGraphicalNode;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.createLink;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.dropFromModelExplorer;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.deleteView;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.AbstractTest;
+import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
+import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
+import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * JUnit tests for element Delete test (via palette tools) in diagram.
+ */
+public class TestLinkBasicDeleteFromDiagram extends AbstractTest {
+
+ public static EObject blockSource;
+ public static EObject blockTarget;
+ public static EObject interfaceTarget;
+
+ public static View dependency;
+ public static View usage;
+ public static View interfaceRealization;
+ public static View generalization;
+
+ public static View associationComposite;
+ public static View associationCompositeDirected;
+ public static View associationNone;
+ public static View associationNoneDirected;
+ public static View associationShared;
+ public static View associationSharedDirected;
+
+ @BeforeClass
+ public static void prepare() throws Exception {
+ // Prepare elements for link creation tests
+ blockSource = createGraphicalNode(SysMLElementTypes.BLOCK, SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID, getDiagramView()).getElement();
+ blockTarget = createGraphicalNode(SysMLElementTypes.BLOCK, SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID, getDiagramView()).getElement();
+ interfaceTarget = createGraphicalNode(UMLElementTypes.INTERFACE, UMLGraphicalTypes.SHAPE_UML_INTERFACE_AS_CLASSIFIER_ID, getDiagramView()).getElement();
+
+ EObject tmp = null;
+
+ tmp = createLink(UMLElementTypes.DEPENDENCY, blockSource, blockTarget);
+ dependency = dropFromModelExplorer(tmp, getDiagramView());
+ tmp = createLink(UMLElementTypes.USAGE, blockSource, blockTarget);
+ usage = dropFromModelExplorer(tmp, getDiagramView());
+ tmp = createLink(UMLElementTypes.INTERFACE_REALIZATION, blockSource, interfaceTarget);
+ interfaceRealization = dropFromModelExplorer(tmp, getDiagramView());
+ tmp = createLink(UMLElementTypes.GENERALIZATION, blockSource, blockTarget);
+ generalization = dropFromModelExplorer(tmp, getDiagramView());
+ tmp = createLink(SysMLElementTypes.ASSOCIATION_COMPOSITE, blockSource, blockTarget);
+ associationComposite = dropFromModelExplorer(tmp, getDiagramView());
+ tmp = createLink(SysMLElementTypes.ASSOCIATION_COMPOSITE_DIRECTED, blockSource, blockTarget);
+ associationCompositeDirected = dropFromModelExplorer(tmp, getDiagramView());
+ tmp = createLink(SysMLElementTypes.ASSOCIATION_NONE, blockSource, blockTarget);
+ associationNone = dropFromModelExplorer(tmp, getDiagramView());
+ tmp = createLink(SysMLElementTypes.ASSOCIATION_NONE_DIRECTED, blockSource, blockTarget);
+ associationNoneDirected = dropFromModelExplorer(tmp, getDiagramView());
+ tmp = createLink(SysMLElementTypes.ASSOCIATION_SHARED, blockSource, blockTarget);
+ associationShared = dropFromModelExplorer(tmp, getDiagramView());
+ tmp = createLink(SysMLElementTypes.ASSOCIATION_SHARED_DIRECTED, blockSource, blockTarget);
+ associationSharedDirected = dropFromModelExplorer(tmp, getDiagramView());
+ }
+
+ @Test
+ public void testBasicDeleteFromModelDependency() throws Exception {
+ deleteView(dependency, true);
+ }
+
+ @Test
+ public void testBasicDeleteFromModelUsage() throws Exception {
+ deleteView(usage, true);
+ }
+
+ @Test
+ public void testBasicDeleteFromModelInterfaceRealization() throws Exception {
+ deleteView(interfaceRealization, true);
+ }
+
+ @Test
+ public void testBasicDeleteFromModelGeneralization() throws Exception {
+ deleteView(generalization, true);
+ }
+
+ @Test
+ public void testBasicDeleteFromModelAssociationComposite() throws Exception {
+ deleteView(associationComposite, true);
+ }
+
+ @Test
+ public void testBasicDeleteFromModelAssociationCompositeDirected() throws Exception {
+ deleteView(associationCompositeDirected, true);
+ }
+
+ @Test
+ public void testBasicDeleteFromModelAssociationNone() throws Exception {
+ deleteView(associationNone, true);
+ }
+
+ @Test
+ public void testBasicDeleteFromModelAssociationNoneDirected() throws Exception {
+ deleteView(associationNoneDirected, true);
+ }
+
+ @Test
+ public void testBasicDeleteFromModelAssociationShared() throws Exception {
+ deleteView(associationShared, true);
+ }
+
+ @Test
+ public void testBasicDeleteFromModelAssociationSharedDirected() throws Exception {
+ deleteView(associationSharedDirected, true);
+ }
+
+}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/delete/TestLinkBasicDeleteFromModel.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/delete/TestLinkBasicDeleteFromModel.java new file mode 100644 index 00000000000..fe8ce5f864e --- /dev/null +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/delete/TestLinkBasicDeleteFromModel.java @@ -0,0 +1,121 @@ +package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.delete;
+
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.createGraphicalNode;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.createLink;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.dropFromModelExplorer;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.deleteElement;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.AbstractTest;
+import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
+import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
+import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * JUnit tests for link element Delete test (via palette tools) in diagram.
+ */
+public class TestLinkBasicDeleteFromModel extends AbstractTest {
+
+ public static EObject blockSource;
+ public static EObject blockTarget;
+ public static EObject interfaceTarget;
+
+ public static View dependency;
+ public static View usage;
+ public static View interfaceRealization;
+ public static View generalization;
+
+ public static View associationComposite;
+ public static View associationCompositeDirected;
+ public static View associationNone;
+ public static View associationNoneDirected;
+ public static View associationShared;
+ public static View associationSharedDirected;
+
+ @BeforeClass
+ public static void prepare() throws Exception {
+ // Prepare elements for link creation tests
+ blockSource = createGraphicalNode(SysMLElementTypes.BLOCK, SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID, getDiagramView()).getElement();
+ blockTarget = createGraphicalNode(SysMLElementTypes.BLOCK, SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID, getDiagramView()).getElement();
+ interfaceTarget = createGraphicalNode(UMLElementTypes.INTERFACE, UMLGraphicalTypes.SHAPE_UML_INTERFACE_AS_CLASSIFIER_ID, getDiagramView()).getElement();
+
+ EObject tmp = null;
+
+ tmp = createLink(UMLElementTypes.DEPENDENCY, blockSource, blockTarget);
+ dependency = dropFromModelExplorer(tmp, getDiagramView());
+ tmp = createLink(UMLElementTypes.USAGE, blockSource, blockTarget);
+ usage = dropFromModelExplorer(tmp, getDiagramView());
+ tmp = createLink(UMLElementTypes.INTERFACE_REALIZATION, blockSource, interfaceTarget);
+ interfaceRealization = dropFromModelExplorer(tmp, getDiagramView());
+ tmp = createLink(UMLElementTypes.GENERALIZATION, blockSource, blockTarget);
+ generalization = dropFromModelExplorer(tmp, getDiagramView());
+ tmp = createLink(SysMLElementTypes.ASSOCIATION_COMPOSITE, blockSource, blockTarget);
+ associationComposite = dropFromModelExplorer(tmp, getDiagramView());
+ tmp = createLink(SysMLElementTypes.ASSOCIATION_COMPOSITE_DIRECTED, blockSource, blockTarget);
+ associationCompositeDirected = dropFromModelExplorer(tmp, getDiagramView());
+ tmp = createLink(SysMLElementTypes.ASSOCIATION_NONE, blockSource, blockTarget);
+ associationNone = dropFromModelExplorer(tmp, getDiagramView());
+ tmp = createLink(SysMLElementTypes.ASSOCIATION_NONE_DIRECTED, blockSource, blockTarget);
+ associationNoneDirected = dropFromModelExplorer(tmp, getDiagramView());
+ tmp = createLink(SysMLElementTypes.ASSOCIATION_SHARED, blockSource, blockTarget);
+ associationShared = dropFromModelExplorer(tmp, getDiagramView());
+ tmp = createLink(SysMLElementTypes.ASSOCIATION_SHARED_DIRECTED, blockSource, blockTarget);
+ associationSharedDirected = dropFromModelExplorer(tmp, getDiagramView());
+ }
+
+ @Test
+ public void testBasicDeleteFromModelDependency() throws Exception {
+ deleteElement(dependency, true);
+ }
+
+ @Test
+ public void testBasicDeleteFromModelUsage() throws Exception {
+ deleteElement(usage, true);
+ }
+
+ @Test
+ public void testBasicDeleteFromModelInterfaceRealization() throws Exception {
+ deleteElement(interfaceRealization, true);
+ }
+
+ @Test
+ public void testBasicDeleteFromModelGeneralization() throws Exception {
+ deleteElement(generalization, true);
+ }
+
+ @Test
+ public void testBasicDeleteFromModelAssociationComposite() throws Exception {
+ deleteElement(associationComposite, true);
+ }
+
+ @Test
+ public void testBasicDeleteFromModelAssociationCompositeDirected() throws Exception {
+ deleteElement(associationCompositeDirected, true);
+ }
+
+ @Test
+ public void testBasicDeleteFromModelAssociationNone() throws Exception {
+ deleteElement(associationNone, true);
+ }
+
+ @Test
+ public void testBasicDeleteFromModelAssociationNoneDirected() throws Exception {
+ deleteElement(associationNoneDirected, true);
+ }
+
+ @Test
+ public void testBasicDeleteFromModelAssociationShared() throws Exception {
+ deleteElement(associationShared, true);
+ }
+
+ @Test
+ public void testBasicDeleteFromModelAssociationSharedDirected() throws Exception {
+ deleteElement(associationSharedDirected, true);
+ }
+
+}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/dnd/TestLinkDropOnDiagram.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/dnd/TestLinkDropOnDiagram.java new file mode 100644 index 00000000000..79a408244a7 --- /dev/null +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/dnd/TestLinkDropOnDiagram.java @@ -0,0 +1,105 @@ +package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.dnd;
+
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.createElement;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.createLink;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.dropFromModelExplorer;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.AbstractTest;
+import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
+import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * JUnit tests for Link DnD tests (via palette tools).
+ */
+public class TestLinkDropOnDiagram extends AbstractTest {
+
+ public static EObject blockSource;
+ public static EObject blockTarget;
+ public static EObject interfaceTarget;
+
+ public static EObject dependency;
+ public static EObject usage;
+ public static EObject interfaceRealization;
+ public static EObject generalization;
+
+ public static EObject associationComposite;
+ public static EObject associationCompositeDirected;
+ public static EObject associationNone;
+ public static EObject associationNoneDirected;
+ public static EObject associationShared;
+ public static EObject associationSharedDirected;
+
+ @BeforeClass
+ public static void prepare() throws Exception {
+ // Prepare elements for link creation tests
+ blockSource = createElement(SysMLElementTypes.BLOCK, getDiagramView());
+ blockTarget = createElement(SysMLElementTypes.BLOCK, getDiagramView());
+ interfaceTarget = createElement(UMLElementTypes.INTERFACE, getDiagramView());
+
+ dependency = createLink(UMLElementTypes.DEPENDENCY, blockSource, blockTarget);
+ usage = createLink(UMLElementTypes.USAGE, blockSource, blockTarget);
+ interfaceRealization = createLink(UMLElementTypes.INTERFACE_REALIZATION, blockSource, interfaceTarget);
+ generalization = createLink(UMLElementTypes.GENERALIZATION, blockSource, blockTarget);
+
+ associationComposite = createLink(SysMLElementTypes.ASSOCIATION_COMPOSITE, blockSource, blockTarget);
+ associationCompositeDirected = createLink(SysMLElementTypes.ASSOCIATION_COMPOSITE_DIRECTED, blockSource, blockTarget);
+ associationNone = createLink(SysMLElementTypes.ASSOCIATION_NONE, blockSource, blockTarget);
+ associationNoneDirected = createLink(SysMLElementTypes.ASSOCIATION_NONE_DIRECTED, blockSource, blockTarget);
+ associationShared = createLink(SysMLElementTypes.ASSOCIATION_SHARED, blockSource, blockTarget);
+ associationSharedDirected = createLink(SysMLElementTypes.ASSOCIATION_SHARED_DIRECTED, blockSource, blockTarget);
+ }
+
+ @Test
+ public void dropDependencyInDiagram() throws Exception {
+ dropFromModelExplorer(dependency, getDiagramView(), true);
+ }
+
+ @Test
+ public void dropUsageInDiagram() throws Exception {
+ dropFromModelExplorer(usage, getDiagramView(), true);
+ }
+
+ @Test
+ public void dropInterfaceRealizationInDiagram() throws Exception {
+ dropFromModelExplorer(interfaceRealization, getDiagramView(), true);
+ }
+
+ @Test
+ public void dropGeneralizationInDiagram() throws Exception {
+ dropFromModelExplorer(generalization, getDiagramView(), true);
+ }
+
+ @Test
+ public void dropAssociationCompositeInDiagram() throws Exception {
+ dropFromModelExplorer(associationComposite, getDiagramView(), true);
+ }
+
+ @Test
+ public void dropAssociationCompositeDirectedInDiagram() throws Exception {
+ dropFromModelExplorer(associationCompositeDirected, getDiagramView(), true);
+ }
+
+ @Test
+ public void dropAssociationNoneInDiagram() throws Exception {
+ dropFromModelExplorer(associationNone, getDiagramView(), true);
+ }
+
+ @Test
+ public void dropAssociationNoneDirectedInDiagram() throws Exception {
+ dropFromModelExplorer(associationNoneDirected, getDiagramView(), true);
+ }
+
+ @Test
+ public void dropAssociationSharedInDiagram() throws Exception {
+ dropFromModelExplorer(associationShared, getDiagramView(), true);
+ }
+
+ @Test
+ public void dropAssociationSharedDirectedInDiagram() throws Exception {
+ dropFromModelExplorer(associationSharedDirected, getDiagramView(), true);
+ }
+}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/dnd/link/TestLinkDropOnModel.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/dnd/link/TestLinkDropOnModel.java new file mode 100644 index 00000000000..f40f5e3f9ea --- /dev/null +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/dnd/link/TestLinkDropOnModel.java @@ -0,0 +1,126 @@ +package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.dnd.link;
+
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getEditPart;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.createElement;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.createGraphicalNode;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.createLink;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.dropFromModelExplorer;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.AbstractTest;
+import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
+import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * JUnit tests for Link DnD tests (via palette tools).
+ */
+public class TestLinkDropOnModel extends AbstractTest {
+
+ public static View container;
+ public static View containerNode;
+
+ public static EObject blockSource;
+ public static EObject blockTarget;
+ public static EObject interfaceTarget;
+
+ public static EObject dependency;
+ public static EObject usage;
+ public static EObject interfaceRealization;
+ public static EObject generalization;
+
+ public static EObject associationComposite;
+ public static EObject associationCompositeDirected;
+ public static EObject associationNone;
+ public static EObject associationNoneDirected;
+ public static EObject associationShared;
+ public static EObject associationSharedDirected;
+
+ @BeforeClass
+ public static void prepare() throws Exception {
+ // Prepare elements for link creation tests
+ containerNode = createGraphicalNode(UMLElementTypes.MODEL, ElementTypes.MODEL.getSemanticHint(), getDiagramView());
+ container = ViewUtil.getChildBySemanticHint(containerNode, ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT);
+
+ blockSource = createElement(SysMLElementTypes.BLOCK, container);
+ blockTarget = createElement(SysMLElementTypes.BLOCK, container);
+ interfaceTarget = createElement(UMLElementTypes.INTERFACE, container);
+
+ dependency = createLink(UMLElementTypes.DEPENDENCY, blockSource, blockTarget);
+ usage = createLink(UMLElementTypes.USAGE, blockSource, blockTarget);
+ interfaceRealization = createLink(UMLElementTypes.INTERFACE_REALIZATION, blockSource, interfaceTarget);
+ generalization = createLink(UMLElementTypes.GENERALIZATION, blockSource, blockTarget);
+
+ associationComposite = createLink(SysMLElementTypes.ASSOCIATION_COMPOSITE, blockSource, blockTarget);
+ associationCompositeDirected = createLink(SysMLElementTypes.ASSOCIATION_COMPOSITE_DIRECTED, blockSource, blockTarget);
+ associationNone = createLink(SysMLElementTypes.ASSOCIATION_NONE, blockSource, blockTarget);
+ associationNoneDirected = createLink(SysMLElementTypes.ASSOCIATION_NONE_DIRECTED, blockSource, blockTarget);
+ associationShared = createLink(SysMLElementTypes.ASSOCIATION_SHARED, blockSource, blockTarget);
+ associationSharedDirected = createLink(SysMLElementTypes.ASSOCIATION_SHARED_DIRECTED, blockSource, blockTarget);
+ }
+
+ @Test // https://bugs.eclipse.org/bugs/show_bug.cgi?id=348549
+ public void dropExceptionToFix_bug348549() throws Exception {
+ getEditPart(container).setFocus(true);
+// java.lang.IllegalArgumentException: An EditPart has to be selectable (isSelectable() == true) in order to obtain focus.
+// at org.eclipse.core.runtime.Assert.isLegal(Assert.java:63)
+// at org.eclipse.gef.editparts.AbstractEditPart.setFocus(AbstractEditPart.java:1005)
+// at org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.dnd.link.TestLinkDropOnModel.dropDependency(TestLinkDropOnModel.java:71)
+ dropFromModelExplorer(dependency, container, true);
+ }
+
+ @Test
+ public void dropDependency() throws Exception {
+ dropFromModelExplorer(dependency, container, true);
+ }
+
+ @Test
+ public void dropUsage() throws Exception {
+ dropFromModelExplorer(usage, container, true);
+ }
+
+ @Test
+ public void dropInterfaceRealization() throws Exception {
+ dropFromModelExplorer(interfaceRealization, container, true);
+ }
+
+ @Test
+ public void dropGeneralization() throws Exception {
+ dropFromModelExplorer(generalization, container, true);
+ }
+
+ @Test
+ public void dropAssociationComposite() throws Exception {
+ dropFromModelExplorer(associationComposite, container, true);
+ }
+
+ @Test
+ public void dropAssociationCompositeDirected() throws Exception {
+ dropFromModelExplorer(associationCompositeDirected, container, true);
+ }
+
+ @Test
+ public void dropAssociationNone() throws Exception {
+ dropFromModelExplorer(associationNone, container, true);
+ }
+
+ @Test
+ public void dropAssociationNoneDirected() throws Exception {
+ dropFromModelExplorer(associationNoneDirected, container, true);
+ }
+
+ @Test
+ public void dropAssociationShared() throws Exception {
+ dropFromModelExplorer(associationShared, container, true);
+ }
+
+ @Test
+ public void dropAssociationSharedDirected() throws Exception {
+ dropFromModelExplorer(associationSharedDirected, container, true);
+ }
+}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/dnd/link/TestLinkDropOnModelCN.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/dnd/link/TestLinkDropOnModelCN.java new file mode 100644 index 00000000000..8b2e9d2fba1 --- /dev/null +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/dnd/link/TestLinkDropOnModelCN.java @@ -0,0 +1,118 @@ +package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.dnd.link;
+
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.createElement;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.createGraphicalNode;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.createLink;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.dropFromModelExplorer;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.AbstractTest;
+import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
+import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * JUnit tests for Link DnD tests (via palette tools).
+ */
+public class TestLinkDropOnModelCN extends AbstractTest {
+
+ public static View container;
+ public static View containerNode;
+
+ public static EObject blockSource;
+ public static EObject blockTarget;
+ public static EObject interfaceTarget;
+
+ public static EObject dependency;
+ public static EObject usage;
+ public static EObject interfaceRealization;
+ public static EObject generalization;
+
+ public static EObject associationComposite;
+ public static EObject associationCompositeDirected;
+ public static EObject associationNone;
+ public static EObject associationNoneDirected;
+ public static EObject associationShared;
+ public static EObject associationSharedDirected;
+
+ @BeforeClass
+ public static void prepare() throws Exception {
+ // Prepare elements for link creation tests
+ // Prepare elements for link creation tests
+ View topNode = createGraphicalNode(UMLElementTypes.PACKAGE, ElementTypes.PACKAGE.getSemanticHint(), getDiagramView());
+ View topNodeCpt = ViewUtil.getChildBySemanticHint(topNode, ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT);
+ containerNode = createGraphicalNode(UMLElementTypes.MODEL, ElementTypes.MODEL_CN.getSemanticHint(), topNodeCpt);
+ container = ViewUtil.getChildBySemanticHint(containerNode, ElementTypes.MODEL_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT);
+
+ blockSource = createElement(SysMLElementTypes.BLOCK, container);
+ blockTarget = createElement(SysMLElementTypes.BLOCK, container);
+ interfaceTarget = createElement(UMLElementTypes.INTERFACE, container);
+
+ dependency = createLink(UMLElementTypes.DEPENDENCY, blockSource, blockTarget);
+ usage = createLink(UMLElementTypes.USAGE, blockSource, blockTarget);
+ interfaceRealization = createLink(UMLElementTypes.INTERFACE_REALIZATION, blockSource, interfaceTarget);
+ generalization = createLink(UMLElementTypes.GENERALIZATION, blockSource, blockTarget);
+
+ associationComposite = createLink(SysMLElementTypes.ASSOCIATION_COMPOSITE, blockSource, blockTarget);
+ associationCompositeDirected = createLink(SysMLElementTypes.ASSOCIATION_COMPOSITE_DIRECTED, blockSource, blockTarget);
+ associationNone = createLink(SysMLElementTypes.ASSOCIATION_NONE, blockSource, blockTarget);
+ associationNoneDirected = createLink(SysMLElementTypes.ASSOCIATION_NONE_DIRECTED, blockSource, blockTarget);
+ associationShared = createLink(SysMLElementTypes.ASSOCIATION_SHARED, blockSource, blockTarget);
+ associationSharedDirected = createLink(SysMLElementTypes.ASSOCIATION_SHARED_DIRECTED, blockSource, blockTarget);
+ }
+
+ @Test
+ public void dropDependency() throws Exception {
+ dropFromModelExplorer(dependency, container, true);
+ }
+
+ @Test
+ public void dropUsage() throws Exception {
+ dropFromModelExplorer(usage, container, true);
+ }
+
+ @Test
+ public void dropInterfaceRealization() throws Exception {
+ dropFromModelExplorer(interfaceRealization, container, true);
+ }
+
+ @Test
+ public void dropGeneralization() throws Exception {
+ dropFromModelExplorer(generalization, container, true);
+ }
+
+ @Test
+ public void dropAssociationComposite() throws Exception {
+ dropFromModelExplorer(associationComposite, container, true);
+ }
+
+ @Test
+ public void dropAssociationCompositeDirected() throws Exception {
+ dropFromModelExplorer(associationCompositeDirected, container, true);
+ }
+
+ @Test
+ public void dropAssociationNone() throws Exception {
+ dropFromModelExplorer(associationNone, container, true);
+ }
+
+ @Test
+ public void dropAssociationNoneDirected() throws Exception {
+ dropFromModelExplorer(associationNoneDirected, container, true);
+ }
+
+ @Test
+ public void dropAssociationShared() throws Exception {
+ dropFromModelExplorer(associationShared, container, true);
+ }
+
+ @Test
+ public void dropAssociationSharedDirected() throws Exception {
+ dropFromModelExplorer(associationSharedDirected, container, true);
+ }
+}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/dnd/link/TestLinkDropOnPackage.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/dnd/link/TestLinkDropOnPackage.java new file mode 100644 index 00000000000..aac0d2b3d1b --- /dev/null +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/dnd/link/TestLinkDropOnPackage.java @@ -0,0 +1,114 @@ +package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.dnd.link;
+
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.createElement;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.createGraphicalNode;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.createLink;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.dropFromModelExplorer;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.AbstractTest;
+import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
+import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * JUnit tests for Link DnD tests (via palette tools).
+ */
+public class TestLinkDropOnPackage extends AbstractTest {
+
+ public static View container;
+
+ public static EObject blockSource;
+ public static EObject blockTarget;
+ public static EObject interfaceTarget;
+
+ public static EObject dependency;
+ public static EObject usage;
+ public static EObject interfaceRealization;
+ public static EObject generalization;
+
+ public static EObject associationComposite;
+ public static EObject associationCompositeDirected;
+ public static EObject associationNone;
+ public static EObject associationNoneDirected;
+ public static EObject associationShared;
+ public static EObject associationSharedDirected;
+
+ @BeforeClass
+ public static void prepare() throws Exception {
+ // Prepare elements for link creation tests
+ View containerNode = createGraphicalNode(UMLElementTypes.PACKAGE, ElementTypes.PACKAGE.getSemanticHint(), getDiagramView());
+ container = ViewUtil.getChildBySemanticHint(containerNode, ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT);
+
+ blockSource = createElement(SysMLElementTypes.BLOCK, container);
+ blockTarget = createElement(SysMLElementTypes.BLOCK, container);
+ interfaceTarget = createElement(UMLElementTypes.INTERFACE, container);
+
+ dependency = createLink(UMLElementTypes.DEPENDENCY, blockSource, blockTarget);
+ usage = createLink(UMLElementTypes.USAGE, blockSource, blockTarget);
+ interfaceRealization = createLink(UMLElementTypes.INTERFACE_REALIZATION, blockSource, interfaceTarget);
+ generalization = createLink(UMLElementTypes.GENERALIZATION, blockSource, blockTarget);
+
+ associationComposite = createLink(SysMLElementTypes.ASSOCIATION_COMPOSITE, blockSource, blockTarget);
+ associationCompositeDirected = createLink(SysMLElementTypes.ASSOCIATION_COMPOSITE_DIRECTED, blockSource, blockTarget);
+ associationNone = createLink(SysMLElementTypes.ASSOCIATION_NONE, blockSource, blockTarget);
+ associationNoneDirected = createLink(SysMLElementTypes.ASSOCIATION_NONE_DIRECTED, blockSource, blockTarget);
+ associationShared = createLink(SysMLElementTypes.ASSOCIATION_SHARED, blockSource, blockTarget);
+ associationSharedDirected = createLink(SysMLElementTypes.ASSOCIATION_SHARED_DIRECTED, blockSource, blockTarget);
+ }
+
+ @Test
+ public void dropDependency() throws Exception {
+ dropFromModelExplorer(dependency, container, true);
+ }
+
+ @Test
+ public void dropUsage() throws Exception {
+ dropFromModelExplorer(usage, container, true);
+ }
+
+ @Test
+ public void dropInterfaceRealization() throws Exception {
+ dropFromModelExplorer(interfaceRealization, container, true);
+ }
+
+ @Test
+ public void dropGeneralization() throws Exception {
+ dropFromModelExplorer(generalization, container, true);
+ }
+
+ @Test
+ public void dropAssociationComposite() throws Exception {
+ dropFromModelExplorer(associationComposite, container, true);
+ }
+
+ @Test
+ public void dropAssociationCompositeDirected() throws Exception {
+ dropFromModelExplorer(associationCompositeDirected, container, true);
+ }
+
+ @Test
+ public void dropAssociationNone() throws Exception {
+ dropFromModelExplorer(associationNone, container, true);
+ }
+
+ @Test
+ public void dropAssociationNoneDirected() throws Exception {
+ dropFromModelExplorer(associationNoneDirected, container, true);
+ }
+
+ @Test
+ public void dropAssociationShared() throws Exception {
+ dropFromModelExplorer(associationShared, container, true);
+ }
+
+ @Test
+ public void dropAssociationSharedDirected() throws Exception {
+ dropFromModelExplorer(associationSharedDirected, container, true);
+ }
+}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/dnd/link/TestLinkDropOnPackageCN.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/dnd/link/TestLinkDropOnPackageCN.java new file mode 100644 index 00000000000..f63275f1a30 --- /dev/null +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/dnd/link/TestLinkDropOnPackageCN.java @@ -0,0 +1,116 @@ +package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.dnd.link;
+
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.createElement;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.createGraphicalNode;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestPrepareUtils.createLink;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.TestUtils.dropFromModelExplorer;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.AbstractTest;
+import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
+import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * JUnit tests for Link DnD tests (via palette tools).
+ */
+public class TestLinkDropOnPackageCN extends AbstractTest {
+
+ public static View container;
+
+ public static EObject blockSource;
+ public static EObject blockTarget;
+ public static EObject interfaceTarget;
+
+ public static EObject dependency;
+ public static EObject usage;
+ public static EObject interfaceRealization;
+ public static EObject generalization;
+
+ public static EObject associationComposite;
+ public static EObject associationCompositeDirected;
+ public static EObject associationNone;
+ public static EObject associationNoneDirected;
+ public static EObject associationShared;
+ public static EObject associationSharedDirected;
+
+ @BeforeClass
+ public static void prepare() throws Exception {
+ // Prepare elements for link creation tests
+ View topNode = createGraphicalNode(UMLElementTypes.PACKAGE, ElementTypes.PACKAGE.getSemanticHint(), getDiagramView());
+ View topNodeCpt = ViewUtil.getChildBySemanticHint(topNode, ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT);
+ View containerNode = createGraphicalNode(UMLElementTypes.PACKAGE, ElementTypes.PACKAGE_CN.getSemanticHint(), topNodeCpt);
+ container = ViewUtil.getChildBySemanticHint(containerNode, ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT);
+
+ blockSource = createElement(SysMLElementTypes.BLOCK, container);
+ blockTarget = createElement(SysMLElementTypes.BLOCK, container);
+ interfaceTarget = createElement(UMLElementTypes.INTERFACE, container);
+
+ dependency = createLink(UMLElementTypes.DEPENDENCY, blockSource, blockTarget);
+ usage = createLink(UMLElementTypes.USAGE, blockSource, blockTarget);
+ interfaceRealization = createLink(UMLElementTypes.INTERFACE_REALIZATION, blockSource, interfaceTarget);
+ generalization = createLink(UMLElementTypes.GENERALIZATION, blockSource, blockTarget);
+
+ associationComposite = createLink(SysMLElementTypes.ASSOCIATION_COMPOSITE, blockSource, blockTarget);
+ associationCompositeDirected = createLink(SysMLElementTypes.ASSOCIATION_COMPOSITE_DIRECTED, blockSource, blockTarget);
+ associationNone = createLink(SysMLElementTypes.ASSOCIATION_NONE, blockSource, blockTarget);
+ associationNoneDirected = createLink(SysMLElementTypes.ASSOCIATION_NONE_DIRECTED, blockSource, blockTarget);
+ associationShared = createLink(SysMLElementTypes.ASSOCIATION_SHARED, blockSource, blockTarget);
+ associationSharedDirected = createLink(SysMLElementTypes.ASSOCIATION_SHARED_DIRECTED, blockSource, blockTarget);
+ }
+
+ @Test
+ public void dropDependency() throws Exception {
+ dropFromModelExplorer(dependency, container, true);
+ }
+
+ @Test
+ public void dropUsage() throws Exception {
+ dropFromModelExplorer(usage, container, true);
+ }
+
+ @Test
+ public void dropInterfaceRealization() throws Exception {
+ dropFromModelExplorer(interfaceRealization, container, true);
+ }
+
+ @Test
+ public void dropGeneralization() throws Exception {
+ dropFromModelExplorer(generalization, container, true);
+ }
+
+ @Test
+ public void dropAssociationComposite() throws Exception {
+ dropFromModelExplorer(associationComposite, container, true);
+ }
+
+ @Test
+ public void dropAssociationCompositeDirected() throws Exception {
+ dropFromModelExplorer(associationCompositeDirected, container, true);
+ }
+
+ @Test
+ public void dropAssociationNone() throws Exception {
+ dropFromModelExplorer(associationNone, container, true);
+ }
+
+ @Test
+ public void dropAssociationNoneDirected() throws Exception {
+ dropFromModelExplorer(associationNoneDirected, container, true);
+ }
+
+ @Test
+ public void dropAssociationShared() throws Exception {
+ dropFromModelExplorer(associationShared, container, true);
+ }
+
+ @Test
+ public void dropAssociationSharedDirected() throws Exception {
+ dropFromModelExplorer(associationSharedDirected, container, true);
+ }
+}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/suites/AllCreationAssociationTests.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/suites/AllCreationAssociationTests.java new file mode 100644 index 00000000000..fe530d0b496 --- /dev/null +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/suites/AllCreationAssociationTests.java @@ -0,0 +1,37 @@ +package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.suites;
+
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.association.TestLinkCreationAssociationCompositeDirectedForSources;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.association.TestLinkCreationAssociationCompositeDirectedFromBlock;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.association.TestLinkCreationAssociationCompositeForSources;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.association.TestLinkCreationAssociationCompositeFromBlock;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.association.TestLinkCreationAssociationNoneDirectedForSources;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.association.TestLinkCreationAssociationNoneDirectedFromBlock;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.association.TestLinkCreationAssociationNoneForSources;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.association.TestLinkCreationAssociationNoneFromBlock;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.association.TestLinkCreationAssociationSharedDirectedForSources;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.association.TestLinkCreationAssociationSharedDirectedFromBlock;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.association.TestLinkCreationAssociationSharedForSources;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.association.TestLinkCreationAssociationSharedFromBlock;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+
+@RunWith(Suite.class)
+@SuiteClasses({
+ TestLinkCreationAssociationCompositeDirectedForSources.class,
+ TestLinkCreationAssociationCompositeForSources.class,
+ TestLinkCreationAssociationNoneDirectedForSources.class,
+ TestLinkCreationAssociationNoneForSources.class,
+ TestLinkCreationAssociationSharedDirectedForSources.class,
+ TestLinkCreationAssociationSharedForSources.class,
+ TestLinkCreationAssociationCompositeFromBlock.class,
+ TestLinkCreationAssociationCompositeDirectedFromBlock.class,
+ TestLinkCreationAssociationNoneFromBlock.class,
+ TestLinkCreationAssociationNoneDirectedFromBlock.class,
+ TestLinkCreationAssociationSharedFromBlock.class,
+ TestLinkCreationAssociationSharedDirectedFromBlock.class
+ })
+public class AllCreationAssociationTests {
+
+}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/suites/AllCreationLinkTests.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/suites/AllCreationLinkTests.java new file mode 100644 index 00000000000..04d18e877be --- /dev/null +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/suites/AllCreationLinkTests.java @@ -0,0 +1,34 @@ +package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.suites;
+
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.TestLinkCreationCommentConstraintForSources;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.TestLinkCreationCommentConstraintFromComment;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.TestLinkCreationCommentConstraintFromConstraint;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.TestLinkCreationDependencyForSources;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.TestLinkCreationDependencyFromBlock;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.TestLinkCreationGeneralizationForSources;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.TestLinkCreationGeneralizationFromBlock;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.TestLinkCreationInterfaceRealizationForSources;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.TestLinkCreationInterfaceRealizationFromBlock;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.TestLinkCreationUsageForSources;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.link.TestLinkCreationUsageFromBlock;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+
+@RunWith(Suite.class)
+@SuiteClasses({
+ TestLinkCreationDependencyForSources.class,
+ TestLinkCreationGeneralizationForSources.class,
+ TestLinkCreationDependencyFromBlock.class,
+ TestLinkCreationGeneralizationFromBlock.class,
+ TestLinkCreationInterfaceRealizationForSources.class,
+ TestLinkCreationUsageForSources.class,
+ TestLinkCreationInterfaceRealizationFromBlock.class,
+ TestLinkCreationUsageFromBlock.class,
+ TestLinkCreationCommentConstraintForSources.class,
+ TestLinkCreationCommentConstraintFromComment.class,
+ TestLinkCreationCommentConstraintFromConstraint.class })
+public class AllCreationLinkTests {
+
+}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/suites/AllDeletionTests.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/suites/AllDeletionTests.java new file mode 100644 index 00000000000..35d2b588494 --- /dev/null +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/suites/AllDeletionTests.java @@ -0,0 +1,20 @@ +package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.suites;
+
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.delete.TestLinkBasicDeleteFromDiagram;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.delete.TestLinkBasicDeleteFromModel;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.delete.TestNodeBasicDeleteFromDiagram;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.delete.TestNodeBasicDeleteFromModel;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+
+@RunWith(Suite.class)
+@SuiteClasses({
+ TestLinkBasicDeleteFromDiagram.class,
+ TestLinkBasicDeleteFromModel.class,
+ TestNodeBasicDeleteFromDiagram.class,
+ TestNodeBasicDeleteFromModel.class })
+public class AllDeletionTests {
+
+}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/suites/AllDiagramTests.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/suites/AllDiagramTests.java index 4bfab49721c..4d3fc8db15c 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/suites/AllDiagramTests.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/suites/AllDiagramTests.java @@ -2,8 +2,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.suites; import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.TestDiagramCreation;
import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.creation.TestNodeCreationOnDiagram;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.delete.TestNodeBasicDeleteFromDiagram;
-import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.delete.TestNodeBasicDeleteFromModel;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.dnd.TestLinkDropOnDiagram;
import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.dnd.TestNodeDropOnDiagram;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -15,8 +14,7 @@ import org.junit.runners.Suite.SuiteClasses; TestDiagramCreation.class,
TestNodeCreationOnDiagram.class,
TestNodeDropOnDiagram.class,
- TestNodeBasicDeleteFromDiagram.class,
- TestNodeBasicDeleteFromModel.class
+ TestLinkDropOnDiagram.class
})
public class AllDiagramTests {
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/suites/AllDnDLinkTests.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/suites/AllDnDLinkTests.java new file mode 100644 index 00000000000..b0f76c6935f --- /dev/null +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/suites/AllDnDLinkTests.java @@ -0,0 +1,14 @@ +package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.suites;
+
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.dnd.link.TestLinkDropOnModel;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.dnd.link.TestLinkDropOnPackage;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+
+@RunWith(Suite.class)
+@SuiteClasses({ TestLinkDropOnModel.class, TestLinkDropOnPackage.class })
+public class AllDnDLinkTests {
+
+}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/suites/AllTests.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/suites/AllTests.java index f6d4a047917..e68592f2289 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/suites/AllTests.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/suites/AllTests.java @@ -11,7 +11,11 @@ import org.junit.runners.Suite.SuiteClasses; AllCreationInheritedTests.class,
AllDiagramTests.class,
AllDnDCustomTests.class,
- AllDnDInheritedTests.class })
+ AllDnDInheritedTests.class,
+ AllCreationLinkTests.class,
+ AllCreationAssociationTests.class,
+ AllDnDLinkTests.class,
+ AllDeletionTests.class })
public class AllTests {
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/utils/EditorUtils.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/utils/EditorUtils.java index 7655672029c..03a6a1e0d4c 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/utils/EditorUtils.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/utils/EditorUtils.java @@ -2,11 +2,14 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils; import java.util.Iterator;
+import org.eclipse.emf.common.command.CommandStack;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.gef.EditPart;
import org.eclipse.gef.Tool;
import org.eclipse.gef.util.EditPartUtilities;
import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramCommandStack;
+import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramEditDomain;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.core.services.ServiceException;
@@ -64,12 +67,22 @@ public class EditorUtils { @SuppressWarnings("unchecked")
Iterator<EditPart> it = EditPartUtilities.getAllChildren(getDiagramEditPart()).iterator();
while(it.hasNext()) {
- EditPart editPart = (EditPart)it.next();
+ EditPart editPart = it.next();
if(editPart.getModel() == view) {
return editPart;
}
}
+ // Test diagram nested connections and look for the view
+ @SuppressWarnings("unchecked")
+ Iterator<EditPart> itLinks = EditPartUtilities.getAllNestedConnectionEditParts(getDiagramEditPart()).iterator();
+ while(itLinks.hasNext()) {
+ EditPart editPart = itLinks.next();
+ if(editPart.getModel() == view) {
+ return editPart;
+ }
+ }
+
throw new Exception("Unable to find edit part for the given view.");
}
@@ -78,6 +91,18 @@ public class EditorUtils { return factory.createTool(toolId);
}
+ public static IDiagramEditDomain getDiagramEditingDomain() throws Exception {
+ return getDiagramEditor().getDiagramEditDomain();
+ }
+
+ public static DiagramCommandStack getDiagramCommandStack() throws Exception {
+ return getDiagramEditingDomain().getDiagramCommandStack();
+ }
+
+ public static CommandStack getCommandStack() throws Exception {
+ return getTransactionalEditingDomain().getCommandStack();
+ }
+
public static TransactionalEditingDomain getTransactionalEditingDomain() throws Exception {
ServicesRegistry serviceRegistry = (ServicesRegistry)getEditor().getAdapter(ServicesRegistry.class);
@@ -88,7 +113,7 @@ public class EditorUtils { throw new Exception("Unable to retrieve service.", e);
}
}
-
+
public static IEditorPart getEditor() throws Exception {
return PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/utils/TestPrepareUtils.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/utils/TestPrepareUtils.java index 66ea2f53c0c..6fb2d57bd5f 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/utils/TestPrepareUtils.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/utils/TestPrepareUtils.java @@ -1,5 +1,6 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramCommandStack;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getEditPart;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getTransactionalEditingDomain;
@@ -15,16 +16,16 @@ import org.eclipse.gef.commands.Command; import org.eclipse.gmf.runtime.common.core.command.ICommand;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
import org.eclipse.gmf.runtime.diagram.ui.commands.CreateCommand;
+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;
import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
import org.eclipse.gmf.runtime.notation.Node;
import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.diagram.common.command.wrappers.GEFtoEMFCommandWrapper;
-import org.eclipse.papyrus.diagram.common.command.wrappers.GMFtoEMFCommandWrapper;
import org.eclipse.papyrus.diagram.common.commands.SemanticAdapter;
import org.eclipse.papyrus.service.edit.commands.ConfigureFeatureCommandFactory;
import org.eclipse.papyrus.service.edit.commands.IConfigureCommandFactory;
@@ -40,6 +41,7 @@ public class TestPrepareUtils { public static void changeVisibility(View view) throws Exception {
SetCommand changeVisibilityCommand = new SetCommand(getTransactionalEditingDomain(), view, NotationPackage.eINSTANCE.getView_Visible(), !view.isVisible());
+ //getCommandStack().execute(new EMFtoGEFCommandWrapper(changeVisibilityCommand));
getTransactionalEditingDomain().getCommandStack().execute(changeVisibilityCommand);
}
@@ -55,7 +57,7 @@ public class TestPrepareUtils { // Create type
CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), container.eContainer(), SysMLElementTypes.BLOCK);
ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(container.eContainer()).getEditCommand(createTypeRequest);
- getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createTypeCommand));
+ getDiagramCommandStack().execute(new ICommandProxy(createTypeCommand));
createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));
@@ -63,7 +65,7 @@ public class TestPrepareUtils { // Create type
CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), container.eContainer(), SysMLElementTypes.BLOCK);
ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(container.eContainer()).getEditCommand(createTypeRequest);
- getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createTypeCommand));
+ getDiagramCommandStack().execute(new ICommandProxy(createTypeCommand));
createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));
@@ -71,18 +73,27 @@ public class TestPrepareUtils { // Create type
CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), container.eContainer(), UMLElementTypes.DATA_TYPE);
ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(container.eContainer()).getEditCommand(createTypeRequest);
- getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createTypeCommand));
+ getDiagramCommandStack().execute(new ICommandProxy(createTypeCommand));
createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));
}
ICommand createElementCommand = ElementEditServiceUtils.getCommandProvider(container).getEditCommand(createElementRequest);
- getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createElementCommand));
+ getDiagramCommandStack().execute(new ICommandProxy(createElementCommand));
return GMFCommandUtils.getCommandEObjectResult(createElementCommand);
}
+ public static EObject createLink(IElementType elementType, EObject source, EObject target) throws Exception {
+ CreateRelationshipRequest createRelationshipRequest = new CreateRelationshipRequest(getTransactionalEditingDomain(), source, target, elementType);
+
+ ICommand createRelationshipCommand = ElementEditServiceUtils.getCommandProvider(elementType).getEditCommand(createRelationshipRequest);
+ getDiagramCommandStack().execute(new ICommandProxy(createRelationshipCommand));
+
+ return GMFCommandUtils.getCommandEObjectResult(createRelationshipCommand);
+ }
+
public static View createGraphicalNode(IElementType elementType, String graphicalType, View containerView) throws Exception {
EObject newObject = createElement(elementType, containerView);
@@ -90,7 +101,7 @@ public class TestPrepareUtils { // Add view
ViewDescriptor viewDescriptor = new ViewDescriptor(new SemanticAdapter(newObject, null), Node.class, graphicalType, ViewUtil.APPEND, true, Activator.DIAGRAM_PREFERENCES_HINT);
CreateCommand createViewCommand = new CreateCommand(getTransactionalEditingDomain(), viewDescriptor, containerView);
- getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createViewCommand));
+ getDiagramCommandStack().execute(new ICommandProxy(createViewCommand));
EReference[] erefs = new EReference[]{ NotationPackage.eINSTANCE.getView_Element() };
@SuppressWarnings("unchecked")
@@ -98,7 +109,7 @@ public class TestPrepareUtils { return (View)views.toArray()[0];
}
-
+
public static View dropFromModelExplorer(IElementType elementType, View containerView) throws Exception {
EObject newObject = createElement(elementType, containerView);
return dropFromModelExplorer(newObject, containerView);
@@ -118,7 +129,7 @@ public class TestPrepareUtils { // Get drop command
Command command = containerEditPart.getCommand(dropRequest);
- getTransactionalEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(command));
+ getDiagramCommandStack().execute(command);
EReference[] erefs = new EReference[]{ NotationPackage.eINSTANCE.getView_Element() };
@SuppressWarnings("unchecked")
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/utils/TestUtils.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/utils/TestUtils.java index fdcc7a71e86..5e940fa2e4f 100644 --- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/utils/TestUtils.java +++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/utils/TestUtils.java @@ -1,5 +1,6 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramCommandStack;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramEditor;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramView;
import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getEditPart;
@@ -23,9 +24,10 @@ 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.View;
-import org.eclipse.papyrus.diagram.common.command.wrappers.GEFtoEMFCommandWrapper;
import org.eclipse.papyrus.diagram.common.service.AspectUnspecifiedTypeConnectionTool;
+import org.eclipse.papyrus.diagram.common.service.AspectUnspecifiedTypeConnectionTool.CreateAspectUnspecifiedTypeConnectionRequest;
import org.eclipse.papyrus.diagram.common.service.AspectUnspecifiedTypeCreationTool;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.Activator;
public class TestUtils {
@@ -56,12 +58,11 @@ public class TestUtils { fail("The command should be executable.");
} else {
// Ok the command can be executed.
- getTransactionalEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(command));
+ getDiagramCommandStack().execute(command);
- // Test undo
- getTransactionalEditingDomain().getCommandStack().execute(getTransactionalEditingDomain().getCommandStack().getUndoCommand());
- // Test redo
- getTransactionalEditingDomain().getCommandStack().execute(getTransactionalEditingDomain().getCommandStack().getRedoCommand());
+ // Test undo - redo
+ getDiagramCommandStack().undo();
+ getDiagramCommandStack().redo();
// Test the results then
// fail("Result tests not implemented.");
@@ -98,12 +99,11 @@ public class TestUtils { fail("The command should be executable.");
} else {
// Ok the command can be executed.
- getTransactionalEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(command));
+ getDiagramCommandStack().execute(command);
- // Test undo
- getTransactionalEditingDomain().getCommandStack().execute(getTransactionalEditingDomain().getCommandStack().getUndoCommand());
- // Test redo
- getTransactionalEditingDomain().getCommandStack().execute(getTransactionalEditingDomain().getCommandStack().getRedoCommand());
+ // Test undo - redo
+ getDiagramCommandStack().undo();
+ getDiagramCommandStack().redo();
// Test the results then
// fail("Result tests not implemented.");
@@ -126,7 +126,7 @@ public class TestUtils { ArrayList<EObject> list = new ArrayList<EObject>();
list.add(eObject);
dropRequest.setObjects(list);
- dropRequest.setLocation(new Point(20, 20));
+ dropRequest.setLocation(new Point(200, 200));
// Get drop command
Command command = containerEditPart.getCommand(dropRequest);
@@ -144,12 +144,11 @@ public class TestUtils { fail("The command should be executable.");
} else {
// Ok the command can be executed.
- getTransactionalEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(command));
+ getDiagramCommandStack().execute(command);
- // Test undo
- getTransactionalEditingDomain().getCommandStack().execute(getTransactionalEditingDomain().getCommandStack().getUndoCommand());
- // Test redo
- getTransactionalEditingDomain().getCommandStack().execute(getTransactionalEditingDomain().getCommandStack().getRedoCommand());
+ // Test undo - redo
+ getDiagramCommandStack().undo();
+ getDiagramCommandStack().redo();
// Test the results then
// fail("Result tests not implemented.");
@@ -157,17 +156,17 @@ public class TestUtils { }
}
- public static void createFromPalette(String toolId, View containerView, boolean isAllowed) throws Exception {
+ public static void createNodeFromPalette(String toolId, View containerView, boolean isAllowed) throws Exception {
if(isAllowed) {
- createFromPalette(toolId, containerView, isAllowed, true);
+ createNodeFromPalette(toolId, containerView, isAllowed, true);
} else {
- createFromPalette(toolId, containerView, isAllowed, false);
+ createNodeFromPalette(toolId, containerView, isAllowed, false);
}
}
- public static void createFromPalette(String toolId, View containerView, boolean isAllowed, boolean execute) throws Exception {
+ public static void createNodeFromPalette(String toolId, View containerView, boolean isAllowed, boolean execute) throws Exception {
// Find container EditPart (for command creation)
EditPart containerEditPart = getEditPart(containerView);
@@ -193,13 +192,13 @@ public class TestUtils { } else {
// Ok the command can be executed.
if(execute) {
- getTransactionalEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(command));
+ getDiagramCommandStack().execute(command);
- // Test undo
- getTransactionalEditingDomain().getCommandStack().execute(getTransactionalEditingDomain().getCommandStack().getUndoCommand());
- // Test redo
- getTransactionalEditingDomain().getCommandStack().execute(getTransactionalEditingDomain().getCommandStack().getRedoCommand());
+ // Test undo - redo
+ getDiagramCommandStack().undo();
+ getDiagramCommandStack().redo();
}
+
// Test the results then
// fail("Result tests not implemented.");
}
@@ -217,9 +216,96 @@ public class TestUtils { return creationTool.createCreateRequest();
} else if(tool instanceof AspectUnspecifiedTypeConnectionTool) {
- throw new Exception("Test support not implemented for this kind of tool.");
+ AspectUnspecifiedTypeConnectionTool connectionTool = (AspectUnspecifiedTypeConnectionTool)tool;
+ // Don't forget to set the diagram viewer (required for preferenceHints to mimic manual creation)
+ connectionTool.setViewer(getDiagramEditor().getDiagramGraphicalViewer());
+
+ return connectionTool.new CreateAspectUnspecifiedTypeConnectionRequest(connectionTool.getElementTypes(), false, Activator.DIAGRAM_PREFERENCES_HINT);
}
throw new Exception("Unexpected kind of creation tool.");
}
+
+ public static void createEdgeFromPalette(String toolId, View sourceView, View targetView, boolean isAllowed) throws Exception {
+
+ if(isAllowed) {
+ createEdgeFromPalette(toolId, sourceView, targetView, isAllowed, true);
+ } else {
+ createEdgeFromPalette(toolId, sourceView, targetView, isAllowed, false);
+ }
+
+ }
+
+ public static void createEdgeFromPalette(String toolId, View sourceView, View targetView, boolean isAllowed, boolean execute) throws Exception {
+
+ // Find palette tool to simulate element creation and prepare request
+ Tool tool = getPaletteTool(toolId);
+ CreateAspectUnspecifiedTypeConnectionRequest createRequest = (CreateAspectUnspecifiedTypeConnectionRequest) getCreateRequest(tool);
+
+ // Test source creation command
+ createRequest.setSourceEditPart(getEditPart(sourceView));
+ createRequest.setType(RequestConstants.REQ_CONNECTION_START);
+ Command srcCommand = getEditPart(sourceView).getCommand(createRequest);
+
+ // Test source command
+ if ((srcCommand == null) || !(srcCommand.canExecute())) { // Non-executable command
+ if (targetView == null) { // Only test behavior on source
+ if (!isAllowed) {
+ // Current behavior matches the expected results
+ return;
+ } else {
+ fail("The command should be executable.");
+ }
+
+ } else { // Test complete creation, the command should necessary be executable
+ fail("The command should be executable.");
+ }
+
+ } else { // Executable command
+ if (targetView == null) { // Only test behavior on source
+ if (!isAllowed) {
+ fail("The command should not be executable.");
+ } else {
+ // Current behavior matches the expected results - no execution test.
+ return;
+ }
+
+ } else { // The command is executable and a target is provided - continue the test
+
+ // Get target command (complete link creation)
+ createRequest.setSourceEditPart(getEditPart(sourceView));
+ createRequest.setTargetEditPart(getEditPart(targetView));
+ createRequest.setType(RequestConstants.REQ_CONNECTION_END);
+ Command tgtCommand = getEditPart(targetView).getCommand(createRequest);
+
+ // Test the target command
+ if ((tgtCommand == null) || !(tgtCommand.canExecute())) { // Non-executable command
+ if (!isAllowed) {
+ // Current behavior matches the expected results
+ return;
+ } else {
+ fail("The command should be executable.");
+ }
+
+ } else { // Executable command
+ if (!isAllowed) {
+ fail("The command should not be executable.");
+ } else {
+ // Current behavior matches the expected results
+ if(execute) { // Test command execution
+ getDiagramCommandStack().execute(tgtCommand);
+
+ // Test undo - redo
+ getDiagramCommandStack().undo();
+ getDiagramCommandStack().redo();
+ }
+
+ // Test the results then
+ // fail("Result tests not implemented.");
+ }
+ }
+ }
+
+ }
+ }
}
|