Commit ad28251a authored by mogos's avatar mogos
Browse files

* ALL TCS: verify that messageIdentifier is correctly set

* CTP_1_1_2_2 receive template accepts any automatic eCall message
* CTP_1_1_3_2 receive template accepts any manual eCall message
* CTP_1_1_10_3 checks the time difference between the first send signal and the last instead of between call establishment and last send signal
* CTP_1_1_16_1 wait before clearing down to ensure that the ivs has received the AL-ACK
* CTP_1_1_17_3 
    a) use network clear down instead of AL-ACK clear down
	b) on the call back the IVS should switch to voice
parent b1f794ab
Loading
Loading
Loading
Loading
+27 −19
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ module AtsECall_IVS_Testcases {
            // Test Body
            f_establishCall("Trigger automatic eCall");

            f_verifyMSD(ANY_DECODED_ECALL);
            f_verifyMSD(ANY_AUTOMATIC_ECALL);

            f_userAction("Apply new trigger while eCall is in progress");

@@ -306,7 +306,7 @@ module AtsECall_IVS_Testcases {
            // Test Body
            f_establishCall("Trigger manual eCall");

            f_verifyMSD(ANY_DECODED_ECALL);
            f_verifyMSD(ANY_MANUAL_ECALL);

            f_userAction("Apply new trigger");

@@ -810,9 +810,8 @@ module AtsECall_IVS_Testcases {
            // Local variables
            template(value) ConfigParameters v_locaPsapSimCfg modifies m_defaultPsapSimulatorConfiguration := {inbandDirection := PUSH, ignoreSendSignal := true}
            var FeedbackResult v_feedback;
            var CallEstablishedEvent v_callEstablishedEvent;
            var Event v_event;
            var InbandSendSignalReceivedEvent v_lastSendSignal;
            var InbandSendSignalReceivedEvent v_firstSendSignal, v_lastSendSignal;
            var integer v_diff;
            timer t_guard := PX_T3_TIMER * 2.0;

@@ -821,14 +820,14 @@ module AtsECall_IVS_Testcases {

            // Test Body
            v_feedback := f_establishCall("Trigger manual or automatic eCall");
            if(ischosen(v_feedback.event)) {
                v_callEstablishedEvent := v_feedback.event.callEstablished;
            }

            // start listening for start signal
            t_guard.start;
            alt {
                [] eCallFeedback.receive(mw_inbandSendSignalReceived(PX_WORKER, ?)) -> value v_event {
                    if (not isbound(v_firstSendSignal)) {
                        v_firstSendSignal := v_event.inbandSendSignalReceived;
                    }
                    v_lastSendSignal := v_event.inbandSendSignalReceived;
                    repeat;
                }
@@ -838,13 +837,18 @@ module AtsECall_IVS_Testcases {
                }
            }

            v_diff := fx_timeDiff(v_callEstablishedEvent.time, v_lastSendSignal.time);
            if (not isbound(v_firstSendSignal)) {
                setverdict(fail, "No Initiation signal received");
            }
            else {
                v_diff := fx_timeDiff(v_firstSendSignal.time, v_lastSendSignal.time);
                if (v_diff < 0 or v_diff > float2int(PX_T3_TIMER * 1000.0)) {
                    setverdict(fail, "The received audible Initiation signal persisted for " & fx_float2str((int2float(v_diff) / 1000.0)) & "s (> " & fx_float2str(PX_T3_TIMER) & "s) from when the call is answered")
                }
                else {
                    setverdict(pass, "The received audible Initiation signal did not persist for longer than " & fx_float2str(PX_T3_TIMER) & " s from when the call is answered");
                }
            }

            // Postamble
            f_configDown();
@@ -1305,7 +1309,9 @@ module AtsECall_IVS_Testcases {

            f_expectFeedback(mw_inbandMsdReceived(PX_WORKER, ?, f_toTemplate(PX_ECALL_MESSAGE)), PX_TIMEOUT, true);

            f_clearDown(NETWORK, c_now);
            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_WORKER));

            f_clearDown(NETWORK, 5.0);

            f_userVerify("Is the IVS cleared down?",
                "IVS cleared down the call following receipt of a clear down message from the network",
@@ -1482,7 +1488,7 @@ module AtsECall_IVS_Testcases {
        testcase CTP_1_1_17_3() runs on PsapMtc system PsapSystem {
            
            // Local variables
            template(value) ConfigParameters v_locaPsapSimCfg modifies m_defaultPsapSimulatorConfiguration := {automaticAlAck := true, alAckValue := c_clearDownAlAck};
            template(value) ConfigParameters v_locaPsapSimCfg modifies m_defaultPsapSimulatorConfiguration := {automaticAlAck := true, alAckValue := c_positiveAlAck};
            timer t_callbackDelay := PX_CTP_1_1_17_3_CALL_BACK_DELAY;

            // Test component configuration
@@ -1493,7 +1499,9 @@ module AtsECall_IVS_Testcases {

            f_expectFeedback(mw_inbandMsdReceived(PX_WORKER, ?, f_toTemplate(PX_ECALL_MESSAGE)));
            
            f_expectFeedback(mw_callHangUp(PX_WORKER, ?, EXTERNAL), PX_TIMEOUT, true);
            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_WORKER));
            
            f_clearDown(NETWORK, 10.0);

            eCallControl.send(m_setAutomaticAlAck(PX_WORKER, true, c_positiveAlAck));
            f_expectFeedback(mw_anyConfigChanged);
@@ -1524,7 +1532,7 @@ module AtsECall_IVS_Testcases {
            eCallControl.send(m_callCreate(PX_WORKER, PX_IVS_PHONE_NUMBER));
            f_expectFeedback(mw_callEstablished(PX_WORKER, ?, EXTERNAL));
            
            f_verifyMSD(ANY_DECODED_ECALL);
            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_WORKER));

            f_userVerify("Was the call-back automatically answered by the IVS?",
                "Call answered automatically",