Review LIS tests implementation (ec721896) · Commits · EMTEL - Emergency Communications / NG112 Conformance Test Suites

test_purposes/lis.tplan2

+47 −47

Original line number	Diff line number	Diff line
		@@ -76,7 +76,7 @@ Test objective
		"IUT successfully responds with a Point when it receives a HTTP POST location request without location type"
		Reference
		"ETSI TS 103 479 [1], clause 5.5",
		"Next Generation 112 LTD [2], Clause 4.10",
		"EENA Next Generation 112 LTD [2], Clause 4.10",
		"RFC5985 [3]"
		Config Id CFG_LIS_01
		PICS Selection H_QRY_GEO1
		@@ -146,7 +146,7 @@ Test objective
		"IUT successfully responds with a Circle when it receives a HTTP POST location request without location type"
		Reference
		"ETSI TS 103 479 [1], clause 5.5",
		"Next Generation 112 LTD [2], Clause 4.10",
		"EENA Next Generation 112 LTD [2], Clause 4.10",
		"RFC5985 [3]"
		Config Id CFG_LIS_01
		PICS Selection H_QRY_GEO2
		@@ -220,7 +220,7 @@ Test objective
		"IUT successfully responds with a reference when it receives a HTTP POST location request with location type locationURI and exact attribute"
		Reference
		"ETSI TS 103 479 [1], clause 5.5",
		"Next Generation 112 LTD [2], Clause 4.10",
		"EENA Next Generation 112 LTD [2], Clause 4.10",
		"RFC5985 [3]"
		Config Id CFG_LIS_01
		PICS Selection H_QRY_GEO4
		@@ -282,7 +282,7 @@ Test objective
		"IUT successfully responds with a reference and geodetic location when it receives a HTTP POST location request with location types locationURI and geodetic and exact attribute"
		Reference
		"ETSI TS 103 479 [1], clause 5.5",
		"Next Generation 112 LTD [2], Clause 4.10",
		"EENA Next Generation 112 LTD [2], Clause 4.10",
		"RFC5985 [3]"
		Config Id CFG_LIS_01
		PICS Selection H_QRY_STR1 and H_QRY_GEO2 and H_QRY_GEO4
		@@ -363,7 +363,7 @@ Test objective
		"IUT successfully responds with an error response when it receives a HTTP POST location request for an unknown device"
		Reference
		"ETSI TS 103 479 [1], clause 5.5",
		"Next Generation 112 LTD [2], Clause 4.10",
		"EENA Next Generation 112 LTD [2], Clause 4.10",
		"RFC5985 [3]"
		Config Id CFG_LIS_01
		PICS Selection H_QRY_ERR1
		@@ -415,7 +415,7 @@ Test objective
		"IUT successfully responds with a CIVIC address when it receives a HTTP POST location request without location type"
		Reference
		"ETSI TS 103 479 [1], clause 5.5",
		"Next Generation 112 LTD [2], Clause 4.10",
		"EENA Next Generation 112 LTD [2], Clause 4.10",
		"RFC5985 [3]"
		Config Id CFG_LIS_01
		PICS Selection H_QRY_CIV1
		@@ -491,7 +491,7 @@ Test objective
		"IUT successfully responds with an error response when it receives a HTTP POST location request with an unmatched location type"
		Reference
		"ETSI TS 103 479 [1], clause 5.5",
		"Next Generation 112 LTD [2], Clause 4.10",
		"EENA Next Generation 112 LTD [2], Clause 4.10",
		"RFC5985 [3]"
		Config Id CFG_LIS_01
		PICS Selection H_QRY_ERR2
		@@ -550,7 +550,7 @@ Test objective
		"IUT successfully returns the location when a locationURI is dereferenced"
		Reference
		"ETSI TS 103 479 [1], clause 5.5",
		"Next Generation 112 LTD [2], Clause 4.10",
		"EENA Next Generation 112 LTD [2], Clause 4.10",
		"RFC5985 [3]",
		"RFC6753 [4]"
		Config Id CFG_LIS_01
		@@ -613,7 +613,7 @@ Test objective
		"IUT returns HTTP error 404 if it does not support HTTP GET method"
		Reference
		"ETSI TS 103 479 [1], clause 5.5",
		"Next Generation 112 LTD [2], Clause 4.10",
		"EENA Next Generation 112 LTD [2], Clause 4.10",
		"RFC5985 [3]",
		"RFC6753 [4]"
		Config Id CFG_LIS_01

ttcn/AtsNg112/AtsNg112_Simulators.ttcn

+1 −1

Original line number	Diff line number	Diff line
		@@ -152,7 +152,7 @@ module AtsNg112_Simulators {
		v_headers,
		m_http_message_body_xml(m_body_xml_location_request(
		m_locationRequest(
		{ encvalue_unichar(valueof(m_device({ PX_DEVICE_URI_TEL[1] }))) }
		{ encvalue_unichar(valueof(m_device({ PX_DEVICE_NUMBER[1] }))) }
		)
		)
		)

ttcn/AtsNg112/AtsNg112_TestCases.ttcn

+13 −14

Original line number	Diff line number	Diff line
		@@ -130,7 +130,7 @@ module AtsNg112_TestCases {
		v_headers,
		m_http_message_body_xml(m_body_xml_location_request(
		m_locationRequest(
		{ encvalue_unichar(valueof(m_device({ PX_DEVICE_URI_TEL[0] }))) }
		{ encvalue_unichar(valueof(m_device({ PX_DEVICE_NUMBER[0] }))) }
		)
		)
		)
		@@ -175,8 +175,8 @@ module AtsNg112_TestCases {
		// Extract Circle element from Tuple
		v_temp := v_geopriv.location_info.elem_list[0];
		v_result := decvalue_unichar(v_temp, v_point);
		log(match(v_point, mw_point(PX_DEVICE_NUMBER_POINT))); // FIXME Required by TITAN to get details in case of mismatch
		if (match(v_point, mw_point(PX_DEVICE_NUMBER_POINT))) {
		log(match(v_point, mw_point(PX_DEVICE_NUMBER_POINT_POS))); // FIXME Required by TITAN to get details in case of mismatch
		if (match(v_point, mw_point(PX_DEVICE_NUMBER_POINT_POS))) {
		log("* " & testcasename() & ": PASS: IUT successfully responds with a Point *");
		f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_success);
		} else {
		@@ -240,7 +240,7 @@ module AtsNg112_TestCases {
		v_headers,
		m_http_message_body_xml(m_body_xml_location_request(
		m_locationRequest(
		{ encvalue_unichar(valueof(m_device({ PX_DEVICE_URI_TEL[1] }))) }
		{ encvalue_unichar(valueof(m_device({ PX_DEVICE_NUMBER[PX_DEVICE_NUMBER_CIRCLE] }))) }
		)
		)
		)
		@@ -350,7 +350,7 @@ module AtsNg112_TestCases {
		v_headers,
		m_http_message_body_xml(m_body_xml_location_request(
		m_locationRequest(
		{ encvalue_unichar(valueof(m_device({ PX_DEVICE_URI_TEL[1] }))) },
		{ encvalue_unichar(valueof(m_device({ PX_DEVICE_NUMBER[PX_DEVICE_NUMBER_CIRCLE] }))) },
		m_locationTypeType(
		m_locationTypeBase_locationUri,
		true
		@@ -420,7 +420,7 @@ module AtsNg112_TestCases {
		v_headers,
		m_http_message_body_xml(m_body_xml_location_request(
		m_locationRequest(
		{ encvalue_unichar(valueof(m_device({ PX_DEVICE_URI_TEL[2] }))) },
		{ encvalue_unichar(valueof(m_device({ PX_DEVICE_NUMBER[PX_DEVICE_NUMBER_CIRCLE] }))) },
		m_locationTypeType(
		m_locationTypeBase_geodetic,
		true
		@@ -510,7 +510,6 @@ module AtsNg112_TestCases {
		testcase TC_LIS_HTTP_POST_BV_05() runs on HttpComponent system TestAdapter {
		// Local variables
		var HeaderLines v_headers;
		var HttpMessage v_response;

		// Test control
		if (not(PICS_LIS_IUT) or (not PICS_HTTP_POST_REQUEST) or (not PICS_LOCATION_HELD) or not(PICS_H_QRY_ERR1)) {
		@@ -598,7 +597,7 @@ module AtsNg112_TestCases {
		v_headers,
		m_http_message_body_xml(m_body_xml_location_request(
		m_locationRequest(
		{ encvalue_unichar(valueof(m_device({ PX_DEVICE_URI_TEL[3] }))) },
		{ encvalue_unichar(valueof(m_device({ PX_DEVICE_NUMBER[PX_DEVICE_NUMBER_CIVIC] }))) },
		m_locationTypeType(
		m_locationTypeBase_civic,
		true
		@@ -631,7 +630,7 @@ module AtsNg112_TestCases {
		tc_ac.stop;

		// Extract presence element from Location-Response
		v_temp := v_response.response.body.xml_body.locationResponse.elem_list[0];
		v_temp := v_response.response.body.xml_body.locationResponse.elem_list[PX_DEVICE_NUMBER_POINT];
		v_result := decvalue_unichar(v_temp, v_presence);
		if (v_result == 0) {
		log(match(v_presence, mw_presence)); // FIXME Required by TITAN to get details in case of mismatch
		@@ -712,7 +711,7 @@ module AtsNg112_TestCases {
		v_headers,
		m_http_message_body_xml(m_body_xml_location_request(
		m_locationRequest(
		{ encvalue_unichar(valueof(m_device({ PX_DEVICE_URI_TEL[3] }))) },
		{ encvalue_unichar(valueof(m_device({ PX_DEVICE_NUMBER[PX_DEVICE_NUMBER_POINT] }))) },
		m_locationTypeType(
		m_locationTypeBase_civic,
		true
		@@ -778,9 +777,10 @@ module AtsNg112_TestCases {
		v_headers,
		m_http_message_body_xml(m_body_xml_location_request(
		m_locationRequest(
		{ encvalue_unichar(valueof(m_device({ PX_DEVICE_URI_TEL[0] }))) },
		{ encvalue_unichar(valueof(m_device({ PX_DEVICE_NUMBER[PX_DEVICE_NUMBER_POINT] }))) },
		m_locationTypeType(
		m_locationTypeBase_locationUri )
		m_locationTypeBase_locationUri
		)
		)
		)
		)
		@@ -895,7 +895,6 @@ module AtsNg112_TestCases {
		testcase TC_LIS_HTTP_GET_BV_02() runs on HttpComponent system TestAdapter {
		// Local variables
		var HeaderLines v_headers;
		var HttpMessage v_response;

		// Test control
		if (not(PICS_LIS_IUT) or (PICS_HTTP_GET_REQUEST) or (not PICS_LOCATION_HELD) or not(PICS_H_GET_ERR1)) {

ttcn/LibEmcom/LibNg112/ttcn/LibNg112_Functions.ttcn

+6 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,9 @@ module LibNg112_Functions {

		group preambles {

		/**
		* @desc Setup HTTP pprotocol port
		*/
		function f_cf_01_http_up() runs on HttpComponent {

		// Map ports
		@@ -75,6 +78,9 @@ module LibNg112_Functions {

		group postambles {

		/**
		* @desc Shutdown HTTP pprotocol port
		*/
		function f_cf_01_http_down() runs on HttpComponent {

		// Unmap ports

ttcn/LibEmcom/LibNg112/ttcn/LibNg112_Pics.ttcn

+2 −2

Original line number	Diff line number	Diff line
		@@ -38,12 +38,12 @@ module LibNg112_Pics {
		modulepar boolean PICS_SERVICE_LOST := true;

		/**
		* @desc
		* @desc HTTP post URI for LIS protocol
		*/
		modulepar charstring PICS_LIS_URI := "/api";

		/**
		* @desc
		* @desc HTTP post URI for LIS protocol
		*/
		modulepar charstring PICS_ECRF_URI := "/api";