Results of first week of ITS CMS4/C2C session. (7e41b06a) · Commits · TTCN-3 Libraries / LibIts

ttcn/CAM/LibItsCam_Pics.ttcn

+4 −1

Original line number	Diff line number	Diff line
		@@ -95,7 +95,10 @@ module LibItsCam_Pics {
		*/
		modulepar boolean PICS_CAM_RECEPTION := true;


		/**
		* @desc Is the IUT RSU?
		*/
		modulepar boolean PICS_RSU := false;
		} // end camPics

		} // end LibItsCam_Pics

ttcn/CAM/LibItsCam_Templates.ttcn

+2 −2

Original line number	Diff line number	Diff line
		@@ -392,14 +392,14 @@ module LibItsCam_Templates {
		* @param p_basicVehicleContainer The including basic vehicle container
		*/
		template (present) CAM mw_camMsg_LF_BV(
		in template(present) BasicVehicleContainerLowFrequency p_basicVehicleContainer
		in template(present) BasicVehicleContainerLowFrequency p_basicVehicleContainer := ?
		) modifies mw_camMsg_any := {
		cam := {
		camParameters := {
		basicContainer := ?,
		highFrequencyContainer := ?,
		lowFrequencyContainer := {
		basicVehicleContainerLowFrequency := ?
		basicVehicleContainerLowFrequency := p_basicVehicleContainer
		},
		specialVehicleContainer := *
		}

ttcn/DENM/LibItsDenm_Functions.ttcn

+37 −18

Original line number	Diff line number	Diff line
		@@ -39,14 +39,17 @@ module LibItsDenm_Functions {
		tc_wait.stop;
		log("* " & testcasename() & ": INFO: IUT initialized *");
		}
		[] a_utDefault() {
		//empty on purpose
		}
		[] tc_wait.timeout {
		log("* " & testcasename() & ": INFO: Could not receive expected UT message from IUT in time *");
		f_selfOrClientSyncAndVerdict("error", e_timeout);
		}
		// [else] { // Shortcut defaults
		[else] { // Shortcut defaults
		// //f_sleep(0.050); // 50 ms
		// repeat;
		// }
		repeat;
		}
		}
		}

		@@ -68,14 +71,17 @@ module LibItsDenm_Functions {
		log("* " & testcasename() & ": INFO: IUT pseudonym changed *");
		f_selfOrClientSyncAndVerdict("error", e_error);
		}
		[] a_utDefault() {
		//empty on purpose
		}
		[] tc_wait.timeout {
		log("* " & testcasename() & ": INFO: Could not receive expected UT message from IUT in time *");
		f_selfOrClientSyncAndVerdict("error", e_timeout);
		}
		// [else] { // Shortcut defaults
		[else] { // Shortcut defaults
		// //f_sleep(0.050); // 50 ms
		// repeat;
		// }
		repeat;
		}
		}

		}
		@@ -98,14 +104,17 @@ module LibItsDenm_Functions {
		f_selfOrClientSyncAndVerdict("DENM Trigger failed", e_error);
		}
		}
		[] a_utDefault() {
		//empty on purpose
		}
		[] tc_wait.timeout {
		log("* " & testcasename() & ": INFO: Could not receive expected UT message from IUT in time *");
		f_selfOrClientSyncAndVerdict("error", e_timeout);
		}
		// [else] { // Shortcut defaults
		[else] { // Shortcut defaults
		// //f_sleep(0.050); // 50 ms
		// repeat;
		// }
		repeat;
		}
		}

		return v_actionId;
		@@ -126,14 +135,17 @@ module LibItsDenm_Functions {
		tc_wait.stop;
		v_actionId := v_result.actionId;
		}
		[] a_utDefault() {
		//empty on purpose
		}
		[] tc_wait.timeout {
		log("* " & testcasename() & ": INFO: Could not receive expected UT message from IUT in time *");
		f_selfOrClientSyncAndVerdict("error", e_timeout);
		}
		// [else] { // Shortcut defaults
		[else] { // Shortcut defaults
		// //f_sleep(0.050); // 50 ms
		// repeat;
		// }
		repeat;
		}
		}

		return v_actionId;
		@@ -155,10 +167,13 @@ module LibItsDenm_Functions {
		log("* " & testcasename() & ": INFO: Could not receive expected UT message from IUT in time *");
		f_selfOrClientSyncAndVerdict("error", e_timeout);
		}
		// [else] { // Shortcut defaults
		[] a_utDefault() {
		//empty on purpose
		}
		[else] { // Shortcut defaults
		// //f_sleep(0.050); // 50 ms
		// repeat;
		// }
		repeat;
		}
		}
		}

		@@ -171,6 +186,7 @@ module LibItsDenm_Functions {
		function f_utChangePosition(template (value) UtChangePosition p_position) runs on ItsDenm {

		utPort.send(p_position);
		tc_wait.start;
		alt {
		[] utPort.receive(UtChangePositionResult:?) {
		tc_wait.stop;
		@@ -179,10 +195,13 @@ module LibItsDenm_Functions {
		log("* " & testcasename() & ": INFO: Could not receive expected UT message from IUT in time *");
		f_selfOrClientSyncAndVerdict("error", e_timeout);
		}
		// [else] { // Shortcut defaults
		[] a_utDefault() {
		//empty on purpose
		}
		[else] { // Shortcut defaults
		// //f_sleep(0.050); // 50 ms
		// repeat;
		// }
		repeat;
		}
		}
		}

ttcn/DENM/LibItsDenm_Templates.ttcn

+1 −1

Original line number	Diff line number	Diff line
		@@ -425,7 +425,7 @@ module LibItsDenm_Templates {
		template (value) ActionID p_actionID,
		template (value) StationType p_stationType
		) := {
		management := m_denmMgmtCon(p_actionID, p_stationType, -, -),
		management := m_denmMgmtConTermination(p_actionID, p_stationType, -, -, -, -, isCancellation),
		situation := omit,
		location := omit,
		alacarte := omit

ttcn/GeoNetworking/LibItsGeoNetworking_Functions.ttcn

+15 −3

Original line number	Diff line number	Diff line
		@@ -76,6 +76,13 @@ module LibItsGeoNetworking_Functions {
		tc_wait.stop;
		log("* f_utChangePosition: INFO: IUT position changed *");
		}
		[] utPort.receive(UtChangePositionResult:false) {
		tc_wait.stop;
		log("* f_utChangePosition: INFO: IUT position change was not successful *");
		f_selfOrClientSyncAndVerdict("error", e_error);
		}
		[] a_utDefault() {
		}
		[] tc_wait.timeout {
		log("* f_utChangePosition: INFO: IUT position not changed in time *");
		f_selfOrClientSyncAndVerdict("error", e_timeout);
		@@ -102,11 +109,16 @@ module LibItsGeoNetworking_Functions {
		[] utPort.receive(UtGnTriggerResult:true) {
		tc_wait.stop;
		}
		[] tc_wait.timeout {
		v_return := false;
		[] utPort.receive(UtGnTriggerResult:false) {
		tc_wait.stop;
		log("* UtGnTriggerResult: INFO: UT trigger was not successful *");
		f_selfOrClientSyncAndVerdict("error", e_error);
		}
		[] a_utDefault() {
		}
		[] tc_wait.timeout {
		v_return := false;
		}
		[else] { // Shortcut defaults
		//f_sleep(0.050); // 50 ms
		repeat;
		@@ -1192,7 +1204,7 @@ module LibItsGeoNetworking_Functions {
		/**
		* @desc The default for handling upper tester messages.
		*/
		altstep a_utDefault() runs on ItsGeoNetworking {
		altstep a_utDefault() runs on ItsBaseGeoNetworking {
		var UtGnEventInd v_ind;
		[] utPort.receive(UtGnEventInd:?) -> value v_ind {
		//store every upper tester indication received