Commit c17ce576 authored by Martti Käärik's avatar Martti Käärik
Browse files

Updated meta-model with features from TDL 1.4 specification that would require... 

Updated meta-model with features from TDL 1.4 specification that would require transformation of existing model instances.
Differences compared to 1.3:
* Parameter is NamedElement
* DataUse.reduction is MemberReference
+ TestDescription.isLocallyOrdered
* Block.guard is LocalExpression AND multi-valued
* PeriodicBehaviour.period is LocalExpression AND multi-valued
* BoundedLoopBehaviour.numIteration is LocalExpression AND multi-valued
* Assignment.variable is VariableUse
* Interaction.isTrigger moved to Message
+ Message
+ PredefinedFunction
+ MemberReference
+ PredefinedFunctionCall
+ LocalExpression

Change-Id: I02f02cdf6316384a0f6e64ff4d176c7704ee6591
parent 37702df7

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

+47 −12
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ 
      </eAnnotations>

    </eStructuralFeatures>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="Parameter" abstract="true" eSuperTypes="#//Element">

  <eClassifiers xsi:type="ecore:EClass" name="Parameter" abstract="true" eSuperTypes="#//NamedElement">

    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

      <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataUse.&lt;/p>"/>

    </eAnnotations>
@@ -315,7 +315,7 @@ 
      </eAnnotations>

    </eStructuralFeatures>

    <eStructuralFeatures xsi:type="ecore:EReference" name="reduction" upperBound="-1"

        eType="#//Member">

        eType="#//MemberReference" containment="true">

      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

        <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataUse.&lt;/p>"/>

      </eAnnotations>
@@ -776,8 +776,8 @@ 
        <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::CombinedBehaviour.&lt;/p>"/>

      </eAnnotations>

    </eStructuralFeatures>

    <eStructuralFeatures xsi:type="ecore:EReference" name="guard" eType="#//DataUse"

        containment="true">

    <eStructuralFeatures xsi:type="ecore:EReference" name="guard" upperBound="-1"

        eType="#//LocalExpression" containment="true">

      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

        <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::CombinedBehaviour.&lt;/p>"/>

      </eAnnotations>
@@ -811,7 +811,7 @@ 
      </eAnnotations>

    </eStructuralFeatures>

    <eStructuralFeatures xsi:type="ecore:EReference" name="period" lowerBound="1"

        eType="#//DataUse" containment="true">

        upperBound="-1" eType="#//LocalExpression" containment="true">

      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

        <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::CombinedBehaviour.&lt;/p>"/>

      </eAnnotations>
@@ -861,7 +861,7 @@ 
      <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::CombinedBehaviour.&lt;/p>"/>

    </eAnnotations>

    <eStructuralFeatures xsi:type="ecore:EReference" name="numIteration" lowerBound="1"

        eType="#//DataUse" containment="true">

        upperBound="-1" eType="#//LocalExpression" containment="true">

      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

        <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::CombinedBehaviour.&lt;/p>"/>

      </eAnnotations>
@@ -1057,12 +1057,6 @@ 
    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

      <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::AtomicBehaviour.&lt;/p>"/>

    </eAnnotations>

    <eStructuralFeatures xsi:type="ecore:EReference" name="argument" ordered="false"

        lowerBound="1" eType="#//DataUse" containment="true">

      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

        <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::AtomicBehaviour.&lt;/p>"/>

      </eAnnotations>

    </eStructuralFeatures>

    <eStructuralFeatures xsi:type="ecore:EReference" name="sourceGate" lowerBound="1"

        eType="#//GateReference">

      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
@@ -1075,6 +1069,12 @@ 
        <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::AtomicBehaviour.&lt;/p>"/>

      </eAnnotations>

    </eStructuralFeatures>

    <eStructuralFeatures xsi:type="ecore:EReference" name="argument" ordered="false"

        lowerBound="1" eType="#//DataUse" containment="true">

      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

        <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::AtomicBehaviour.&lt;/p>"/>

      </eAnnotations>

    </eStructuralFeatures>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="Message" eSuperTypes="#//Interaction">

    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
@@ -1087,4 +1087,39 @@ 
      </eAnnotations>

    </eStructuralFeatures>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="PredefinedFunction" eSuperTypes="#//NamedElement">

    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

      <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataDefinition.&lt;/p>"/>

    </eAnnotations>

    <eStructuralFeatures xsi:type="ecore:EReference" name="returnType" eType="#//DataType">

      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

        <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataDefinition.&lt;/p>"/>

      </eAnnotations>

    </eStructuralFeatures>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="MemberReference" eSuperTypes="#//Element">

    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

      <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataUse.&lt;/p>"/>

    </eAnnotations>

    <eStructuralFeatures xsi:type="ecore:EReference" name="member" eType="#//Member"/>

    <eStructuralFeatures xsi:type="ecore:EReference" name="collectionIndex" eType="#//DataUse"

        containment="true"/>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="PredefinedFunctionCall" eSuperTypes="#//DynamicDataUse">

    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

      <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::Data::DataUse.&lt;/p>"/>

    </eAnnotations>

    <eStructuralFeatures xsi:type="ecore:EReference" name="function" lowerBound="1"

        eType="#//PredefinedFunction"/>

    <eStructuralFeatures xsi:type="ecore:EReference" name="actualParameters" upperBound="-1"

        eType="#//DataUse" containment="true"/>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="LocalExpression" eSuperTypes="#//Element">

    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

      <details key="documentation" value="&lt;p>From package TestDescriptionLanguage::TDL_MetaModel::TestBehaviour::CombinedBehaviour.&lt;/p>"/>

    </eAnnotations>

    <eStructuralFeatures xsi:type="ecore:EReference" name="expression" lowerBound="1"

        eType="#//DataUse" containment="true"/>

    <eStructuralFeatures xsi:type="ecore:EReference" name="scope" eType="#//ComponentInstance"/>

  </eClassifiers>

</ecore:EPackage>

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

+16 −1
Original line number Diff line number Diff line
@@ -375,12 +375,27 @@ 
      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//ComponentInstanceBinding/actualComponent"/>

    </genClasses>

    <genClasses ecoreClass="tdl.ecore#//Interaction">

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//Interaction/argument"/>

      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//Interaction/sourceGate"/>

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//Interaction/target"/>

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//Interaction/argument"/>

    </genClasses>

    <genClasses ecoreClass="tdl.ecore#//Message">

      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tdl.ecore#//Message/isTrigger"/>

    </genClasses>

    <genClasses ecoreClass="tdl.ecore#//PredefinedFunction">

      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//PredefinedFunction/returnType"/>

    </genClasses>

    <genClasses ecoreClass="tdl.ecore#//MemberReference">

      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//MemberReference/member"/>

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//MemberReference/collectionIndex"/>

    </genClasses>

    <genClasses ecoreClass="tdl.ecore#//PredefinedFunctionCall">

      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//PredefinedFunctionCall/function"/>

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//PredefinedFunctionCall/actualParameters"/>

    </genClasses>

    <genClasses ecoreClass="tdl.ecore#//LocalExpression">

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tdl.ecore#//LocalExpression/expression"/>

      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tdl.ecore#//LocalExpression/scope"/>

    </genClasses>

  </genPackages>

</genmodel:GenModel>