Titanization: valueof() and imports (d8c7d63c) · Commits · ITS - Intelligent Transport Systems / ITS

ttcn/AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn

+217 −193

File changed.

Preview size limit exceeded, changes collapsed.

ttcn/AtsIPv6OverGeoNetworking/ItsIpv6OverGeoNetworking_TestCases.ttcn

+26 −26

Changes for ttcn/AtsIPv6OverGeoNetworking/ItsIpv6OverGeoNetworking_TestCases.ttcn: 26 added lines, 26 removed lines.
Original line number	Diff line number	Diff line
		@@ -1084,7 +1084,7 @@ module ItsIpv6OverGeoNetworking_TestCases {

		// Test Body
		f_sendGeoNetMessageWithPayload(
		m_geoNwReq_linkLayerBroadcast(
		valueof(m_geoNwReq_linkLayerBroadcast(
		m_geoNwPdu(
		m_geoNwBroadcastPacket(
		v_longPosVectorNodeA,
		@@ -1092,7 +1092,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
		f_getGeoBroadcastArea(vc_gvlTable[c_gvl1].area)
		)
		)
		),
		)),
		m_ipv6Payload(v_ipv6Packet)
		);

		@@ -1190,7 +1190,7 @@ module ItsIpv6OverGeoNetworking_TestCases {

		// Test Body
		f_sendGeoNetMessageWithPayload(
		m_geoNwReq_linkLayerBroadcast(
		valueof(m_geoNwReq_linkLayerBroadcast(
		m_geoNwPdu(
		m_geoNwBroadcastPacket(
		v_longPosVectorNodeA,
		@@ -1198,7 +1198,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
		f_getGeoBroadcastArea(vc_gvlTable[c_gvl2].area)
		)
		)
		),
		)),
		m_ipv6Payload(v_ipv6Packet)
		);

		@@ -1289,7 +1289,7 @@ module ItsIpv6OverGeoNetworking_TestCases {

		// Test Body
		f_sendGeoNetMessageWithPayload(
		m_geoNwReq_linkLayerBroadcast(
		valueof(m_geoNwReq_linkLayerBroadcast(
		m_geoNwPdu(
		m_geoNwAnycastPacket(
		v_longPosVectorNodeA,
		@@ -1297,7 +1297,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
		f_getGeoAnycastArea(vc_gvlTable[c_gvl1].area)
		)
		)
		),
		)),
		m_ipv6Payload(v_ipv6Packet)
		);

		@@ -1394,7 +1394,7 @@ module ItsIpv6OverGeoNetworking_TestCases {

		// Test Body
		f_sendGeoNetMessageWithPayload(
		m_geoNwReq_linkLayerBroadcast(
		valueof(m_geoNwReq_linkLayerBroadcast(
		m_geoNwPdu(
		m_geoNwBroadcastPacket(
		v_longPosVectorNodeA,
		@@ -1402,7 +1402,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
		f_getGeoBroadcastArea(vc_gvlTable[c_gvl1].area)
		)
		)
		),
		)),
		m_ipv6Payload(v_ipv6Packet)
		);

		@@ -1507,7 +1507,7 @@ module ItsIpv6OverGeoNetworking_TestCases {

		// Test Body
		f_sendGeoNetMessageWithPayload(
		m_geoNwReq_linkLayerBroadcast(
		valueof(m_geoNwReq_linkLayerBroadcast(
		m_geoNwPdu(
		m_geoNwBroadcastPacket(
		v_longPosVectorNodeA,
		@@ -1515,7 +1515,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
		f_getGeoBroadcastArea(vc_gvlTable[c_gvl3].area)
		)
		)
		),
		)),
		m_ipv6Payload(v_ipv6Packet)
		);

		@@ -1614,7 +1614,7 @@ module ItsIpv6OverGeoNetworking_TestCases {

		// Test Body
		f_sendGeoNetMessageWithPayload(
		m_geoNwReq_linkLayerBroadcast(
		valueof(m_geoNwReq_linkLayerBroadcast(
		m_geoNwPdu(
		m_geoNwUnicastPacket(
		v_longPosVectorNodeA,
		@@ -1622,7 +1622,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
		vc_localSeqNumber
		)
		)
		),
		)),
		m_ipv6Payload(v_ipv6Packet)
		);

		@@ -1722,7 +1722,7 @@ module ItsIpv6OverGeoNetworking_TestCases {

		// Test Body
		f_sendGeoNetMessageWithPayload(
		m_geoNwReq_linkLayerBroadcast(
		valueof(m_geoNwReq_linkLayerBroadcast(
		m_geoNwPdu(
		m_geoNwUnicastPacket(
		v_longPosVectorNodeB,
		@@ -1730,7 +1730,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
		vc_localSeqNumber
		)
		)
		),
		)),
		m_ipv6Payload(v_ipv6Packet)
		);

		@@ -1829,7 +1829,7 @@ module ItsIpv6OverGeoNetworking_TestCases {

		// Test Body
		f_sendGeoNetMessageWithPayload(
		m_geoNwReq_linkLayerBroadcast(
		valueof(m_geoNwReq_linkLayerBroadcast(
		m_geoNwPdu(
		m_geoNwUnicastPacket(
		v_longPosVectorNodeB,
		@@ -1837,7 +1837,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
		vc_localSeqNumber
		)
		)
		),
		)),
		m_ipv6Payload(v_ipv6Packet)
		);

		@@ -1937,7 +1937,7 @@ module ItsIpv6OverGeoNetworking_TestCases {

		// Test Body
		f_sendGeoNetMessageWithPayload(
		m_geoNwReq_linkLayerBroadcast(
		valueof(m_geoNwReq_linkLayerBroadcast(
		m_geoNwPdu(
		m_geoNwUnicastPacket(
		v_longPosVectorNodeB,
		@@ -1945,7 +1945,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
		vc_localSeqNumber
		)
		)
		),
		)),
		m_ipv6Payload(v_ipv6Packet)
		);

		@@ -2047,7 +2047,7 @@ module ItsIpv6OverGeoNetworking_TestCases {

		// Test Body
		f_sendGeoNetMessageWithPayload(
		m_geoNwReq_linkLayerBroadcast(
		valueof(m_geoNwReq_linkLayerBroadcast(
		m_geoNwPdu(
		m_geoNwUnicastPacket(
		v_longPosVectorNodeB,
		@@ -2055,7 +2055,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
		vc_localSeqNumber
		)
		)
		),
		)),
		m_ipv6Payload(v_ipv6Packet)
		);

		@@ -2152,14 +2152,14 @@ module ItsIpv6OverGeoNetworking_TestCases {

		// Test Body
		f_sendGeoNetMessageWithPayload(
		m_geoNwReq_linkLayerBroadcast(
		valueof(m_geoNwReq_linkLayerBroadcast(
		m_geoNwPdu(
		m_geoNwTsbPacket(
		vc_localSeqNumber,
		v_longPosVectorIut
		)
		)
		),
		)),
		m_ipv6Payload(v_ipv6Packet)
		);

		@@ -2265,7 +2265,7 @@ module ItsIpv6OverGeoNetworking_TestCases {

		// Test Body
		f_sendGeoNetMessageWithPayload(
		m_geoNwReq_linkLayerBroadcast(
		valueof(m_geoNwReq_linkLayerBroadcast(
		m_geoNwPdu(
		m_geoNwBroadcastPacket(
		v_longPosVectorNodeA,
		@@ -2273,7 +2273,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
		f_getGeoBroadcastArea(vc_gvlTable[c_gvl3].area)
		)
		)
		),
		)),
		m_ipv6Payload(v_ipv6Packet)
		);

		@@ -2360,7 +2360,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
		);

		f_sendGeoNetMessageWithPayload(
		m_geoNwReq_linkLayerBroadcast(
		valueof(m_geoNwReq_linkLayerBroadcast(
		m_geoNwPdu(
		m_geoNwBroadcastPacket(
		v_longPosVectorNodeA,
		@@ -2368,7 +2368,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
		f_getGeoBroadcastArea(vc_gvlTable[c_gvl3].area)
		)
		)
		),
		)),
		m_ipv6Payload(v_ipv6Packet)
		);

ttcn/AtsIVIM/ItsIvim_TpFunctions.ttcn

+11 −9

Changes for ttcn/AtsIVIM/ItsIvim_TpFunctions.ttcn: 11 added lines, 9 removed lines.
Original line number	Diff line number	Diff line
		/**
		* @author ETSI STF517
		* @author ETSI STF517 / STF525
		* @version $URL$
		* $Id$
		* @desc IVIM TP functions
		@@ -22,6 +22,7 @@ module ItsIvim_TpFunctions {
		import from LibItsCommon_Pixits all;
		import from LibItsCommon_Functions all;
		import from LibItsCommon_TypesAndValues all;
		import from LibItsCommon_ASN1_NamedNumbers all;

		// LibIts
		import from ITS_Container language "ASN.1:1997" all;
		@@ -34,6 +35,7 @@ module ItsIvim_TpFunctions {
		import from LibItsIvim_TestSystem all;
		import from LibItsIvim_Functions all;
		import from LibItsIvim_Pics all;
		import from LibItsIvim_ASN1_IVInamedNumbers all;

		group iviMessageTransmission {

		@@ -177,14 +179,14 @@ module ItsIvim_TpFunctions {
		// Preamble
		f_prInitialState();
		for (i := 0; i < lengthof(v_utTriggers) - 1; i := i + 1) {
		f_utTriggerEvent(v_utTriggers[i]);
		f_utTriggerEvent(valueof(v_utTriggers[i]));
		f_awaitIviMessage(mw_ivimInd(mw_anyIvimPdu), v_ivimInd);
		v_iviIdentificationNumbers[i] := v_ivimInd.msgIn.ivi.mandatory.iviIdentificationNumber;
		}
		f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);

		// Test Body
		f_utTriggerEvent(v_utTriggers[lengthof(v_utTriggers) - 1]);
		f_utTriggerEvent(valueof(v_utTriggers[lengthof(v_utTriggers) - 1]));
		f_awaitIviMessage(mw_ivimInd(mw_anyIvimPdu), v_ivimInd);
		v_iviIdentificationNumbers[lengthof(v_iviIdentificationNumbers) - 1] := v_ivimInd.msgIn.ivi.mandatory.iviIdentificationNumber;

		@@ -239,7 +241,7 @@ module ItsIvim_TpFunctions {
		// Preamble
		f_prInitialState();
		for (i := 0; i < lengthof(v_utTriggers) - 1; i := i + 1) {
		f_utTriggerEvent(v_utTriggers[i]);
		f_utTriggerEvent(valueof(v_utTriggers[i]));
		f_awaitIviMessage(mw_ivimInd(mw_anyIvimPdu), v_ivimInd);
		f_poCancelEvent(e_iut, v_ivimInd.msgIn.ivi.mandatory.iviIdentificationNumber);
		}
		@@ -248,7 +250,7 @@ module ItsIvim_TpFunctions {
		f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);

		// Test Body
		f_utTriggerEvent(v_utTriggers[lengthof(v_utTriggers) - 1]);
		f_utTriggerEvent(valueof(v_utTriggers[lengthof(v_utTriggers) - 1]));

		tc_ac.start;
		alt {
		@@ -1565,13 +1567,13 @@ module ItsIvim_TpFunctions {
		v_ivimReq := valueof(
		m_ivimReq(
		m_ivimStructurePdu(
		m_ivimStructure(
		m_iviManagementContainer(
		valueof(m_ivimStructure(
		valueof(m_iviManagementContainer(
		f_getProvider(),
		1,
		IviStatus_new_
		)
		)
		))
		))
		)
		)
		);

ttcn/AtsSecurity/ItsSecurity_Functions.ttcn

+14 −10

Changes for ttcn/AtsSecurity/ItsSecurity_Functions.ttcn: 14 added lines, 10 removed lines.
Original line number	Diff line number	Diff line
		/**
		* @author ETSI / STF481 / STF507 / STF517
		* @author ETSI / STF481 / STF507 / STF517 / STF525
		* @version $URL$
		* $Id$
		* @desc Module containing functions for the secured GN ATS
		@@ -24,23 +24,27 @@ module ItsSecurity_Functions {
		import from LibItsCommon_TypesAndValues all;
		import from LibItsCommon_TestSystem all;
		import from LibItsCommon_Functions all;
		import from LibItsCommon_ASN1_NamedNumbers all;

		// LibItsDenm
		import from LibItsDenm_TypesAndValues all;
		import from LibItsDenm_Templates all;
		import from LibItsDenm_Functions all;
		import from LibItsDenm_TestSystem all;
		import from LibItsDenm_EncdecDeclarations all;

		// LibItsCam
		import from LibItsCam_Templates all;
		import from LibItsCam_Functions all;
		import from LibItsCam_TestSystem all;
		import from LibItsCam_EncdecDeclarations all;

		// LibItsGeoNetworking
		import from LibItsGeoNetworking_TestSystem all;
		import from LibItsGeoNetworking_Functions all;
		import from LibItsGeoNetworking_Templates all;
		import from LibItsGeoNetworking_TypesAndValues all;
		import from LibItsGeoNetworking_EncdecDeclarations all;

		// LibItsSecurity
		import from LibItsSecurity_TypesAndValues all;
		@@ -195,7 +199,7 @@ module ItsSecurity_Functions {
		// Local variables
		var GeoNetworkingPdu v_securedGnPdu := f_prepareSecuredCam(p_configId, p_headerFields, p_signerInfoType);

		f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(v_securedGnPdu));
		f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_securedGnPdu)));

		return v_securedGnPdu;

		@@ -225,7 +229,7 @@ module ItsSecurity_Functions {
		var GeoNetworkingPdu v_securedGnPdu := f_prepareSecuredCam_Bo(p_configId, p_protocolVersion, p_trailerStatus, p_headerFields, p_signerInfoType);

		// log("v_securedGnPdu = ", v_securedGnPdu);
		f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(v_securedGnPdu));
		f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_securedGnPdu)));

		return v_securedGnPdu;

		@@ -397,7 +401,7 @@ module ItsSecurity_Functions {
		// Local variables
		var GeoNetworkingPdu v_securedGnPdu := f_prepareSecuredDenm(p_configId, p_headerFields, p_signerInfoType);

		f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(v_securedGnPdu));
		f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_securedGnPdu)));

		return v_securedGnPdu;

		@@ -425,7 +429,7 @@ module ItsSecurity_Functions {
		// Local variables
		var GeoNetworkingPdu v_securedGnPdu := f_prepareSecuredDenm_Bo(p_configId, p_protocolVersion, p_trailerStatus, p_headerFields, p_signerInfoType);

		f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(v_securedGnPdu));
		f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_securedGnPdu)));

		return v_securedGnPdu;

		@@ -565,7 +569,7 @@ module ItsSecurity_Functions {
		// Local variables
		var GeoNetworkingPdu v_securedGnPdu := f_prepareSecuredBeacon(p_configId, p_headerFields, p_signerInfoType);

		f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(v_securedGnPdu));
		f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_securedGnPdu)));

		return v_securedGnPdu;

		@@ -593,7 +597,7 @@ module ItsSecurity_Functions {
		// Local variables
		var GeoNetworkingPdu v_securedGnPdu := f_prepareSecuredBeacon_Bo(p_configId, p_protocolVersion, p_trailerStatus, p_headerFields, p_signerInfoType);

		f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(v_securedGnPdu));
		f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_securedGnPdu)));

		return v_securedGnPdu;

		@@ -632,7 +636,7 @@ module ItsSecurity_Functions {
		/**
		* @desc Behaviour function for triggering a CAM change speed event on IUT
		*/
		function fb_setCamFrequencyGreatherThan1Hz() runs on ItsCam system ItsSecSystem {
		function fb_setCamFrequencyGreatherThan1Hz() runs on ItsCam /* TITAN TODO: system ItsSecSystem */{

		// Local variables
		var SpeedValue v_speedValues[5] := { 1000, 2000, 3000, 4000, 5000 } //cm/s
		@@ -684,7 +688,7 @@ module ItsSecurity_Functions {
		/**
		* @desc Behaviour function for triggering a DENM event on IUT
		*/
		function fb_secTriggerDenmEvent() runs on ItsDenm system ItsSecSystem {
		function fb_secTriggerDenmEvent() runs on ItsDenm /* TITAN TODO: system ItsSecSystem */ {

		// Local variables
		var template (value) SituationContainer v_situation := m_situation(CauseCodeType_vehicleBreakdown_, VehicleBreakdownSubCauseCode_unavailable_);
		@@ -700,7 +704,7 @@ module ItsSecurity_Functions {
		/**
		* @desc Behaviour function for cancelling previously triggered DENM events on IUT
		*/
		function fb_secCancelDenmEvent() runs on ItsDenm system ItsSecSystem {
		function fb_secCancelDenmEvent() runs on ItsDenm /* TITAN TODO: system ItsSecSystem */ {

		// Local variables
		var integer v_counter;

ttcn/AtsSecurity/ItsSecurity_TestCases.ttcn

+110 −106

File changed.

Preview size limit exceeded, changes collapsed.