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

Updated libraries.

parent 03abc842

plugins/org.etsi.mts.tdl.library/src/org/etsi/mts/tdl/library/HttpJavaMappings.tdltx

+8 −7
Changes for plugins/org.etsi.mts.tdl.library/src/org/etsi/mts/tdl/library/HttpJavaMappings.tdltx: 8 added lines, 7 removed lines.
Original line number Diff line number Diff line 
@Version: "1.0.0"

Package HttpJavaMappings {

	Import all from Tdl

	Import all from TDL

	Import all from Java

	Import all from HTTP.MessageBased

	

	@JavaPackage

    @MappingName : "Java"

	@[JavaPackage,

    	MappingName : "Java"]

	Use "org.etsi.mts.tdl.execution.java.adapters.http" as HttpAdapter

	

    @JavaClass
@@ -36,8 +37,8 @@ Package HttpJavaMappings { 
    @JavaClass

	Map Location to "HttpParameterLocation" in HttpAdapter as Location_Mapping

	

    @JavaClass

    @MappingName : "Java"

    @[JavaClass,

    	MappingName : "Java"]

	Use "org.etsi.mts.tdl.execution.java.adapters.http.HttpParameterLocation" as HttpParameterLocation

	Map path to "path" in HttpParameterLocation as path_mapping

	Map query to "query" in HttpParameterLocation as query_mapping
@@ -47,8 +48,8 @@ Package HttpJavaMappings { 
    @JavaClass

	Map Method to "HttpMethod" in HttpAdapter as Method_Mapping

	

    @JavaClass

    @MappingName : "Java"

    @[JavaClass,

    	MappingName : "Java"]

	Use "org.etsi.mts.tdl.execution.java.adapters.http.HttpMethod" as HttpMethod

	Map GET to "GET" in HttpMethod as GET_mapping

	Map POST to "POST" in HttpMethod as POST_mapping

plugins/org.etsi.mts.tdl.library/src/org/etsi/mts/tdl/library/Java.tdltx

+14 −11
Changes for plugins/org.etsi.mts.tdl.library/src/org/etsi/mts/tdl/library/Java.tdltx: 14 added lines, 11 removed lines.
Original line number Diff line number Diff line 
@Version: "1.0.0"

Package Java {

	Import all from Tdl

	Import all from TDL

	

	/* Applied to a DataResourceMapping to specify a package  */

	Annotation JavaPackage
@@ -19,8 +20,10 @@ Package Java { 
	Annotation JavaSetter

	

	

    @JavaPackage

    @MappingName : "Java"

    @[

    	JavaPackage,

    	MappingName : "Java"

    ]

    Use "java.lang" as JavaLang

	Map Boolean to "Boolean" in JavaLang as Boolean_mapping

	Map Integer to "Integer" in JavaLang as Integer_mapping
@@ -28,27 +31,27 @@ Package Java { 
	

	

	

    @JavaPackage

    @MappingName : "Java"

    @[JavaPackage,

    	MappingName : "Java"]

    Use "org.etsi.mts.tdl.execution.java.tri" as Tri

    

    @JavaClass

	Map Verdict to "Verdict" in Tri as Verdict_Mapping

	

    @JavaClass

    @MappingName : "Java"

    @[JavaClass,

    	MappingName : "Java"]

	Use "org.etsi.mts.tdl.execution.java.tri.Verdict" as VerdictClass

	Map pass to "pass" in VerdictClass as pass_mapping

	Map fail to "fail" in VerdictClass as fail_mapping

	Map inconclusive to "inconclusive" in VerdictClass as inconclusive_mapping

	

	

    @JavaPackage

    @MappingName : "Java"

    @[JavaPackage,

    	MappingName : "Java"]

    Use "org.etsi.mts.tdl.execution.java.rt.core" as RuntimeCore

    

    @JavaClass

    @MappingName : "Java"

    @[JavaClass,

    	MappingName : "Java"]

	Use "org.etsi.mts.tdl.execution.java.rt.core.TimeUnit" as TimeUnitClass

	Map second to "Second" in TimeUnitClass as second_mapping

plugins/org.etsi.mts.tdl.library/src/org/etsi/mts/tdl/library/Standard.tdltx

deleted100644 → 0
+0 −57
Changes for plugins/org.etsi.mts.tdl.library/src/org/etsi/mts/tdl/library/Standard.tdltx: 0 added lines, 57 removed lines.
Original line number Diff line number Diff line 
Package TDL {

	//TODO: extract to standard library

	Constraint length

	Constraint minLength

	Constraint maxLength

	Constraint range

	Constraint format

	Constraint union

	Constraint uniontype

	

	Type Boolean

	Type Integer

	Type String

	Type Verdict

	

	//TODO: these do not work at present -> literal values take precedence?

	Boolean ^true

	Boolean ^false

	Boolean True

	Boolean False

	

	Verdict pass

	Verdict fail

	Verdict inconclusive

	

	Time second

	

	Annotation Master

	Annotation MappingName



    //standard annotations for STO

    Annotation Initial conditions

    Annotation Expected behaviour

    Annotation Final conditions

    Annotation Test Purpose Description

    Annotation when

    Annotation then

    Annotation PICS

	

	Predefined == returns Boolean

	Predefined != returns Boolean

	Predefined and returns Boolean

	Predefined or returns Boolean

	Predefined xor returns Boolean

	Predefined not returns Boolean

	Predefined < returns Boolean

	Predefined > returns Boolean

	Predefined <= returns Boolean

	Predefined >= returns Boolean

	Predefined +

	Predefined -

	Predefined *

	Predefined /

	Predefined mod

	Predefined size returns Integer

	

}
 
 No newline at end of file

plugins/org.etsi.mts.tdl.standalone/lib/HTTP.tdltx

+1 −1
Changes for plugins/org.etsi.mts.tdl.standalone/lib/HTTP.tdltx: 1 added line, 1 removed line.
Original line number Diff line number Diff line 
@Version: "1.0.0"

Package HTTP {

	

	Import all from TDL

	Package MessageBasedConfiguration {

		Import all from MessageBased

		Message Gate HTTPGate accepts Request,Response

plugins/org.etsi.mts.tdl.standalone/lib/HttpJavaMappings.tdltx

+8 −7
Changes for plugins/org.etsi.mts.tdl.standalone/lib/HttpJavaMappings.tdltx: 8 added lines, 7 removed lines.
Original line number Diff line number Diff line 
@Version: "1.0.0"

Package HttpJavaMappings {

	Import all from Tdl

	Import all from TDL

	Import all from Java

	Import all from HTTP.MessageBased

	

	@JavaPackage

    @MappingName : "Java"

	@[JavaPackage,

    	MappingName : "Java"]

	Use "org.etsi.mts.tdl.execution.java.adapters.http" as HttpAdapter

	

    @JavaClass
@@ -36,8 +37,8 @@ Package HttpJavaMappings { 
    @JavaClass

	Map Location to "HttpParameterLocation" in HttpAdapter as Location_Mapping

	

    @JavaClass

    @MappingName : "Java"

    @[JavaClass,

    	MappingName : "Java"]

	Use "org.etsi.mts.tdl.execution.java.adapters.http.HttpParameterLocation" as HttpParameterLocation

	Map path to "path" in HttpParameterLocation as path_mapping

	Map query to "query" in HttpParameterLocation as query_mapping
@@ -47,8 +48,8 @@ Package HttpJavaMappings { 
    @JavaClass

	Map Method to "HttpMethod" in HttpAdapter as Method_Mapping

	

    @JavaClass

    @MappingName : "Java"

    @[JavaClass,

    	MappingName : "Java"]

	Use "org.etsi.mts.tdl.execution.java.adapters.http.HttpMethod" as HttpMethod

	Map GET to "GET" in HttpMethod as GET_mapping

	Map POST to "POST" in HttpMethod as POST_mapping