Bug 502408 - [SysML 1.4][Parametric] Cannot drop parameter in atttribute
- use correct element type ids (sysmldi)
- add a junit test to avoid regression
Change-Id: Ibae5aa98b7d1bf31ec3804eb4333732785cc7e9d
Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.common.tests/META-INF/MANIFEST.MF b/diagram/org.eclipse.papyrus.sysml14.diagram.common.tests/META-INF/MANIFEST.MF
index 6b6b306..248693a 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.common.tests/META-INF/MANIFEST.MF
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.common.tests/META-INF/MANIFEST.MF
@@ -19,3 +19,5 @@
org.eclipse.papyrus.uml.diagram.statemachine;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.uml.diagram.timing;bundle-version="[1.2.0,2.0.0)",
org.eclipse.papyrus.uml.diagram.usecase;bundle-version="[2.0.0,3.0.0)"
+Export-Package: org.eclipse.papyrus.sysml14.diagram.common.tests.resources,
+ org.eclipse.papyrus.sysml14.diagram.common.tests.util
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.common.tests/src/org/eclipse/papyrus/sysml14/diagram/common/tests/util/GraphicalSysMLServiceTypeUtilTest.java b/diagram/org.eclipse.papyrus.sysml14.diagram.common.tests/src/org/eclipse/papyrus/sysml14/diagram/common/tests/util/GraphicalSysMLServiceTypeUtilTest.java
new file mode 100644
index 0000000..e69efa5
--- /dev/null
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.common.tests/src/org/eclipse/papyrus/sysml14/diagram/common/tests/util/GraphicalSysMLServiceTypeUtilTest.java
@@ -0,0 +1,52 @@
+/*****************************************************************************
+ * Copyright (c) 2016 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:
+ * Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.sysml14.diagram.common.tests.util;
+
+import java.util.Map;
+
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration;
+import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;
+import org.eclipse.papyrus.sysml14.diagram.common.util.GraphicalSysMLServiceTypeUtil;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * Check constant of GraphicalSysMLServiceTypeUtil
+ *
+ */
+public class GraphicalSysMLServiceTypeUtilTest {
+
+ @BeforeClass
+ public static void loadSysMLDefinition() {
+ ElementTypeSetConfigurationRegistry instance = ElementTypeSetConfigurationRegistry.getInstance();
+ Map<String, Map<String, ElementTypeSetConfiguration>> elementTypeSetConfigurations = instance.getElementTypeSetConfigurations();
+ Map<String, ElementTypeSetConfiguration> map = elementTypeSetConfigurations.get("org.eclipse.papyrus.infra.services.edit.TypeContext");
+ ElementTypeSetConfiguration elementTypeSetConfiguration = map.get("org.eclipse.papyrus.sysmldi.elementTypes");
+ Assert.assertNotNull("The SysML element type set definition is missing", elementTypeSetConfiguration);
+ }
+
+ @Test
+ public void checkConstraintLabelElementTypeId() {
+ Assert.assertTrue("ORG_ECLIPSE_PAPYRUS_SYSML14_CONSTRAINT_LABEL should have a valid element id : " , ElementEditServiceUtils.getEditServiceProvider().isKnownElementType(GraphicalSysMLServiceTypeUtil.ORG_ECLIPSE_PAPYRUS_SYSML14_CONSTRAINT_LABEL));
+ }
+
+ @Test
+ public void checkParameterBorderItemLabelElementTypeId() {
+ Assert.assertTrue("ORG_ECLIPSE_PAPYRUS_SYSML14_PARAMETER_BORDER_ITEM should have a valid element id : " , ElementEditServiceUtils.getEditServiceProvider().isKnownElementType(GraphicalSysMLServiceTypeUtil.ORG_ECLIPSE_PAPYRUS_SYSML14_PARAMETER_BORDER_ITEM));
+ }
+
+}
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.common/src/org/eclipse/papyrus/sysml14/diagram/common/util/GraphicalSysMLServiceTypeUtil.java b/diagram/org.eclipse.papyrus.sysml14.diagram.common/src/org/eclipse/papyrus/sysml14/diagram/common/util/GraphicalSysMLServiceTypeUtil.java
index 2a39955..85bc664 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.common/src/org/eclipse/papyrus/sysml14/diagram/common/util/GraphicalSysMLServiceTypeUtil.java
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.common/src/org/eclipse/papyrus/sysml14/diagram/common/util/GraphicalSysMLServiceTypeUtil.java
@@ -22,8 +22,8 @@
private GraphicalSysMLServiceTypeUtil() {
}
- public static final String ORG_ECLIPSE_PAPYRUS_SYSML14_PARAMETER_BORDER_ITEM = "org.eclipse.papyrus.SysML14.Parameter_BorderItem"; //$NON-NLS-1$
+ public static final String ORG_ECLIPSE_PAPYRUS_SYSML14_PARAMETER_BORDER_ITEM = "org.eclipse.papyrus.sysmldi.Parameter_BorderItem"; //$NON-NLS-1$
- public static final String ORG_ECLIPSE_PAPYRUS_SYSML14_CONSTRAINT_LABEL = "org.eclipse.papyrus.SysML14.Constraint_Label";//$NON-NLS-1$
+ public static final String ORG_ECLIPSE_PAPYRUS_SYSML14_CONSTRAINT_LABEL = "org.eclipse.papyrus.sysmldi.Constraint_Label";//$NON-NLS-1$
}
