Commit 126f9aed authored by Philip Makedonski's avatar Philip Makedonski
Browse files

* reverted advanced test objective

parent deeeec0b

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

+1 −4
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
    <eStructuralFeatures xsi:type="ecore:EReference" name="variants" eType="#//Variants"

        containment="true"/>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="AdvancedTestObjective" eSuperTypes="#//StructuredTestObjective"/>

  <eClassifiers xsi:type="ecore:EClass" name="InitialConditions" eSuperTypes="&_0;#//Element">

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

        eType="#//EventSequence" containment="true"/>
@@ -29,10 +28,8 @@ 
  <eClassifiers xsi:type="ecore:EClass" name="EventSequence" eSuperTypes="&_0;#//Element">

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

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

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

        upperBound="-1" eType="ecore:EClass tdl.ecore#//Behaviour" containment="true"/>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="EventOccurrence" abstract="true" eSuperTypes="tdl.ecore#//AtomicBehaviour"/>

  <eClassifiers xsi:type="ecore:EClass" name="EventOccurrence" eSuperTypes="&_0;#//Element"/>

  <eClassifiers xsi:type="ecore:EClass" name="ExpectedBehaviour" eSuperTypes="&_0;#//Element">

    <eStructuralFeatures xsi:type="ecore:EReference" name="whenClause" eType="#//EventSequence"

        containment="true"/>

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

+0 −2
Original line number Diff line number Diff line
@@ -44,13 +44,11 @@ 
      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference structured.ecore#//StructuredTestObjective/picsReference"/>

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference structured.ecore#//StructuredTestObjective/variants"/>

    </genClasses>

    <genClasses ecoreClass="structured.ecore#//AdvancedTestObjective"/>

    <genClasses ecoreClass="structured.ecore#//InitialConditions">

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference structured.ecore#//InitialConditions/conditions"/>

    </genClasses>

    <genClasses ecoreClass="structured.ecore#//EventSequence">

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference structured.ecore#//EventSequence/events"/>

      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference structured.ecore#//EventSequence/behaviours"/>

    </genClasses>

    <genClasses image="false" ecoreClass="structured.ecore#//EventOccurrence"/>

    <genClasses ecoreClass="structured.ecore#//ExpectedBehaviour">