diff options
| author | ytanguy | 2012-03-14 15:21:37 +0000 |
|---|---|---|
| committer | ytanguy | 2012-03-14 15:21:37 +0000 |
| commit | 1f5eef7e350a6debc346072dbff95210febc7e39 (patch) | |
| tree | 2b6382e799f65b6192890fbb5f25fd268d398930 | |
| parent | bb4b067aaa48fe4e2042a681193ee8230ef3c379 (diff) | |
| download | org.eclipse.papyrus-1f5eef7e350a6debc346072dbff95210febc7e39.tar.gz org.eclipse.papyrus-1f5eef7e350a6debc346072dbff95210febc7e39.tar.xz org.eclipse.papyrus-1f5eef7e350a6debc346072dbff95210febc7e39.zip | |
372355: [SysML Internal Block Diagram] JUnit tests for the Internal Block Diagram
https://bugs.eclipse.org/bugs/show_bug.cgi?id=372355
26 files changed, 1345 insertions, 27 deletions
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/creation/link/connector/encapsulated/AbstractLinkCreationForSourcesTest.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/creation/link/connector/encapsulated/AbstractLinkCreationForSourcesTest.java index 43fccd0811d..87a64ea8204 100644 --- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/creation/link/connector/encapsulated/AbstractLinkCreationForSourcesTest.java +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/creation/link/connector/encapsulated/AbstractLinkCreationForSourcesTest.java @@ -25,7 +25,7 @@ public class AbstractLinkCreationForSourcesTest extends org.eclipse.papyrus.sysm @BeforeClass
public static void setPartBlockEncapsulated() throws Exception {
- TestPrepareUtils.setBlockEncapsulated((Element)(partContainer1.getElement().eGet(UMLPackage.eINSTANCE.getTypedElement_Type())));
+ TestPrepareUtils.setBlockIsEncapsulated((Element)(partContainer1.getElement().eGet(UMLPackage.eINSTANCE.getTypedElement_Type())), true);
}
}
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/creation/link/connector/encapsulated/AbstractLinkCreationFromElementTest.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/creation/link/connector/encapsulated/AbstractLinkCreationFromElementTest.java index 706e0c4c0b5..db43f674c1a 100644 --- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/creation/link/connector/encapsulated/AbstractLinkCreationFromElementTest.java +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/creation/link/connector/encapsulated/AbstractLinkCreationFromElementTest.java @@ -25,7 +25,7 @@ public class AbstractLinkCreationFromElementTest extends org.eclipse.papyrus.sys @BeforeClass
public static void setPartBlockEncapsulated() throws Exception {
- TestPrepareUtils.setBlockEncapsulated((Element)(partContainer1.getElement().eGet(UMLPackage.eINSTANCE.getTypedElement_Type())));
+ TestPrepareUtils.setBlockIsEncapsulated((Element)(partContainer1.getElement().eGet(UMLPackage.eINSTANCE.getTypedElement_Type())), true);
}
}
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/reorient/connector/encapsulated/AbstractLinkReorientSourceConnectorTest.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/reorient/connector/encapsulated/AbstractLinkReorientSourceConnectorTest.java index 4d3fe9665ba..cde53a2b0e4 100644 --- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/reorient/connector/encapsulated/AbstractLinkReorientSourceConnectorTest.java +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/reorient/connector/encapsulated/AbstractLinkReorientSourceConnectorTest.java @@ -25,6 +25,6 @@ public class AbstractLinkReorientSourceConnectorTest extends org.eclipse.papyrus @BeforeClass
public static void setPartBlockEncapsulated() throws Exception {
- TestPrepareUtils.setBlockEncapsulated((Element) (partContainer1.getElement().eGet(UMLPackage.eINSTANCE.getTypedElement_Type())));
+ TestPrepareUtils.setBlockIsEncapsulated((Element) (partContainer1.getElement().eGet(UMLPackage.eINSTANCE.getTypedElement_Type())), true);
}
}
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/reorient/connector/encapsulated/AbstractLinkReorientTargetConnectorTest.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/reorient/connector/encapsulated/AbstractLinkReorientTargetConnectorTest.java index 2045b160ffd..d42c1e8bdfb 100644 --- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/reorient/connector/encapsulated/AbstractLinkReorientTargetConnectorTest.java +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/reorient/connector/encapsulated/AbstractLinkReorientTargetConnectorTest.java @@ -25,7 +25,7 @@ public class AbstractLinkReorientTargetConnectorTest extends org.eclipse.papyrus @BeforeClass
public static void setPartBlockEncapsulated() throws Exception {
- TestPrepareUtils.setBlockEncapsulated((Element) (partContainer1.getElement().eGet(UMLPackage.eINSTANCE.getTypedElement_Type())));
+ TestPrepareUtils.setBlockIsEncapsulated((Element) (partContainer1.getElement().eGet(UMLPackage.eINSTANCE.getTypedElement_Type())), true);
}
}
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/AbstractSetEncapsulationDeleteConnectorTest.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/AbstractSetEncapsulationDeleteConnectorTest.java new file mode 100644 index 00000000000..d778b6c4e44 --- /dev/null +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/AbstractSetEncapsulationDeleteConnectorTest.java @@ -0,0 +1,139 @@ +/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.sysml.diagram.internalblock.tests.set.encapsulation;
+
+import static org.eclipse.papyrus.sysml.diagram.internalblock.tests.utils.TestUtils.setEncapsulationDeleteConnectorTest;
+
+import java.util.Map;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.sysml.diagram.internalblock.tests.creation.link.AbstractLinkPrepareTest;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.UMLPackage;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * JUnit abstract tests for encapsulation modification effect on Connector test (via palette tools).
+ */
+public class AbstractSetEncapsulationDeleteConnectorTest extends AbstractLinkPrepareTest {
+
+ public static View sourceView;
+
+ public static Map<View, Boolean> isConnectorDestroyed;
+
+ public Element block;
+
+ @Before
+ public void initBlock() {
+ block = (Element)(partContainer1.getElement().eGet(UMLPackage.eINSTANCE.getTypedElement_Type()));
+ }
+
+ @Test
+ public void setEncapsulationDeleteConnectorWithTargetActorPart() throws Exception {
+ View targetView = actorPartTargetView;
+ setEncapsulationDeleteConnectorTest(block, sourceView, targetView, isCreationAllowed.get(targetView), isConnectorDestroyed.get(targetView));
+ }
+
+ @Test
+ public void setEncapsulationDeleteConnectorWithTargetNestedActorPart() throws Exception {
+ View targetView = nestedActorPartTargetView;
+ setEncapsulationDeleteConnectorTest(block, sourceView, targetView, isCreationAllowed.get(targetView), isConnectorDestroyed.get(targetView));
+ }
+
+ @Test
+ public void setEncapsulationDeleteConnectorWithTargetPortOnBlock() throws Exception {
+ View targetView = portOnBlockTargetView;
+ setEncapsulationDeleteConnectorTest(block, sourceView, targetView, isCreationAllowed.get(targetView), isConnectorDestroyed.get(targetView));
+ }
+
+ @Test
+ public void setEncapsulationDeleteConnectorWithTargetPortOnPart() throws Exception {
+ View targetView = portOnPartTargetView;
+ setEncapsulationDeleteConnectorTest(block, sourceView, targetView, isCreationAllowed.get(targetView), isConnectorDestroyed.get(targetView));
+ }
+
+ @Test
+ public void setEncapsulationDeleteConnectorWithTargetPortOnNestedPart() throws Exception {
+ View targetView = portOnNestedPartTargetView;
+ setEncapsulationDeleteConnectorTest(block, sourceView, targetView, isCreationAllowed.get(targetView), isConnectorDestroyed.get(targetView));
+ }
+
+ @Test
+ public void setEncapsulationDeleteConnectorWithTargetFlowPortOnBlock() throws Exception {
+ View targetView = flowportOnBlockTargetView;
+ setEncapsulationDeleteConnectorTest(block, sourceView, targetView, isCreationAllowed.get(targetView), isConnectorDestroyed.get(targetView));
+ }
+
+ @Test
+ public void setEncapsulationDeleteConnectorWithTargetFlowPortOnPart() throws Exception {
+ View targetView = flowportOnPartTargetView;
+ setEncapsulationDeleteConnectorTest(block, sourceView, targetView, isCreationAllowed.get(targetView), isConnectorDestroyed.get(targetView));
+ }
+
+ @Test
+ public void setEncapsulationDeleteConnectorWithTargetFlowPortOnNestedPart() throws Exception {
+ View targetView = flowportOnNestedPartTargetView;
+ setEncapsulationDeleteConnectorTest(block, sourceView, targetView, isCreationAllowed.get(targetView), isConnectorDestroyed.get(targetView));
+ }
+
+ @Test
+ public void setEncapsulationDeleteConnectorWithTargetPart() throws Exception {
+ View targetView = partTargetView;
+ setEncapsulationDeleteConnectorTest(block, sourceView, targetView, isCreationAllowed.get(targetView), isConnectorDestroyed.get(targetView));
+ }
+
+ @Test
+ public void setEncapsulationDeleteConnectorWithTargetNestedPart() throws Exception {
+ View targetView = nestedPartTargetView;
+ setEncapsulationDeleteConnectorTest(block, sourceView, targetView, isCreationAllowed.get(targetView), isConnectorDestroyed.get(targetView));
+ }
+
+ @Test
+ public void setEncapsulationDeleteConnectorWithTargetProperty() throws Exception {
+ View targetView = propertyTargetView;
+ setEncapsulationDeleteConnectorTest(block, sourceView, targetView, isCreationAllowed.get(targetView), isConnectorDestroyed.get(targetView));
+ }
+
+ @Test
+ public void setEncapsulationDeleteConnectorWithTargetNestedProperty() throws Exception {
+ View targetView = nestedPropertyTargetView;
+ setEncapsulationDeleteConnectorTest(block, sourceView, targetView, isCreationAllowed.get(targetView), isConnectorDestroyed.get(targetView));
+ }
+
+ @Test
+ public void setEncapsulationDeleteConnectorWithTargetReference() throws Exception {
+ View targetView = referenceTargetView;
+ setEncapsulationDeleteConnectorTest(block, sourceView, targetView, isCreationAllowed.get(targetView), isConnectorDestroyed.get(targetView));
+ }
+
+ @Test
+ public void setEncapsulationDeleteConnectorWithTargetNestedReference() throws Exception {
+ View targetView = nestedReferenceTargetView;
+ setEncapsulationDeleteConnectorTest(block, sourceView, targetView, isCreationAllowed.get(targetView), isConnectorDestroyed.get(targetView));
+ }
+
+ @Test
+ public void setEncapsulationDeleteConnectorWithTargetValue() throws Exception {
+ View targetView = valueTargetView;
+ setEncapsulationDeleteConnectorTest(block, sourceView, targetView, isCreationAllowed.get(targetView), isConnectorDestroyed.get(targetView));
+ }
+
+ @Test
+ public void setEncapsulationDeleteConnectorWithTargetNestedValue() throws Exception {
+ View targetView = nestedValueTargetView;
+ setEncapsulationDeleteConnectorTest(block, sourceView, targetView, isCreationAllowed.get(targetView), isConnectorDestroyed.get(targetView));
+ }
+
+}
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromActorPart.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromActorPart.java new file mode 100644 index 00000000000..d43771ead29 --- /dev/null +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromActorPart.java @@ -0,0 +1,66 @@ +/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.sysml.diagram.internalblock.tests.set.encapsulation;
+
+import java.util.HashMap;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.junit.BeforeClass;
+
+/**
+ * JUnit tests for Connector link removal during Block#setIsEncapsulated() test (via palette tools).
+ */
+public class TestSetEncapsulationDeleteConnectorFromActorPart extends AbstractSetEncapsulationDeleteConnectorTest {
+
+ @BeforeClass
+ public static void initSource() throws Exception {
+ sourceView = actorPartSourceView;
+ }
+
+ @BeforeClass
+ public static void initExpectedResults() throws Exception {
+
+ // Initialize source creation results
+ isConnectorDestroyed = new HashMap<View, Boolean>();
+
+ isConnectorDestroyed.put(actorPartTargetView, false);
+ isConnectorDestroyed.put(nestedActorPartTargetView, true);
+
+ isConnectorDestroyed.put(portOnBlockTargetView, false);
+ isConnectorDestroyed.put(portOnPartTargetView, false);
+ isConnectorDestroyed.put(portOnNestedPartTargetView, true);
+
+ isConnectorDestroyed.put(flowportOnBlockTargetView, false);
+ isConnectorDestroyed.put(flowportOnPartTargetView, false);
+ isConnectorDestroyed.put(flowportOnNestedPartTargetView, true);
+
+ isConnectorDestroyed.put(partTargetView, false);
+ isConnectorDestroyed.put(nestedPartTargetView, true);
+
+ isConnectorDestroyed.put(propertyTargetView, false);
+ isConnectorDestroyed.put(nestedPropertyTargetView, true);
+
+ isConnectorDestroyed.put(referenceTargetView, false);
+ isConnectorDestroyed.put(nestedReferenceTargetView, true);
+
+ isConnectorDestroyed.put(valueTargetView, false);
+ isConnectorDestroyed.put(nestedValueTargetView, true);
+
+ // Initialize connector creation possibility
+ for(View view : isConnectorDestroyed.keySet()) {
+ isCreationAllowed.put(view, true);
+ }
+ }
+
+}
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromFlowPortOnBlock.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromFlowPortOnBlock.java new file mode 100644 index 00000000000..c76f1ae11d3 --- /dev/null +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromFlowPortOnBlock.java @@ -0,0 +1,69 @@ +/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.sysml.diagram.internalblock.tests.set.encapsulation;
+
+import java.util.HashMap;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.junit.BeforeClass;
+
+/**
+ * JUnit tests for Connector link removal during Block#setIsEncapsulated() test (via palette tools).
+ */
+public class TestSetEncapsulationDeleteConnectorFromFlowPortOnBlock extends AbstractSetEncapsulationDeleteConnectorTest {
+
+ @BeforeClass
+ public static void init() throws Exception {
+ sourceView = flowportOnBlockSourceView;
+ }
+
+ @BeforeClass
+ public static void initExpectedResults() throws Exception {
+
+ // Initialize source creation results
+ isConnectorDestroyed = new HashMap<View, Boolean>();
+
+ isConnectorDestroyed.put(actorPartTargetView, false);
+ isConnectorDestroyed.put(nestedActorPartTargetView, true);
+
+ isConnectorDestroyed.put(portOnBlockTargetView, false);
+ isConnectorDestroyed.put(portOnPartTargetView, false);
+ isConnectorDestroyed.put(portOnNestedPartTargetView, true);
+
+ isConnectorDestroyed.put(flowportOnBlockTargetView, false);
+ isConnectorDestroyed.put(flowportOnPartTargetView, false);
+ isConnectorDestroyed.put(flowportOnNestedPartTargetView, true);
+
+ isConnectorDestroyed.put(partTargetView, false);
+ isConnectorDestroyed.put(nestedPartTargetView, true);
+
+ isConnectorDestroyed.put(propertyTargetView, false);
+ isConnectorDestroyed.put(nestedPropertyTargetView, true);
+
+ isConnectorDestroyed.put(referenceTargetView, false);
+ isConnectorDestroyed.put(nestedReferenceTargetView, true);
+
+ isConnectorDestroyed.put(valueTargetView, false);
+ isConnectorDestroyed.put(nestedValueTargetView, true);
+
+ // Initialize connector creation possibility
+ for(View view : isConnectorDestroyed.keySet()) {
+ isCreationAllowed.put(view, true);
+ }
+ isCreationAllowed.put(portOnBlockTargetView, false);
+ isCreationAllowed.put(flowportOnBlockTargetView, false);
+
+ }
+
+}
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromFlowPortOnNestedPart.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromFlowPortOnNestedPart.java new file mode 100644 index 00000000000..af6ee65c6bb --- /dev/null +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromFlowPortOnNestedPart.java @@ -0,0 +1,67 @@ +/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.sysml.diagram.internalblock.tests.set.encapsulation;
+
+import java.util.HashMap;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.junit.BeforeClass;
+
+/**
+ * JUnit tests for Connector link removal during Block#setIsEncapsulated() test (via palette tools).
+ */
+public class TestSetEncapsulationDeleteConnectorFromFlowPortOnNestedPart extends AbstractSetEncapsulationDeleteConnectorTest {
+
+ @BeforeClass
+ public static void init() throws Exception {
+ sourceView = flowportOnNestedPartSourceView;
+ }
+
+ @BeforeClass
+ public static void initExpectedResults() throws Exception {
+
+ // Initialize source creation results
+ isConnectorDestroyed = new HashMap<View, Boolean>();
+
+ isConnectorDestroyed.put(actorPartTargetView, true);
+ isConnectorDestroyed.put(nestedActorPartTargetView, false);
+
+ isConnectorDestroyed.put(portOnBlockTargetView, true);
+ isConnectorDestroyed.put(portOnPartTargetView, true);
+ isConnectorDestroyed.put(portOnNestedPartTargetView, false);
+
+ isConnectorDestroyed.put(flowportOnBlockTargetView, true);
+ isConnectorDestroyed.put(flowportOnPartTargetView, true);
+ isConnectorDestroyed.put(flowportOnNestedPartTargetView, false);
+
+ isConnectorDestroyed.put(partTargetView, true);
+ isConnectorDestroyed.put(nestedPartTargetView, false);
+
+ isConnectorDestroyed.put(propertyTargetView, true);
+ isConnectorDestroyed.put(nestedPropertyTargetView, false);
+
+ isConnectorDestroyed.put(referenceTargetView, true);
+ isConnectorDestroyed.put(nestedReferenceTargetView, false);
+
+ isConnectorDestroyed.put(valueTargetView, true);
+ isConnectorDestroyed.put(nestedValueTargetView, false);
+
+ // Initialize connector creation possibility
+ for(View view : isConnectorDestroyed.keySet()) {
+ isCreationAllowed.put(view, true);
+ }
+
+ }
+
+}
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromFlowPortOnPart.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromFlowPortOnPart.java new file mode 100644 index 00000000000..2ade7d63964 --- /dev/null +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromFlowPortOnPart.java @@ -0,0 +1,67 @@ +/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.sysml.diagram.internalblock.tests.set.encapsulation;
+
+import java.util.HashMap;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.junit.BeforeClass;
+
+/**
+ * JUnit tests for Connector link removal during Block#setIsEncapsulated() test (via palette tools).
+ */
+public class TestSetEncapsulationDeleteConnectorFromFlowPortOnPart extends AbstractSetEncapsulationDeleteConnectorTest {
+
+ @BeforeClass
+ public static void init() throws Exception {
+ sourceView = flowportOnPartSourceView;
+ }
+
+ @BeforeClass
+ public static void initExpectedResults() throws Exception {
+
+ // Initialize source creation results
+ isConnectorDestroyed = new HashMap<View, Boolean>();
+
+ isConnectorDestroyed.put(actorPartTargetView, false);
+ isConnectorDestroyed.put(nestedActorPartTargetView, false);
+
+ isConnectorDestroyed.put(portOnBlockTargetView, false);
+ isConnectorDestroyed.put(portOnPartTargetView, false);
+ isConnectorDestroyed.put(portOnNestedPartTargetView, false);
+
+ isConnectorDestroyed.put(flowportOnBlockTargetView, false);
+ isConnectorDestroyed.put(flowportOnPartTargetView, false);
+ isConnectorDestroyed.put(flowportOnNestedPartTargetView, false);
+
+ isConnectorDestroyed.put(partTargetView, false);
+ isConnectorDestroyed.put(nestedPartTargetView, false);
+
+ isConnectorDestroyed.put(propertyTargetView, false);
+ isConnectorDestroyed.put(nestedPropertyTargetView, false);
+
+ isConnectorDestroyed.put(referenceTargetView, false);
+ isConnectorDestroyed.put(nestedReferenceTargetView, false);
+
+ isConnectorDestroyed.put(valueTargetView, false);
+ isConnectorDestroyed.put(nestedValueTargetView, false);
+
+ // Initialize connector creation possibility
+ for(View view : isConnectorDestroyed.keySet()) {
+ isCreationAllowed.put(view, true);
+ }
+
+ }
+
+}
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromNestedActorPart.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromNestedActorPart.java new file mode 100644 index 00000000000..6493e4d4ae5 --- /dev/null +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromNestedActorPart.java @@ -0,0 +1,67 @@ +/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.sysml.diagram.internalblock.tests.set.encapsulation;
+
+import java.util.HashMap;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.junit.BeforeClass;
+
+/**
+ * JUnit tests for Connector link removal during Block#setIsEncapsulated() test (via palette tools).
+ */
+public class TestSetEncapsulationDeleteConnectorFromNestedActorPart extends AbstractSetEncapsulationDeleteConnectorTest {
+
+ @BeforeClass
+ public static void init() throws Exception {
+ sourceView = nestedActorPartSourceView;
+ }
+
+ @BeforeClass
+ public static void initExpectedResults() throws Exception {
+
+ // Initialize source creation results
+ isConnectorDestroyed = new HashMap<View, Boolean>();
+
+ isConnectorDestroyed.put(actorPartTargetView, true);
+ isConnectorDestroyed.put(nestedActorPartTargetView, false);
+
+ isConnectorDestroyed.put(portOnBlockTargetView, true);
+ isConnectorDestroyed.put(portOnPartTargetView, true);
+ isConnectorDestroyed.put(portOnNestedPartTargetView, false);
+
+ isConnectorDestroyed.put(flowportOnBlockTargetView, true);
+ isConnectorDestroyed.put(flowportOnPartTargetView, true);
+ isConnectorDestroyed.put(flowportOnNestedPartTargetView, false);
+
+ isConnectorDestroyed.put(partTargetView, true);
+ isConnectorDestroyed.put(nestedPartTargetView, false);
+
+ isConnectorDestroyed.put(propertyTargetView, true);
+ isConnectorDestroyed.put(nestedPropertyTargetView, false);
+
+ isConnectorDestroyed.put(referenceTargetView, true);
+ isConnectorDestroyed.put(nestedReferenceTargetView, false);
+
+ isConnectorDestroyed.put(valueTargetView, true);
+ isConnectorDestroyed.put(nestedValueTargetView, false);
+
+ // Initialize connector creation possibility
+ for(View view : isConnectorDestroyed.keySet()) {
+ isCreationAllowed.put(view, true);
+ }
+
+ }
+
+}
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromNestedPart.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromNestedPart.java new file mode 100644 index 00000000000..ee0922af951 --- /dev/null +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromNestedPart.java @@ -0,0 +1,67 @@ +/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.sysml.diagram.internalblock.tests.set.encapsulation;
+
+import java.util.HashMap;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.junit.BeforeClass;
+
+/**
+ * JUnit tests for Connector link removal during Block#setIsEncapsulated() test (via palette tools).
+ */
+public class TestSetEncapsulationDeleteConnectorFromNestedPart extends AbstractSetEncapsulationDeleteConnectorTest {
+
+ @BeforeClass
+ public static void init() throws Exception {
+ sourceView = nestedPartSourceView;
+ }
+
+ @BeforeClass
+ public static void initExpectedResults() throws Exception {
+
+ // Initialize source creation results
+ isConnectorDestroyed = new HashMap<View, Boolean>();
+
+ isConnectorDestroyed.put(actorPartTargetView, true);
+ isConnectorDestroyed.put(nestedActorPartTargetView, false);
+
+ isConnectorDestroyed.put(portOnBlockTargetView, true);
+ isConnectorDestroyed.put(portOnPartTargetView, true);
+ isConnectorDestroyed.put(portOnNestedPartTargetView, false);
+
+ isConnectorDestroyed.put(flowportOnBlockTargetView, true);
+ isConnectorDestroyed.put(flowportOnPartTargetView, true);
+ isConnectorDestroyed.put(flowportOnNestedPartTargetView, false);
+
+ isConnectorDestroyed.put(partTargetView, true);
+ isConnectorDestroyed.put(nestedPartTargetView, false);
+
+ isConnectorDestroyed.put(propertyTargetView, true);
+ isConnectorDestroyed.put(nestedPropertyTargetView, false);
+
+ isConnectorDestroyed.put(referenceTargetView, true);
+ isConnectorDestroyed.put(nestedReferenceTargetView, false);
+
+ isConnectorDestroyed.put(valueTargetView, true);
+ isConnectorDestroyed.put(nestedValueTargetView, false);
+
+ // Initialize connector creation possibility
+ for(View view : isConnectorDestroyed.keySet()) {
+ isCreationAllowed.put(view, true);
+ }
+
+ }
+
+}
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromNestedProperty.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromNestedProperty.java new file mode 100644 index 00000000000..f681520bf43 --- /dev/null +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromNestedProperty.java @@ -0,0 +1,67 @@ +/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.sysml.diagram.internalblock.tests.set.encapsulation;
+
+import java.util.HashMap;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.junit.BeforeClass;
+
+/**
+ * JUnit tests for Connector link removal during Block#setIsEncapsulated() test (via palette tools).
+ */
+public class TestSetEncapsulationDeleteConnectorFromNestedProperty extends AbstractSetEncapsulationDeleteConnectorTest {
+
+ @BeforeClass
+ public static void init() throws Exception {
+ sourceView = nestedPropertySourceView;
+ }
+
+ @BeforeClass
+ public static void initExpectedResults() throws Exception {
+
+ // Initialize source creation results
+ isConnectorDestroyed = new HashMap<View, Boolean>();
+
+ isConnectorDestroyed.put(actorPartTargetView, true);
+ isConnectorDestroyed.put(nestedActorPartTargetView, false);
+
+ isConnectorDestroyed.put(portOnBlockTargetView, true);
+ isConnectorDestroyed.put(portOnPartTargetView, true);
+ isConnectorDestroyed.put(portOnNestedPartTargetView, false);
+
+ isConnectorDestroyed.put(flowportOnBlockTargetView, true);
+ isConnectorDestroyed.put(flowportOnPartTargetView, true);
+ isConnectorDestroyed.put(flowportOnNestedPartTargetView, false);
+
+ isConnectorDestroyed.put(partTargetView, true);
+ isConnectorDestroyed.put(nestedPartTargetView, false);
+
+ isConnectorDestroyed.put(propertyTargetView, true);
+ isConnectorDestroyed.put(nestedPropertyTargetView, false);
+
+ isConnectorDestroyed.put(referenceTargetView, true);
+ isConnectorDestroyed.put(nestedReferenceTargetView, false);
+
+ isConnectorDestroyed.put(valueTargetView, true);
+ isConnectorDestroyed.put(nestedValueTargetView, false);
+
+ // Initialize connector creation possibility
+ for(View view : isConnectorDestroyed.keySet()) {
+ isCreationAllowed.put(view, true);
+ }
+
+ }
+
+}
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromNestedReference.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromNestedReference.java new file mode 100644 index 00000000000..75c377b5c8b --- /dev/null +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromNestedReference.java @@ -0,0 +1,67 @@ +/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.sysml.diagram.internalblock.tests.set.encapsulation;
+
+import java.util.HashMap;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.junit.BeforeClass;
+
+/**
+ * JUnit tests for Connector link removal during Block#setIsEncapsulated() test (via palette tools).
+ */
+public class TestSetEncapsulationDeleteConnectorFromNestedReference extends AbstractSetEncapsulationDeleteConnectorTest {
+
+ @BeforeClass
+ public static void init() throws Exception {
+ sourceView = nestedReferenceSourceView;
+ }
+
+ @BeforeClass
+ public static void initExpectedResults() throws Exception {
+
+ // Initialize source creation results
+ isConnectorDestroyed = new HashMap<View, Boolean>();
+
+ isConnectorDestroyed.put(actorPartTargetView, true);
+ isConnectorDestroyed.put(nestedActorPartTargetView, false);
+
+ isConnectorDestroyed.put(portOnBlockTargetView, true);
+ isConnectorDestroyed.put(portOnPartTargetView, true);
+ isConnectorDestroyed.put(portOnNestedPartTargetView, false);
+
+ isConnectorDestroyed.put(flowportOnBlockTargetView, true);
+ isConnectorDestroyed.put(flowportOnPartTargetView, true);
+ isConnectorDestroyed.put(flowportOnNestedPartTargetView, false);
+
+ isConnectorDestroyed.put(partTargetView, true);
+ isConnectorDestroyed.put(nestedPartTargetView, false);
+
+ isConnectorDestroyed.put(propertyTargetView, true);
+ isConnectorDestroyed.put(nestedPropertyTargetView, false);
+
+ isConnectorDestroyed.put(referenceTargetView, true);
+ isConnectorDestroyed.put(nestedReferenceTargetView, false);
+
+ isConnectorDestroyed.put(valueTargetView, true);
+ isConnectorDestroyed.put(nestedValueTargetView, false);
+
+ // Initialize connector creation possibility
+ for(View view : isConnectorDestroyed.keySet()) {
+ isCreationAllowed.put(view, true);
+ }
+
+ }
+
+}
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromNestedValue.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromNestedValue.java new file mode 100644 index 00000000000..d76af4c4cc2 --- /dev/null +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromNestedValue.java @@ -0,0 +1,67 @@ +/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.sysml.diagram.internalblock.tests.set.encapsulation;
+
+import java.util.HashMap;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.junit.BeforeClass;
+
+/**
+ * JUnit tests for Connector link removal during Block#setIsEncapsulated() test (via palette tools).
+ */
+public class TestSetEncapsulationDeleteConnectorFromNestedValue extends AbstractSetEncapsulationDeleteConnectorTest {
+
+ @BeforeClass
+ public static void init() throws Exception {
+ sourceView = nestedValueSourceView;
+ }
+
+ @BeforeClass
+ public static void initExpectedResults() throws Exception {
+
+ // Initialize source creation results
+ isConnectorDestroyed = new HashMap<View, Boolean>();
+
+ isConnectorDestroyed.put(actorPartTargetView, true);
+ isConnectorDestroyed.put(nestedActorPartTargetView, false);
+
+ isConnectorDestroyed.put(portOnBlockTargetView, true);
+ isConnectorDestroyed.put(portOnPartTargetView, true);
+ isConnectorDestroyed.put(portOnNestedPartTargetView, false);
+
+ isConnectorDestroyed.put(flowportOnBlockTargetView, true);
+ isConnectorDestroyed.put(flowportOnPartTargetView, true);
+ isConnectorDestroyed.put(flowportOnNestedPartTargetView, false);
+
+ isConnectorDestroyed.put(partTargetView, true);
+ isConnectorDestroyed.put(nestedPartTargetView, false);
+
+ isConnectorDestroyed.put(propertyTargetView, true);
+ isConnectorDestroyed.put(nestedPropertyTargetView, false);
+
+ isConnectorDestroyed.put(referenceTargetView, true);
+ isConnectorDestroyed.put(nestedReferenceTargetView, false);
+
+ isConnectorDestroyed.put(valueTargetView, true);
+ isConnectorDestroyed.put(nestedValueTargetView, false);
+
+ // Initialize connector creation possibility
+ for(View view : isConnectorDestroyed.keySet()) {
+ isCreationAllowed.put(view, true);
+ }
+
+ }
+
+}
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromPart.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromPart.java new file mode 100644 index 00000000000..b904c8454bb --- /dev/null +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromPart.java @@ -0,0 +1,66 @@ +/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.sysml.diagram.internalblock.tests.set.encapsulation;
+
+import java.util.HashMap;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.junit.BeforeClass;
+
+/**
+ * JUnit tests for Connector link removal during Block#setIsEncapsulated() test (via palette tools).
+ */
+public class TestSetEncapsulationDeleteConnectorFromPart extends AbstractSetEncapsulationDeleteConnectorTest {
+
+ @BeforeClass
+ public static void initSource() throws Exception {
+ sourceView = partSourceView;
+ }
+
+ @BeforeClass
+ public static void initExpectedResults() throws Exception {
+
+ // Initialize source creation results
+ isConnectorDestroyed = new HashMap<View, Boolean>();
+
+ isConnectorDestroyed.put(actorPartTargetView, false);
+ isConnectorDestroyed.put(nestedActorPartTargetView, true);
+
+ isConnectorDestroyed.put(portOnBlockTargetView, false);
+ isConnectorDestroyed.put(portOnPartTargetView, false);
+ isConnectorDestroyed.put(portOnNestedPartTargetView, true);
+
+ isConnectorDestroyed.put(flowportOnBlockTargetView, false);
+ isConnectorDestroyed.put(flowportOnPartTargetView, false);
+ isConnectorDestroyed.put(flowportOnNestedPartTargetView, true);
+
+ isConnectorDestroyed.put(partTargetView, false);
+ isConnectorDestroyed.put(nestedPartTargetView, true);
+
+ isConnectorDestroyed.put(propertyTargetView, false);
+ isConnectorDestroyed.put(nestedPropertyTargetView, true);
+
+ isConnectorDestroyed.put(referenceTargetView, false);
+ isConnectorDestroyed.put(nestedReferenceTargetView, true);
+
+ isConnectorDestroyed.put(valueTargetView, false);
+ isConnectorDestroyed.put(nestedValueTargetView, true);
+
+ // Initialize connector creation possibility
+ for(View view : isConnectorDestroyed.keySet()) {
+ isCreationAllowed.put(view, true);
+ }
+ }
+
+}
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromPortOnBlock.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromPortOnBlock.java new file mode 100644 index 00000000000..6bffae507d3 --- /dev/null +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromPortOnBlock.java @@ -0,0 +1,69 @@ +/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.sysml.diagram.internalblock.tests.set.encapsulation;
+
+import java.util.HashMap;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.junit.BeforeClass;
+
+/**
+ * JUnit tests for Connector link removal during Block#setIsEncapsulated() test (via palette tools).
+ */
+public class TestSetEncapsulationDeleteConnectorFromPortOnBlock extends AbstractSetEncapsulationDeleteConnectorTest {
+
+ @BeforeClass
+ public static void init() throws Exception {
+ sourceView = portOnBlockSourceView;
+ }
+
+ @BeforeClass
+ public static void initExpectedResults() throws Exception {
+
+ // Initialize source creation results
+ isConnectorDestroyed = new HashMap<View, Boolean>();
+
+ isConnectorDestroyed.put(actorPartTargetView, false);
+ isConnectorDestroyed.put(nestedActorPartTargetView, true);
+
+ isConnectorDestroyed.put(portOnBlockTargetView, false);
+ isConnectorDestroyed.put(portOnPartTargetView, false);
+ isConnectorDestroyed.put(portOnNestedPartTargetView, true);
+
+ isConnectorDestroyed.put(flowportOnBlockTargetView, false);
+ isConnectorDestroyed.put(flowportOnPartTargetView, false);
+ isConnectorDestroyed.put(flowportOnNestedPartTargetView, true);
+
+ isConnectorDestroyed.put(partTargetView, false);
+ isConnectorDestroyed.put(nestedPartTargetView, true);
+
+ isConnectorDestroyed.put(propertyTargetView, false);
+ isConnectorDestroyed.put(nestedPropertyTargetView, true);
+
+ isConnectorDestroyed.put(referenceTargetView, false);
+ isConnectorDestroyed.put(nestedReferenceTargetView, true);
+
+ isConnectorDestroyed.put(valueTargetView, false);
+ isConnectorDestroyed.put(nestedValueTargetView, true);
+
+ // Initialize connector creation possibility
+ for(View view : isConnectorDestroyed.keySet()) {
+ isCreationAllowed.put(view, true);
+ }
+ isCreationAllowed.put(portOnBlockTargetView, false);
+ isCreationAllowed.put(flowportOnBlockTargetView, false);
+
+ }
+
+}
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromPortOnNestedPart.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromPortOnNestedPart.java new file mode 100644 index 00000000000..4afc6f75921 --- /dev/null +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromPortOnNestedPart.java @@ -0,0 +1,67 @@ +/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.sysml.diagram.internalblock.tests.set.encapsulation;
+
+import java.util.HashMap;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.junit.BeforeClass;
+
+/**
+ * JUnit tests for Connector link removal during Block#setIsEncapsulated() test (via palette tools).
+ */
+public class TestSetEncapsulationDeleteConnectorFromPortOnNestedPart extends AbstractSetEncapsulationDeleteConnectorTest {
+
+ @BeforeClass
+ public static void init() throws Exception {
+ sourceView = portOnNestedPartSourceView;
+ }
+
+ @BeforeClass
+ public static void initExpectedResults() throws Exception {
+
+ // Initialize source creation results
+ isConnectorDestroyed = new HashMap<View, Boolean>();
+
+ isConnectorDestroyed.put(actorPartTargetView, true);
+ isConnectorDestroyed.put(nestedActorPartTargetView, false);
+
+ isConnectorDestroyed.put(portOnBlockTargetView, true);
+ isConnectorDestroyed.put(portOnPartTargetView, true);
+ isConnectorDestroyed.put(portOnNestedPartTargetView, false);
+
+ isConnectorDestroyed.put(flowportOnBlockTargetView, true);
+ isConnectorDestroyed.put(flowportOnPartTargetView, true);
+ isConnectorDestroyed.put(flowportOnNestedPartTargetView, false);
+
+ isConnectorDestroyed.put(partTargetView, true);
+ isConnectorDestroyed.put(nestedPartTargetView, false);
+
+ isConnectorDestroyed.put(propertyTargetView, true);
+ isConnectorDestroyed.put(nestedPropertyTargetView, false);
+
+ isConnectorDestroyed.put(referenceTargetView, true);
+ isConnectorDestroyed.put(nestedReferenceTargetView, false);
+
+ isConnectorDestroyed.put(valueTargetView, true);
+ isConnectorDestroyed.put(nestedValueTargetView, false);
+
+ // Initialize connector creation possibility
+ for(View view : isConnectorDestroyed.keySet()) {
+ isCreationAllowed.put(view, true);
+ }
+
+ }
+
+}
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromPortOnPart.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromPortOnPart.java new file mode 100644 index 00000000000..3fede2484c7 --- /dev/null +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromPortOnPart.java @@ -0,0 +1,67 @@ +/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.sysml.diagram.internalblock.tests.set.encapsulation;
+
+import java.util.HashMap;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.junit.BeforeClass;
+
+/**
+ * JUnit tests for Connector link removal during Block#setIsEncapsulated() test (via palette tools).
+ */
+public class TestSetEncapsulationDeleteConnectorFromPortOnPart extends AbstractSetEncapsulationDeleteConnectorTest {
+
+ @BeforeClass
+ public static void init() throws Exception {
+ sourceView = portOnPartSourceView;
+ }
+
+ @BeforeClass
+ public static void initExpectedResults() throws Exception {
+
+ // Initialize source creation results
+ isConnectorDestroyed = new HashMap<View, Boolean>();
+
+ isConnectorDestroyed.put(actorPartTargetView, false);
+ isConnectorDestroyed.put(nestedActorPartTargetView, false);
+
+ isConnectorDestroyed.put(portOnBlockTargetView, false);
+ isConnectorDestroyed.put(portOnPartTargetView, false);
+ isConnectorDestroyed.put(portOnNestedPartTargetView, false);
+
+ isConnectorDestroyed.put(flowportOnBlockTargetView, false);
+ isConnectorDestroyed.put(flowportOnPartTargetView, false);
+ isConnectorDestroyed.put(flowportOnNestedPartTargetView, false);
+
+ isConnectorDestroyed.put(partTargetView, false);
+ isConnectorDestroyed.put(nestedPartTargetView, false);
+
+ isConnectorDestroyed.put(propertyTargetView, false);
+ isConnectorDestroyed.put(nestedPropertyTargetView, false);
+
+ isConnectorDestroyed.put(referenceTargetView, false);
+ isConnectorDestroyed.put(nestedReferenceTargetView, false);
+
+ isConnectorDestroyed.put(valueTargetView, false);
+ isConnectorDestroyed.put(nestedValueTargetView, false);
+
+ // Initialize connector creation possibility
+ for(View view : isConnectorDestroyed.keySet()) {
+ isCreationAllowed.put(view, true);
+ }
+
+ }
+
+}
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromProperty.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromProperty.java new file mode 100644 index 00000000000..3e2b4e76598 --- /dev/null +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromProperty.java @@ -0,0 +1,66 @@ +/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.sysml.diagram.internalblock.tests.set.encapsulation;
+
+import java.util.HashMap;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.junit.BeforeClass;
+
+/**
+ * JUnit tests for Connector link removal during Block#setIsEncapsulated() test (via palette tools).
+ */
+public class TestSetEncapsulationDeleteConnectorFromProperty extends AbstractSetEncapsulationDeleteConnectorTest {
+
+ @BeforeClass
+ public static void initSource() throws Exception {
+ sourceView = propertySourceView;
+ }
+
+ @BeforeClass
+ public static void initExpectedResults() throws Exception {
+
+ // Initialize source creation results
+ isConnectorDestroyed = new HashMap<View, Boolean>();
+
+ isConnectorDestroyed.put(actorPartTargetView, false);
+ isConnectorDestroyed.put(nestedActorPartTargetView, true);
+
+ isConnectorDestroyed.put(portOnBlockTargetView, false);
+ isConnectorDestroyed.put(portOnPartTargetView, false);
+ isConnectorDestroyed.put(portOnNestedPartTargetView, true);
+
+ isConnectorDestroyed.put(flowportOnBlockTargetView, false);
+ isConnectorDestroyed.put(flowportOnPartTargetView, false);
+ isConnectorDestroyed.put(flowportOnNestedPartTargetView, true);
+
+ isConnectorDestroyed.put(partTargetView, false);
+ isConnectorDestroyed.put(nestedPartTargetView, true);
+
+ isConnectorDestroyed.put(propertyTargetView, false);
+ isConnectorDestroyed.put(nestedPropertyTargetView, true);
+
+ isConnectorDestroyed.put(referenceTargetView, false);
+ isConnectorDestroyed.put(nestedReferenceTargetView, true);
+
+ isConnectorDestroyed.put(valueTargetView, false);
+ isConnectorDestroyed.put(nestedValueTargetView, true);
+
+ // Initialize connector creation possibility
+ for(View view : isConnectorDestroyed.keySet()) {
+ isCreationAllowed.put(view, true);
+ }
+ }
+
+}
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromReference.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromReference.java new file mode 100644 index 00000000000..2fa73888d37 --- /dev/null +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromReference.java @@ -0,0 +1,66 @@ +/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.sysml.diagram.internalblock.tests.set.encapsulation;
+
+import java.util.HashMap;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.junit.BeforeClass;
+
+/**
+ * JUnit tests for Connector link removal during Block#setIsEncapsulated() test (via palette tools).
+ */
+public class TestSetEncapsulationDeleteConnectorFromReference extends AbstractSetEncapsulationDeleteConnectorTest {
+
+ @BeforeClass
+ public static void initSource() throws Exception {
+ sourceView = referenceSourceView;
+ }
+
+ @BeforeClass
+ public static void initExpectedResults() throws Exception {
+
+ // Initialize source creation results
+ isConnectorDestroyed = new HashMap<View, Boolean>();
+
+ isConnectorDestroyed.put(actorPartTargetView, false);
+ isConnectorDestroyed.put(nestedActorPartTargetView, true);
+
+ isConnectorDestroyed.put(portOnBlockTargetView, false);
+ isConnectorDestroyed.put(portOnPartTargetView, false);
+ isConnectorDestroyed.put(portOnNestedPartTargetView, true);
+
+ isConnectorDestroyed.put(flowportOnBlockTargetView, false);
+ isConnectorDestroyed.put(flowportOnPartTargetView, false);
+ isConnectorDestroyed.put(flowportOnNestedPartTargetView, true);
+
+ isConnectorDestroyed.put(partTargetView, false);
+ isConnectorDestroyed.put(nestedPartTargetView, true);
+
+ isConnectorDestroyed.put(propertyTargetView, false);
+ isConnectorDestroyed.put(nestedPropertyTargetView, true);
+
+ isConnectorDestroyed.put(referenceTargetView, false);
+ isConnectorDestroyed.put(nestedReferenceTargetView, true);
+
+ isConnectorDestroyed.put(valueTargetView, false);
+ isConnectorDestroyed.put(nestedValueTargetView, true);
+
+ // Initialize connector creation possibility
+ for(View view : isConnectorDestroyed.keySet()) {
+ isCreationAllowed.put(view, true);
+ }
+ }
+
+}
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromValue.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromValue.java new file mode 100644 index 00000000000..74853a2d770 --- /dev/null +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/set/encapsulation/TestSetEncapsulationDeleteConnectorFromValue.java @@ -0,0 +1,66 @@ +/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.sysml.diagram.internalblock.tests.set.encapsulation;
+
+import java.util.HashMap;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.junit.BeforeClass;
+
+/**
+ * JUnit tests for Connector link removal during Block#setIsEncapsulated() test (via palette tools).
+ */
+public class TestSetEncapsulationDeleteConnectorFromValue extends AbstractSetEncapsulationDeleteConnectorTest {
+
+ @BeforeClass
+ public static void initSource() throws Exception {
+ sourceView = valueSourceView;
+ }
+
+ @BeforeClass
+ public static void initExpectedResults() throws Exception {
+
+ // Initialize source creation results
+ isConnectorDestroyed = new HashMap<View, Boolean>();
+
+ isConnectorDestroyed.put(actorPartTargetView, false);
+ isConnectorDestroyed.put(nestedActorPartTargetView, true);
+
+ isConnectorDestroyed.put(portOnBlockTargetView, false);
+ isConnectorDestroyed.put(portOnPartTargetView, false);
+ isConnectorDestroyed.put(portOnNestedPartTargetView, true);
+
+ isConnectorDestroyed.put(flowportOnBlockTargetView, false);
+ isConnectorDestroyed.put(flowportOnPartTargetView, false);
+ isConnectorDestroyed.put(flowportOnNestedPartTargetView, true);
+
+ isConnectorDestroyed.put(partTargetView, false);
+ isConnectorDestroyed.put(nestedPartTargetView, true);
+
+ isConnectorDestroyed.put(propertyTargetView, false);
+ isConnectorDestroyed.put(nestedPropertyTargetView, true);
+
+ isConnectorDestroyed.put(referenceTargetView, false);
+ isConnectorDestroyed.put(nestedReferenceTargetView, true);
+
+ isConnectorDestroyed.put(valueTargetView, false);
+ isConnectorDestroyed.put(nestedValueTargetView, true);
+
+ // Initialize connector creation possibility
+ for(View view : isConnectorDestroyed.keySet()) {
+ isCreationAllowed.put(view, true);
+ }
+ }
+
+}
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/suites/AllCreationLinkTests.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/suites/AllCreationLinkTests.java index 2dd0ecec020..a4c46df69c6 100644 --- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/suites/AllCreationLinkTests.java +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/suites/AllCreationLinkTests.java @@ -20,12 +20,10 @@ import org.junit.runners.Suite.SuiteClasses; @RunWith(Suite.class)
@SuiteClasses({
- AllCreationInheritedLinkTests.class,
-
AllCreationConnectorTests.class,
AllCreationConnectorWithEncapsulatedPartTests.class,
-
- AllCreationDependencyTests.class
+ AllCreationDependencyTests.class,
+ AllCreationInheritedLinkTests.class,
})
public class AllCreationLinkTests {
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/suites/AllSetEncapsulationTests.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/suites/AllSetEncapsulationTests.java new file mode 100644 index 00000000000..f11b4020467 --- /dev/null +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/suites/AllSetEncapsulationTests.java @@ -0,0 +1,63 @@ +/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.sysml.diagram.internalblock.tests.suites;
+
+import org.eclipse.papyrus.sysml.diagram.internalblock.tests.set.encapsulation.TestSetEncapsulationDeleteConnectorFromActorPart;
+import org.eclipse.papyrus.sysml.diagram.internalblock.tests.set.encapsulation.TestSetEncapsulationDeleteConnectorFromFlowPortOnBlock;
+import org.eclipse.papyrus.sysml.diagram.internalblock.tests.set.encapsulation.TestSetEncapsulationDeleteConnectorFromFlowPortOnNestedPart;
+import org.eclipse.papyrus.sysml.diagram.internalblock.tests.set.encapsulation.TestSetEncapsulationDeleteConnectorFromFlowPortOnPart;
+import org.eclipse.papyrus.sysml.diagram.internalblock.tests.set.encapsulation.TestSetEncapsulationDeleteConnectorFromNestedActorPart;
+import org.eclipse.papyrus.sysml.diagram.internalblock.tests.set.encapsulation.TestSetEncapsulationDeleteConnectorFromNestedPart;
+import org.eclipse.papyrus.sysml.diagram.internalblock.tests.set.encapsulation.TestSetEncapsulationDeleteConnectorFromNestedProperty;
+import org.eclipse.papyrus.sysml.diagram.internalblock.tests.set.encapsulation.TestSetEncapsulationDeleteConnectorFromNestedReference;
+import org.eclipse.papyrus.sysml.diagram.internalblock.tests.set.encapsulation.TestSetEncapsulationDeleteConnectorFromNestedValue;
+import org.eclipse.papyrus.sysml.diagram.internalblock.tests.set.encapsulation.TestSetEncapsulationDeleteConnectorFromPart;
+import org.eclipse.papyrus.sysml.diagram.internalblock.tests.set.encapsulation.TestSetEncapsulationDeleteConnectorFromPortOnBlock;
+import org.eclipse.papyrus.sysml.diagram.internalblock.tests.set.encapsulation.TestSetEncapsulationDeleteConnectorFromPortOnNestedPart;
+import org.eclipse.papyrus.sysml.diagram.internalblock.tests.set.encapsulation.TestSetEncapsulationDeleteConnectorFromPortOnPart;
+import org.eclipse.papyrus.sysml.diagram.internalblock.tests.set.encapsulation.TestSetEncapsulationDeleteConnectorFromProperty;
+import org.eclipse.papyrus.sysml.diagram.internalblock.tests.set.encapsulation.TestSetEncapsulationDeleteConnectorFromReference;
+import org.eclipse.papyrus.sysml.diagram.internalblock.tests.set.encapsulation.TestSetEncapsulationDeleteConnectorFromValue;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+@RunWith(Suite.class)
+@SuiteClasses({
+
+ // Lot of duplicate tests, more subtle situation should be tested.
+ // These test should most probably be done in SysML service type tests, but
+ // the connector creation still require to use the end views.
+
+ TestSetEncapsulationDeleteConnectorFromActorPart.class,
+ TestSetEncapsulationDeleteConnectorFromFlowPortOnBlock.class,
+ TestSetEncapsulationDeleteConnectorFromFlowPortOnNestedPart.class,
+ TestSetEncapsulationDeleteConnectorFromFlowPortOnPart.class,
+ TestSetEncapsulationDeleteConnectorFromNestedActorPart.class,
+ TestSetEncapsulationDeleteConnectorFromNestedPart.class,
+ TestSetEncapsulationDeleteConnectorFromNestedProperty.class,
+ TestSetEncapsulationDeleteConnectorFromNestedReference.class,
+ TestSetEncapsulationDeleteConnectorFromNestedValue.class,
+ TestSetEncapsulationDeleteConnectorFromPart.class,
+ TestSetEncapsulationDeleteConnectorFromPortOnBlock.class,
+ TestSetEncapsulationDeleteConnectorFromPortOnNestedPart.class,
+ TestSetEncapsulationDeleteConnectorFromPortOnPart.class,
+ TestSetEncapsulationDeleteConnectorFromProperty.class,
+ TestSetEncapsulationDeleteConnectorFromReference.class,
+ TestSetEncapsulationDeleteConnectorFromValue.class,
+
+})
+public class AllSetEncapsulationTests {
+
+}
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/suites/AllTests.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/suites/AllTests.java index dba0339ca43..ba4679c7af3 100644 --- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/suites/AllTests.java +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/suites/AllTests.java @@ -23,10 +23,12 @@ import org.junit.runners.Suite.SuiteClasses; AllCreationLinkTests.class,
AllCreationCustomNodeTests.class,
AllCreationInheritedNodeTests.class,
+ AllDropLinkTests.class,
AllDropNodeTests.class,
AllDropInheritedTests.class,
AllAlternateDropTests.class,
- AllDropLinkTests.class
+ AllReorientLinkTests.class,
+ AllSetEncapsulationTests.class
})
public class AllTests {
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/utils/TestPrepareUtils.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/utils/TestPrepareUtils.java index 31a9b7c2434..271a3f784ba 100644 --- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/utils/TestPrepareUtils.java +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/utils/TestPrepareUtils.java @@ -150,6 +150,13 @@ public class TestPrepareUtils { }
createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));
+ } else if (elementType == UMLElementTypes.PROPERTY) {
+
+ // If container is a Property, substitute container by the Property type
+ if (container instanceof Property) {
+ container = ((Property) container).getType();
+ createElementRequest.setContainer(container);
+ }
}
ICommand createElementCommand = ElementEditServiceUtils.getCommandProvider(container).getEditCommand(createElementRequest);
@@ -158,12 +165,12 @@ public class TestPrepareUtils { return GMFCommandUtils.getCommandEObjectResult(createElementCommand);
}
- public static void setBlockEncapsulated(final Element block) throws Exception {
+ public static void setBlockIsEncapsulated(final Element block, final boolean isEncapsulated) throws Exception {
AbstractTransactionalCommand setCommand = new AbstractTransactionalCommand(getTransactionalEditingDomain(), "Set Block isEncapsulated", null) {
@Override
protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
Block blockApp = UMLUtil.getStereotypeApplication(block, Block.class);
- blockApp.setIsEncapsulated(true);
+ blockApp.setIsEncapsulated(isEncapsulated);
return CommandResult.newOKCommandResult(block);
}
};
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/utils/TestUtils.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/utils/TestUtils.java index 6dd2f2ef999..3855d7e89b9 100644 --- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/utils/TestUtils.java +++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/utils/TestUtils.java @@ -24,6 +24,7 @@ import static org.junit.Assert.fail; import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.Iterator;
import java.util.List;
import junit.framework.Assert;
@@ -54,7 +55,9 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest; 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.emf.type.core.requests.IEditCommandRequest;
import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
import org.eclipse.gmf.runtime.notation.Connector;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.commands.ActionHandler;
@@ -62,6 +65,10 @@ import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.papyrus.gmf.diagram.common.commands.SelectAndExecuteCommand;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.sysml.blocks.Block;
+import org.eclipse.papyrus.sysml.blocks.BlocksPackage;
import org.eclipse.papyrus.sysml.blocks.NestedConnectorEnd;
import org.eclipse.papyrus.sysml.diagram.internalblock.Activator;
import org.eclipse.papyrus.uml.diagram.common.service.AspectUnspecifiedTypeConnectionTool;
@@ -71,9 +78,8 @@ import org.eclipse.ui.IWorkbenchCommandConstants; import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.commands.ICommandService;
import org.eclipse.ui.handlers.IHandlerService;
-import org.eclipse.uml2.uml.Comment;
import org.eclipse.uml2.uml.ConnectorEnd;
-import org.eclipse.uml2.uml.Constraint;
+import org.eclipse.uml2.uml.Element;
import org.eclipse.uml2.uml.Property;
import org.eclipse.uml2.uml.util.UMLUtil;
@@ -405,21 +411,20 @@ public class TestUtils { defaultExecutionTest(tgtCommand);
// Retrieve created object via nested ElementAndViewCreationRequest.
- CreateConnectionViewAndElementRequest subRequest = (CreateConnectionViewAndElementRequest)createRequest.getAllRequests().get(0);
-
- // Specific case for comment - constraint link button
- if("internalblock.tool.comment_constraint_link".equals(toolId)) {
- if(sourceView.getElement() instanceof Comment) {
- subRequest = (CreateConnectionViewAndElementRequest)createRequest.getAllRequests().get(0);
- } else if(sourceView.getElement() instanceof Constraint) {
- subRequest = (CreateConnectionViewAndElementRequest)createRequest.getAllRequests().get(1);
- } else {
- return null;
- }
+ View newView = null;
+ Iterator<?> it = createRequest.getAllRequests().iterator();
+ while(it.hasNext() && newView == null) {
+ CreateConnectionViewAndElementRequest subRequest = (CreateConnectionViewAndElementRequest) it.next();
+ newView = (View)subRequest.getConnectionViewDescriptor().getAdapter(View.class);
}
-
- View newView = (View)subRequest.getConnectionViewDescriptor().getAdapter(View.class);
- return newView.getElement();
+
+
+ if (newView != null) {
+ return newView.getElement();
+ } else {
+ fail("No edge seem to have been created.");
+ }
+
}
// Test the results then
@@ -557,6 +562,39 @@ public class TestUtils { }
}
+ public static void setEncapsulationDeleteConnectorTest(Element block, View sourceView, View targetView, boolean canCreateConnector, boolean isConnectorDestroyExpected) throws Exception {
+
+ if (! canCreateConnector) {
+ return; // abort
+ }
+
+ // Make sure the block is not encapsulated before Connector creation.
+ TestPrepareUtils.setBlockIsEncapsulated(block, false);
+
+ // Create connector
+ org.eclipse.uml2.uml.Connector connector = (org.eclipse.uml2.uml.Connector) createEdgeFromPalette("internalblock.tool.connector", sourceView, targetView, true, true);
+
+ // Prepare set encapsulated command and execute (with undo, re-do).
+ Block blockApp = UMLUtil.getStereotypeApplication(block, Block.class);
+ IElementEditService provider = ElementEditServiceUtils.getCommandProvider(blockApp);
+ if (provider == null) { fail("Could not get IElementEditService for Block stereotype application."); }
+
+ IEditCommandRequest setEncapsulationRequest = new SetRequest(getTransactionalEditingDomain(), blockApp, BlocksPackage.eINSTANCE.getBlock_IsEncapsulated(), true);
+ ICommand setEncapsulationCommand = provider.getEditCommand(setEncapsulationRequest);
+ defaultExecutionTest(new ICommandProxy(setEncapsulationCommand));
+
+ // Test if the Connector have been destroyed
+ if (isConnectorDestroyExpected) {
+ if (connector.eResource() != null) { // connector destroyed has no container
+ fail("Connector was expected to be destroyed.");
+ }
+ } else {
+ if (connector.eResource() == null) { // connector destroyed has no container
+ fail("Connector was not expected to be destroyed.");
+ }
+ }
+ }
+
/**
* Copy the list of objects into the Clipboard
*
|