Removed inline templates in altsteps (7ee6482d) · Commits · ITS - Intelligent Transport Systems / ECall_HLAP

ttcn/AtsECall_IVS_Testcases.ttcn

+3 −3

Original line number	Diff line number	Diff line
		@@ -1362,7 +1362,7 @@ module AtsECall_IVS_Testcases {
		// Local variables
		var FeedbackResult v_feedback;
		var CallEstablishedEvent v_callEstablished;
		var CallHangUpEvent v_callHangUp;
		var Event v_event;
		var integer v_diff;
		timer t_t2 := PX_T2_TIMER + PX_CTP_1_1_16_2_HANG_UP_RANGE;

		@@ -1380,8 +1380,8 @@ module AtsECall_IVS_Testcases {
		f_verifyMSD(PX_ECALL_MESSAGE);

		alt {
		[] eCallFeedback.receive(CallHangUpEvent:?) -> value v_callHangUp {
		v_diff := fx_timeDiff(v_callEstablished.time, v_callHangUp.time);
		[] eCallFeedback.receive(mw_anyCallHangUp) -> value v_event {
		v_diff := fx_timeDiff(v_callEstablished.time, v_event.callHangUp.time);

		if (v_diff < float2int(PX_T2_TIMER * 1000.0 - PX_CTP_1_1_16_2_HANG_UP_RANGE)) {
		setverdict(fail, "IVS cleared down call before T2 expired")

ttcn/AtsECall_PSAP_Testcases.ttcn

+1 −1

Original line number	Diff line number	Diff line
		@@ -217,7 +217,7 @@ module AtsECall_PSAP_Testcases {
		// because of CRC errors T7 should expire
		}

		[] eCallFeedback.receive(TimerExpiredEvent:?) {
		[] eCallFeedback.receive(mw_anyTimerExpired) {
		// because of CRC errors T7 should expire
		}

ttcn/LibItsECall_Functions.ttcn

+41 −43

Original line number	Diff line number	Diff line
		@@ -145,38 +145,6 @@
		}
		}

		altstep a_unexpectedEvents() runs on PsapMtc {
		var CallAbortedEvent v_callAborted;

		[] uiPort.receive {
		repeat;
		}

		[] eCallFeedback.receive(InbandNackSentEvent:?) {
		repeat;
		}

		[] eCallFeedback.receive(InbandSendSignalReceivedEvent:?) {
		repeat;
		}

		[] eCallFeedback.receive(mw_callHangUp(PX_WORKER, ?, EXTERNAL)) {
		f_stopTestcase(fail, "Unexpected external hang up!");
		}

		[] eCallFeedback.receive(CallRejectedEvent:?) {
		f_stopTestcase(fail, "Call was rejected!");
		}

		[] eCallFeedback.receive(CallAbortedEvent:?) -> value v_callAborted {
		f_stopTestcase(fail, "Call was aborted: """ & v_callAborted.reason & """!");
		}

		[] eCallFeedback.receive {
		f_stopTestcase(fail, "Wrong message received!");
		}
		}

		function f_stopTestcase(in verdicttype p_verdict, in charstring p_reason) runs on ECallMtc {
		setverdict(p_verdict, p_reason);

		@@ -311,17 +279,14 @@
		}
		}



		altstep a_default_behaviour() runs on IvsMtc {
		var CallAbortedEvent v_callAborted;
		var Event v_timerExpired;
		var Event v_event;

		[] eCallFeedback.receive(LogMessage:?) {
		repeat;
		}

		[] eCallFeedback.receive(CallOutgoingEvent:?) {
		[] eCallFeedback.receive(mw_anyCallOutgoing) {
		repeat;
		}

		@@ -365,20 +330,20 @@
		repeat;
		}

		[] eCallFeedback.receive(mw_timerExpired(p_worker := PX_WORKERS[0].id)) -> value v_timerExpired {
		f_stopTestcase(fail, "Timer " & v_timerExpired.timerExpired.name & " expired");
		[] eCallFeedback.receive(mw_timerExpired(p_worker := PX_WORKERS[0].id)) -> value v_event {
		f_stopTestcase(fail, "Timer " & v_event.timerExpired.name & " expired");
		}

		[] eCallFeedback.receive(mw_callHangUp(PX_WORKERS[0].id, ?, EXTERNAL)) {
		f_stopTestcase(fail, "Unexpected external hang up!");
		}

		[] eCallFeedback.receive(CallRejectedEvent:?) {
		[] eCallFeedback.receive(mw_anyCallRejected) {
		f_stopTestcase(fail, "Call was rejected!");
		}

		[] eCallFeedback.receive(CallAbortedEvent:?) -> value v_callAborted {
		f_stopTestcase(fail, "Call was aborted: """ & v_callAborted.reason & """!");
		[] eCallFeedback.receive(mw_anyCallAborted) -> value v_event {
		f_stopTestcase(fail, "Call was aborted: """ & v_event.callAborted.reason & """!");
		}

		[] eCallFeedback.receive {
		@@ -386,6 +351,39 @@
		repeat;
		}
		}

		altstep a_unexpectedEvents() runs on PsapMtc {
		var Event v_event;

		[] uiPort.receive {
		repeat;
		}

		[] eCallFeedback.receive(mw_anyInbandNackSent) {
		repeat;
		}

		[] eCallFeedback.receive(mw_anyInbandSendSignalReceived) {
		repeat;
		}

		[] eCallFeedback.receive(mw_callHangUp(PX_WORKER, ?, EXTERNAL)) {
		f_stopTestcase(fail, "Unexpected external hang up!");
		}

		[] eCallFeedback.receive(mw_anyCallRejected) {
		f_stopTestcase(fail, "Call was rejected!");
		}

		[] eCallFeedback.receive(mw_anyCallAborted) -> value v_event {
		f_stopTestcase(fail, "Call was aborted: """ & v_event.callAborted.reason & """!");
		}

		[] eCallFeedback.receive {
		f_stopTestcase(fail, "Wrong message received!");
		}
		}

		} // end altsteps

ttcn/LibItsECall_Templates.ttcn

+36 −4

Original line number	Diff line number	Diff line
		@@ -83,6 +83,42 @@ module LibItsECall_Templates {

		group eventTemplates {

		group anyEventTemplates {

		template Event mw_anyConfigChanged := {
		configChanged := ?
		}

		template Event mw_anyCallOutgoing := {
		callOutgoing := ?
		}

		template Event mw_anyInbandNackSent := {
		inbandNackSent := ?
		}

		template Event mw_anyInbandSendSignalReceived := {
		inbandSendSignalReceived := ?
		}

		template Event mw_anyCallRejected := {
		callRejected := ?
		}

		template Event mw_anyCallAborted := {
		callAborted := ?
		}

		template Event mw_anyCallHangUp := {
		callHangUp := ?
		}

		template Event mw_anyTimerExpired := {
		timerExpired := ?
		}

		} // end anyEventTemplates

		/**
		* @desc Configuration template for simulator IVS mode
		*/
		@@ -155,10 +191,6 @@ module LibItsECall_Templates {
		}
		}

		template Event mw_anyConfigChanged := {
		configChanged := ?
		}

		template Event mw_inbandMsdReceived (
		template(present) integer p_worker,
		template(present) charstring p_time := ?,

ttcn/LibItsECall_TestSystem.ttcn

+2 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,8 @@ module LibItsECall_TestSystem {
		group portDefinitions {

		type port AMQPPort message {
		inout all;
		in Event, LogMessage;
		out SetConfigCmd, CallAcceptCmd, CallHangUpCmd, CallRejectBusyCmd, CallCreateCmd, CallCancelCmd, InbandRequestMsdCmd, InbandSendAlAckCmd;
		}

		} // end portDefinitions