Merge with C2C project (34d8b001) · Commits · TTCN-3 Libraries / LibIts

ttcn/BTP/LibItsBtp_Functions.ttcn

+16 −11

Original line number	Diff line number	Diff line
		@@ -31,6 +31,9 @@
		*/
		function f_utInitializeIut(template (value) UtInitialize p_init) runs on ItsBtp {

		//deactivate btpPort default alts
		vc_btpDefaultActive := false;

		utPort.send(p_init);
		tc_wait.start;
		alt {
		@@ -47,12 +50,11 @@
		log("* f_utInitializeIut: INFO: IUT could not be initialized in time *");
		f_selfOrClientSyncAndVerdict("error", e_timeout);
		}
		[else] { // Shortcut defaults
		//f_sleep(0.050); // 50 ms
		repeat;
		}
		}

		//activate btpPort default alts
		vc_btpDefaultActive := true;

		}

		/**
		@@ -61,6 +63,9 @@
		*/
		function f_utTriggerEvent(template (value) UtBtpTrigger p_event) runs on ItsBtp {

		//deactivate btpPort default alts
		vc_btpDefaultActive := false;

		utPort.send(p_event);
		alt {
		[] utPort.receive(UtBtpTriggerResult:true) {
		@@ -71,11 +76,11 @@
		}
		[] tc_wait.timeout {
		}
		[else] { // Shortcut defaults
		//f_sleep(0.050); // 50 ms
		repeat;
		}
		}

		//activate btpPort default alts
		vc_btpDefaultActive := true;

		}

		} // End of group utFunctions
		@@ -113,7 +118,7 @@
		*/
		altstep a_default() runs on ItsBtp {

		[] btpPort.receive {
		[vc_btpDefaultActive] btpPort.receive {
		log("* a_default: ERROR: Received an unexpected message *");
		f_selfOrClientSyncAndVerdict("error", e_error);
		}
		@@ -138,12 +143,12 @@
		*/
		altstep a_utDefault() runs on ItsBtp {
		var UtBtpEventInd v_ind;
		[] utPort.receive(UtBtpEventInd:?) -> value v_ind {
		[vc_utDefaultActive] utPort.receive(UtBtpEventInd:?) -> value v_ind {
		//store every upper tester indication received
		vc_utEvents[lengthof(vc_utEvents)] := v_ind;
		repeat;
		}
		[] utPort.receive {
		[vc_utDefaultActive] utPort.receive {
		log("* " & testcasename() & ": INFO: Received unhandled/unknown UT message from IUT *");
		repeat;
		}

ttcn/BTP/LibItsBtp_TestSystem.ttcn

+3 −0

Original line number	Diff line number	Diff line
		@@ -80,6 +80,9 @@ module LibItsBtp_TestSystem {

		var UtBtpEventIndList vc_utEvents := {};

		var boolean vc_utDefaultActive := true;
		var boolean vc_btpDefaultActive := true;

		} // End of component ItsBtp

		group networkAndTransportPrimitives {

ttcn/CAM/LibItsCam_Functions.ttcn

+20 −12

Original line number	Diff line number	Diff line
		@@ -32,6 +32,9 @@ module LibItsCam_Functions {
		*/
		function f_utInitializeIut(template (value) UtInitialize p_init) runs on ItsCam {

		//deactivate camPort default alts
		vc_camDefaultActive := false;

		utPort.send(p_init);
		tc_wait.start;
		alt {
		@@ -48,12 +51,11 @@ module LibItsCam_Functions {
		log("* f_utInitializeIut: INFO: IUT could not be initialized in time *");
		f_selfOrClientSyncAndVerdict("error", e_timeout);
		}
		[else] { // Shortcut defaults
		//f_sleep(0.050); // 50 ms
		repeat;
		}
		}

		//activate camPort default alts
		vc_camDefaultActive := true;

		}

		/**
		@@ -62,6 +64,9 @@ module LibItsCam_Functions {
		*/
		function f_utTriggerEvent(template (value) UtCamTrigger p_event) runs on ItsCam {

		//deactivate camPort default alts
		vc_camDefaultActive := false;

		utPort.send(p_event);
		tc_wait.start;
		alt {
		@@ -73,11 +78,11 @@ module LibItsCam_Functions {
		}
		[] tc_wait.timeout {
		}
		[else] { // Shortcut defaults
		//f_sleep(0.050); // 50 ms
		repeat;
		}
		}

		//activate camPort default alts
		vc_camDefaultActive := true;

		}

		/**
		@@ -86,6 +91,9 @@ module LibItsCam_Functions {
		*/
		function f_utChangePosition(template (value) UtChangePosition p_position) runs on ItsCam {

		//deactivate camPort default alts
		vc_camDefaultActive := false;

		utPort.send(p_position);
		alt {
		[] utPort.receive(UtChangePositionResult:?) {
		@@ -98,11 +106,11 @@ module LibItsCam_Functions {
		log("* " & testcasename() & ": INFO: Could not receive expected UT message from IUT in time *");
		f_selfOrClientSyncAndVerdict("error", e_timeout);
		}
		[else] { // Shortcut defaults
		//f_sleep(0.050); // 50 ms
		repeat;
		}
		}

		//activate camPort default alts
		vc_camDefaultActive := true;

		}

		} // End of group utFunctions

ttcn/CAM/LibItsCam_TestSystem.ttcn

+3 −0

Original line number	Diff line number	Diff line
		@@ -108,6 +108,9 @@ module LibItsCam_TestSystem {

		var UtCamEventIndList vc_utEvents := {};

		var boolean vc_utDefaultActive := true;
		var boolean vc_camDefaultActive := true;

		} // End of component ItsCam

		group facilityPrimitives {

ttcn/DENM/LibItsDenm_Functions.ttcn

+43 −28

Original line number	Diff line number	Diff line
		@@ -33,6 +33,9 @@ module LibItsDenm_Functions {
		*/
		function f_utInitializeIut(template (value) UtInitialize p_init) runs on ItsDenm {

		//deactivate denmPort default alts
		vc_denmDefaultActive := false;

		utPort.send(p_init);
		tc_wait.start;
		alt {
		@@ -47,11 +50,11 @@ module LibItsDenm_Functions {
		log("* " & testcasename() & ": INFO: Could not receive expected UT message from IUT in time *");
		f_selfOrClientSyncAndVerdict("error", e_timeout);
		}
		[else] { // Shortcut defaults
		// //f_sleep(0.050); // 50 ms
		repeat;
		}
		}

		//activate denmPort default alts
		vc_denmDefaultActive := true;

		}

		/**
		@@ -60,6 +63,9 @@ module LibItsDenm_Functions {
		*/
		function f_utChangePseudonym ( template (value) UtChangePseudonym p_change ) runs on ItsDenm {

		//deactivate denmPort default alts
		vc_denmDefaultActive := false;

		utPort.send(p_change);
		tc_wait.start;
		alt {
		@@ -79,12 +85,11 @@ module LibItsDenm_Functions {
		log("* " & testcasename() & ": INFO: Could not receive expected UT message from IUT in time *");
		f_selfOrClientSyncAndVerdict("error", e_timeout);
		}
		[else] { // Shortcut defaults
		// //f_sleep(0.050); // 50 ms
		repeat;
		}
		}

		//activate denmPort default alts
		vc_denmDefaultActive := true;

		}

		/**
		@@ -95,6 +100,9 @@ module LibItsDenm_Functions {
		var ActionID v_actionId;
		var UtDenmTriggerResult v_result;

		//deactivate denmPort default alts
		vc_denmDefaultActive := false;

		utPort.send(p_event);
		tc_wait.start;
		alt {
		@@ -112,12 +120,11 @@ module LibItsDenm_Functions {
		log("* " & testcasename() & ": INFO: Could not receive expected UT message from IUT in time *");
		f_selfOrClientSyncAndVerdict("error", e_timeout);
		}
		[else] { // Shortcut defaults
		// //f_sleep(0.050); // 50 ms
		repeat;
		}
		}

		//activate denmPort default alts
		vc_denmDefaultActive := true;

		return v_actionId;
		}

		@@ -129,6 +136,9 @@ module LibItsDenm_Functions {
		var ActionID v_actionId;
		var UtDenmUpdateResult v_result;

		//deactivate denmPort default alts
		vc_denmDefaultActive := false;

		utPort.send(p_event);
		tc_wait.start;
		alt {
		@@ -143,12 +153,11 @@ module LibItsDenm_Functions {
		log("* " & testcasename() & ": INFO: Could not receive expected UT message from IUT in time *");
		f_selfOrClientSyncAndVerdict("error", e_timeout);
		}
		[else] { // Shortcut defaults
		// //f_sleep(0.050); // 50 ms
		repeat;
		}
		}

		//activate denmPort default alts
		vc_denmDefaultActive := true;

		return v_actionId;
		}

		@@ -158,6 +167,9 @@ module LibItsDenm_Functions {
		*/
		function f_utTerminateEvent(template (value) UtDenmTermination p_event) runs on ItsDenm {

		//deactivate denmPort default alts
		vc_denmDefaultActive := false;

		utPort.send(p_event);
		tc_wait.start;
		alt {
		@@ -171,11 +183,11 @@ module LibItsDenm_Functions {
		[] a_utDefault() {
		//empty on purpose
		}
		[else] { // Shortcut defaults
		// //f_sleep(0.050); // 50 ms
		repeat;
		}
		}

		//activate denmPort default alts
		vc_denmDefaultActive := true;

		}

		/**
		@@ -186,6 +198,9 @@ module LibItsDenm_Functions {
		*/
		function f_utChangePosition(template (value) UtChangePosition p_position) runs on ItsDenm {

		//deactivate denmPort default alts
		vc_denmDefaultActive := false;

		utPort.send(p_position);
		tc_wait.start;
		alt {
		@@ -199,11 +214,11 @@ module LibItsDenm_Functions {
		[] a_utDefault() {
		//empty on purpose
		}
		[else] { // Shortcut defaults
		// //f_sleep(0.050); // 50 ms
		repeat;
		}
		}

		//activate denmPort default alts
		vc_denmDefaultActive := true;

		}

		} // End of group utFunctions
		@@ -362,12 +377,12 @@ module LibItsDenm_Functions {
		* @desc The base default.
		*/
		altstep a_default() runs on ItsDenm {
		[] denmPort.receive(mw_denmInd(mw_denmPdu(mw_anyDenm))) {
		[vc_denmDefaultActive] denmPort.receive(mw_denmInd(mw_denmPdu(mw_anyDenm))) {
		log("* " & testcasename() & ": INFO: DENM message received in default *");
		vc_denmReceived := true;
		repeat;
		}
		[] denmPort.receive {
		[vc_denmDefaultActive] denmPort.receive {
		log("* " & testcasename() & ": ERROR: Received an unexpected message *");
		f_selfOrClientSyncAndVerdict("error", e_error);
		}
		@@ -392,12 +407,12 @@ module LibItsDenm_Functions {
		*/
		altstep a_utDefault() runs on ItsDenm {
		var UtDenmEventInd v_event;
		[] utPort.receive(UtDenmEventInd:?) -> value v_event {
		[vc_utDefaultActive] utPort.receive(UtDenmEventInd:?) -> value v_event {
		//store every upper tester indication received
		vc_utEvents[lengthof(vc_utEvents)] := v_event;
		repeat;
		}
		[] utPort.receive {
		[vc_utDefaultActive] utPort.receive {
		log("* " & testcasename() & ": INFO: Received unhandled/unknown UT message from IUT *");
		repeat;
		}