Merge pull request #712 from Systems-Modeling/ST6RI-896

ST6RI-896 getDirectedUsage broken on an ActionDefinition or Constraint Definition

Author: seidewitz

org.omg.sysml.interactive.tests/src/org/omg/sysml/interactive/tests/DerivedPropertyAndOperationTest.java

@@ -37,6 +37,7 @@
 import org.omg.sysml.lang.sysml.Definition;
 import org.omg.sysml.lang.sysml.Element;
 import org.omg.sysml.lang.sysml.Expression;
+import org.omg.sysml.lang.sysml.Feature;
 import org.omg.sysml.lang.sysml.ItemUsage;
 import org.omg.sysml.lang.sysml.Namespace;
 import org.omg.sysml.lang.sysml.Relationship;
@@ -172,4 +173,52 @@ public void testPathOperation() throws Exception {
 		assertEquals("TopLevel/3/1/1/1", TopLevel_3_1_1.getOwnedRelatedElement().get(0).path());
 	}
 
+	public final String directedUsageTest =
+			  "package Test {\n"
+			+ "    item def I {\n"
+			+ "        in x;\n"
+			+ "        in y;\n"
+			+ "    }"
+			+ "    action def A {\n"
+			+ "        in x;\n"
+			+ "        in y;\n"
+			+ "    }"
+			+ "    constraint def C {\n"
+			+ "        in x;\n"
+			+ "        in y;\n"
+			+ "    }"
+			+ "}";
+	
+	@Test
+	public void testDirectedUsage() throws Exception {
+		SysMLInteractive instance = getSysMLInteractiveInstance();
+		SysMLInteractiveResult result = instance.process(directedUsageTest);
+		Element root = result.getRootElement();
+		List<Element> elements = ((Namespace)root).getOwnedMember();
+		List<Element> ownedMembers = ((Namespace)elements.get(0)).getOwnedMember();
+		List<Feature> directedFeatures = ((Definition)ownedMembers.get(0)).getDirectedFeature();
+		List<Usage> directedUsages = ((Definition)ownedMembers.get(0)).getDirectedUsage();
+		assertEquals("item def (directedFeatures.size)", 2, directedFeatures.size());
+		assertEquals("item def (directedUsages.size)", 2, directedUsages.size());
+		assertEquals("item def (directedUsages)", directedFeatures, directedUsages);
+		
+		// Check that getting directedFeatures and directedUsages work for ActionDefinitions and
+		// ConstraintDefinitions, even though they are kinds of Behaviors, and Behavior redefines
+		// directedFeature as parameter.
+		
+		directedFeatures = ((Definition)ownedMembers.get(1)).getDirectedFeature();
+		directedUsages = ((Definition)ownedMembers.get(1)).getDirectedUsage();
+		assertEquals("action def (directedFeatures.size)", 2, directedFeatures.size());
+		assertEquals("action def (directedUsages.size)", 2, directedUsages.size());
+		assertEquals("action def (directedUsages)", directedFeatures, directedUsages);
+		
+		// The ConstraintDefinition "C" has three directedFeatures, including its return parameter,
+		// but only the first two are Usages.
+		directedFeatures = ((Definition)ownedMembers.get(2)).getDirectedFeature();
+		directedUsages = ((Definition)ownedMembers.get(2)).getDirectedUsage();
+		assertEquals("constraint def (directedFeatures.size)", 3, directedFeatures.size());
+		assertEquals("constraint def (directedUsages.size)", 2, directedUsages.size());
+		assertEquals("constraint def (directedUsages)", directedFeatures.subList(0, 2), directedUsages);
+	}
+	
 }

org.omg.sysml/src/org/omg/sysml/delegate/setting/Definition_directedUsage_SettingDelegate.java

@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * SysML 2 Pilot Implementation
+ * Copyright (c) 2025 Model Driven Solutions, Inc.
+ *    
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *  
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *  
+ * @license LGPL-3.0-or-later <http://spdx.org/licenses/LGPL-3.0-or-later>
+ *  
+ *******************************************************************************/
+
+package org.omg.sysml.delegate.setting;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.uml2.common.util.DerivedEObjectEList;
+import org.omg.sysml.lang.sysml.ActionDefinition;
+import org.omg.sysml.lang.sysml.ConstraintDefinition;
+import org.omg.sysml.lang.sysml.SysMLPackage;
+import org.omg.sysml.lang.sysml.Usage;
+
+public class Definition_directedUsage_SettingDelegate extends DefaultDerivedPropertySettingDelegate {
+
+	public Definition_directedUsage_SettingDelegate(EStructuralFeature eStructuralFeature) {
+		super(eStructuralFeature);		
+	}
+
+	@Override
+	protected EList<?> basicGet(InternalEObject owner) {
+		return owner instanceof ActionDefinition?
+				new DerivedEObjectEList<>(Usage.class, owner, eStructuralFeature.getFeatureID(), new int[] {SysMLPackage.ACTION_DEFINITION__PARAMETER}):
+			   owner instanceof ConstraintDefinition?
+				new DerivedEObjectEList<>(Usage.class, owner, eStructuralFeature.getFeatureID(), new int[] {SysMLPackage.CONSTRAINT_DEFINITION__PARAMETER}):
+				super.basicGet(owner);
+	}
+}