Skip to content

ST6RI-895 Item usages should be able to be typed by occurrence definitions #715

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
seidewitz merged 2 commits into from
Nov 27, 2025
Merged

ST6RI-895 Item usages should be able to be typed by occurrence definitions #715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eff06d7
ST6RI-895 Removed definition validation checks for item and part usages.
seidewitz Nov 16, 2025
870e130
ST6RI-895 Updated SysML Xpect tests for new occurrence validation msg.
seidewitz Nov 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions ...l.xpect.tests/src/org/omg/sysml/xpect/tests/validation/invalid/ItemUsage_invalid.sysml.xt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,28 +37,28 @@ END_SETUP
package pkg {
public import ScalarValues::*;
item def A {
// XPECT errors --> "An item must be typed by item definitions." at "item i1: Real;"
// XPECT errors --> "An occurrence, item or part must be typed by occurrence definitions." at "item i1: Real;"
// XPECT warnings --> "Duplicate of inherited member name 'self' from DataValue, Item" at "item i1: Real;"
item i1: Real;
// XPECT errors --> "An item must be typed by item definitions." at "item i2: att;"
// XPECT errors --> "An occurrence, item or part must be typed by occurrence definitions." at "item i2: att;"
// XPECT warnings --> "Duplicate of inherited member name 'self' from DataValue, Item" at "item i2: att;"
item i2: att;
// XPECT errors --> "An item must be typed by item definitions." at "item i3: act;"
// XPECT errors --> "An occurrence, item or part must be typed by occurrence definitions." at "item i3: act;"
//* XPECT warnings ---
"Duplicate of inherited member name 'self' from Action, Item" at "item i3: act;"
"Duplicate of inherited member name 'start' from Action, Item" at "item i3: act;"
"Duplicate of inherited member name 'done' from Action, Item" at "item i3: act;"
--- */
item i3: act;
// XPECT errors --> "An item must be typed by item definitions." at "item i4: AttDef;"
// XPECT errors --> "An occurrence, item or part must be typed by occurrence definitions." at "item i4: AttDef;"
// XPECT warnings --> "Duplicate of inherited member name 'self' from DataValue, Item" at "item i4: AttDef;"
item i4: AttDef;
// XPECT errors ---> "An item must be typed by item definitions." at "item i5: PartDef::aPort;"
// XPECT errors ---> "An occurrence, item or part must be typed by occurrence definitions." at "item i5: PartDef::aPort;"
// XPECT warnings --> "Duplicate of inherited member name 'self' from Item, Port" at "item i5: PartDef::aPort;"
item i5: PartDef::aPort;
// XPECT errors ---> "An item must be typed by item definitions." at "item i6: PartDef::aPart;"
// XPECT errors ---> "An occurrence, item or part must be typed by occurrence definitions." at "item i6: PartDef::aPart;"
item i6: PartDef::aPart;
// XPECT errors --> "An item must be typed by item definitions." at "item i7: PartDef, AttDef;"
// XPECT errors --> "An occurrence, item or part must be typed by occurrence definitions." at "item i7: PartDef, AttDef;"
// XPECT warnings --> "Duplicate of inherited member name 'self' from DataValue, Part" at "item i7: PartDef, AttDef;"
item i7: PartDef, AttDef;
}
Expand Down
8 changes: 4 additions & 4 deletions ...t.tests/src/org/omg/sysml/xpect/tests/validation/invalid/OccurrenceUsage_invalid.sysml.xt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ END_SETUP
package pkg {
public import ScalarValues::*;
occurrence def A {
// XPECT errors --> "An occurrence must be typed by occurrence definitions." at "occurrence areal: Real;"
// XPECT errors --> "An occurrence, item or part must be typed by occurrence definitions." at "occurrence areal: Real;"
// XPECT warnings --> "Duplicate of inherited member name 'self' from DataValue, Occurrence" at "occurrence areal: Real;"
occurrence areal: Real;
// XPECT errors --> "An occurrence must be typed by occurrence definitions." at "occurrence avalue :> aValue;"
// XPECT errors --> "An occurrence, item or part must be typed by occurrence definitions." at "occurrence avalue :> aValue;"
// XPECT warnings --> "Duplicate of inherited member name 'self' from DataValue, Occurrence" at "occurrence avalue :> aValue;"
occurrence avalue:> aValue;
// XPECT errors --> "An occurrence must be typed by occurrence definitions." at "occurrence twoTypes: PartDef, Real;"
// XPECT errors --> "An occurrence, item or part must be typed by occurrence definitions." at "occurrence twoTypes: PartDef, Real;"
// XPECT warnings --> "Duplicate of inherited member name 'self' from DataValue, Part" at "occurrence twoTypes: PartDef, Real;"
occurrence twoTypes: PartDef, Real;
}
Expand All @@ -55,7 +55,7 @@ package pkg {
// XPECT errors --> "Must reference an occurrence." at "a"
event a;

// XPECT errors --> "An occurrence must be typed by occurrence definitions." at "event a.areal;"
// XPECT errors --> "An occurrence, item or part must be typed by occurrence definitions." at "event a.areal;"
//* XPECT warnings ---
"Duplicate of inherited member name 'self' from DataValue, Occurrence" at "event a.areal;"
"Duplicate of inherited member name 'self' from DataValue, Occurrence" at "a.areal"
Expand Down
14 changes: 7 additions & 7 deletions ...l.xpect.tests/src/org/omg/sysml/xpect/tests/validation/invalid/PartUsage_invalid.sysml.xt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,28 +37,28 @@ END_SETUP
package pkg {
public import ScalarValues::*;
part def A {
// XPECT errors --> "A part must be typed by item definitions." at "part p1: Real;"
// XPECT errors --> "An occurrence, item or part must be typed by occurrence definitions." at "part p1: Real;"
// XPECT warnings --> "Duplicate of inherited member name 'self' from DataValue, Part" at "part p1: Real;"
part p1: Real;
// XPECT errors --> "A part must be typed by item definitions." at "part p2: att;"
// XPECT errors --> "An occurrence, item or part must be typed by occurrence definitions." at "part p2: att;"
// XPECT warnings --> "Duplicate of inherited member name 'self' from DataValue, Part" at "part p2: att;"
part p2: att;
// XPECT errors --> "A part must be typed by item definitions." at "part p3: act;"
// XPECT errors --> "An occurrence, item or part must be typed by occurrence definitions." at "part p3: act;"
//* XPECT warnings ---
"Duplicate of inherited member name 'self' from Action, Part" at "part p3: act;"
"Duplicate of inherited member name 'start' from Action, Part" at "part p3: act;"
"Duplicate of inherited member name 'done' from Action, Part" at "part p3: act;"
--- */
part p3: act;
// XPECT errors --> "A part must be typed by item definitions." at "part p4: AttDef;"
// XPECT errors --> "An occurrence, item or part must be typed by occurrence definitions." at "part p4: AttDef;"
// XPECT warnings --> "Duplicate of inherited member name 'self' from DataValue, Part" at "part p4: AttDef;"
part p4: AttDef;
// XPECT errors --> "A part must be typed by item definitions." at "part p5: PartDef::aPort;"
// XPECT errors --> "An occurrence, item or part must be typed by occurrence definitions." at "part p5: PartDef::aPort;"
// XPECT warnings --> "Duplicate of inherited member name 'self' from Part, Port" at "part p5: PartDef::aPort;"
part p5: PartDef::aPort;
// XPECT errors ---> "A part must be typed by item definitions." at "part p6: PartDef::aPart;"
// XPECT errors ---> "An occurrence, item or part must be typed by occurrence definitions." at "part p6: PartDef::aPart;"
part p6: PartDef::aPart;
// XPECT errors --> "A part must be typed by item definitions." at "part p7: PartDef, AttDef;"
// XPECT errors --> "An occurrence, item or part must be typed by occurrence definitions." at "part p7: PartDef, AttDef;"
// XPECT warnings --> "Duplicate of inherited member name 'self' from DataValue, Part" at "part p7: PartDef, AttDef;"
part p7: PartDef, AttDef;
}
Expand Down
4 changes: 2 additions & 2 deletions ...t.tests/src/org/omg/sysml/xpect/tests/validation/invalid/UsageDefinition_invalid.sysml.xt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ package UsageDefinition_invalid {
ref i1 : i, I;
// XPECT errors ---> "A usage must be typed by definitions." at "ref i2 : i;"
ref i2 : i;
// XPECT errors ---> "An item must be typed by item definitions." at "item i3 : i;"
// XPECT errors ---> "An occurrence, item or part must be typed by occurrence definitions." at "item i3 : i;"
item i3 : i;

part def P;
Expand All @@ -51,7 +51,7 @@ package UsageDefinition_invalid {
ref p1 : p, P;
// XPECT errors ---> "A usage must be typed by definitions." at "ref p2 : p;"
ref p2 : p;
// XPECT errors ---> "A part must be typed by item definitions." at "part p3 : p;"
// XPECT errors ---> "An occurrence, item or part must be typed by occurrence definitions." at "part p3 : p;"
part p3 : p;

action def Ac;
Expand Down
133 changes: 61 additions & 72 deletions org.omg.sysml.xtext/src/org/omg/sysml/xtext/validation/SysMLValidator.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,111 +30,107 @@ import org.eclipse.emf.ecore.EReference
import org.eclipse.emf.ecore.EStructuralFeature
import org.eclipse.xtext.validation.Check
import org.omg.kerml.xtext.validation.KerMLValidator
import org.omg.sysml.lang.sysml.AcceptActionUsage
import org.omg.sysml.lang.sysml.ActionDefinition
import org.omg.sysml.lang.sysml.ActionUsage
import org.omg.sysml.lang.sysml.ActorMembership
import org.omg.sysml.lang.sysml.AllocationDefinition
import org.omg.sysml.lang.sysml.AllocationUsage
import org.omg.sysml.lang.sysml.AnalysisCaseDefinition
import org.omg.sysml.lang.sysml.AnalysisCaseUsage
import org.omg.sysml.lang.sysml.AssertConstraintUsage
import org.omg.sysml.lang.sysml.AssignmentActionUsage
import org.omg.sysml.lang.sysml.Association
import org.omg.sysml.lang.sysml.AttributeDefinition
import org.omg.sysml.lang.sysml.AttributeUsage
import org.omg.sysml.lang.sysml.Behavior
import org.omg.sysml.lang.sysml.CalculationUsage
import org.omg.sysml.lang.sysml.CaseDefinition
import org.omg.sysml.lang.sysml.CaseUsage
import org.omg.sysml.lang.sysml.Classifier
import org.omg.sysml.lang.sysml.ConjugatedPortDefinition
import org.omg.sysml.lang.sysml.ConnectionUsage
import org.omg.sysml.lang.sysml.ConstraintUsage
import org.omg.sysml.lang.sysml.ControlNode
import org.omg.sysml.lang.sysml.DataType
import org.omg.sysml.lang.sysml.DecisionNode
import org.omg.sysml.lang.sysml.Definition
import org.omg.sysml.lang.sysml.EnumerationDefinition
import org.omg.sysml.lang.sysml.EnumerationUsage
import org.omg.sysml.lang.sysml.EventOccurrenceUsage
import org.omg.sysml.lang.sysml.ExhibitStateUsage
import org.omg.sysml.lang.sysml.Expose
import org.omg.sysml.lang.sysml.Expression
import org.omg.sysml.lang.sysml.Feature
import org.omg.sysml.lang.sysml.FeatureChainExpression
import org.omg.sysml.lang.sysml.FeatureMembership
import org.omg.sysml.lang.sysml.FeatureReferenceExpression
import org.omg.sysml.lang.sysml.FlowDefinition
import org.omg.sysml.lang.sysml.FlowUsage
import org.omg.sysml.lang.sysml.ForLoopActionUsage
import org.omg.sysml.lang.sysml.ForkNode
import org.omg.sysml.lang.sysml.FramedConcernMembership
import org.omg.sysml.lang.sysml.Function
import org.omg.sysml.lang.sysml.IfActionUsage
import org.omg.sysml.lang.sysml.IncludeUseCaseUsage
import org.omg.sysml.lang.sysml.Interaction
import org.omg.sysml.lang.sysml.InterfaceDefinition
import org.omg.sysml.lang.sysml.InterfaceUsage
import org.omg.sysml.lang.sysml.ItemUsage
import org.omg.sysml.lang.sysml.JoinNode
import org.omg.sysml.lang.sysml.MergeNode
import org.omg.sysml.lang.sysml.Metaclass
import org.omg.sysml.lang.sysml.MetadataUsage
import org.omg.sysml.lang.sysml.Namespace
import org.omg.sysml.lang.sysml.ObjectiveMembership
import org.omg.sysml.lang.sysml.OccurrenceDefinition
import org.omg.sysml.lang.sysml.OccurrenceUsage
import org.omg.sysml.lang.sysml.OperatorExpression
import org.omg.sysml.lang.sysml.ParameterMembership
import org.omg.sysml.lang.sysml.PartDefinition
import org.omg.sysml.lang.sysml.PartUsage
import org.omg.sysml.lang.sysml.PerformActionUsage
import org.omg.sysml.lang.sysml.PortDefinition
import org.omg.sysml.lang.sysml.PortUsage
import org.omg.sysml.lang.sysml.Predicate
import org.omg.sysml.lang.sysml.ReferenceUsage
import org.omg.sysml.lang.sysml.Relationship
import org.omg.sysml.lang.sysml.RenderingDefinition
import org.omg.sysml.lang.sysml.RenderingUsage
import org.omg.sysml.lang.sysml.RequirementConstraintKind
import org.omg.sysml.lang.sysml.RequirementConstraintMembership
import org.omg.sysml.lang.sysml.RequirementDefinition
import org.omg.sysml.lang.sysml.RequirementUsage
import org.omg.sysml.lang.sysml.RequirementVerificationMembership
import org.omg.sysml.lang.sysml.SatisfyRequirementUsage
import org.omg.sysml.lang.sysml.SendActionUsage
import org.omg.sysml.lang.sysml.StakeholderMembership
import org.omg.sysml.lang.sysml.StateDefinition
import org.omg.sysml.lang.sysml.StateSubactionKind
import org.omg.sysml.lang.sysml.StateSubactionMembership
import org.omg.sysml.lang.sysml.StateUsage
import org.omg.sysml.lang.sysml.Step
import org.omg.sysml.lang.sysml.Structure
import org.omg.sysml.lang.sysml.SubjectMembership
import org.omg.sysml.lang.sysml.Succession
import org.omg.sysml.lang.sysml.SysMLPackage
import org.omg.sysml.lang.sysml.TransitionFeatureKind
import org.omg.sysml.lang.sysml.TransitionFeatureMembership
import org.omg.sysml.lang.sysml.TransitionUsage
import org.omg.sysml.lang.sysml.TriggerInvocationExpression
import org.omg.sysml.lang.sysml.TriggerKind
import org.omg.sysml.lang.sysml.Type
import org.omg.sysml.lang.sysml.Usage
import org.omg.sysml.lang.sysml.UseCaseDefinition
import org.omg.sysml.lang.sysml.UseCaseUsage
import org.omg.sysml.lang.sysml.VariantMembership
import org.omg.sysml.lang.sysml.VerificationCaseDefinition
import org.omg.sysml.lang.sysml.VerificationCaseUsage
import org.omg.sysml.lang.sysml.ViewDefinition
import org.omg.sysml.lang.sysml.ViewRenderingMembership
import org.omg.sysml.lang.sysml.ViewUsage
import org.omg.sysml.lang.sysml.ViewpointDefinition
import org.omg.sysml.lang.sysml.ViewpointUsage
import org.omg.sysml.lang.sysml.TransitionUsage
import org.omg.sysml.lang.sysml.Succession
import org.omg.sysml.lang.sysml.StateDefinition
import org.omg.sysml.lang.sysml.Type
import org.omg.sysml.lang.sysml.StateSubactionKind
import org.omg.sysml.lang.sysml.UseCaseUsage
import org.omg.sysml.lang.sysml.UseCaseDefinition
import org.omg.sysml.lang.sysml.MetadataUsage
import org.omg.sysml.lang.sysml.Metaclass
import org.omg.sysml.lang.sysml.Interaction
import org.omg.sysml.lang.sysml.SendActionUsage
import org.omg.sysml.lang.sysml.FeatureReferenceExpression
import org.omg.sysml.lang.sysml.FeatureChainExpression
import org.omg.sysml.lang.sysml.OperatorExpression
import org.omg.sysml.lang.sysml.util.SysMLLibraryUtil
import org.omg.sysml.lang.sysml.Expression
import org.omg.sysml.lang.sysml.EventOccurrenceUsage
import org.omg.sysml.lang.sysml.ConjugatedPortDefinition
import org.omg.sysml.lang.sysml.AssignmentActionUsage
import org.omg.sysml.lang.sysml.TriggerInvocationExpression
import org.omg.sysml.lang.sysml.ControlNode
import org.omg.sysml.lang.sysml.DecisionNode
import org.omg.sysml.lang.sysml.ForkNode
import org.omg.sysml.lang.sysml.JoinNode
import org.omg.sysml.lang.sysml.MergeNode
import org.omg.sysml.lang.sysml.PerformActionUsage
import org.omg.sysml.lang.sysml.ExhibitStateUsage
import org.omg.sysml.lang.sysml.StateSubactionMembership
import org.omg.sysml.lang.sysml.TransitionFeatureMembership
import org.omg.sysml.lang.sysml.AssertConstraintUsage
import org.omg.sysml.lang.sysml.FramedConcernMembership
import org.omg.sysml.lang.sysml.RequirementConstraintMembership
import org.omg.sysml.lang.sysml.SatisfyRequirementUsage
import org.omg.sysml.lang.sysml.StakeholderMembership
import org.omg.sysml.lang.sysml.AcceptActionUsage
import org.omg.sysml.lang.sysml.IncludeUseCaseUsage
import org.omg.sysml.lang.sysml.Expose
import org.omg.sysml.lang.sysml.ViewRenderingMembership
import org.omg.sysml.lang.sysml.AttributeDefinition
import org.omg.sysml.lang.sysml.Namespace
import org.omg.sysml.lang.sysml.ActionDefinition
import org.omg.sysml.lang.sysml.TransitionFeatureKind
import org.omg.sysml.lang.sysml.ActorMembership
import org.omg.sysml.lang.sysml.RequirementConstraintKind
import org.omg.sysml.lang.sysml.ForLoopActionUsage
import org.omg.sysml.lang.sysml.ReferenceUsage
import org.omg.sysml.lang.sysml.IfActionUsage
import org.omg.sysml.lang.sysml.WhileLoopActionUsage
import org.omg.sysml.lang.sysml.TriggerKind
import org.omg.sysml.lang.sysml.FlowDefinition
import org.omg.sysml.lang.sysml.FlowUsage
import org.omg.sysml.lang.sysml.Relationship
import org.omg.sysml.lang.sysml.util.SysMLLibraryUtil
import org.omg.sysml.util.FeatureUtil
import org.omg.sysml.util.UsageUtil
import org.omg.sysml.lang.sysml.Classifier

/**
* This class contains custom validation rules.
Expand Down Expand Up @@ -181,7 +177,7 @@ class SysMLValidator extends KerMLValidator {
public static val INVALID_EVENT_OCCURRENCE_USAGE_REFERENCE_MSG = "Must reference an occurrence."

public static val INVALID_OCCURRENCE_USAGE_TYPE = "validateOccurrenceUsageType_"
public static val INVALID_OCCURRENCE_USAGE_TYPE_MSG = "An occurrence must be typed by occurrence definitions."
public static val INVALID_OCCURRENCE_USAGE_TYPE_MSG = "An occurrence, item or part must be typed by occurrence definitions."
public static val INVALID_OCCURRENCE_USAGE_INDIVIDUAL_DEFINITION = "validateOccurrenceUsageIndividualDefinition"
public static val INVALID_OCCURRENCE_USAGE_INDIVIDUAL_DEFINITION_MSG = "At most one individual definition is allowed."
public static val INVALID_OCCURRENCE_USAGE_INDIVIDUAL_USAGE = "validateOccurrenceUsageIndividualUsage"
Expand Down Expand Up @@ -580,7 +576,7 @@ class SysMLValidator extends KerMLValidator {
@Check
def checkOccurrenceUsage(OccurrenceUsage usg) {
// All types must be Classes
if (!(usg instanceof ItemUsage || usg instanceof PortUsage || usg instanceof Step))
if (!(usg instanceof PortUsage || usg instanceof ConnectionUsage || usg instanceof MetadataUsage || usg instanceof Step))
checkAllTypes(usg, org.omg.sysml.lang.sysml.Class, INVALID_OCCURRENCE_USAGE_TYPE_MSG, SysMLPackage.eINSTANCE.occurrenceUsage_OccurrenceDefinition, INVALID_OCCURRENCE_USAGE_TYPE)

// validateOccurrenceUsageIndividualDefinition
Expand All @@ -607,20 +603,13 @@ class SysMLValidator extends KerMLValidator {

}

@Check
def checkItemUsage(ItemUsage iu) {
// All types must be Structures
if (!(iu instanceof PartUsage || iu instanceof PortUsage || iu instanceof MetadataUsage))
checkAllTypes(iu, Structure, INVALID_ITEM_USAGE_TYPE_MSG, SysMLPackage.eINSTANCE.itemUsage_ItemDefinition, INVALID_ITEM_USAGE_TYPE)
}
// @Check
// def checkItemUsage(ItemUsage iu) {
// }

@Check
def checkPartUsage(PartUsage pu){
if (!(pu instanceof ConnectionUsage))
if (checkAllTypes(pu, Structure, INVALID_PART_USAGE_TYPE_MSG, SysMLPackage.eINSTANCE.itemUsage_ItemDefinition, INVALID_PART_USAGE_TYPE))
// validatePartUsagePartDefinition
checkAtLeastOneType(pu, PartDefinition, INVALID_PART_USAGE_PART_DEFINITION_MSG, SysMLPackage.eINSTANCE.partUsage_PartDefinition, INVALID_PART_USAGE_PART_DEFINITION)
}
// @Check
// def checkPartUsage(PartUsage pu){
// }

@Check
def checkConjugatedPortDefinition(ConjugatedPortDefinition cpd) {
Expand Down Expand Up @@ -868,7 +857,7 @@ class SysMLValidator extends KerMLValidator {
if ((featureMembership instanceof StateSubactionMembership ||
featureMembership instanceof TransitionFeatureMembership) &&
usg.payloadArgument === null) {
error(org.omg.sysml.xtext.validation.SysMLValidator.INVALID_SEND_ACTION_USAGE_PAYLOAD_ARGUMENT_MSG, usg, null, org.omg.sysml.xtext.validation.SysMLValidator.INVALID_SEND_ACTION_USAGE_PAYLOAD_ARGUMENT_MSG)
error(SysMLValidator.INVALID_SEND_ACTION_USAGE_PAYLOAD_ARGUMENT_MSG, usg, null, SysMLValidator.INVALID_SEND_ACTION_USAGE_PAYLOAD_ARGUMENT_MSG)
}
}

Expand Down