Commit bdcad7ac authored by berge's avatar berge
Browse files

Fixed some naming conventions

parent 89273216

ttcn/AtsECall_IVS_Testcases.ttcn

+108 −107

File changed.

Preview size limit exceeded, changes collapsed.

ttcn/AtsECall_PSAP_Testcases.ttcn

+38 −38
Original line number Diff line number Diff line
@@ -218,10 +218,10 @@ module AtsECall_PSAP_Testcases { 
        testcase CTP_3_1_7_4() runs on IVSMtc system IVSSimulator {

            

            // Local variables

            var ConfigParameters localIVSSimulatorConfiguration := modifies defaultIVSSimulatorConfiguration := {simulateCrcError := true};

            var ConfigParameters v_localIVSSimulatorConfiguration := modifies defaultIVSSimulatorConfiguration := {simulateCrcError := true};



            // Test component configuration

            f_configPsapUp(localIVSSimulatorConfiguration);

            f_configPsapUp(v_localIVSSimulatorConfiguration);



            // Test Body

            eCallControl.send(m_callCreate(PX_WORKERS[0].id, PX_PSAP_PHONE_NUMBER, EXTERNAL));
@@ -236,19 +236,19 @@ module AtsECall_PSAP_Testcases { 
                // because of CRC errors T7 should expire

                }



                [] eCallFeedback.receive(mw_inbandStartSignalReceived(worker := PX_WORKERS[0].id, reliable := true)) {

                [] eCallFeedback.receive(mw_inbandStartSignalReceived(p_worker := PX_WORKERS[0].id, reliable := true)) {

                    repeat;

                }



                [] eCallFeedback.receive(mw_inbandStartSignalReceived(worker := PX_WORKERS[0].id, reliable := true)) {

                [] eCallFeedback.receive(mw_inbandStartSignalReceived(p_worker := PX_WORKERS[0].id, reliable := true)) {

                    f_stopTestcase(fail, "LL-ACK reveceived for MSD with CRC error")

                }



                [] eCallFeedback.receive(mw_inbandLlAckReceived(worker := PX_WORKERS[0].id, reliable := true)) {

                [] eCallFeedback.receive(mw_inbandLlAckReceived(p_worker := PX_WORKERS[0].id, reliable := true)) {

                    f_stopTestcase(fail, "LL-ACK reveceived for MSD with CRC error")

                }



                [] eCallFeedback.receive(mw_inbandAlAckReceived(worker := PX_WORKERS[0].id, reliable := true)) {

                [] eCallFeedback.receive(mw_inbandAlAckReceived(p_worker := PX_WORKERS[0].id, reliable := true)) {

                    f_stopTestcase(fail, "AL-ACK reveceived for MSD with CRC error")

                }

            }
@@ -296,17 +296,17 @@ module AtsECall_PSAP_Testcases { 
        testcase CTP_3_1_7_5() runs on IVSMtc system IVSSimulator {

            

            // Local variables

            var ConfigParameters localIVSSimulatorConfiguration := modifies defaultIVSSimulatorConfiguration := {eCallMessage := PX_BAD_ECALL_MESSAGE};

            var ConfigParameters v_localIVSSimulatorConfiguration := modifies defaultIVSSimulatorConfiguration := {eCallMessage := PX_BAD_ECALL_MESSAGE};



            // Test component configuration

            f_configPsapUp(localIVSSimulatorConfiguration);

            f_configPsapUp(v_localIVSSimulatorConfiguration);



            // Test Body

            eCallControl.send(m_callCreate(PX_WORKERS[0].id, PX_PSAP_PHONE_NUMBER, EXTERNAL));

            f_expectFeedback<CallEstablishedEvent>(mw_callEstablished(PX_WORKERS[0].id, ?, EXTERNAL));



            f_expectFeedback<InbandStartSignalReceivedEvent>(mw_inbandStartSignalReceived(worker := PX_WORKERS[0].id, reliable := true));

            f_expectFeedback<InbandLlAckReceivedEvent>(mw_inbandLlAckReceived(worker := PX_WORKERS[0].id, reliable := true));

            f_expectFeedback<InbandStartSignalReceivedEvent>(mw_inbandStartSignalReceived(p_worker := PX_WORKERS[0].id, p_reliable := true));

            f_expectFeedback<InbandLlAckReceivedEvent>(mw_inbandLlAckReceived(p_worker := PX_WORKERS[0].id, p_reliable := true));



            f_expectFeedback<CallVoiceConnectionEstablishedEvent>(mw_callVoiceConnectionEstablished(PX_WORKERS[0].id));
@@ -518,7 +518,7 @@ module AtsECall_PSAP_Testcases { 


            f_userAction("Clear down PSAP");



            f_expectFeedback<CallHangUpEvent>(mw_callHangUp(worker := PX_WORKERS[0].id, callRef := EXTERNAL), PX_TIMEOUT, true);

            f_expectFeedback<CallHangUpEvent>(mw_callHangUp(p_worker := PX_WORKERS[0].id, p_callRef := EXTERNAL), PX_TIMEOUT, true);



            f_userVerify("Is the operator line free?",

                "Operator line became free",
@@ -574,13 +574,13 @@ module AtsECall_PSAP_Testcases { 
            eCallControl.send(m_callCreate(PX_WORKERS[0].id, PX_PSAP_PHONE_NUMBER, EXTERNAL));

            f_expectFeedback<CallEstablishedEvent>(mw_callEstablished(PX_WORKERS[0].id, ?, EXTERNAL));



            f_expectFeedback<InbandStartSignalReceivedEvent>(mw_inbandStartSignalReceived(worker := PX_WORKERS[0].id, reliable := true));

            f_expectFeedback<InbandStartSignalReceivedEvent>(mw_inbandStartSignalReceived(p_worker := PX_WORKERS[0].id, p_reliable := true));



            f_userAction("Clear down PSAP");



            f_expectFeedback<InbandLlAckReceivedEvent>(mw_inbandLlAckReceived(worker := PX_WORKERS[0].id, reliable := true), PX_TIMEOUT, true);

            f_expectFeedback<InbandLlAckReceivedEvent>(mw_inbandLlAckReceived(p_worker := PX_WORKERS[0].id, p_reliable := true), PX_TIMEOUT, true);



            f_expectFeedback<InbandAlAckReceivedEvent>(mw_inbandAlAckReceived(worker := PX_WORKERS[0].id, val := CLEAR_DOWN_AL_ACK, reliable := true), PX_TIMEOUT, true);

            f_expectFeedback<InbandAlAckReceivedEvent>(mw_inbandAlAckReceived(p_worker := PX_WORKERS[0].id, p_val := CLEAR_DOWN_AL_ACK, p_reliable := true), PX_TIMEOUT, true);



            setverdict(pass, "Status bit of AL-ACK equal 1 (Cleardown)");
@@ -623,7 +623,7 @@ module AtsECall_PSAP_Testcases { 


            f_userAction("Clear down eCall");



            f_expectFeedback<CallHangUpEvent>(mw_callHangUp(worker := PX_WORKERS[0].id, callRef := EXTERNAL), PX_TIMEOUT, true);

            f_expectFeedback<CallHangUpEvent>(mw_callHangUp(p_worker := PX_WORKERS[0].id, p_callRef := EXTERNAL), PX_TIMEOUT, true);



            f_userAction("Initiate call back procedure");
@@ -680,7 +680,7 @@ module AtsECall_PSAP_Testcases { 


            f_userAction("Clear down eCall");



            f_expectFeedback<CallHangUpEvent>(mw_callHangUp(worker := PX_WORKERS[0].id, callRef := EXTERNAL), PX_TIMEOUT, true);

            f_expectFeedback<CallHangUpEvent>(mw_callHangUp(p_worker := PX_WORKERS[0].id, p_callRef := EXTERNAL), PX_TIMEOUT, true);



            f_userAction("Initiate call back procedure");
@@ -735,7 +735,7 @@ module AtsECall_PSAP_Testcases { 
            eCallControl.send(m_callCreate(PX_WORKERS[0].id, PX_PSAP_PHONE_NUMBER, EXTERNAL));

            f_expectFeedback<CallEstablishedEvent>(mw_callEstablished(PX_WORKERS[0].id, ?, EXTERNAL));



            f_expectFeedback<InbandAlAckReceivedEvent>(mw_inbandAlAckReceived(worker := PX_WORKERS[0].id, reliable := true), PX_TIMEOUT, true);

            f_expectFeedback<InbandAlAckReceivedEvent>(mw_inbandAlAckReceived(p_worker := PX_WORKERS[0].id, p_reliable := true), PX_TIMEOUT, true);



            // Postamble

            f_configDown();
@@ -776,7 +776,7 @@ module AtsECall_PSAP_Testcases { 
            eCallControl.send(m_callCreate(PX_WORKERS[0].id, PX_PSAP_PHONE_NUMBER, EXTERNAL));

            f_expectFeedback<CallEstablishedEvent>(mw_callEstablished(PX_WORKERS[0].id, ?, EXTERNAL));



            f_expectFeedback<InbandStartSignalReceivedEvent>(mw_inbandStartSignalReceived(worker := PX_WORKERS[0].id, reliable := true));

            f_expectFeedback<InbandStartSignalReceivedEvent>(mw_inbandStartSignalReceived(p_worker := PX_WORKERS[0].id, p_reliable := true));



            // Postamble

            f_configDown();
@@ -810,10 +810,10 @@ module AtsECall_PSAP_Testcases { 
        testcase CTP_3_1_5_2() runs on IVSMtc system IVSSimulator {

            

            // Local variables

            template ConfigParameters localIvsSimulatorConfiguration modifies defaultIVSSimulatorConfiguration := {inbandState := OFF, inbandControl := MANUAL}

            template ConfigParameters v_localIvsSimulatorConfiguration modifies defaultIVSSimulatorConfiguration := {inbandState := OFF, inbandControl := MANUAL}



            // Test component configuration

            f_configPsapUp(localIvsSimulatorConfiguration);

            f_configPsapUp(v_localIvsSimulatorConfiguration);



            // Test Body

            eCallControl.send(m_callCreate(PX_WORKERS[0].id, PX_PSAP_PHONE_NUMBER, EXTERNAL));
@@ -857,19 +857,19 @@ module AtsECall_PSAP_Testcases { 
        testcase CTP_3_1_6() runs on IVSMtc system IVSSimulator {

            

            // Local variables

            var InbandStartSignalReceivedEvent startSignal;

            var CallEstablishedEvent callEstablished;

            var InbandStartSignalReceivedEvent v_startSignal;

            var CallEstablishedEvent v_callEstablished;



            // Test component configuration

            f_configPsapUp(defaultIVSSimulatorConfiguration);



            // Test Body

            eCallControl.send(m_callCreate(PX_WORKERS[0].id, PX_PSAP_PHONE_NUMBER, EXTERNAL));

            callEstablished := f_expectFeedback<CallEstablishedEvent>(mw_callEstablished(PX_WORKERS[0].id, ?, EXTERNAL));

            v_callEstablished := f_expectFeedback<CallEstablishedEvent>(mw_callEstablished(PX_WORKERS[0].id, ?, EXTERNAL));



            startSignal := f_expectFeedback<InbandStartSignalReceivedEvent>(mw_inbandStartSignalReceived(worker := PX_WORKERS[0].id, reliable := true));

            v_startSignal := f_expectFeedback<InbandStartSignalReceivedEvent>(mw_inbandStartSignalReceived(p_worker := PX_WORKERS[0].id, p_reliable := true));



            f_timeoutCheck(callEstablished.time, startSignal.time, PX_T5_TIMER,

            f_timeoutCheck(v_callEstablished.time, v_startSignal.time, PX_T5_TIMER,

                "In-band modem sent ‘SEND MSD’ message before T5 expired",

                "In-band modem did not send ‘SEND MSD’ message before T5 expired");
@@ -904,33 +904,33 @@ module AtsECall_PSAP_Testcases { 
        testcase CTP_3_1_7_1() runs on IVSMtc system IVSSimulator {

            

            // Local variables

            var InbandStartSignalReceivedEvent startSignal;

            var CallEstablishedEvent callEstablished;

            var InbandLlAckReceivedEvent llAckReceived;

            var InbandAlAckReceivedEvent alAckReceived;

            var InbandStartSignalReceivedEvent v_startSignal;

            var CallEstablishedEvent v_callEstablished;

            var InbandLlAckReceivedEvent v_llAckReceived;

            var InbandAlAckReceivedEvent v_alAckReceived;



            // Test component configuration

            f_configPsapUp(defaultIVSSimulatorConfiguration);



            // Test Body

            eCallControl.send(m_callCreate(PX_WORKERS[0].id, PX_PSAP_PHONE_NUMBER, EXTERNAL));

            callEstablished := f_expectFeedback<CallEstablishedEvent>(mw_callEstablished(PX_WORKERS[0].id, ?, EXTERNAL));

            v_callEstablished := f_expectFeedback<CallEstablishedEvent>(mw_callEstablished(PX_WORKERS[0].id, ?, EXTERNAL));



            startSignal := f_expectFeedback<InbandStartSignalReceivedEvent>(mw_inbandStartSignalReceived(worker := PX_WORKERS[0].id, reliable := true));

            v_startSignal := f_expectFeedback<InbandStartSignalReceivedEvent>(mw_inbandStartSignalReceived(p_worker := PX_WORKERS[0].id, p_reliable := true));



            f_timeoutCheck(callEstablished.time, startSignal.time, PX_T5_TIMER,

            f_timeoutCheck(v_callEstablished.time, v_startSignal.time, PX_T5_TIMER,

                "In-band modem sent ‘SEND MSD’ message before T5 expired",

                "In-band modem did not send ‘SEND MSD’ message before T5 expired");



            llAckReceived := f_expectFeedback<InbandLlAckReceivedEvent>(mw_inbandLlAckReceived(worker := PX_WORKERS[0].id, reliable := true), PX_TIMEOUT, true);

            v_llAckReceived := f_expectFeedback<InbandLlAckReceivedEvent>(mw_inbandLlAckReceived(p_worker := PX_WORKERS[0].id, p_reliable := true), PX_TIMEOUT, true);



            f_timeoutCheck(startSignal.time, llAckReceived.time, PX_T7_TIMER,

            f_timeoutCheck(v_startSignal.time, v_llAckReceived.time, PX_T7_TIMER,

                "In-band modem sent ‘LL ACK’ message before T7 expired",

                "In-band modem did not send ‘LL ACK’ message before T7 expired");



            alAckReceived := f_expectFeedback<InbandAlAckReceivedEvent>(mw_inbandAlAckReceived(worker := PX_WORKERS[0].id, reliable := true));

            v_alAckReceived := f_expectFeedback<InbandAlAckReceivedEvent>(mw_inbandAlAckReceived(p_worker := PX_WORKERS[0].id, p_reliable := true));



            f_timeoutCheck(llAckReceived.time, alAckReceived.time, PX_T6_TIMER,

            f_timeoutCheck(v_llAckReceived.time, v_alAckReceived.time, PX_T6_TIMER,

                "In-band modem sent ‘AL ACK’ message before T6 expired",

                "In-band modem did not send ‘AL ACK’ message before T6 expired");
@@ -1007,10 +1007,10 @@ module AtsECall_PSAP_Testcases { 
        testcase CTP_3_1_7_3() runs on IVSMtc system IVSSimulator {

            

            // Local variables

            template ConfigParameters localIvsSimulatorConfiguration modifies defaultIVSSimulatorConfiguration := {simulateCrcError := true}

            template ConfigParameters v_localIvsSimulatorConfiguration modifies defaultIVSSimulatorConfiguration := {simulateCrcError := true}



            // Test component configuration

            f_configPsapUp(localIvsSimulatorConfiguration);

            f_configPsapUp(v_localIvsSimulatorConfiguration);



            // Test Body

            eCallControl.send(m_callCreate(PX_WORKERS[0].id, PX_PSAP_PHONE_NUMBER, EXTERNAL));

ttcn/LibItsECall_Functions.ttcn

+79 −79

File changed.

Preview size limit exceeded, changes collapsed.

ttcn/LibItsECall_Templates.ttcn

+4 −3
Original line number Diff line number Diff line
@@ -25,16 +25,17 @@ module LibItsECall_Templates { 
    function f_expandMsdValue(in ECallMessageUnion p_eCallMessageUnion) return ECallMessageUnion {

        // expand msd that was given as encoded if valid, otherwise leave as is

        if (ischosen(p_eCallMessageUnion.encoded)) {

            var ECallMessage msd;

            var ECallMessage v_msd;



            if (decvalue(oct2bit(p_eCallMessageUnion.encoded), msd) == 0) {

                p_eCallMessageUnion.decoded := msd;

            if (decvalue(oct2bit(p_eCallMessageUnion.encoded), v_msd) == 0) {

                p_eCallMessageUnion.decoded := v_msd;

            }

        }



        return p_eCallMessageUnion;

    }

    

    // FIXME

    const ConfigParameters defaultIVSSimulatorConfiguration := {

        mode := IVS,

        t3Timer := 2.0,

ttcn/LibItsECall_TestSystem.ttcn

+4 −4
Original line number Diff line number Diff line
@@ -21,10 +21,10 @@ module LibItsECall_TestSystem { 
            port AMQPPort eCallFeedback;

            port UIPort uiPort;



            var boolean initialized;

            var boolean vc_initialized;

            

            var LogComponent logComponent;

            var UIComponent uiComponent;

            var LogComponent vc_logComponent;

            var UIComponent vc_uiComponent;

        }

            

        type component PSAPMtc extends ECallMtc {
@@ -32,7 +32,7 @@ module LibItsECall_TestSystem { 
        }

        

        type component IVSMtc extends ECallMtc {

            var ECallMessageUnion eCallMessage;

            var ECallMessageUnion vc_eCallMessage;

        }



        type component PSAPSimulator {