Corrected timer handling for upper tester functions. (f14147cb) · Commits · TTCN-3 Libraries / LibIts

ttcn/BTP/LibItsBtp_Functions.ttcn

+8 −4

Original line number	Diff line number	Diff line
		@@ -64,15 +64,17 @@
		function f_utInitializeIut() runs on ItsNt {

		utPort.send(UtBtpInitialize:{});
		tc_ac.start;
		tc_wait.start;
		alt {
		[] utPort.receive(UtBtpResult:true) {
		tc_wait.stop;
		log("* f_utInitializeIut: INFO: IUT initialized *");
		}
		[] utPort.receive {
		tc_wait.stop;
		f_selfOrClientSyncAndVerdict("error", e_error, "* IUT could not be initialized *");
		}
		[] tc_ac.timeout {
		[] tc_wait.timeout {
		f_selfOrClientSyncAndVerdict("error", e_timeout, "* IUT could not be initialized in time *");
		}
		}
		@@ -103,15 +105,17 @@
		var template (value) UtBtpCheck v_utMsg := { p_event };

		utPort.send(v_utMsg);
		tc_ac.start;
		tc_wait.start;
		alt {
		[] utPort.receive(UtBtpResult:true) {
		tc_wait.stop;
		v_ret := e_success;
		}
		[] utPort.receive {
		tc_wait.stop;
		v_ret := e_error;
		}
		[] tc_ac.timeout {
		[] tc_wait.timeout {
		v_ret := e_timeout;
		f_selfOrClientSyncAndVerdict("error", e_timeout, "* Timeout while waiting for event check result *");
		}

+9 −5

Original line number	Diff line number	Diff line
		@@ -133,16 +133,18 @@ module LibItsCam_Functions {
		function f_utInitializeIut() runs on ItsFa {

		utPort.send(UtCamInitialize:{});
		tc_ac.start;
		tc_wait.start;
		alt {
		[] utPort.receive(UtCamResult:true) {
		log("* f_utInitializeIut: PASS: IUT initialized *");
		tc_wait.stop;
		log("* f_utInitializeIut: IUT initialized *");
		}
		[] utPort.receive {
		tc_wait.stop;
		f_selfOrClientSyncAndVerdict("error", e_error, "* f_utInitializeIut: IUT could not be initialized *");
		stop;
		}
		[] tc_ac.timeout {
		[] tc_wait.timeout {
		f_selfOrClientSyncAndVerdict("error", e_timeout, "* f_utInitializeIut: IUT could not be initialized in time *");
		stop;
		}
		@@ -172,17 +174,19 @@ module LibItsCam_Functions {
		var template (value) UtCamCheck v_utMsg := { p_event };

		utPort.send(v_utMsg);
		tc_ac.start;
		tc_wait.start;
		alt {
		[] utPort.receive(UtCamResult:true) {
		tc_wait.stop;
		log("* f_utCheckEvent: PASS: Event correctly indicated at application layer *");
		v_ret := e_success;
		}
		[] utPort.receive {
		tc_wait.stop;
		f_selfOrClientSyncAndVerdict("error", e_error, "* f_utCheckEvent: Event not correctly indicated at application layer *");
		v_ret := e_error;
		}
		[] tc_ac.timeout {
		[] tc_wait.timeout {
		f_selfOrClientSyncAndVerdict("error", e_timeout, "* f_utCheckEvent: Timeout while waiting for event check result *");
		v_ret := e_timeout;
		}

+9 −5

Original line number	Diff line number	Diff line
		@@ -176,15 +176,17 @@ module LibItsDenm_Functions {
		function f_utInitializeIut() runs on ItsFa {

		utPort.send(UtDenmInitialize:{});
		tc_ac.start;
		tc_wait.start;
		alt {
		[] utPort.receive(UtDenmResult:true) {
		log("* f_utInitializeIut: PASS: IUT initialized *");
		tc_wait.stop;
		log("* f_utInitializeIut: IUT initialized *");
		}
		[] utPort.receive {
		tc_wait.stop;
		f_selfOrClientSyncAndVerdict("error", e_error, "* f_utInitializeIut: IUT could not be initialized *");
		}
		[] tc_ac.timeout {
		[] tc_wait.timeout {
		f_selfOrClientSyncAndVerdict("error", e_timeout, "* f_utInitializeIut: IUT could not be initialized in time *");
		}
		}
		@@ -215,9 +217,10 @@ module LibItsDenm_Functions {
		var template (value) UtDenmCheck v_utMsg := { p_event };

		utPort.send(v_utMsg);
		tc_ac.start;
		tc_wait.start;
		alt {
		[] utPort.receive(UtDenmResult:true) {
		tc_wait.stop;
		if (p_discard == false) {
		log("* f_utCheckEvent: Event correctly indicated at application layer *");
		}
		@@ -226,6 +229,7 @@ module LibItsDenm_Functions {
		}
		}
		[] utPort.receive {
		tc_wait.stop;
		if (p_discard == false) {
		f_selfOrClientSyncAndVerdict("error", e_error, "* f_utCheckEvent: Event not correctly indicated at application layer *");
		}
		@@ -234,7 +238,7 @@ module LibItsDenm_Functions {
		repeat;
		}
		}
		[] tc_ac.timeout {
		[] tc_wait.timeout {
		if (p_discard == false) {
		f_selfOrClientSyncAndVerdict("error", e_timeout, "* f_utCheckEvent: Timeout while waiting for event check result *");
		}

+8 −4

Original line number	Diff line number	Diff line
		@@ -931,15 +931,17 @@ module LibItsGeoNetworking_Functions {
		function f_utInitializeIut() runs on ItsNt {

		utPort.send(UtGNInitialize:{});
		tc_ac.start;
		tc_wait.start;
		alt {
		[] utPort.receive(UtGNResult:true) {
		tc_wait.stop;
		log("* f_utInitializeIut: IUT initialized *");
		}
		[] utPort.receive {
		tc_wait.stop;
		f_selfOrClientSyncAndVerdict("error", e_error, "* f_utInitializeIut: IUT could not be initialized *");
		}
		[] tc_ac.timeout {
		[] tc_wait.timeout {
		f_selfOrClientSyncAndVerdict("error", e_timeout, "* f_utInitializeIut: IUT could not be initialized in time *");
		}
		}
		@@ -969,9 +971,10 @@ module LibItsGeoNetworking_Functions {
		var template (value) UtGNCheck v_utMsg := { p_event };

		utPort.send(v_utMsg);
		tc_ac.start;
		tc_wait.start;
		alt {
		[] utPort.receive(UtGNResult:true) {
		tc_wait.stop;
		if (p_discard == false) {
		log("* f_utCheckEvent: Event correctly indicated at application layer *");
		}
		@@ -980,6 +983,7 @@ module LibItsGeoNetworking_Functions {
		}
		}
		[] utPort.receive {
		tc_wait.stop;
		if (p_discard == false) {
		f_selfOrClientSyncAndVerdict("error", e_error, "* f_utCheckEvent: Event not correctly indicated at application layer *");
		}
		@@ -988,7 +992,7 @@ module LibItsGeoNetworking_Functions {
		repeat;
		}
		}
		[] tc_ac.timeout {
		[] tc_wait.timeout {
		if (p_discard == false) {
		f_selfOrClientSyncAndVerdict("error", e_timeout, "* f_utCheckEvent: Timeout while waiting for event check result *");
		}