Commit 41ec938e authored by Philip Makedonski's avatar Philip Makedonski
Browse files

+ updated templates, libraries, wizards

parent 61f96ce8

plugins/org.etsi.mts.tdl.tx.ui/src/org/etsi/mts/tdl/ui/wizard/TDLtxFileTemplateProvider.xtend

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ final class TDLtxFileWithTPD { 
				    	References: "Epic #xy"

				    }  

				

					Test Purpose Description TP_01 {

					Test Purpose TP_01 {

						Objective: TO_01

						Configuration: nodeTC

						PICS: (F1 or F2) on tester

plugins/org.etsi.mts.tdl.tx.ui/src/org/etsi/mts/tdl/ui/wizard/TDLtxProjectBase.xtend

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ final class TDLtxProjectBase { 
				    Event receives

				    

					//Example test purpose specification as a structured test objective    

				    Test Purpose TP_01 {

				    Test Purpose TP_01 @TPLan3 {

				        Objective: "Check that the connection is initiated"

				        Reference: "ES 999 999"

				    	Initial conditions

plugins/org.etsi.mts.tdl.tx.ui/src/org/etsi/mts/tdl/ui/wizard/TDLtxProjectBaseTPD.xtend

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ final class TDLtxProjectBaseTPD { 
				    	References: "Epic #xy"

				    }  

				

					Test Purpose Description TP_01 {

					Test Purpose TP_01 {

						Objective: TO_01

						Configuration: nodeTC

						PICS: (F1 or F2) on tester

plugins/org.etsi.mts.tdl.tx.ui/templates/TDL.tdltx

+3 −2
Original line number Diff line number Diff line 
@Version: "1.8.1"

@Version: "1.8.2"

Package TDL {

	Constraint length

	Constraint minLength
@@ -35,9 +35,10 @@ Package TDL { 
    Annotation Initial conditions

    Annotation Expected behaviour

    Annotation Final conditions

    Annotation Test Purpose Description

    Annotation Test Purpose

    Annotation when

    Annotation then

    Annotation Variant

	

	Predefined == returns Boolean

	Predefined != returns Boolean

plugins/org.etsi.mts.tdl.tx.ui/templates/templates.xml

+4 −4
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ with { 
</template><template autoinsert="true" context="org.etsi.mts.tdl.TDLtx.PackageableElement" deleted="false" description="Structured Data Type with one Member" enabled="true" id="org.etsi.mts.tdl.tx.templates.Structured.Data.Type.with.Member" name="Structured Data Type with Member">Structure ${name} (

	${dataType:CrossReference(Parameter.dataType)} ${memberName}${cursor}

)

</template><template autoinsert="true" context="org.etsi.mts.tdl.TDLtx.StructuredTestObjective" deleted="false" description="Structured Test Objective full" enabled="true" id="org.etsi.mts.tdl.tx.templates.Structured.Test.Objective.full" name="Structured Test Objective full">Test Purpose ${tpName} {

</template><template autoinsert="true" context="org.etsi.mts.tdl.TDLtx.StructuredTestObjective" deleted="false" description="Structured Test Objective full" enabled="true" id="org.etsi.mts.tdl.tx.templates.Structured.Test.Objective.full" name="Structured Test Objective full">Test Purpose ${tpName} @TPLan3 {

    Objective: "${description}"

    Reference: "${reference}"

	Initial conditions
@@ -175,7 +175,7 @@ with { 
	with {

	    the ${entity:CrossReference(EntityReference.entity)} entity ${finalEvent:CrossReference(EventReference.event)}

	}

}</template><template autoinsert="true" context="org.etsi.mts.tdl.TDLtx.StructuredTestObjective" deleted="false" description="Structured Test Objective minimal " enabled="true" id="org.etsi.mts.tdl.tx.templates.Structured.Test.Objective.minimal" name="Structured Test Objective minimal">Test Purpose ${tpName} {

}</template><template autoinsert="true" context="org.etsi.mts.tdl.TDLtx.StructuredTestObjective" deleted="false" description="Structured Test Objective minimal " enabled="true" id="org.etsi.mts.tdl.tx.templates.Structured.Test.Objective.minimal" name="Structured Test Objective minimal">Test Purpose ${tpName} @TPLan3 {

    Objective: "${description}"

    Reference: "${reference}"

    ${cursor}
@@ -228,7 +228,7 @@ Component ${componentType} { 
	Description: "${description}"

	References: "${reference}"

}

</template><template autoinsert="true" context="org.etsi.mts.tdl.TDLtx.TestDescription" deleted="false" description="Test Purpose Description - Expected Behaviour Only Template" enabled="true" id="org.etsi.mts.tdl.tx.templates.TestPurposeDescription" name="Test Purpose Description - Expected Behaviour Only">Test Purpose Description ${tpdName} {

</template><template autoinsert="true" context="org.etsi.mts.tdl.TDLtx.TestDescription" deleted="false" description="Test Purpose - Expected Behaviour Only Template" enabled="true" id="org.etsi.mts.tdl.tx.templates.TestPurposeDescription" name="Test Purpose Description - Expected Behaviour Only">Test Purpose ${tpdName} {

	Objective: ${objective:CrossReference('TestDescription.testObjective')}

	Configuration: ${configuration:CrossReference('TestDescription.testConfiguration')}

	Expected behaviour
@@ -241,7 +241,7 @@ Component ${componentType} { 
		}

	}

}

</template><template autoinsert="true" context="org.etsi.mts.tdl.TDLtx.TestDescription" deleted="false" description="Test Purpose Description - Full Template" enabled="true" id="org.etsi.mts.tdl.tx.templates.Test.Purpose.Description.-.Full" name="Test Purpose Description - Full">Test Purpose Description ${tpdName} {

</template><template autoinsert="true" context="org.etsi.mts.tdl.TDLtx.TestDescription" deleted="false" description="Test Purpose - Full Template" enabled="true" id="org.etsi.mts.tdl.tx.templates.Test.Purpose.Description.-.Full" name="Test Purpose Description - Full">Test Purpose ${tpdName} {

	Objective: ${objective:CrossReference('TestDescription.testObjective')}

	Configuration: ${configuration:CrossReference('TestDescription.testConfiguration')}

	Initial conditions