replaced eCallControl and eCallFeedback with modem (0006809) (f86e4c0d) · Commits · ITS - Intelligent Transport Systems / ECall_HLAP

ttcn/AtsECall_IVS_Testcases.ttcn

+9 −9

Original line number	Diff line number	Diff line
		@@ -874,7 +874,7 @@ module AtsECall_IVS_Testcases {
		// start listening for start signal
		t_guard.start;
		alt {
		[] eCallFeedback.receive(mw_inbandSendSignalReceived(PX_WORKER, ?)) -> value v_event {
		[] modem.receive(mw_inbandSendSignalReceived(PX_WORKER, ?)) -> value v_event {
		if (not isbound(v_firstSendSignal)) {
		v_firstSendSignal := v_event.inbandSendSignalReceived;
		}
		@@ -1139,7 +1139,7 @@ module AtsECall_IVS_Testcases {
		"An eCall has not been established or a speech conversation is not in progress between the IVS and PSAP",
		c_mbYes);

		eCallControl.send(m_inbandRequestMsd(PX_WORKER));
		modem.send(m_inbandRequestMsd(PX_WORKER));

		f_verifyMSD(PX_ECALL_MESSAGE);

		@@ -1294,12 +1294,12 @@ module AtsECall_IVS_Testcases {

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

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

		@@ -1383,7 +1383,7 @@ module AtsECall_IVS_Testcases {
		"IVS did not clear down the call following receipt of a clear down message from the network",
		c_mbYes);

		eCallControl.send(m_setAutomaticAlAck(PX_WORKER, true, c_clearDownAlAck));
		modem.send(m_setAutomaticAlAck(PX_WORKER, true, c_clearDownAlAck));
		f_expectFeedback(mw_anyConfigChanged);

		// AL-ACK clear down
		@@ -1465,7 +1465,7 @@ module AtsECall_IVS_Testcases {
		}
		}

		[] eCallFeedback.receive {
		[] modem.receive {
		repeat;
		}

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

		f_clearDown(NETWORK, 10.0);

		eCallControl.send(m_setAutomaticAlAck(PX_WORKER, true, c_positiveAlAck));
		modem.send(m_setAutomaticAlAck(PX_WORKER, true, c_positiveAlAck));
		f_expectFeedback(mw_anyConfigChanged);

		uiPort.send(ShowMessageBox: {
		@@ -1709,7 +1709,7 @@ module AtsECall_IVS_Testcases {
		"2-way speech not possible",
		c_mbYes);

		eCallControl.send(m_inbandRequestMsd(PX_WORKER));
		modem.send(m_inbandRequestMsd(PX_WORKER));

		f_verifyMSD(PX_ECALL_MESSAGE);

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

		f_mnoExpect(mw_callHangUp(PX_WORKER, ?, EXTERNAL), PX_TIMEOUT, true);

		eCallControl.send(m_setAutomaticAlAck(PX_WORKER, true, c_positiveAlAck));
		modem.send(m_setAutomaticAlAck(PX_WORKER, true, c_positiveAlAck));
		f_expectFeedback(mw_anyConfigChanged);

		t_callbackDelay.start;

ttcn/LibItsECall_Functions.ttcn

+29 −33

Original line number	Diff line number	Diff line
		@@ -169,10 +169,10 @@ module LibItsECall_Functions {
		mno.send(m_callHangUpC(PX_WORKER));
		}
		else {
		eCallControl.send(m_setAutomaticAlAck(PX_WORKER, true, c_clearDownAlAck));
		modem.send(m_setAutomaticAlAck(PX_WORKER, true, c_clearDownAlAck));
		f_expectFeedback(mw_anyConfigChanged);

		eCallControl.send(m_inbandRequestMsd(PX_WORKER));
		modem.send(m_inbandRequestMsd(PX_WORKER));
		f_verifyMSD(PX_ECALL_MESSAGE);
		}
		}
		@@ -184,7 +184,7 @@ module LibItsECall_Functions {
		function f_setMSD(ECallMessageUnion p_eCall) runs on IvsMtc {
		var ModemConfiguration v_newConfig := {eCallMessage := p_eCall};

		eCallControl.send(m_setConfig(PX_WORKERS[0].id, v_newConfig));
		modem.send(m_setConfig(PX_WORKERS[0].id, v_newConfig));
		}

		/**
		@@ -209,17 +209,17 @@ module LibItsECall_Functions {

		t.start;
		alt {
		[] eCallFeedback.receive(mw_inbandStartSignalReceived(PX_WORKERS[0].id)) {
		[] modem.receive(mw_inbandStartSignalReceived(PX_WORKERS[0].id)) {
		t.start;
		repeat;
		}

		[] eCallFeedback.receive(mw_inbandLlAckReceived(PX_WORKERS[0].id)) {
		[] modem.receive(mw_inbandLlAckReceived(PX_WORKERS[0].id)) {
		t.start;
		repeat;
		}

		[] eCallFeedback.receive(mw_inbandAlAckReceived(PX_WORKERS[0].id, -, -, p_alAckValue)) {
		[] modem.receive(mw_inbandAlAckReceived(PX_WORKERS[0].id, -, -, p_alAckValue)) {
		t.stop;
		}

		@@ -276,10 +276,10 @@ module LibItsECall_Functions {

		vc_eCallMessage := v_eCallMessageExpanded;

		eCallControl.send(m_setConfig(PX_WORKERS[0].id, v_psapConfig));
		modem.send(m_setConfig(PX_WORKERS[0].id, v_psapConfig));
		f_expectFeedback(p_e := mw_ivsConfigChanged(p_workerConf.id, ?, ?), p_ignoreOtherMessages := true);

		eCallControl.send(m_setConfig(PX_WORKERS[0].id, p_configuration));
		modem.send(m_setConfig(PX_WORKERS[0].id, p_configuration));
		f_expectFeedback(p_e := mw_ivsConfigChanged(p_workerConf.id, ?, p_configuration), p_ignoreOtherMessages := true);
		}

		@@ -302,12 +302,12 @@ module LibItsECall_Functions {

		t.start;
		alt {
		[] eCallFeedback.receive(p_e) -> value v_received {
		[] modem.receive(p_e) -> value v_received {
		v_result.event := v_received;
		t.stop;
		}

		[p_ignoreOtherMessages] eCallFeedback.receive {
		[p_ignoreOtherMessages] modem.receive {
		repeat;
		}

		@@ -450,43 +450,43 @@ module LibItsECall_Functions {
		var Event v_modemEvent;
		var MnoEvent v_mnoEvent;

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

		[] eCallFeedback.receive(mw_inbandStateChanged(PX_WORKERS[0].id)) {
		[] modem.receive(mw_inbandStateChanged(PX_WORKERS[0].id)) {
		repeat;
		}

		[] eCallFeedback.receive(mw_inbandSendSignalReceived(PX_WORKERS[0].id)) {
		[] modem.receive(mw_inbandSendSignalReceived(PX_WORKERS[0].id)) {
		repeat;
		}

		[] eCallFeedback.receive(mw_inbandStartSignalReceived(PX_WORKERS[0].id, -, -, false)) {
		[] modem.receive(mw_inbandStartSignalReceived(PX_WORKERS[0].id, -, -, false)) {
		repeat;
		}

		[] eCallFeedback.receive(mw_inbandNackSent(PX_WORKERS[0].id)) {
		[] modem.receive(mw_inbandNackSent(PX_WORKERS[0].id)) {
		repeat;
		}

		[] eCallFeedback.receive(mw_inbandNackReceived(PX_WORKERS[0].id)) {
		[] modem.receive(mw_inbandNackReceived(PX_WORKERS[0].id)) {
		repeat;
		}

		[] eCallFeedback.receive(mw_inbandLlAckSent(PX_WORKERS[0].id)) {
		[] modem.receive(mw_inbandLlAckSent(PX_WORKERS[0].id)) {
		repeat;
		}

		[] eCallFeedback.receive(mw_inbandAlAckSent(PX_WORKERS[0].id)) {
		[] modem.receive(mw_inbandAlAckSent(PX_WORKERS[0].id)) {
		repeat;
		}

		[] eCallFeedback.receive(mw_ivsConfigChanged(PX_WORKERS[0].id, ?, ?)) {
		[] modem.receive(mw_ivsConfigChanged(PX_WORKERS[0].id, ?, ?)) {
		repeat;
		}

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

		@@ -534,11 +534,11 @@ module LibItsECall_Functions {
		repeat;
		}

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

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

		@@ -605,8 +605,7 @@ module LibItsECall_Functions {
		function f_configIvsModemUp(in ModemConfiguration p_configuration) runs on PsapMtc {
		var ModemConfiguration v_ivsConfig := {mode := IVS};

		map(self:eCallFeedback, system:eCallFeedback);
		map(self:eCallControl, system:eCallControl);
		map(self:modem, system:modem);

		// Final configuration
		p_configuration.t4Timer := PX_T4_TIMER;
		@@ -614,10 +613,10 @@ module LibItsECall_Functions {
		p_configuration.t8Timer := PX_T8_TIMER;
		p_configuration.internalSubscriber := PX_INTERNAL_SUBSCRIBER;

		eCallControl.send(m_setConfig(PX_WORKER, v_ivsConfig));
		modem.send(m_setConfig(PX_WORKER, v_ivsConfig));
		f_expectFeedback(p_e := mw_ivsConfigChanged(PX_WORKER, ?, ?), p_ignoreOtherMessages := true);

		eCallControl.send(m_setConfig(PX_WORKER, p_configuration));
		modem.send(m_setConfig(PX_WORKER, p_configuration));
		f_expectFeedback(p_e := mw_psapConfigChanged(PX_WORKER, ?, p_configuration), p_ignoreOtherMessages := true);

		vc_initialized := true;
		@@ -666,11 +665,10 @@ module LibItsECall_Functions {
		f_clearDown(NETWORK, c_now);

		// reset modem state
		eCallControl.send(m_setConfig(PX_WORKER, v_ivsConfig));
		modem.send(m_setConfig(PX_WORKER, v_ivsConfig));
		f_expectFeedback(p_e := mw_ivsConfigChanged(PX_WORKER, ?, ?), p_ignoreOtherMessages := true);

		unmap(self:eCallControl, system:eCallControl);
		unmap(self:eCallFeedback, system:eCallFeedback);
		unmap(self:modem, system:modem);
		} // end f_configIvsModemDown
		}

		@@ -687,8 +685,7 @@ module LibItsECall_Functions {
		vc_uiComponent := UIComponent.create("UIComponent");

		map(vc_logComponent:logPort, system:logPort);
		map(self:eCallControl, system:eCallControl);
		map(self:eCallFeedback, system:eCallFeedback);
		map(self:modem, system:modem);
		connect(self:uiPort, vc_uiComponent:uiPort);

		vc_logComponent.start(f_logBehaviour());
		@@ -719,8 +716,7 @@ module LibItsECall_Functions {
		vc_uiComponent.stop;

		disconnect(self:uiPort, vc_uiComponent:uiPort);
		unmap(self:eCallControl, system:eCallControl);
		unmap(self:eCallFeedback, system:eCallFeedback);
		unmap(self:modem, system:modem);
		unmap(vc_logComponent:logPort, system:logPort);
		} // end f_configPsapDown
		} // end psapConfigurationFunctions

ttcn/LibItsECall_TestSystem.ttcn

+5 −10

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

		/**
		* @desc Simulator port
		* @desc In-band modem port
		*/
		type port AMQPPort message {
		type port ModemPort message {
		in Event, LogMessage;
		out SetConfigCmd, InbandRequestMsdCmd, InbandSendAlAckCmd;
		}
		@@ -50,8 +50,7 @@ module LibItsECall_TestSystem {
		* @member vc_uiComponent User interface component (for non-blocking user interaction)
		*/
		type component ECallMtc {
		port AMQPPort eCallControl;
		port AMQPPort eCallFeedback;
		port ModemPort modem;
		port UIPort uiPort;
		port MNOPort mno;

		@@ -96,8 +95,7 @@ module LibItsECall_TestSystem {
		* @member logPort Logging port
		*/
		type component PsapSystem {
		port AMQPPort eCallControl;
		port AMQPPort eCallFeedback;
		port ModemPort modem;
		port LogMessagePort logPort;
		port MNOPort mno;
		}
		@@ -111,10 +109,7 @@ module LibItsECall_TestSystem {
		* @member logPort Logging port
		*/
		type component IvsSystem {
		port AMQPPort eCallControl;
		port AMQPPort eCallControl2;
		port AMQPPort eCallFeedback;
		port AMQPPort eCallFeedback2;
		port ModemPort modem;
		port LogMessagePort logPort;
		}