Commit 2d362ed1 authored by mogos's avatar mogos
Browse files

added timers as constants (0006808)

parent 12a97b7d

ttcn/LibItsECall_Functions.ttcn

+12 −17
Original line number Diff line number Diff line
@@ -192,12 +192,12 @@ module LibItsECall_Functions { 
     * @param p_alAckValue  Expected AL Ack value

     */

    function f_verifyMsdSentSuccesfully(template(present) AckValueType p_alAckValue := c_positiveAlAck) runs on IvsMtc {

        f_expectFeedback(mw_inbandStartSignalReceived(PX_WORKERS[0].id, -, -, true));



        f_verifyAckReceived(p_alAckValue);



        vc_eCallMessage.decoded.msd.msdStructure.messageIdentifier := vc_eCallMessage.decoded.msd.msdStructure.messageIdentifier + 1;

        f_setMSD(vc_eCallMessage);

//        f_expectFeedback(mw_inbandStartSignalReceived(PX_WORKERS[0].id, -, -, true));

//

//        f_verifyAckReceived(p_alAckValue);

//

//        vc_eCallMessage.decoded.msd.msdStructure.messageIdentifier := vc_eCallMessage.decoded.msd.msdStructure.messageIdentifier + 1;

//        f_setMSD(vc_eCallMessage);

    }



    /**
@@ -267,10 +267,6 @@ module LibItsECall_Functions { 
        var ModemConfiguration v_psapConfig := {mode := PSAP};

        

        // Final configuration

        p_configuration.t3Timer := PX_T3_TIMER;

        p_configuration.t5Timer := PX_T5_TIMER;

        p_configuration.t6Timer := PX_T6_TIMER;

        p_configuration.t7Timer := PX_T7_TIMER;

        p_configuration.internalSubscriber := p_workerConf.internalSubscriber;

        p_configuration.eCallMessage := v_eCallMessageExpanded;
@@ -580,16 +576,18 @@ module LibItsECall_Functions { 
            }



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

                if (ischosen(v_modemEvent.inbandMsdReceived.encoded)) {

                    f_stopPsapTestcase(fail, "Invalid MSD received, could not decode");

                var ECallMessageUnion eCallMessage := v_modemEvent.inbandMsdReceived.eCallMessage;



                if (ischosen(eCallMessage.encoded)) {

                    f_stopIvsTestcase(fail, "Invalid MSD received, could not decode");

                }

                else {

                    f_stopPsapTestcase(fail, "Invalid MSD received");

                    f_stopIvsTestcase(fail, "Invalid MSD received");

                }

            }



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

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

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

            }
@@ -658,9 +656,6 @@ module LibItsECall_Functions { 
            map(self:modem, system:modem);



            // Final configuration

            p_configuration.t4Timer := PX_T4_TIMER;

            p_configuration.t6Timer := PX_T6_TIMER;

            p_configuration.t8Timer := PX_T8_TIMER;

            p_configuration.internalSubscriber := PX_INTERNAL_SUBSCRIBER;



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