Fixed compilation issues (IBM) (6579a255) · Commits · TTCN-3 Libraries / LibIts

ttcn/BTP/LibItsBtp_Functions.ttcn

+6 −3

Original line number	Original line	Diff line number	Diff line
	@@ -53,13 +53,16 @@
	altstep a_default() runs on ItsNt {		altstep a_default() runs on ItsNt {

	[] btpPort.receive {		[] btpPort.receive {
	f_selfOrClientSyncAndVerdict("error", e_error, "* a_default: Received an unexpected message *");		log("* a_default: Received an unexpected message *");
			f_selfOrClientSyncAndVerdict("error", e_error);
	}		}
	[] tc_wait.timeout {		[] tc_wait.timeout {
	f_selfOrClientSyncAndVerdict("error", e_timeout, "* a_default: Timeout while awaiting reaction of the IUT prior to Upper Tester action *");		log("* a_default: Timeout while awaiting reaction of the IUT prior to Upper Tester action *");
			f_selfOrClientSyncAndVerdict("error", e_timeout);
	}		}
	[] tc_ac.timeout {		[] tc_ac.timeout {
	f_selfOrClientSyncAndVerdict("error", e_timeout, "* a_default: Timeout while awaiting the reception of a message *");		log("* a_default: Timeout while awaiting the reception of a message *");
			f_selfOrClientSyncAndVerdict("error", e_timeout);
	}		}
	[] a_shutdown() {		[] a_shutdown() {
	f_poDefault();		f_poDefault();

ttcn/CAM/LibItsCam_Functions.ttcn

+7 −4

Original line number	Original line	Diff line number	Diff line
	@@ -58,13 +58,16 @@ module LibItsCam_Functions {
	altstep a_default() runs on ItsFa {		altstep a_default() runs on ItsFa {

	[] camPort.receive(mw_camInd ( mw_camMsg_any )){		[] camPort.receive(mw_camInd ( mw_camMsg_any )){
	f_selfOrClientSyncAndVerdict("error", e_error, "* a_basicDefault: CAM message received in default *");		log("* a_basicDefault: CAM message received in default *");
			f_selfOrClientSyncAndVerdict("error", e_error);
	}		}
	[] camPort.receive {		[] camPort.receive {
	f_selfOrClientSyncAndVerdict("error", e_error, "* a_basicDefault: event received on CAM port in default *");		log("* a_basicDefault: event received on CAM port in default *");
			f_selfOrClientSyncAndVerdict("error", e_error);
	}		}
	[] any timer.timeout {		[] any timer.timeout {
	f_selfOrClientSyncAndVerdict("error", e_timeout, "* a_basicDefault: a timer expired in default *");		log("* a_basicDefault: a timer expired in default *");
			f_selfOrClientSyncAndVerdict("error", e_timeout);
	}		}
	[] a_shutdown() {		[] a_shutdown() {
	f_poDefault();		f_poDefault();

ttcn/Common/LibItsCommon_Functions.ttcn

+11 −6

Original line number	Original line	Diff line number	Diff line
	@@ -35,10 +35,12 @@ module LibItsCommon_Functions {
	}		}
	[] utPort.receive {		[] utPort.receive {
	tc_wait.stop;		tc_wait.stop;
	f_selfOrClientSyncAndVerdict("error", e_error, "* IUT could not be initialized *");		log("* f_utInitializeIut: INFO: IUT could not be initialized *");
			f_selfOrClientSyncAndVerdict("error", e_error);
	}		}
	[] tc_wait.timeout {		[] tc_wait.timeout {
	f_selfOrClientSyncAndVerdict("error", e_timeout, "* IUT could not be initialized in time *");		log("* f_utInitializeIut: INFO: IUT could not be initialized in time *");
			f_selfOrClientSyncAndVerdict("error", e_timeout);
	}		}
	}		}

	@@ -61,7 +63,7 @@ module LibItsCommon_Functions {
	* @param p_discard The event should not appear. Default value: FALSE.		* @param p_discard The event should not appear. Default value: FALSE.
	* @return		* @return
	*/		*/
	function f_utCheckEvent(template (value) UtEvent p_event, boolean p_discard := false) runs on ItsAdapterComponent {		function f_utCheckEvent(template (value) UtEvent p_event, boolean p_discard) runs on ItsAdapterComponent {
	var template (value) UtCheck v_utMsg := { p_event };		var template (value) UtCheck v_utMsg := { p_event };

	utPort.send(v_utMsg);		utPort.send(v_utMsg);
	@@ -73,13 +75,15 @@ module LibItsCommon_Functions {
	log("* f_utCheckEvent: Event correctly indicated at application layer *");		log("* f_utCheckEvent: Event correctly indicated at application layer *");
	}		}
	else {		else {
	f_selfOrClientSyncAndVerdict("error", e_error, "* f_utCheckEvent: Event indicated at application layer where it should be discarded *");		log("* f_utCheckEvent: ERROR: Event indicated at application layer where it should be discarded *");
			f_selfOrClientSyncAndVerdict("error", e_error);
	}		}
	}		}
	[] utPort.receive {		[] utPort.receive {
	tc_wait.stop;		tc_wait.stop;
	if (p_discard == false) {		if (p_discard == false) {
	f_selfOrClientSyncAndVerdict("error", e_error, "* f_utCheckEvent: Event not correctly indicated at application layer *");		log("* f_utCheckEvent: ERROR: Event not correctly indicated at application layer *");
			f_selfOrClientSyncAndVerdict("error", e_error);
	}		}
	else {		else {
	log("* f_utCheckEvent: Another event indicated at application layer, repeating check *");		log("* f_utCheckEvent: Another event indicated at application layer, repeating check *");
	@@ -88,7 +92,8 @@ module LibItsCommon_Functions {
	}		}
	[] tc_wait.timeout {		[] tc_wait.timeout {
	if (p_discard == false) {		if (p_discard == false) {
	f_selfOrClientSyncAndVerdict("error", e_timeout, "* f_utCheckEvent: Timeout while waiting for event check result *");		log("* f_utCheckEvent: ERROR: Timeout while waiting for event check result *");
			f_selfOrClientSyncAndVerdict("error", e_timeout);
	}		}
	else {		else {
	log("* f_utCheckEvent: Event not indicated at application layer *");		log("* f_utCheckEvent: Event not indicated at application layer *");

ttcn/DENM/LibItsDenm_Functions.ttcn

+8 −4

Original line number	Original line	Diff line number	Diff line
	@@ -57,13 +57,16 @@ module LibItsDenm_Functions {
	*/		*/
	altstep a_default() runs on ItsFa {		altstep a_default() runs on ItsFa {
	[] denmPort.receive {		[] denmPort.receive {
	f_selfOrClientSyncAndVerdict("error", e_error, "* a_default: Received an unexpected message *");		log("* a_default: Received an unexpected message *");
			f_selfOrClientSyncAndVerdict("error", e_error);
	}		}
	[] tc_wait.timeout {		[] tc_wait.timeout {
	f_selfOrClientSyncAndVerdict("error", e_timeout, "* a_default: Timeout while awaiting reaction of the IUT prior to Upper Tester action *");		log("* a_default: Timeout while awaiting reaction of the IUT prior to Upper Tester action *");
			f_selfOrClientSyncAndVerdict("error", e_timeout);
	}		}
	[] tc_ac.timeout {		[] tc_ac.timeout {
	f_selfOrClientSyncAndVerdict("error", e_timeout, "* a_default: Timeout while awaiting the reception of a message *");		log("* a_default: Timeout while awaiting the reception of a message *");
			f_selfOrClientSyncAndVerdict("error", e_timeout);
	}		}
	[] a_shutdown() {		[] a_shutdown() {
	f_poDefault();		f_poDefault();
	@@ -192,7 +195,8 @@ module LibItsDenm_Functions {
	tc_ac.stop;		tc_ac.stop;
	}		}
	[] tc_ac.timeout {		[] tc_ac.timeout {
	f_selfOrClientSyncAndVerdict("error", e_timeout, "* f_awaitDenMessageOut: INFO: Timeout while awaiting the reception of a message *");		log("* f_awaitDenMessageOut: INFO: Timeout while awaiting the reception of a message *");
			f_selfOrClientSyncAndVerdict("error", e_timeout);
	}		}
	}		}

ttcn/GeoNetworking/LibItsGeoNetworking_Functions.ttcn

+10 −5

Original line number	Original line	Diff line number	Diff line
	@@ -570,13 +570,16 @@ module LibItsGeoNetworking_Functions {
	repeat;		repeat;
	}		}
	[] geoNetworkingPort.receive {		[] geoNetworkingPort.receive {
	f_selfOrClientSyncAndVerdict("error", e_error, "* a_default: Received an unexpected message *");		log("* a_default: ERROR: Received an unexpected message *");
			f_selfOrClientSyncAndVerdict("error", e_error);
	}		}
	[] tc_wait.timeout {		[] tc_wait.timeout {
	f_selfOrClientSyncAndVerdict("error", e_timeout, "* a_default: Timeout while awaiting reaction of the IUT prior to Upper Tester action *");		log("* a_default: ERROR: Timeout while awaiting reaction of the IUT prior to Upper Tester action *");
			f_selfOrClientSyncAndVerdict("error", e_timeout);
	}		}
	[] tc_ac.timeout {		[] tc_ac.timeout {
	f_selfOrClientSyncAndVerdict("error", e_timeout, "* a_default: Timeout while awaiting the reception of a message *");		log("* a_default: ERROR: Timeout while awaiting the reception of a message *");
			f_selfOrClientSyncAndVerdict("error", e_timeout);
	}		}
	[] a_shutdown() {		[] a_shutdown() {
	f_poDefault();		f_poDefault();
	@@ -963,10 +966,12 @@ module LibItsGeoNetworking_Functions {
	}		}
	[] acPort.receive {		[] acPort.receive {
	tc_ac.stop;		tc_ac.stop;
	f_selfOrClientSyncAndVerdict("error", e_error, "* f_acGetLongPosVector: Received unexpected message *");		log("* f_acGetLongPosVector: ERROR: Received unexpected message *");
			f_selfOrClientSyncAndVerdict("error", e_error);
	}		}
	[] tc_ac.timeout {		[] tc_ac.timeout {
	f_selfOrClientSyncAndVerdict("error", e_timeout, "* f_acGetLongPosVector: Timeout while waiting for adapter control event result *");		log("* f_acGetLongPosVector: ERROR: Timeout while waiting for adapter control event result *");
			f_selfOrClientSyncAndVerdict("error", e_timeout);
	}		}
	}		}

Admin message