Commit 6f18dd32 authored by Philip Makedonski's avatar Philip Makedonski
Browse files

* updated diagrams with latest changes (defaultTester, default values for... 

* updated diagrams with latest changes (defaultTester, default values for parameters and simple data instances)
parent aca12a6c

TestDescriptionLanguage/tdl.notation

+1268 −1029

File changed.

Preview size limit exceeded, changes collapsed.

TestDescriptionLanguage/tdl.uml

+51 −6
Changes for TestDescriptionLanguage/tdl.uml: 51 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -199,7 +199,9 @@ 
</body>

        </ownedComment>

        <ownedComment xmi:type="uml:Comment" xmi:id="_LfKawEOtEeyG_Yt003PTNg">

          <body>Change Log

          <body>Latest

- componentInstance optional for VariableUse

Change Log

- Added UniversalDataUse

-- Changed to MappableDataElementUse

-- Changed to NamedDataElementUse
@@ -242,7 +244,12 @@ covers most cases 
        </ownedComment>

        <ownedComment xmi:type="uml:Comment" xmi:id="_tVjJcGKFEey5Tq57j4Ni_g">

          <body>Change Log:

- Changed SimpleDataType.extension to [0..1]</body>

- Changed SimpleDataType.extension to [0..1]

- Added value for SimpleDataInstance</body>

        </ownedComment>

        <ownedComment xmi:type="uml:Comment" xmi:id="_F3n2EGZ9EfGL9M5DyryTJQ">

          <body>Change log:

- Added value to FormalParameter</body>

        </ownedComment>

        <packagedElement xmi:type="uml:Package" xmi:id="_R1-b8HlFEeSVko5r_SJ_NA" name="DataDefinition">

          <ownedComment xmi:type="uml:Comment" xmi:id="_HFr74FINEeytR_qPigAF5g">
@@ -315,6 +322,10 @@ covers most cases 
          </packagedElement>

          <packagedElement xmi:type="uml:Class" xmi:id="_g0xJsAwcEeSyW5TlhCAZUA" name="SimpleDataInstance">

            <generalization xmi:type="uml:Generalization" xmi:id="_--mrEAwcEeSyW5TlhCAZUA" general="_--G8wOy_EeKqo4Ny4D-vKA"/>

            <ownedAttribute xmi:type="uml:Property" xmi:id="_ByVRIGZ8EfGL9M5DyryTJQ" name="value" type="_WJp72GjrEeSGaIFXgYnwew" aggregation="composite" association="_ByPKgGZ8EfGL9M5DyryTJQ">

              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ByV4MGZ8EfGL9M5DyryTJQ"/>

              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ByWfQGZ8EfGL9M5DyryTJQ" value="1"/>

            </ownedAttribute>

          </packagedElement>

          <packagedElement xmi:type="uml:Class" xmi:id="_GPy5YAwgEeSyW5TlhCAZUA" name="StructuredDataType">

            <generalization xmi:type="uml:Generalization" xmi:id="_FqZbYAwiEeSyW5TlhCAZUA" general="_DFaAoO4xEeKygtYz46QGBw"/>
@@ -419,6 +430,10 @@ covers most cases 
          </packagedElement>

          <packagedElement xmi:type="uml:Class" xmi:id="_7GEycBI_EeSWKPaJEaS7sQ" name="FormalParameter">

            <generalization xmi:type="uml:Generalization" xmi:id="_NDW3YBJAEeSWKPaJEaS7sQ" general="_YUbVQG8BEeSktv7vAivsJQ"/>

            <ownedAttribute xmi:type="uml:Property" xmi:id="_6y6ygGZ8EfGL9M5DyryTJQ" name="value" type="_WJp72GjrEeSGaIFXgYnwew" aggregation="composite" association="_6y3IIGZ8EfGL9M5DyryTJQ">

              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6y6ygWZ8EfGL9M5DyryTJQ"/>

              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6y7ZkGZ8EfGL9M5DyryTJQ" value="1"/>

            </ownedAttribute>

          </packagedElement>

          <packagedElement xmi:type="uml:Class" xmi:id="_E3EycBJAEeSWKPaJEaS7sQ" name="Variable">

            <generalization xmi:type="uml:Generalization" xmi:id="_L7DLgBJAEeSWKPaJEaS7sQ" general="_TO2tgFRxEeSGV_4El4z6Og"/>
@@ -569,8 +584,8 @@ covers most cases 
          <packagedElement xmi:type="uml:Class" xmi:id="_wpPAcFU4EeSayvSxECItWQ" name="VariableUse">

            <generalization xmi:type="uml:Generalization" xmi:id="_4kjRMFU4EeSayvSxECItWQ" general="_Er2MgFRwEeSK7t9cQ4MpAA"/>

            <ownedAttribute xmi:type="uml:Property" xmi:id="_dwb5AFU5EeSayvSxECItWQ" name="componentInstance" type="_9PcJMO7oEeKEI7DGGPzGog" association="_dwb5A1U5EeSayvSxECItWQ">

              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_dwb5AVU5EeSayvSxECItWQ" value="1"/>

              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dwb5AlU5EeSayvSxECItWQ" value="1"/>

              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hB5ZkGZ-EfGL9M5DyryTJQ" name="LiteralInteger1"/>

              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hB6AoGZ-EfGL9M5DyryTJQ" name="LiteralUnlimitedNatural1" value="*"/>

            </ownedAttribute>

            <ownedAttribute xmi:type="uml:Property" xmi:id="_mVAywG8PEeSktv7vAivsJQ" name="variable" type="_E3EycBJAEeSWKPaJEaS7sQ" association="_mVAyw28PEeSktv7vAivsJQ">

              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_mVAywW8PEeSktv7vAivsJQ" value="1"/>
@@ -872,8 +887,24 @@ covers most cases 
          </eAnnotations>

          <ownedEnd xmi:type="uml:Property" xmi:id="_7QDFshzUEe-N2LXMtyQYmA" name="parameterBinding" type="_WJgKzmjrEeSGaIFXgYnwew" association="_7QB3kBzUEe-N2LXMtyQYmA"/>

        </packagedElement>

        <packagedElement xmi:type="uml:Association" xmi:id="_ByPKgGZ8EfGL9M5DyryTJQ" name="A_value_simpledatainstance" memberEnd="_ByVRIGZ8EfGL9M5DyryTJQ _ByWfQWZ8EfGL9M5DyryTJQ">

          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ByUqEGZ8EfGL9M5DyryTJQ" source="org.eclipse.papyrus">

            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ByUqEWZ8EfGL9M5DyryTJQ" key="nature" value="UML_Nature"/>

          </eAnnotations>

          <ownedEnd xmi:type="uml:Property" xmi:id="_ByWfQWZ8EfGL9M5DyryTJQ" name="simpledatainstance" type="_g0xJsAwcEeSyW5TlhCAZUA" association="_ByPKgGZ8EfGL9M5DyryTJQ"/>

        </packagedElement>

        <packagedElement xmi:type="uml:Association" xmi:id="_6y3IIGZ8EfGL9M5DyryTJQ" name="A_value_formalparameter" memberEnd="_6y6ygGZ8EfGL9M5DyryTJQ _6y7ZkWZ8EfGL9M5DyryTJQ">

          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6y6LcGZ8EfGL9M5DyryTJQ" source="org.eclipse.papyrus">

            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6y6LcWZ8EfGL9M5DyryTJQ" key="nature" value="UML_Nature"/>

          </eAnnotations>

          <ownedEnd xmi:type="uml:Property" xmi:id="_6y7ZkWZ8EfGL9M5DyryTJQ" name="formalparameter" type="_7GEycBI_EeSWKPaJEaS7sQ" association="_6y3IIGZ8EfGL9M5DyryTJQ"/>

        </packagedElement>

      </packagedElement>

      <packagedElement xmi:type="uml:Package" xmi:id="_wKKK0OzAEeKqo4Ny4D-vKA" name="Time">

        <ownedComment xmi:type="uml:Comment" xmi:id="_I_O1UGZ_EfGL9M5DyryTJQ">

          <body>Change log:

- Changed componentInstance to optional for TimerOperation</body>

        </ownedComment>

        <packagedElement xmi:type="uml:Class" xmi:id="_EX8C4iH4EeSpDonUzsDrRg" name="Time">

          <generalization xmi:type="uml:Generalization" xmi:id="_OMxl4DQTEeSy59ljSot60w" general="_YchMsAwZEeSyW5TlhCAZUA"/>

        </packagedElement>
@@ -890,8 +921,8 @@ covers most cases 
            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kUUfou-9EeKh3utQwSgWiA" value="1"/>

          </ownedAttribute>

          <ownedAttribute xmi:type="uml:Property" xmi:id="_EnSmQHrIEeSWuMHj58bJ6Q" name="componentInstance" type="_9PcJMO7oEeKEI7DGGPzGog" association="_EnVCgHrIEeSWuMHj58bJ6Q">

            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_EnSmQXrIEeSWuMHj58bJ6Q" value="1"/>

            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EnSmQnrIEeSWuMHj58bJ6Q" value="1"/>

            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-TXvkGZ-EfGL9M5DyryTJQ" name="LiteralInteger1"/>

            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-TXvkWZ-EfGL9M5DyryTJQ" name="LiteralUnlimitedNatural1" value="*"/>

          </ownedAttribute>

        </packagedElement>

        <packagedElement xmi:type="uml:Association" xmi:id="_kUnakO-9EeKh3utQwSgWiA" name="timerOperation_timer_1" memberEnd="_kUnake-9EeKh3utQwSgWiA _kUUfoO-9EeKh3utQwSgWiA">
@@ -1252,6 +1283,10 @@ covers most cases 
            <body>Change Log:

- Changed VerdictAssignment.verdict to DataUse

</body>

          </ownedComment>

          <ownedComment xmi:type="uml:Comment" xmi:id="_FwZXQGZ-EfGL9M5DyryTJQ">

            <body>Change log:

- Added defaultTester to Block</body>

          </ownedComment>

          <packagedElement xmi:type="uml:Class" xmi:id="_ZGOQkO7uEeKEI7DGGPzGog" name="Behaviour" isAbstract="true">

            <generalization xmi:type="uml:Generalization" xmi:id="_3YCKoEhxEeOIBu03wL3k1g" general="_oFvnIM5xEeKBmZvNr53Zng"/>
@@ -1270,6 +1305,10 @@ covers most cases 
              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_F3-UYVOfEeSBn4xehKK8og" value="1"/>

              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_F3-UYlOfEeSBn4xehKK8og" value="*"/>

            </ownedAttribute>

            <ownedAttribute xmi:type="uml:Property" xmi:id="_6FfPUmZ9EfGL9M5DyryTJQ" name="defaultTester" type="_9PcJMO7oEeKEI7DGGPzGog" association="_6FeBMGZ9EfGL9M5DyryTJQ">

              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6Ff2YGZ9EfGL9M5DyryTJQ"/>

              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6Ff2YWZ9EfGL9M5DyryTJQ" value="1"/>

            </ownedAttribute>

          </packagedElement>

          <packagedElement xmi:type="uml:Class" xmi:id="_Lvx-cO7vEeKEI7DGGPzGog" name="CombinedBehaviour" isAbstract="true">

            <generalization xmi:type="uml:Generalization" xmi:id="_O7fsgO7vEeKEI7DGGPzGog" general="_ZGOQkO7uEeKEI7DGGPzGog"/>
@@ -1467,6 +1506,12 @@ covers most cases 
          <packagedElement xmi:type="uml:Class" xmi:id="_rf9NsERvEeqBvYJaFSFI5A" name="OptionalBehaviour">

            <generalization xmi:type="uml:Generalization" xmi:id="_rf9NsURvEeqBvYJaFSFI5A" general="_tH-xcBQLEeOImOhKB9FC0A"/>

          </packagedElement>

          <packagedElement xmi:type="uml:Association" xmi:id="_6FeBMGZ9EfGL9M5DyryTJQ" name="A_defaultTester_block" memberEnd="_6FfPUmZ9EfGL9M5DyryTJQ _6Ff2YmZ9EfGL9M5DyryTJQ">

            <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6FfPUGZ9EfGL9M5DyryTJQ" source="org.eclipse.papyrus">

              <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6FfPUWZ9EfGL9M5DyryTJQ" key="nature" value="UML_Nature"/>

            </eAnnotations>

            <ownedEnd xmi:type="uml:Property" xmi:id="_6Ff2YmZ9EfGL9M5DyryTJQ" name="singlecombinedbehaviour" type="_7Z1gMO7tEeKEI7DGGPzGog" association="_6FeBMGZ9EfGL9M5DyryTJQ"/>

          </packagedElement>

        </packagedElement>

        <packagedElement xmi:type="uml:Package" xmi:id="_u99A8FOkEeSBn4xehKK8og" name="AtomicBehaviour">

          <ownedComment xmi:type="uml:Comment" xmi:id="_hj2t0FL_EeytR_qPigAF5g">