Commit f431c367 authored by mogos's avatar mogos
Browse files

fix for: 0006823: modulepar WorkerConfArray PX_WORKERS

parent ef1ddcfd

ttcn/AtsECall_IVS_Testcases.ttcn

+52 −52
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ module AtsECall_IVS_Testcases { 


            f_verifyMSD(ANY_AUTOMATIC_ECALL);



            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_WORKER));

            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_MODEM_INSTANCE));



            f_userAction("Apply new trigger (manual or automatic) while eCall is in progress");
@@ -157,7 +157,7 @@ module AtsECall_IVS_Testcases { 


            f_verifyMSD(PX_ECALL_MESSAGE);



            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_WORKER));

            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_MODEM_INSTANCE));



            v_button := f_messageBoxYesNo("Verify", "Was the handsfree equipment disabled in the crash test/simulation?");

            if (v_button == c_mbNo) {
@@ -346,7 +346,7 @@ module AtsECall_IVS_Testcases { 


            f_verifyMSD(ANY_MANUAL_ECALL);



            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_WORKER));

            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_MODEM_INSTANCE));



            f_userAction("Apply new trigger (manual or automatic) while eCall is in progress");
@@ -389,7 +389,7 @@ module AtsECall_IVS_Testcases { 


            f_verifyMSD(ANY_DECODED_ECALL);



            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_WORKER));

            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_MODEM_INSTANCE));



            f_userAction("Attempt to disconnect eCall using vehicle HMI");
@@ -435,7 +435,7 @@ module AtsECall_IVS_Testcases { 


            f_verifyMSD(ANY_DECODED_ECALL);



            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_WORKER));

            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_MODEM_INSTANCE));



            f_userAction("Attempt to disconnect eCall using vehicle HMI");
@@ -481,7 +481,7 @@ module AtsECall_IVS_Testcases { 


            f_verifyMSD(ANY_DECODED_ECALL);



            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_WORKER));

            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_MODEM_INSTANCE));



            f_userAction("Switch OFF ignition");
@@ -527,7 +527,7 @@ module AtsECall_IVS_Testcases { 


            f_verifyMSD(ANY_DECODED_ECALL);



            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_WORKER));

            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_MODEM_INSTANCE));



            f_userAction("Switch OFF ignition");
@@ -585,13 +585,13 @@ module AtsECall_IVS_Testcases { 
                "Not all components of the IVS, which are necessary for an eCall, are available and not influenced by the previously-running communication (HMI, Audio,...)",

                c_mbYes);



            f_mnoExpect(mw_callIncoming(PX_WORKER, ?, PX_IVS_PHONE_NUMBER, PX_PSAP_PHONE_NUMBER));

            callControl.send(m_callAccept(PX_WORKER));

            f_mnoExpect(mw_callEstablished(PX_WORKER, ?));

            f_mnoExpect(mw_callIncoming(PX_MODEM_INSTANCE, ?, PX_IVS_PHONE_NUMBER, PX_PSAP_PHONE_NUMBER));

            callControl.send(m_callAccept(PX_MODEM_INSTANCE));

            f_mnoExpect(mw_callEstablished(PX_MODEM_INSTANCE, ?));



            f_verifyMSD(PX_ECALL_MESSAGE);



            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_WORKER));

            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_MODEM_INSTANCE));



            f_userVerify("Is voice communication possible?",

                "IVS microphone and loudspeaker were reconnected",
@@ -635,7 +635,7 @@ module AtsECall_IVS_Testcases { 


            f_verifyMSD(PX_ECALL_MESSAGE);

            

            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_WORKER));

            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_MODEM_INSTANCE));



            f_userVerify("Was audio muted during MSD transmission?",

                "Audio was muted during MSD transmission",
@@ -825,7 +825,7 @@ module AtsECall_IVS_Testcases { 
            // Test Body

            f_establishCall();



            f_expectFeedback(mw_inbandNackSent(PX_WORKER));

            f_expectFeedback(mw_inbandNackSent(PX_MODEM_INSTANCE));



            f_clearDown(NETWORK, c_now);
@@ -874,7 +874,7 @@ module AtsECall_IVS_Testcases { 
            // start listening for start signal

            t_guard.start;

            alt {

                [] modem.receive(mw_inbandSendSignalReceived(PX_WORKER, ?)) -> value v_event {

                [] modem.receive(mw_inbandSendSignalReceived(PX_MODEM_INSTANCE, ?)) -> value v_event {

                    if (not isbound(v_firstSendSignal)) {

                        v_firstSendSignal := v_event.inbandSendSignalReceived;

                    }
@@ -936,7 +936,7 @@ module AtsECall_IVS_Testcases { 
            f_verifyMSD(PX_ECALL_MESSAGE);



            // Postamble

            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_WORKER));

            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_MODEM_INSTANCE));



            f_configIvsDown();

        }
@@ -973,7 +973,7 @@ module AtsECall_IVS_Testcases { 
            f_verifyMSD(PX_ECALL_MESSAGE);



            // Postamble

            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_WORKER));

            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_MODEM_INSTANCE));



            f_configIvsDown();

        }
@@ -1011,7 +1011,7 @@ module AtsECall_IVS_Testcases { 
            f_verifyMSD(PX_ECALL_MESSAGE);



            // Postamble

            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_WORKER));

            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_MODEM_INSTANCE));



            f_configIvsDown();

        }
@@ -1048,7 +1048,7 @@ module AtsECall_IVS_Testcases { 
            f_verifyMSD(PX_ECALL_MESSAGE);



            // Postamble

            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_WORKER));

            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_MODEM_INSTANCE));



            f_configIvsDown();

        }
@@ -1084,7 +1084,7 @@ module AtsECall_IVS_Testcases { 


            f_verifyMSD(PX_ECALL_MESSAGE);

            

            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_WORKER));

            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_MODEM_INSTANCE));



            f_userVerify("Was voice 2-way voice communication possible after receiving positive AL_ACK or within 5s of LL_ACK?",

                "2-way speech made possible between the IVS and PSAP test point",
@@ -1132,18 +1132,18 @@ module AtsECall_IVS_Testcases { 


            f_verifyMSD(PX_ECALL_MESSAGE);

            

            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_WORKER));

            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_MODEM_INSTANCE));



            f_userVerify("Is speech conversation in progress between the IVS and PSAP?",

                "An eCall has been established and a speech conversation is in progress between the IVS and PSAP",

                "An eCall has not been established or a speech conversation is not in progress between the IVS and PSAP",

                c_mbYes);



            modem.send(m_inbandRequestMsd(PX_WORKER));

            modem.send(m_inbandRequestMsd(PX_MODEM_INSTANCE));



            f_verifyMSD(PX_ECALL_MESSAGE);

            

            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_WORKER));

            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_MODEM_INSTANCE));

      

            f_userVerify("Was IVS audio muted during MSD transfer?",

                "IVS audio muted during MSD transfer",
@@ -1192,7 +1192,7 @@ module AtsECall_IVS_Testcases { 
            // Test Body

            f_establishCall(ANY, TEST);



            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_WORKER), PX_TIMEOUT, true);

            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_MODEM_INSTANCE), PX_TIMEOUT, true);



            f_userVerify("Was 2-way voice communication possible after T5 has expired?",

                "2-way speech was possible between the IVS and PSAP test point",
@@ -1238,7 +1238,7 @@ module AtsECall_IVS_Testcases { 


            f_verifyMSD(PX_ECALL_MESSAGE);



            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_WORKER));

            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_MODEM_INSTANCE));



            f_userVerify("Was 2-way voice communication possible after T6 has expired?",

                "2-way speech was possible between the IVS and PSAP test point",
@@ -1294,12 +1294,12 @@ module AtsECall_IVS_Testcases { 


            t.start;

            alt {

                [] modem.receive(mw_t8Expired(PX_WORKER)) -> value v_event {

                [] modem.receive(mw_t8Expired(PX_MODEM_INSTANCE)) -> value v_event {

                    v_t8Expired := v_event.timerExpired;

                    t.stop;

                }



                [] modem.receive(mw_inbandNackSent(PX_WORKER)) -> value v_event {

                [] modem.receive(mw_inbandNackSent(PX_MODEM_INSTANCE)) -> value v_event {

                    v_lastNack := v_event.inbandNackSent;

                    v_nacksSent := v_nacksSent + 1;
@@ -1326,7 +1326,7 @@ module AtsECall_IVS_Testcases { 
                }

            }



            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_WORKER));

            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_MODEM_INSTANCE));



            f_userVerify("Was 2-way voice communication possible after T7 has expired?",

                "2-way speech was possible between the IVS and PSAP test point",
@@ -1374,7 +1374,7 @@ module AtsECall_IVS_Testcases { 


            f_verifyMSD(PX_ECALL_MESSAGE);



            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_WORKER));

            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_MODEM_INSTANCE));



            f_clearDown(NETWORK, 5.0);
@@ -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);



            adapterControl.send(m_setAutomaticAlAck(PX_WORKER, true, c_clearDownAlAck));

            adapterControl.send(m_setAutomaticAlAck(PX_MODEM_INSTANCE, true, c_clearDownAlAck));

            f_adapterExpect(mw_anyConfigChanged);



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


            f_verifyMSD(PX_ECALL_MESSAGE);



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

            f_mnoExpect(mw_callHangUp(PX_MODEM_INSTANCE, ?), PX_TIMEOUT, true);



            f_userVerify("Is the IVS cleared down?",

                "IVS cleared down the call following receipt of an AL ACK CLEAR DOWN message from the PSAP",
@@ -1451,7 +1451,7 @@ module AtsECall_IVS_Testcases { 


            f_verifyMSD(PX_ECALL_MESSAGE);



            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_WORKER));

            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_MODEM_INSTANCE));



            alt {

                [] callControl.receive(mw_anyCallHangUp) -> value v_callEvent {
@@ -1518,7 +1518,7 @@ module AtsECall_IVS_Testcases { 


            f_verifyMSD(ANY_DECODED_ECALL);



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

            f_mnoExpect(mw_callHangUp(PX_MODEM_INSTANCE, ?), PX_TIMEOUT, true);



            f_userVerify("Is a record of the received application layer acknowledgment (AL-ACK) and time stamp, sent from the PSAP test point, stored in the IVS?",

                "A record of the received time stamped AL-ACK has been stored in the IVS",
@@ -1578,7 +1578,7 @@ module AtsECall_IVS_Testcases { 
            //

            f_establishCall();



            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_WORKER), PX_TIMEOUT, true);

            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_MODEM_INSTANCE), PX_TIMEOUT, true);



            f_clearDown(NETWORK, c_now);
@@ -1593,12 +1593,12 @@ module AtsECall_IVS_Testcases { 
                    msgTimeout := MESSAGEBOX_DISPLAY_TIME

                });



            callControl.send(m_callCreate(PX_WORKER, PX_IVS_PHONE_NUMBER));

            f_mnoExpect(mw_callEstablished(PX_WORKER, ?));

            callControl.send(m_callCreate(PX_MODEM_INSTANCE, PX_IVS_PHONE_NUMBER));

            f_mnoExpect(mw_callEstablished(PX_MODEM_INSTANCE, ?));



            f_verifyMSD(ANY_DECODED_ECALL);

            

            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_WORKER));

            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_MODEM_INSTANCE));



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

                "Call answered automatically",
@@ -1657,11 +1657,11 @@ module AtsECall_IVS_Testcases { 


            f_verifyMSD(ANY_DECODED_ECALL);



            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_WORKER));

            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_MODEM_INSTANCE));



            f_clearDown(NETWORK, 10.0);



            adapterControl.send(m_setAutomaticAlAck(PX_WORKER, true, c_positiveAlAck));

            adapterControl.send(m_setAutomaticAlAck(PX_MODEM_INSTANCE, true, c_positiveAlAck));

            f_adapterExpect(mw_anyConfigChanged);



            uiPort.send(ShowMessageBox: {
@@ -1687,12 +1687,12 @@ module AtsECall_IVS_Testcases { 
                }

            }



            callControl.send(m_callCreate(PX_WORKER, PX_IVS_PHONE_NUMBER));

            f_mnoExpect(mw_callEstablished(PX_WORKER, ?));

            callControl.send(m_callCreate(PX_MODEM_INSTANCE, PX_IVS_PHONE_NUMBER));

            f_mnoExpect(mw_callEstablished(PX_MODEM_INSTANCE, ?));



            // Test Body



            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_WORKER));

            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_MODEM_INSTANCE));



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

                "Call answered automatically",
@@ -1709,11 +1709,11 @@ module AtsECall_IVS_Testcases { 
                "2-way speech not possible",

                c_mbYes);



            modem.send(m_inbandRequestMsd(PX_WORKER));

            modem.send(m_inbandRequestMsd(PX_MODEM_INSTANCE));



            f_verifyMSD(PX_ECALL_MESSAGE);



            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_WORKER));

            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_MODEM_INSTANCE));



            f_userVerify("Was the IVS microphone muted during MSD transmission?",

                "IVS microphone was muted",
@@ -1775,15 +1775,15 @@ module AtsECall_IVS_Testcases { 


            f_verifyMSD(ANY_DECODED_ECALL);



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

            f_mnoExpect(mw_callHangUp(PX_MODEM_INSTANCE, ?), PX_TIMEOUT, true);



            adapterControl.send(m_setAutomaticAlAck(PX_WORKER, true, c_positiveAlAck));

            adapterControl.send(m_setAutomaticAlAck(PX_MODEM_INSTANCE, true, c_positiveAlAck));

            f_adapterExpect(mw_anyConfigChanged);



            t_callbackDelay.start;



            callControl.send(m_callCreate(PX_WORKER, PX_IVS_PHONE_NUMBER));

            f_mnoExpect(mw_callEstablished(PX_WORKER, ?));

            callControl.send(m_callCreate(PX_MODEM_INSTANCE, PX_IVS_PHONE_NUMBER));

            f_mnoExpect(mw_callEstablished(PX_MODEM_INSTANCE, ?));



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

                "Call answered automatically",
@@ -1830,7 +1830,7 @@ module AtsECall_IVS_Testcases { 


            f_verifyMSD(PX_ECALL_MESSAGE);



            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_WORKER));

            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_MODEM_INSTANCE));



            f_userVerify("Was voice 2-way voice communication possible after receiving positive AL_ACK or within 5s of LL_ACK?",

                "2-way speech made possible between the IVS and PSAP test point",
@@ -1879,7 +1879,7 @@ module AtsECall_IVS_Testcases { 


            f_verifyMSD(ANY_DECODED_ECALL);



            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_WORKER));

            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_MODEM_INSTANCE));



            f_clearDown(NETWORK, 5.0);
@@ -1907,10 +1907,10 @@ module AtsECall_IVS_Testcases { 
                }

            }



            callControl.send(m_callCreate(PX_WORKER, PX_IVS_PHONE_NUMBER));

            f_mnoExpect(mw_callEstablished(PX_WORKER, ?));

            callControl.send(m_callCreate(PX_MODEM_INSTANCE, PX_IVS_PHONE_NUMBER));

            f_mnoExpect(mw_callEstablished(PX_MODEM_INSTANCE, ?));



            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_WORKER));

            f_expectFeedback(mw_callVoiceConnectionEstablished(PX_MODEM_INSTANCE));



            f_userVerify("Is 2-way speech possible?",

                "2-way speech possible",

ttcn/LibItsECall_Functions.ttcn

+38 −38
Original line number Diff line number Diff line
@@ -108,11 +108,11 @@ module LibItsECall_Functions { 
            return v_feedback;

        }



        f_mnoExpect(mw_callIncoming(PX_WORKER, ?, p_ivsNumber, p_psapNumber));

        f_mnoExpect(mw_callIncoming(PX_MODEM_INSTANCE, ?, p_ivsNumber, p_psapNumber));



        callControl.send(m_callAccept(PX_WORKER));

        callControl.send(m_callAccept(PX_MODEM_INSTANCE));



        v_feedback := f_mnoExpect(mw_callEstablished(PX_WORKER, ?));

        v_feedback := f_mnoExpect(mw_callEstablished(PX_MODEM_INSTANCE, ?));

        if (v_feedback.failure == true) {

            f_stopIvsTestcase(inconc, "Could not establish eCall");

        }
@@ -149,7 +149,7 @@ module LibItsECall_Functions { 
    function f_verifyMSD(in template(present) ECallMessageUnion p_expectedEcallMessage) runs on PsapMtc {

        template ECallMessageUnion mw_msd := f_generateMSDTemplate(p_expectedEcallMessage);



        f_expectFeedback(mw_inbandMsdReceived(PX_WORKER, ?, mw_msd));

        f_expectFeedback(mw_inbandMsdReceived(PX_MODEM_INSTANCE, ?, mw_msd));

        vc_messageIdentifier := vc_messageIdentifier + 1;

    }
@@ -167,13 +167,13 @@ module LibItsECall_Functions { 
                t_hangUpTimer.timeout;

            }

      

            callControl.send(m_callHangUpC(PX_WORKER));

            callControl.send(m_callHangUpC(PX_MODEM_INSTANCE));

        }

        else {

            adapterControl.send(m_setAutomaticAlAck(PX_WORKER, true, c_clearDownAlAck));

            adapterControl.send(m_setAutomaticAlAck(PX_MODEM_INSTANCE, true, c_clearDownAlAck));

            f_adapterExpect(mw_anyConfigChanged);



            modem.send(m_inbandRequestMsd(PX_WORKER));

            modem.send(m_inbandRequestMsd(PX_MODEM_INSTANCE));

            f_verifyMSD(PX_ECALL_MESSAGE);

        }

    }
@@ -185,7 +185,7 @@ module LibItsECall_Functions { 
    function f_setMSD(ECallMessageUnion p_eCall) runs on IvsMtc {

        var ModemConfiguration v_newConfig := {eCallMessage := p_eCall};



        adapterControl.send(m_setConfig(PX_WORKERS[0].id, v_newConfig));

        adapterControl.send(m_setConfig(PX_MODEM_INSTANCES[0].id, v_newConfig));

    }



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


        t.start;

        alt {

            [] modem.receive(mw_inbandStartSignalReceived(PX_WORKERS[0].id)) {

            [] modem.receive(mw_inbandStartSignalReceived(PX_MODEM_INSTANCES[0].id)) {

                t.start;

                repeat;

            }



            [] modem.receive(mw_inbandLlAckReceived(PX_WORKERS[0].id)) {

            [] modem.receive(mw_inbandLlAckReceived(PX_MODEM_INSTANCES[0].id)) {

                t.start;

                repeat;

            }



            [] modem.receive(mw_inbandAlAckReceived(PX_WORKERS[0].id, -, -, p_alAckValue)) {

            [] modem.receive(mw_inbandAlAckReceived(PX_MODEM_INSTANCES[0].id, -, -, p_alAckValue)) {

                t.stop;

            }
@@ -273,10 +273,10 @@ module LibItsECall_Functions { 


        vc_eCallMessage := v_eCallMessageExpanded;

//TODO create equivalent for Psap Mtc

        adapterControl.send(m_setConfig(PX_WORKERS[0].id, v_psapConfig));

        adapterControl.send(m_setConfig(PX_MODEM_INSTANCES[0].id, v_psapConfig));

//        f_adapterExpect(p_e := mw_ivsConfigChanged(p_workerConf.id, ?, ?), p_ignoreOtherMessages := true);



        adapterControl.send(m_setConfig(PX_WORKERS[0].id, p_configuration));

        adapterControl.send(m_setConfig(PX_MODEM_INSTANCES[0].id, p_configuration));

//        f_adapterExpect(p_e := mw_ivsConfigChanged(p_workerConf.id, ?, p_configuration), p_ignoreOtherMessages := true);

    }
@@ -502,31 +502,31 @@ module LibItsECall_Functions { 
                repeat;

            }



            [] modem.receive(mw_inbandSendSignalReceived(PX_WORKERS[0].id)) {

            [] modem.receive(mw_inbandSendSignalReceived(PX_MODEM_INSTANCES[0].id)) {

                repeat;

            }



            [] modem.receive(mw_inbandStartSignalReceived(PX_WORKERS[0].id, -, -, false)) {

            [] modem.receive(mw_inbandStartSignalReceived(PX_MODEM_INSTANCES[0].id, -, -, false)) {

                repeat;

            }



            [] modem.receive(mw_inbandNackSent(PX_WORKERS[0].id)) {

            [] modem.receive(mw_inbandNackSent(PX_MODEM_INSTANCES[0].id)) {

                repeat;

            }

    

            [] modem.receive(mw_inbandNackReceived(PX_WORKERS[0].id)) {

            [] modem.receive(mw_inbandNackReceived(PX_MODEM_INSTANCES[0].id)) {

                repeat;

            }

    

            [] modem.receive(mw_inbandLlAckSent(PX_WORKERS[0].id)) {

            [] modem.receive(mw_inbandLlAckSent(PX_MODEM_INSTANCES[0].id)) {

                repeat;

            }



            [] modem.receive(mw_inbandAlAckSent(PX_WORKERS[0].id)) {

            [] modem.receive(mw_inbandAlAckSent(PX_MODEM_INSTANCES[0].id)) {

                repeat;

            }



            [] modem.receive(mw_timerExpired(p_worker := PX_WORKERS[0].id)) -> value v_modemEvent {

            [] modem.receive(mw_timerExpired(p_worker := PX_MODEM_INSTANCES[0].id)) -> value v_modemEvent {

                f_stopPsapTestcase(fail, "Timer " & v_modemEvent.timerExpired.name & " expired");

            }
@@ -536,15 +536,15 @@ module LibItsECall_Functions { 
                repeat;

            }



            [] callControl.receive(mw_callEstablished(PX_WORKERS[0].id, ?)) {

            [] callControl.receive(mw_callEstablished(PX_MODEM_INSTANCES[0].id, ?)) {

                repeat;

            }



            [] callControl.receive(mw_callHangUp(PX_WORKERS[0].id, ?)) {

            [] callControl.receive(mw_callHangUp(PX_MODEM_INSTANCES[0].id, ?)) {

                repeat;

            }



            [] callControl.receive(mw_callHangUp(PX_WORKERS[0].id, ?)) {

            [] callControl.receive(mw_callHangUp(PX_MODEM_INSTANCES[0].id, ?)) {

                f_stopPsapTestcase(fail, "Unexpected external hang up!");

            }
@@ -558,7 +558,7 @@ module LibItsECall_Functions { 






            [] adapterControl.receive(mw_ivsConfigChanged(PX_WORKERS[0].id, ?, ?)) {

            [] adapterControl.receive(mw_ivsConfigChanged(PX_MODEM_INSTANCES[0].id, ?, ?)) {

                repeat;

            }
@@ -588,7 +588,7 @@ module LibItsECall_Functions { 
                repeat;

            }



            [] modem.receive(mw_inbandMsdReceived(p_worker := PX_WORKERS[0].id)) -> value v_modemEvent {

            [] modem.receive(mw_inbandMsdReceived(p_worker := PX_MODEM_INSTANCES[0].id)) -> value v_modemEvent {

                var ECallMessageUnion eCallMessage := v_modemEvent.inbandMsdReceived.eCallMessage;



                if (ischosen(eCallMessage.encoded)) {
@@ -599,16 +599,16 @@ module LibItsECall_Functions { 
                }

            }



            [] modem.receive(mw_callVoiceConnectionEstablished(p_worker := PX_WORKERS[0].id)) {

            [] modem.receive(mw_callVoiceConnectionEstablished(p_worker := PX_MODEM_INSTANCES[0].id)) {

                f_stopIvsTestcase(fail, "Switch to voice communication was not expected");

            }



            [] modem.receive(mw_timerExpired(p_worker := PX_WORKERS[0].id)) -> value v_modemEvent {

            [] modem.receive(mw_timerExpired(p_worker := PX_MODEM_INSTANCES[0].id)) -> value v_modemEvent {

                f_stopIvsTestcase(fail, "Timer " & v_modemEvent.timerExpired.name & " expired");

            }





            [] callControl.receive(mw_callHangUp(PX_WORKER, ?)) {

            [] callControl.receive(mw_callHangUp(PX_MODEM_INSTANCE, ?)) {

                f_stopIvsTestcase(fail, "Unexpected external hang up!");

            }
@@ -675,11 +675,11 @@ module LibItsECall_Functions { 
            // Final configuration

            p_configuration.internalSubscriber := PX_INTERNAL_SUBSCRIBER;



            adapterControl.send(m_setConfig(PX_WORKER, v_ivsConfig));

            f_adapterExpect(p_e := mw_ivsConfigChanged(PX_WORKER, ?, ?), p_ignoreOtherMessages := true);

            adapterControl.send(m_setConfig(PX_MODEM_INSTANCE, v_ivsConfig));

            f_adapterExpect(p_e := mw_ivsConfigChanged(PX_MODEM_INSTANCE, ?, ?), p_ignoreOtherMessages := true);



            adapterControl.send(m_setConfig(PX_WORKER, p_configuration));

            f_adapterExpect(p_e := mw_psapConfigChanged(PX_WORKER, ?, p_configuration), p_ignoreOtherMessages := true);

            adapterControl.send(m_setConfig(PX_MODEM_INSTANCE, p_configuration));

            f_adapterExpect(p_e := mw_psapConfigChanged(PX_MODEM_INSTANCE, ?, p_configuration), p_ignoreOtherMessages := true);



            vc_initialized := true;

            vc_messageIdentifier := c_initialMessageIdentifier;
@@ -728,8 +728,8 @@ module LibItsECall_Functions { 
            f_clearDown(NETWORK, c_now);



            // reset modem state

            adapterControl.send(m_setConfig(PX_WORKER, v_ivsConfig));

            f_adapterExpect(p_e := mw_ivsConfigChanged(PX_WORKER, ?, ?), p_ignoreOtherMessages := true);

            adapterControl.send(m_setConfig(PX_MODEM_INSTANCE, v_ivsConfig));

            f_adapterExpect(p_e := mw_ivsConfigChanged(PX_MODEM_INSTANCE, ?, ?), p_ignoreOtherMessages := true);



            unmap(self:modem, system:modem);

        } // end f_configIvsModemDown
@@ -757,7 +757,7 @@ module LibItsECall_Functions { 
            activate(a_defaultUi());

            activate(a_defaultIvs());



            f_setSimulatorConfigurationIvs(PX_WORKERS[0], p_configuration);

            f_setSimulatorConfigurationIvs(PX_MODEM_INSTANCES[0], p_configuration);

          

            vc_initialized := true;
@@ -880,12 +880,12 @@ module LibItsECall_Functions { 
        // monitor redial attempts

        t_redialWindowTimer.start;

        alt {

            [] callControl.receive(mw_callIncoming(PX_WORKER, ?, PX_IVS_PHONE_NUMBER, PX_PSAP_PHONE_NUMBER)) {

            [] callControl.receive(mw_callIncoming(PX_MODEM_INSTANCE, ?, PX_IVS_PHONE_NUMBER, PX_PSAP_PHONE_NUMBER)) {

                v_redialAttempted := true;

                repeat;

            }



            [] callControl.receive(mw_callCanceled(PX_WORKER, ?)) {

            [] callControl.receive(mw_callCanceled(PX_MODEM_INSTANCE, ?)) {

                repeat;

            }
@@ -899,7 +899,7 @@ module LibItsECall_Functions { 
        // no more redial attempts should be registered

        t_guard.start;

        alt {

            [] callControl.receive(mw_callIncoming(PX_WORKER, ?, PX_IVS_PHONE_NUMBER, PX_PSAP_PHONE_NUMBER)) {

            [] callControl.receive(mw_callIncoming(PX_MODEM_INSTANCE, ?, PX_IVS_PHONE_NUMBER, PX_PSAP_PHONE_NUMBER)) {

                setverdict(fail, "Redial attempted after two minutes");

            }

ttcn/LibItsECall_Pixits.ttcn

+13 −13

File changed.

Preview size limit exceeded, changes collapsed.