Skip to content

Commit bf8a4e9

Browse files
committed
ST6RI-897 Updated relations tests to not use EndFeature/ParamMembership.
1 parent 976621c commit bf8a4e9

2 files changed

Lines changed: 7 additions & 16 deletions

File tree

org.omg.sysml.interactive.tests/src/org/omg/sysml/semantics/tests/SysMLBinaryRelationTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* SysML 2 Pilot Implementation
3-
* Copyright (C) 2024,2025 Model Driven Solutions, Inc.
3+
* Copyright (C) 2024-2026 Model Driven Solutions, Inc.
44
*
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU Lesser General Public License as published by
@@ -132,7 +132,8 @@ public void checkSuccessionFlowUsageSpecialization() {
132132

133133
public static void addEndTo(Type type) {
134134
var end = SysMLFactory.eINSTANCE.createFeature();
135-
var endMembership = SysMLFactory.eINSTANCE.createEndFeatureMembership();
135+
end.setIsEnd(true);
136+
var endMembership = SysMLFactory.eINSTANCE.createFeatureMembership();
136137
endMembership.setOwnedMemberFeature(end);
137138
type.getOwnedRelationship().add(endMembership);
138139
}

org.omg.sysml.interactive.tests/src/org/omg/sysml/semantics/tests/SysMLImpliedRelationsTest.java

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* SysML 2 Pilot Implementation
3-
* Copyright (C) 2024, 2025 Model Driven Solutions, Inc.
3+
* Copyright (C) 2024-2026 Model Driven Solutions, Inc.
44
*
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU Lesser General Public License as published by
@@ -27,7 +27,6 @@
2727
import org.junit.Ignore;
2828
import org.junit.Test;
2929
import org.omg.sysml.lang.sysml.FeatureDirectionKind;
30-
import org.omg.sysml.lang.sysml.ParameterMembership;
3130
import org.omg.sysml.lang.sysml.StateSubactionKind;
3231
import org.omg.sysml.lang.sysml.SysMLFactory;
3332
import org.omg.sysml.util.ElementUtil;
@@ -104,10 +103,7 @@ public void checkAssignmentActionUsageAccessedFeatureRedefinition() {
104103

105104
var targetParam = SysMLFactory.eINSTANCE.createFeature();
106105
targetParam.setDirection(FeatureDirectionKind.IN);
107-
108-
ParameterMembership parameterMembership = SysMLFactory.eINSTANCE.createParameterMembership();
109-
assignment.getOwnedRelationship().add(parameterMembership);
110-
parameterMembership.setOwnedMemberParameter(targetParam);
106+
TypeUtil.addOwnedFeatureTo(assignment, targetParam);
111107

112108
var firstOfTarget = SysMLFactory.eINSTANCE.createFeature();
113109
TypeUtil.addOwnedFeatureTo(targetParam, firstOfTarget);
@@ -136,10 +132,7 @@ public void checkAssignmentActionUsageReferentRedefinition() {
136132

137133
var targetParam = SysMLFactory.eINSTANCE.createFeature();
138134
targetParam.setDirection(FeatureDirectionKind.IN);
139-
140-
ParameterMembership parameterMembership = SysMLFactory.eINSTANCE.createParameterMembership();
141-
assignment.getOwnedRelationship().add(parameterMembership);
142-
parameterMembership.setOwnedMemberParameter(targetParam);
135+
TypeUtil.addOwnedFeatureTo(assignment, targetParam);
143136

144137
var firstOfTarget = SysMLFactory.eINSTANCE.createFeature();
145138
TypeUtil.addOwnedFeatureTo(targetParam, firstOfTarget);
@@ -163,10 +156,7 @@ public void checkAssignmentActionUsageStartingAtRedefinition() {
163156

164157
var targetParam = SysMLFactory.eINSTANCE.createFeature();
165158
targetParam.setDirection(FeatureDirectionKind.IN);
166-
167-
ParameterMembership parameterMembership = SysMLFactory.eINSTANCE.createParameterMembership();
168-
assignment.getOwnedRelationship().add(parameterMembership);
169-
parameterMembership.setOwnedMemberParameter(targetParam);
159+
TypeUtil.addOwnedFeatureTo(assignment, targetParam);
170160

171161
var firstOfTarget = SysMLFactory.eINSTANCE.createFeature();
172162
TypeUtil.addOwnedFeatureTo(targetParam, firstOfTarget);

0 commit comments

Comments
 (0)