Updated getParticipatingComponents() for all Behaviours and Block. (4aa15303) · Commits · TDL Open Source / TOP IDE

plugins/org.etsi.mts.tdl.model/model/tdl.ecore

+80 −33

Changes for plugins/org.etsi.mts.tdl.model/model/tdl.ecore: 80 added lines, 33 removed lines.
Original line number	Diff line number	Diff line
		@@ -287,6 +287,14 @@
		<eClassifiers xsi:type="ecore:EClass" name="Time" eSuperTypes="#//SimpleDataType"/>
		<eClassifiers xsi:type="ecore:EClass" name="TimeLabel" eSuperTypes="#//NamedElement"/>
		<eClassifiers xsi:type="ecore:EClass" name="TimerOperation" abstract="true" eSuperTypes="#//AtomicBehaviour">
		<eOperations name="getParticipatingComponents" upperBound="-1" eType="#//ComponentInstance">
		<eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
		<details key="body" value=" if self.getParentTestDescription()->exists(td \| td.isLocallyOrdered) then OrderedSet { self.componentInstance } else self.getParentTestDescription().testConfiguration.componentInstance->asOrderedSet() endif "/>
		</eAnnotations>
		<eAnnotations source="http://www.eclipse.org/OCL/Collection">
		<details key="nullFree" value="false"/>
		</eAnnotations>
		</eOperations>
		<eStructuralFeatures xsi:type="ecore:EReference" name="timer" lowerBound="1" eType="#//Timer"/>
		<eStructuralFeatures xsi:type="ecore:EReference" name="componentInstance" lowerBound="1"
		eType="#//ComponentInstance"/>
		@@ -294,7 +302,7 @@
		<eClassifiers xsi:type="ecore:EClass" name="AtomicBehaviour" abstract="true" eSuperTypes="#//Behaviour">
		<eOperations name="getParticipatingComponents" upperBound="-1" eType="#//ComponentInstance">
		<eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
		<details key="body" value=" OrderedSet{} "/>
		<details key="body" value=" if self.getParentTestDescription()->exists(td \| td.isLocallyOrdered) and self.container().oclIsKindOf(Block) then self.container().oclAsType(Block).getParticipatingComponentsExcluding(self)->asOrderedSet() else self.getParentTestDescription().testConfiguration.componentInstance->asOrderedSet() endif "/>
		</eAnnotations>
		<eAnnotations source="http://www.eclipse.org/OCL/Collection">
		<details key="nullFree" value="false"/>
		@@ -311,6 +319,14 @@
		<details key="body" value=" if (self.oclIsKindOf(TimeOut) or self.oclIsKindOf(Quiescence) or (self.oclIsKindOf(Interaction) and self.oclAsType(Interaction).sourceGate.component.role = ComponentInstanceRole::SUT and self.oclAsType(Interaction).target->exists(t \| t.targetGate.component.role = ComponentInstanceRole::Tester) ) ) then true else false endif"/>
		</eAnnotations>
		</eOperations>
		<eOperations name="getParticipatingComponents" upperBound="-1" eType="#//ComponentInstance">
		<eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
		<details key="body" value=" if self.getParentTestDescription()->exists(td \| td.isLocallyOrdered) then OrderedSet{} else self.getParentTestDescription().testConfiguration.componentInstance->asOrderedSet() endif "/>
		</eAnnotations>
		<eAnnotations source="http://www.eclipse.org/OCL/Collection">
		<details key="nullFree" value="false"/>
		</eAnnotations>
		</eOperations>
		<eStructuralFeatures xsi:type="ecore:EReference" name="testObjective" ordered="false"
		upperBound="-1" eType="#//TestObjective"/>
		</eClassifiers>
		@@ -325,12 +341,28 @@
		<eClassifiers xsi:type="ecore:EClass" name="TimerStop" eSuperTypes="#//TimerOperation"/>
		<eClassifiers xsi:type="ecore:EClass" name="TimeOut" eSuperTypes="#//TimerOperation"/>
		<eClassifiers xsi:type="ecore:EClass" name="TimeOperation" abstract="true" eSuperTypes="#//AtomicBehaviour">
		<eOperations name="getParticipatingComponents" upperBound="-1" eType="#//ComponentInstance">
		<eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
		<details key="body" value=" if self.getParentTestDescription()->exists(td \| td.isLocallyOrdered) and self.container().oclIsKindOf(Block) then ( if not self.componentInstance.oclIsUndefined() then OrderedSet { self.componentInstance } else self.container().oclAsType(Block).getParticipatingComponentsExcluding(self)->asOrderedSet() endif ) else self.getParentTestDescription().testConfiguration.componentInstance->asOrderedSet() endif "/>
		</eAnnotations>
		<eAnnotations source="http://www.eclipse.org/OCL/Collection">
		<details key="nullFree" value="false"/>
		</eAnnotations>
		</eOperations>
		<eStructuralFeatures xsi:type="ecore:EReference" name="componentInstance" eType="#//ComponentInstance"/>
		<eStructuralFeatures xsi:type="ecore:EReference" name="period" lowerBound="1"
		eType="#//DataUse" containment="true"/>
		</eClassifiers>
		<eClassifiers xsi:type="ecore:EClass" name="Wait" eSuperTypes="#//TimeOperation"/>
		<eClassifiers xsi:type="ecore:EClass" name="Quiescence" eSuperTypes="#//TimeOperation">
		<eOperations name="getParticipatingComponents" upperBound="-1" eType="#//ComponentInstance">
		<eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
		<details key="body" value=" if self.getParentTestDescription()->exists(td \| td.isLocallyOrdered) and self.container().oclIsKindOf(Block) then ( if not self.componentInstance.oclIsUndefined() or not self.gateReference.oclIsUndefined() then self.componentInstance->including(self.gateReference.component)->asOrderedSet() else self.container().oclAsType(Block).getParticipatingComponentsExcluding(self)->asOrderedSet() endif ) else self.getParentTestDescription().testConfiguration.componentInstance->asOrderedSet() endif "/>
		</eAnnotations>
		<eAnnotations source="http://www.eclipse.org/OCL/Collection">
		<details key="nullFree" value="false"/>
		</eAnnotations>
		</eOperations>
		<eStructuralFeatures xsi:type="ecore:EReference" name="gateReference" eType="#//GateReference"/>
		</eClassifiers>
		<eClassifiers xsi:type="ecore:EClass" name="GateReference" eSuperTypes="#//Element">
		@@ -378,12 +410,21 @@
		<eClassifiers xsi:type="ecore:EClass" name="Block" eSuperTypes="#//Element">
		<eOperations name="getParticipatingComponents" upperBound="-1" eType="#//ComponentInstance">
		<eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
		<details key="body" value=" self.getParentTestDescription().testConfiguration.componentInstance->asOrderedSet() "/>
		<details key="body" value=" if self.getParentTestDescription()->exists(td \| td.isLocallyOrdered) then self.behaviour.getParticipatingComponents()->asOrderedSet() else self.getParentTestDescription().testConfiguration.componentInstance->asOrderedSet() endif "/>
		</eAnnotations>
		<eAnnotations source="http://www.eclipse.org/OCL/Collection">
		<details key="nullFree" value="false"/>
		</eAnnotations>
		</eOperations>
		<eOperations name="getParticipatingComponentsExcluding" upperBound="-1" eType="#//ComponentInstance">
		<eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
		<details key="body" value=" if self.getParentTestDescription()->exists(td \| td.isLocallyOrdered) then self.behaviour->excluding(excluded).getParticipatingComponents()->asOrderedSet() else self.getParentTestDescription().testConfiguration.componentInstance->asOrderedSet() endif "/>
		</eAnnotations>
		<eAnnotations source="http://www.eclipse.org/OCL/Collection">
		<details key="nullFree" value="false"/>
		</eAnnotations>
		<eParameters name="excluded" eType="#//Behaviour"/>
		</eOperations>
		<eStructuralFeatures xsi:type="ecore:EReference" name="behaviour" lowerBound="1"
		upperBound="-1" eType="#//Behaviour" containment="true"/>
		<eStructuralFeatures xsi:type="ecore:EReference" name="guard" upperBound="-1"
		@@ -396,6 +437,14 @@
		eType="#//ExceptionalBehaviour" containment="true"/>
		</eClassifiers>
		<eClassifiers xsi:type="ecore:EClass" name="PeriodicBehaviour" eSuperTypes="#//Behaviour">
		<eOperations name="getParticipatingComponents" upperBound="-1" eType="#//ComponentInstance">
		<eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
		<details key="body" value=" if self.getParentTestDescription()->exists(td \| td.isLocallyOrdered) then self.block.getParticipatingComponents()->asOrderedSet() else self.getParentTestDescription().testConfiguration.componentInstance->asOrderedSet() endif "/>
		</eAnnotations>
		<eAnnotations source="http://www.eclipse.org/OCL/Collection">
		<details key="nullFree" value="false"/>
		</eAnnotations>
		</eOperations>
		<eStructuralFeatures xsi:type="ecore:EReference" name="block" lowerBound="1" eType="#//Block"
		containment="true"/>
		<eStructuralFeatures xsi:type="ecore:EReference" name="period" lowerBound="1"
		@@ -403,6 +452,14 @@
		</eClassifiers>
		<eClassifiers xsi:type="ecore:EClass" name="ExceptionalBehaviour" abstract="true"
		eSuperTypes="#//Behaviour">
		<eOperations name="getParticipatingComponents" upperBound="-1" eType="#//ComponentInstance">
		<eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
		<details key="body" value=" if self.getParentTestDescription()->exists(td \| td.isLocallyOrdered) then self.block.getParticipatingComponents()->asOrderedSet() else self.getParentTestDescription().testConfiguration.componentInstance->asOrderedSet() endif "/>
		</eAnnotations>
		<eAnnotations source="http://www.eclipse.org/OCL/Collection">
		<details key="nullFree" value="false"/>
		</eAnnotations>
		</eOperations>
		<eStructuralFeatures xsi:type="ecore:EReference" name="block" lowerBound="1" eType="#//Block"
		containment="true"/>
		<eStructuralFeatures xsi:type="ecore:EReference" name="guardedComponent" eType="#//ComponentInstance"/>
		@@ -410,6 +467,14 @@
		<eClassifiers xsi:type="ecore:EClass" name="AlternativeBehaviour" eSuperTypes="#//MultipleCombinedBehaviour"/>
		<eClassifiers xsi:type="ecore:EClass" name="MultipleCombinedBehaviour" abstract="true"
		eSuperTypes="#//CombinedBehaviour">
		<eOperations name="getParticipatingComponents" upperBound="-1" eType="#//ComponentInstance">
		<eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
		<details key="body" value=" if self.getParentTestDescription()->exists(td \| td.isLocallyOrdered) then self.periodic.getParticipatingComponents() ->union(self.exceptional.getParticipatingComponents()) ->union(self.block.getParticipatingComponents())->asOrderedSet() else self.getParentTestDescription().testConfiguration.componentInstance->asOrderedSet() endif "/>
		</eAnnotations>
		<eAnnotations source="http://www.eclipse.org/OCL/Collection">
		<details key="nullFree" value="false"/>
		</eAnnotations>
		</eOperations>
		<eStructuralFeatures xsi:type="ecore:EReference" name="block" lowerBound="1" upperBound="-1"
		eType="#//Block" containment="true"/>
		</eClassifiers>
		@@ -420,6 +485,14 @@
		</eClassifiers>
		<eClassifiers xsi:type="ecore:EClass" name="SingleCombinedBehaviour" abstract="true"
		eSuperTypes="#//CombinedBehaviour">
		<eOperations name="getParticipatingComponents" upperBound="-1" eType="#//ComponentInstance">
		<eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
		<details key="body" value=" if self.getParentTestDescription()->exists(td \| td.isLocallyOrdered) then self.periodic.getParticipatingComponents() ->union(self.exceptional.getParticipatingComponents()) ->union(self.block.getParticipatingComponents())->asOrderedSet() else self.getParentTestDescription().testConfiguration.componentInstance->asOrderedSet() endif "/>
		</eAnnotations>
		<eAnnotations source="http://www.eclipse.org/OCL/Collection">
		<details key="nullFree" value="false"/>
		</eAnnotations>
		</eOperations>
		<eStructuralFeatures xsi:type="ecore:EReference" name="block" lowerBound="1" eType="#//Block"
		containment="true"/>
		</eClassifiers>
		@@ -440,14 +513,6 @@
		</eStructuralFeatures>
		</eClassifiers>
		<eClassifiers xsi:type="ecore:EClass" name="VerdictAssignment" eSuperTypes="#//AtomicBehaviour">
		<eOperations name="getParticipatingComponents" upperBound="-1" eType="#//ComponentInstance">
		<eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
		<details key="body" value=" self.getParentTestDescription().testConfiguration.componentInstance->asOrderedSet() "/>
		</eAnnotations>
		<eAnnotations source="http://www.eclipse.org/OCL/Collection">
		<details key="nullFree" value="false"/>
		</eAnnotations>
		</eOperations>
		<eStructuralFeatures xsi:type="ecore:EReference" name="verdict" lowerBound="1"
		eType="#//DataUse" containment="true"/>
		</eClassifiers>
		@@ -457,26 +522,8 @@
		<eStructuralFeatures xsi:type="ecore:EReference" name="condition" lowerBound="1"
		eType="#//DataUse" containment="true"/>
		</eClassifiers>
		<eClassifiers xsi:type="ecore:EClass" name="Stop" eSuperTypes="#//AtomicBehaviour">
		<eOperations name="getParticipatingComponents" upperBound="-1" eType="#//ComponentInstance">
		<eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
		<details key="body" value=" self.getParentTestDescription().testConfiguration.componentInstance->asOrderedSet() "/>
		</eAnnotations>
		<eAnnotations source="http://www.eclipse.org/OCL/Collection">
		<details key="nullFree" value="false"/>
		</eAnnotations>
		</eOperations>
		</eClassifiers>
		<eClassifiers xsi:type="ecore:EClass" name="Break" eSuperTypes="#//AtomicBehaviour">
		<eOperations name="getParticipatingComponents" upperBound="-1" eType="#//ComponentInstance">
		<eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
		<details key="body" value=" self.getParentTestDescription().testConfiguration.componentInstance->asOrderedSet() "/>
		</eAnnotations>
		<eAnnotations source="http://www.eclipse.org/OCL/Collection">
		<details key="nullFree" value="false"/>
		</eAnnotations>
		</eOperations>
		</eClassifiers>
		<eClassifiers xsi:type="ecore:EClass" name="Stop" eSuperTypes="#//AtomicBehaviour"/>
		<eClassifiers xsi:type="ecore:EClass" name="Break" eSuperTypes="#//AtomicBehaviour"/>
		<eClassifiers xsi:type="ecore:EClass" name="Assignment" eSuperTypes="#//ActionBehaviour">
		<eStructuralFeatures xsi:type="ecore:EReference" name="variable" lowerBound="1"
		eType="#//VariableUse" containment="true"/>
		@@ -486,7 +533,7 @@
		<eClassifiers xsi:type="ecore:EClass" name="ActionBehaviour" abstract="true" eSuperTypes="#//AtomicBehaviour">
		<eOperations name="getParticipatingComponents" upperBound="-1" eType="#//ComponentInstance">
		<eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
		<details key="body" value=" if (not self.componentInstance.oclIsUndefined()) then OrderedSet{self.componentInstance} else self.getParentTestDescription().testConfiguration.componentInstance->asOrderedSet() endif "/>
		<details key="body" value=" if self.getParentTestDescription()->exists(td \| td.isLocallyOrdered) and self.container().oclIsKindOf(Block) then ( if not self.componentInstance.oclIsUndefined() then OrderedSet { self.componentInstance } else self.container().oclAsType(Block).getParticipatingComponentsExcluding(self)->asOrderedSet() endif ) else self.getParentTestDescription().testConfiguration.componentInstance->asOrderedSet() endif "/>
		</eAnnotations>
		<eAnnotations source="http://www.eclipse.org/OCL/Collection">
		<details key="nullFree" value="false"/>
		@@ -506,7 +553,7 @@
		<eClassifiers xsi:type="ecore:EClass" name="TestDescriptionReference" eSuperTypes="#//AtomicBehaviour">
		<eOperations name="getParticipatingComponents" upperBound="-1" eType="#//ComponentInstance">
		<eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
		<details key="body" value=" self.getParentTestDescription().testConfiguration.componentInstance->asOrderedSet() "/>
		<details key="body" value=" if self.getParentTestDescription()->exists(td \| td.isLocallyOrdered) and not self.componentInstanceBinding->isEmpty() then self.componentInstanceBinding.actualComponent->asOrderedSet() else self.getParentTestDescription().testConfiguration.componentInstance->asOrderedSet() endif "/>
		</eAnnotations>
		<eAnnotations source="http://www.eclipse.org/OCL/Collection">
		<details key="nullFree" value="false"/>
		@@ -528,7 +575,7 @@
		<eClassifiers xsi:type="ecore:EClass" name="Interaction" eSuperTypes="#//AtomicBehaviour">
		<eOperations name="getParticipatingComponents" upperBound="-1" eType="#//ComponentInstance">
		<eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
		<details key="body" value=" self.target ->collect(targetGate.component) ->including(sourceGate.component) ->asOrderedSet() "/>
		<details key="body" value=" if self.getParentTestDescription()->exists(td \| td.isLocallyOrdered) then self.target ->collect(targetGate.component) ->including(sourceGate.component) ->asOrderedSet() else self.getParentTestDescription().testConfiguration.componentInstance->asOrderedSet() endif "/>
		</eAnnotations>
		<eAnnotations source="http://www.eclipse.org/OCL/Collection">
		<details key="nullFree" value="false"/>

plugins/org.etsi.mts.tdl.model/model/tdl.genmodel

+13 −7

File changed.

Preview size limit exceeded, changes collapsed.