renamed event to modemEvent (26095db1) · Commits · ITS - Intelligent Transport Systems / ECall_HLAP

ttcn/AtsECall_IVS_Testcases.ttcn

+10 −10

Original line number	Diff line number	Diff line
		@@ -749,7 +749,7 @@ module AtsECall_IVS_Testcases {
		// Local variables
		template(value) ModemConfiguration m_locaPsapSimCfg modifies m_defaultPsapSimulatorConfiguration := {inbandDirection := PUSH, ignoreSendSignal := true};
		var ExpectResult v_feedback;
		var Event v_event;
		var ModemEvent v_modemEvent;
		var InbandSendSignalReceivedEvent v_firstSendSignal, v_lastSendSignal;
		var integer v_diff;
		timer t_guard := c_t3_timer * 2.0;
		@@ -763,11 +763,11 @@ module AtsECall_IVS_Testcases {
		// start listening for start signal
		t_guard.start;
		alt {
		[] modem.receive(mw_inbandSendSignalReceived(PX_MODEM_INSTANCE, ?)) -> value v_event {
		[] modem.receive(mw_inbandSendSignalReceived(PX_MODEM_INSTANCE, ?)) -> value v_modemEvent {
		if (not isbound(v_firstSendSignal)) {
		v_firstSendSignal := v_event.inbandSendSignalReceived;
		v_firstSendSignal := v_modemEvent.inbandSendSignalReceived;
		}
		v_lastSendSignal := v_event.inbandSendSignalReceived;
		v_lastSendSignal := v_modemEvent.inbandSendSignalReceived;
		repeat;
		}

		@@ -1165,7 +1165,7 @@ module AtsECall_IVS_Testcases {

		// Local variables
		var integer v_nacksSent := 0;
		var Event v_event;
		var ModemEvent v_modemEvent;
		var InbandNackSentEvent v_lastNack;
		var TimerExpiredEvent v_t8Expired;
		var integer v_lastNackDelta;
		@@ -1180,13 +1180,13 @@ module AtsECall_IVS_Testcases {

		t.start;
		alt {
		[] modem.receive(mw_t8Expired(PX_MODEM_INSTANCE)) -> value v_event {
		v_t8Expired := v_event.timerExpired;
		[] modem.receive(mw_t8Expired(PX_MODEM_INSTANCE)) -> value v_modemEvent {
		v_t8Expired := v_modemEvent.timerExpired;
		t.stop;
		}

		[] modem.receive(mw_inbandNackSent(PX_MODEM_INSTANCE)) -> value v_event {
		v_lastNack := v_event.inbandNackSent;
		[] modem.receive(mw_inbandNackSent(PX_MODEM_INSTANCE)) -> value v_modemEvent {
		v_lastNack := v_modemEvent.inbandNackSent;
		v_nacksSent := v_nacksSent + 1;

		t.start;
		@@ -1329,7 +1329,7 @@ module AtsECall_IVS_Testcases {

		// Test Body
		v_feedback := f_establishCall(ANY, TEST);
		if(ischosen(v_feedback.event)) {
		if(ischosen(v_feedback.modemEvent)) {
		v_callEstablished := v_feedback.callEvent.callEstablished;
		}

ttcn/AtsECall_PSAP_Testcases.ttcn

+8 −8

Original line number	Diff line number	Diff line
		@@ -857,8 +857,8 @@ module AtsECall_PSAP_Testcases {
		}

		v_result := f_expectFeedbackPsap(mw_inbandStartSignalReceived(PX_MODEM_INSTANCES[0].id, -, -, true));
		if(ischosen(v_result.event)) {
		v_startSignal := v_result.event.inbandStartSignalReceived;
		if(ischosen(v_result.modemEvent)) {
		v_startSignal := v_result.modemEvent.inbandStartSignalReceived;
		}

		f_timeoutCheck(v_callEstablished.time, v_startSignal.time, f_timerUpperBound(c_t5_timer),
		@@ -913,8 +913,8 @@ module AtsECall_PSAP_Testcases {
		}

		v_result := f_expectFeedbackPsap(mw_inbandStartSignalReceived(PX_MODEM_INSTANCES[0].id, -, -, true));
		if(ischosen(v_result.event)) {
		v_startSignal := v_result.event.inbandStartSignalReceived;
		if(ischosen(v_result.modemEvent)) {
		v_startSignal := v_result.modemEvent.inbandStartSignalReceived;
		}

		f_timeoutCheck(v_callEstablished.time, v_startSignal.time, f_timerUpperBound(c_t5_timer),
		@@ -922,8 +922,8 @@ module AtsECall_PSAP_Testcases {
		"In-band modem did not send 'SEND MSD' message before T5 expired");

		v_result := f_expectFeedbackPsap(mw_inbandLlAckReceived(PX_MODEM_INSTANCES[0].id, -, -, true), PX_TIMEOUT, true);
		if(ischosen(v_result.event)) {
		v_llAckReceived := v_result.event.inbandLlAckReceived;
		if(ischosen(v_result.modemEvent)) {
		v_llAckReceived := v_result.modemEvent.inbandLlAckReceived;
		}

		f_timeoutCheck(v_startSignal.time, v_llAckReceived.time, f_timerUpperBound(c_t7_timer),
		@@ -931,8 +931,8 @@ module AtsECall_PSAP_Testcases {
		"In-band modem did not send 'LL ACK' message before T7 expired");

		v_result := f_expectFeedbackPsap(mw_inbandAlAckReceived(PX_MODEM_INSTANCES[0].id, -, -, -, true));
		if(ischosen(v_result.event)) {
		v_alAckReceived := v_result.event.inbandAlAckReceived;
		if(ischosen(v_result.modemEvent)) {
		v_alAckReceived := v_result.modemEvent.inbandAlAckReceived;
		}

		f_timeoutCheck(v_llAckReceived.time, v_alAckReceived.time, f_timerUpperBound(c_t6_timer),

ttcn/LibItsECall_Functions.ttcn

+13 −13

Original line number	Diff line number	Diff line
		@@ -92,7 +92,7 @@ module LibItsECall_Functions {
		*/
		function f_verifyMSD() runs on PsapMtc {
		var ExpectResult v_result;
		var Event v_event;
		var ModemEvent v_modemEvent;
		var ECallMessage v_eCallMessage;
		var MSDMessage v_receivedMSDMessage;
		var integer v_decoded;
		@@ -110,11 +110,11 @@ module LibItsECall_Functions {
		// Extract the ECallMessage from the event
		//

		if (ischosen(v_result.event)) {
		v_event := v_result.event;
		if (ischosen(v_result.modemEvent)) {
		v_modemEvent := v_result.modemEvent;

		if (ischosen(v_event.inbandMsdReceived)) {
		v_eCallMessage := v_event.inbandMsdReceived.eCallMessage;
		if (ischosen(v_modemEvent.inbandMsdReceived)) {
		v_eCallMessage := v_modemEvent.inbandMsdReceived.eCallMessage;
		}
		else {
		f_stopIvsTestcase(fail, "MSD not received");
		@@ -429,9 +429,9 @@ module LibItsECall_Functions {
		* @param p_ignoreOtherMessages Whether other events shall be ignored or not
		* @return FeedbackResult Received event if reception is successful, or failure
		*/
		function f_expectFeedback(template Event p_e, float p_event_timeout := PX_TIMEOUT, in boolean p_ignoreOtherMessages := false) runs on PsapMtc return ExpectResult {
		function f_expectFeedback(template ModemEvent p_e, float p_event_timeout := PX_TIMEOUT, in boolean p_ignoreOtherMessages := false) runs on PsapMtc return ExpectResult {
		timer t := p_event_timeout;
		var Event v_received;
		var ModemEvent v_received;
		var ExpectResult v_result;
		v_result.failure := false;

		@@ -442,7 +442,7 @@ module LibItsECall_Functions {
		t.start;
		alt {
		[] modem.receive(p_e) -> value v_received {
		v_result.event := v_received;
		v_result.modemEvent := v_received;
		t.stop;
		}

		@@ -553,7 +553,7 @@ module LibItsECall_Functions {
		* @desc Default for IVS mode
		*/
		altstep a_defaultIvs() runs on IvsMtc {
		var Event v_modemEvent;
		var ModemEvent v_modemEvent;
		var CallEvent v_callEvent;

		[] modem.receive(LogMessage:?) {
		@@ -631,7 +631,7 @@ module LibItsECall_Functions {
		* @desc Default for PSAP mode
		*/
		altstep a_defaultPsap() runs on PsapMtc {
		var Event v_modemEvent;
		var ModemEvent v_modemEvent;
		var CallEvent v_callEvent;

		[] uiPort.receive {
		@@ -1047,9 +1047,9 @@ module LibItsECall_Functions {
		* @param p_ignoreOtherMessages Whether other events shall be ignored or not
		* @return FeedbackResult Received event if reception is successful, or failure
		*/
		function f_expectFeedbackPsap(template Event p_e, float p_event_timeout := PX_TIMEOUT, in boolean p_ignoreOtherMessages := false) runs on IvsMtc return ExpectResult {
		function f_expectFeedbackPsap(template ModemEvent p_e, float p_event_timeout := PX_TIMEOUT, in boolean p_ignoreOtherMessages := false) runs on IvsMtc return ExpectResult {
		timer t := p_event_timeout;
		var Event v_received;
		var ModemEvent v_received;
		var ExpectResult v_result;
		v_result.failure := false;

		@@ -1060,7 +1060,7 @@ module LibItsECall_Functions {
		t.start;
		alt {
		[] modem.receive(p_e) -> value v_received {
		v_result.event := v_received;
		v_result.modemEvent := v_received;
		t.stop;
		}

ttcn/LibItsECall_Templates.ttcn

+16 −16

Original line number	Diff line number	Diff line
		@@ -100,21 +100,21 @@ module LibItsECall_Templates {
		/**
		* @desc Receive template for any InbandNackSent event
		*/
		template Event mw_anyInbandNackSent := {
		template ModemEvent mw_anyInbandNackSent := {
		inbandNackSent := ?
		}

		/**
		* @desc Receive template for any ConfigChanged event
		*/
		template Event mw_anyInbandSendSignalReceived := {
		template ModemEvent mw_anyInbandSendSignalReceived := {
		inbandSendSignalReceived := ?
		}

		/**
		* @desc Receive template for any TimerExpired event
		*/
		template Event mw_anyTimerExpired := {
		template ModemEvent mw_anyTimerExpired := {
		timerExpired := ?
		}

		@@ -126,7 +126,7 @@ module LibItsECall_Templates {
		* @param p_time Event timestamp
		* @param p_eCallMessage Received eCall message
		*/
		template Event mw_inbandMsdReceived (
		template ModemEvent mw_inbandMsdReceived (
		template(present) integer p_modemInstance,
		template(present) charstring p_time := ?,
		template(present) ECallMessage p_eCallMessage := ?
		@@ -144,7 +144,7 @@ module LibItsECall_Templates {
		* @param p_time Event timestamp
		* @param p_count
		*/
		template Event mw_inbandLlAckSent (
		template ModemEvent mw_inbandLlAckSent (
		template(present) integer p_modemInstance,
		template(present) charstring p_time := ?,
		template(present) AckNumberType p_count := ?
		@@ -163,7 +163,7 @@ module LibItsECall_Templates {
		* @param p_count
		* @param p_reliable
		*/
		template Event mw_inbandLlAckReceived (
		template ModemEvent mw_inbandLlAckReceived (
		template(present) integer p_modemInstance,
		template(present) charstring p_time := ?,
		template(present) AckNumberType p_count := ?,
		@@ -184,7 +184,7 @@ module LibItsECall_Templates {
		* @param p_count
		* @param p_val Sent AL Ack value
		*/
		template Event mw_inbandAlAckSent (
		template ModemEvent mw_inbandAlAckSent (
		template(present) integer p_modemInstance,
		template(present) charstring p_time := ?,
		template(present) AckNumberType p_count := ?,
		@@ -206,7 +206,7 @@ module LibItsECall_Templates {
		* @param p_val Received AL Ack value
		* @param p_reliable
		*/
		template Event mw_inbandAlAckReceived (
		template ModemEvent mw_inbandAlAckReceived (
		template(present) integer p_modemInstance,
		template(present) charstring p_time := ?,
		template(present) AckNumberType p_count := ?,
		@@ -227,7 +227,7 @@ module LibItsECall_Templates {
		* @param p_modemInstance Target modem instance process
		* @param p_time Event timestamp
		*/
		template Event mw_inbandSendSignalReceived (
		template ModemEvent mw_inbandSendSignalReceived (
		template(present) integer p_modemInstance,
		template(present) charstring p_time := ?
		) := {
		@@ -243,7 +243,7 @@ module LibItsECall_Templates {
		* @param p_time Event timestamp
		* @param p_count
		*/
		template Event mw_inbandNackSent (
		template ModemEvent mw_inbandNackSent (
		template(present) integer p_modemInstance,
		template(present) charstring p_time := ?,
		template(present) PositiveInteger p_count := ?
		@@ -261,7 +261,7 @@ module LibItsECall_Templates {
		* @param p_time Event timestamp
		* @param p_count
		*/
		template Event mw_inbandNackReceived (
		template ModemEvent mw_inbandNackReceived (
		template(present) integer p_modemInstance,
		template(present) charstring p_time := ?,
		template(present) PositiveInteger p_count := ?
		@@ -278,7 +278,7 @@ module LibItsECall_Templates {
		* @param p_modemInstance Target modem instance process
		* @param p_time Event timestamp
		*/
		template Event mw_callVoiceConnectionEstablished (
		template ModemEvent mw_callVoiceConnectionEstablished (
		template(present) integer p_modemInstance,
		template(present) charstring p_time := ?
		) :={
		@@ -295,7 +295,7 @@ module LibItsECall_Templates {
		* @param p_count
		* @param p_reliable
		*/
		template Event mw_inbandStartSignalReceived (
		template ModemEvent mw_inbandStartSignalReceived (
		template(present) integer p_modemInstance,
		template(present) charstring p_time := ?,
		template(present) PositiveInteger p_count := ?,
		@@ -316,7 +316,7 @@ module LibItsECall_Templates {
		* @param p_name Timer name
		* @param p_val Timer value in seconds
		*/
		template Event mw_timerExpired (
		template ModemEvent mw_timerExpired (
		template(present) integer p_modemInstance,
		template(present) charstring p_time := ?,
		template(present) charstring p_name := ?,
		@@ -334,7 +334,7 @@ module LibItsECall_Templates {
		* @desc Receive template for T7 expiration event
		* @param p_modemInstance Target modem instance process
		*/
		template Event mw_t7Expired(
		template ModemEvent mw_t7Expired(
		template(present) integer p_modemInstance
		) := mw_timerExpired(p_modemInstance, ?, "t7", ?);

		@@ -342,7 +342,7 @@ module LibItsECall_Templates {
		* @desc Receveive template for T8 expiration event
		* @param p_modemInstance Target modem instance process
		*/
		template Event mw_t8Expired(
		template ModemEvent mw_t8Expired(
		template(present) integer p_modemInstance
		) := mw_timerExpired(p_modemInstance, ?, "t8", ?);

ttcn/LibItsECall_TestSystem.ttcn

+1 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@ module LibItsECall_TestSystem {
		* @desc In-band modem port
		*/
		type port ModemPort message {
		in Event, LogMessage;
		in ModemEvent, LogMessage;
		out InbandRequestMsdCmd, InbandSendAlAckCmd;
		}