Commit 8563c2b3 authored by berge's avatar berge
Browse files

Fixed some non-standard statements

parent 8cf3c6dd

ttcn/AtsECall_IVS_Testcases.ttcn

+45 −45
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ module AtsECall_IVS_Testcases { 
        testcase CTP_1_1_2_2() runs on PsapMtc system PsapSystem {

            

            // Test component configuration

            f_configIvsUp(c_defaultPsapSimulatorConfiguration);

            f_configIvsUp(m_defaultPsapSimulatorConfiguration);



            // Test Body

            f_establishCall("Trigger automatic eCall");
@@ -137,7 +137,7 @@ module AtsECall_IVS_Testcases { 
            var integer v_button;



            // Test component configuration

            f_configIvsUp(c_defaultPsapSimulatorConfiguration);

            f_configIvsUp(m_defaultPsapSimulatorConfiguration);



            // Test Body

            f_establishCall("Generate a lateral shock");
@@ -195,7 +195,7 @@ module AtsECall_IVS_Testcases { 
            var integer v_button;



            // Test component configuration

            f_configIvsUp(c_defaultPsapSimulatorConfiguration);

            f_configIvsUp(m_defaultPsapSimulatorConfiguration);



            // Test Body

            f_establishCall("Generate a frontal shock");
@@ -245,7 +245,7 @@ module AtsECall_IVS_Testcases { 
            var integer v_crashType;



            // Test component configuration

            f_configIvsUp(c_defaultPsapSimulatorConfiguration);

            f_configIvsUp(m_defaultPsapSimulatorConfiguration);



            // Test Body

            for (v_crashType := 0; v_crashType < lengthof(PX_SUPPORTED_CRASH_TYPES); v_crashType := v_crashType + 1) {
@@ -265,7 +265,7 @@ module AtsECall_IVS_Testcases { 
  

                f_verifyMSD(PX_ECALL_MESSAGE);



                f_clearDown(NETWORK, NOW);

                f_clearDown(NETWORK, c_now);



                f_userVerify("Did the IVS successfully clear-down?",

                    "The IVS successfully cleared-down)",
@@ -301,7 +301,7 @@ module AtsECall_IVS_Testcases { 
        testcase CTP_1_1_3_2() runs on PsapMtc system PsapSystem {

            

            // Test component configuration

            f_configIvsUp(c_defaultPsapSimulatorConfiguration);

            f_configIvsUp(m_defaultPsapSimulatorConfiguration);



            // Test Body

            f_establishCall("Trigger manual eCall");
@@ -345,7 +345,7 @@ module AtsECall_IVS_Testcases { 
            var integer v_button;



            // Test component configuration

            f_configIvsUp(c_defaultPsapSimulatorConfiguration);

            f_configIvsUp(m_defaultPsapSimulatorConfiguration);



            // Test Body

            f_establishCall("Trigger automatic eCall");
@@ -389,7 +389,7 @@ module AtsECall_IVS_Testcases { 
            var integer v_button;



            // Test component configuration

            f_configIvsUp(c_defaultPsapSimulatorConfiguration);

            f_configIvsUp(m_defaultPsapSimulatorConfiguration);



            // Test Body

            f_establishCall("Trigger manual eCall");
@@ -433,7 +433,7 @@ module AtsECall_IVS_Testcases { 
            var integer v_button;



            // Test component configuration

            f_configIvsUp(c_defaultPsapSimulatorConfiguration);

            f_configIvsUp(m_defaultPsapSimulatorConfiguration);



            // Test Body

            f_establishCall("Trigger automatic eCall");
@@ -477,7 +477,7 @@ module AtsECall_IVS_Testcases { 
            var integer v_button;



            // Test component configuration

            f_configIvsUp(c_defaultPsapSimulatorConfiguration);

            f_configIvsUp(m_defaultPsapSimulatorConfiguration);



            // Test Body

            f_establishCall("Trigger manual eCall");
@@ -523,7 +523,7 @@ module AtsECall_IVS_Testcases { 
            var integer v_button;



            // Test component configuration

            f_configIvsUp(c_defaultPsapSimulatorConfiguration);

            f_configIvsUp(m_defaultPsapSimulatorConfiguration);



            // Test Body

            f_userAction("Trigger manual or automatic eCall");
@@ -579,7 +579,7 @@ module AtsECall_IVS_Testcases { 
            var integer v_button;



            // Test component configuration

            f_configIvsUp(c_defaultPsapSimulatorConfiguration);

            f_configIvsUp(m_defaultPsapSimulatorConfiguration);



            // Test Body

            f_establishCall("Trigger manual or automatic eCall");
@@ -619,7 +619,7 @@ module AtsECall_IVS_Testcases { 
        testcase CTP_1_1_7_1() runs on PsapMtc system PsapSystem {



            // Test component configuration

            f_configIvsUp(c_defaultPsapSimulatorConfiguration);

            f_configIvsUp(m_defaultPsapSimulatorConfiguration);



            // Test Body

            f_establishCall("Trigger automatic eCall");
@@ -654,7 +654,7 @@ module AtsECall_IVS_Testcases { 
        testcase CTP_1_1_8_1() runs on PsapMtc system PsapSystem {

            

            // Test component configuration

            f_configIvsUp(c_defaultPsapSimulatorConfiguration);

            f_configIvsUp(m_defaultPsapSimulatorConfiguration);



            // Test Body

            f_establishCall("Trigger manual eCall");
@@ -689,7 +689,7 @@ module AtsECall_IVS_Testcases { 
        testcase CTP_1_1_9_1() runs on PsapMtc system PsapSystem {

            

            // Test component configuration

            f_configIvsUp(c_defaultPsapSimulatorConfiguration);

            f_configIvsUp(m_defaultPsapSimulatorConfiguration);



            // Test Body

            f_establishCall("Trigger test eCall");
@@ -724,7 +724,7 @@ module AtsECall_IVS_Testcases { 
        testcase CTP_1_1_10_1() runs on PsapMtc system PsapSystem {

            

            // Test component configuration

            f_configIvsUp(c_defaultPsapSimulatorConfiguration);

            f_configIvsUp(m_defaultPsapSimulatorConfiguration);



            // Test Body

            f_userAction("Trigger test eCall (to the provisioned non-emergency number)");
@@ -767,7 +767,7 @@ module AtsECall_IVS_Testcases { 
            

            // Local variables

            var boolean v_redialAttempted := false;

            template ConfigParameters v_locaPsapSimCfg modifies c_defaultPsapSimulatorConfiguration := {numberOfAlAcks := 0, numberOfLlAcks := 0, automaticAlAck := false}

            template(value) ConfigParameters v_locaPsapSimCfg modifies m_defaultPsapSimulatorConfiguration := {numberOfAlAcks := 0, numberOfLlAcks := 0, automaticAlAck := false}



            // Test component configuration

            f_configIvsUp(v_locaPsapSimCfg);
@@ -777,7 +777,7 @@ module AtsECall_IVS_Testcases { 


            f_expectFeedback(mw_inbandNackSent(PX_WORKER));



            f_clearDown(NETWORK, NOW);

            f_clearDown(NETWORK, c_now);



            f_validateRedialAttempts();
@@ -808,7 +808,7 @@ module AtsECall_IVS_Testcases { 
        testcase CTP_1_1_10_3() runs on PsapMtc system PsapSystem {

            

            // Local variables

            template ConfigParameters v_locaPsapSimCfg modifies c_defaultPsapSimulatorConfiguration := {inbandDirection := PUSH, ignoreSendSignal := true}

            template(value) ConfigParameters v_locaPsapSimCfg modifies m_defaultPsapSimulatorConfiguration := {inbandDirection := PUSH, ignoreSendSignal := true}

            var CallEstablishedEvent v_callEstablishedEvent;

            var Event v_event;

            var InbandSendSignalReceivedEvent v_lastSendSignal;
@@ -871,7 +871,7 @@ module AtsECall_IVS_Testcases { 
            template ECallMessageUnion localECalMessage modifies expandedECalMessage := {decoded := {msd := {msdStructure := {control_ := {automaticActivation := true, testCall := false}}}}}



            // Test component configuration

            f_configIvsUp(c_defaultPsapSimulatorConfiguration);

            f_configIvsUp(m_defaultPsapSimulatorConfiguration);



            // Test Body

            f_establishCall("Trigger automatic eCall");
@@ -907,7 +907,7 @@ module AtsECall_IVS_Testcases { 
            template ECallMessageUnion localECalMessage modifies expandedECalMessage := {decoded := {msd := {msdStructure := {control_ := {automaticActivation := false, testCall := false}}}}}



            // Test component configuration

            f_configIvsUp(c_defaultPsapSimulatorConfiguration);

            f_configIvsUp(m_defaultPsapSimulatorConfiguration);



            // Test Body

            f_establishCall("Trigger manual eCall");
@@ -944,7 +944,7 @@ module AtsECall_IVS_Testcases { 
            template ECallMessageUnion localECalMessage modifies expandedECalMessage := {decoded := {msd := {msdStructure := {control_ := {automaticActivation := ?, testCall := true}}}}}



            // Test component configuration

            f_configIvsUp(c_defaultPsapSimulatorConfiguration);

            f_configIvsUp(m_defaultPsapSimulatorConfiguration);



            // Test Body

            f_establishCall("Trigger test eCall");
@@ -979,7 +979,7 @@ module AtsECall_IVS_Testcases { 
        testcase CTP_1_1_14_1() runs on PsapMtc system PsapSystem {

            

            // Test component configuration

            f_configIvsUp(c_defaultPsapSimulatorConfiguration);

            f_configIvsUp(m_defaultPsapSimulatorConfiguration);



            // Test Body

            f_establishCall("Trigger test eCall");
@@ -1014,7 +1014,7 @@ module AtsECall_IVS_Testcases { 
        testcase CTP_1_1_15_1() runs on PsapMtc system PsapSystem {

            

            // Test component configuration

            f_configIvsUp(c_defaultPsapSimulatorConfiguration);

            f_configIvsUp(m_defaultPsapSimulatorConfiguration);



            // Test Body

            f_establishCall("Trigger eCall");
@@ -1060,7 +1060,7 @@ module AtsECall_IVS_Testcases { 
        testcase CTP_1_1_15_2() runs on PsapMtc system PsapSystem {

            

            // Test component configuration

            f_configIvsUp(c_defaultPsapSimulatorConfiguration);

            f_configIvsUp(m_defaultPsapSimulatorConfiguration);



            // Test Body

            f_establishCall("Trigger eCall");
@@ -1115,7 +1115,7 @@ module AtsECall_IVS_Testcases { 
        testcase CTP_1_1_15_3() runs on PsapMtc system PsapSystem {

            

            // Local variables

            template ConfigParameters v_locaPsapSimCfg modifies c_defaultPsapSimulatorConfiguration := {inbandState := OFF, inbandControl := MANUAL}

            template(value) ConfigParameters v_locaPsapSimCfg modifies m_defaultPsapSimulatorConfiguration := {inbandState := OFF, inbandControl := MANUAL}



            // Test component configuration

            f_configIvsUp(v_locaPsapSimCfg);
@@ -1159,7 +1159,7 @@ module AtsECall_IVS_Testcases { 
        testcase CTP_1_1_15_4() runs on PsapMtc system PsapSystem {

            

            // Local variables

            template ConfigParameters v_locaPsapSimCfg modifies c_defaultPsapSimulatorConfiguration := {numberOfAlAcks := 0, automaticAlAck := false}

            template(value) ConfigParameters v_locaPsapSimCfg modifies m_defaultPsapSimulatorConfiguration := {numberOfAlAcks := 0, automaticAlAck := false}



            // Test component configuration

            f_configIvsUp(v_locaPsapSimCfg);
@@ -1213,7 +1213,7 @@ module AtsECall_IVS_Testcases { 
            var TimerExpiredEvent v_t8Expired;

            var integer v_lastNackDelta;

            timer t := PX_TIMEOUT;

            template ConfigParameters v_locaPsapSimCfg modifies c_defaultPsapSimulatorConfiguration := {simulateCrcError := true}

            template(value) ConfigParameters v_locaPsapSimCfg modifies m_defaultPsapSimulatorConfiguration := {simulateCrcError := true}



            // Test component configuration

            f_configIvsUp(v_locaPsapSimCfg);
@@ -1294,21 +1294,21 @@ module AtsECall_IVS_Testcases { 
        testcase CTP_1_1_16_1() runs on PsapMtc system PsapSystem {

            

            // Test component configuration

            f_configIvsUp(c_defaultPsapSimulatorConfiguration);

            f_configIvsUp(m_defaultPsapSimulatorConfiguration);



            // Test Body

            f_establishCall("Trigger eCall");



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



            f_clearDown(NETWORK, NOW);

            f_clearDown(NETWORK, c_now);



            f_userVerify("Is the IVS cleared down?",

                "IVS cleared down the call following receipt of a clear down message from the network",

                "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, CLEAR_DOWN_AL_ACK));

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

            f_expectFeedback(mw_anyConfigChanged);



            f_userAction("Trigger eCall");
@@ -1362,7 +1362,7 @@ module AtsECall_IVS_Testcases { 
            timer t_t2 := PX_T2_TIMER + PX_CTP_1_1_16_2_HANG_UP_RANGE;



            // Test component configuration

            f_configIvsUp(c_defaultPsapSimulatorConfiguration);

            f_configIvsUp(m_defaultPsapSimulatorConfiguration);



            // Test Body

            v_callEstablished := f_establishCall("Trigger eCall");
@@ -1426,7 +1426,7 @@ module AtsECall_IVS_Testcases { 
        testcase CTP_1_1_16_3() runs on PsapMtc system PsapSystem {

            

            // Local variables

            template ConfigParameters v_locaPsapSimCfg modifies c_defaultPsapSimulatorConfiguration := {alAckValue := CLEAR_DOWN_AL_ACK};

            template(value) ConfigParameters v_locaPsapSimCfg modifies m_defaultPsapSimulatorConfiguration := {alAckValue := c_clearDownAlAck};



            // Test component configuration

            f_configIvsUp(v_locaPsapSimCfg);
@@ -1474,7 +1474,7 @@ module AtsECall_IVS_Testcases { 
        testcase CTP_1_1_17_3() runs on PsapMtc system PsapSystem {

            

            // Local variables

            template ConfigParameters v_locaPsapSimCfg modifies c_defaultPsapSimulatorConfiguration := {automaticAlAck := true, alAckValue := CLEAR_DOWN_AL_ACK};

            template(value) ConfigParameters v_locaPsapSimCfg modifies m_defaultPsapSimulatorConfiguration := {automaticAlAck := true, alAckValue := c_clearDownAlAck};

            timer t_callbackDelay := PX_CTP_1_1_17_3_CALL_BACK_DELAY;



            // Test component configuration
@@ -1487,7 +1487,7 @@ module AtsECall_IVS_Testcases { 


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



            eCallControl.send(m_setAutomaticAlAck(PX_WORKER, true, POSITIVE_AL_ACK));

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

            f_expectFeedback(mw_anyConfigChanged);



            uiPort.send(ShowMessageBox: {
@@ -1552,7 +1552,7 @@ module AtsECall_IVS_Testcases { 
                "The entertainment system was not muted for the duration of the call",

                c_mbYes);



            f_clearDown(NETWORK, NOW);

            f_clearDown(NETWORK, c_now);



            // Postamble

            f_configDown();
@@ -1586,7 +1586,7 @@ module AtsECall_IVS_Testcases { 
        testcase CTP_1_1_17_4() runs on PsapMtc system PsapSystem {

            

            // Local variables

            template ConfigParameters v_locaPsapSimCfg modifies c_defaultPsapSimulatorConfiguration := {automaticAlAck := true, alAckValue := CLEAR_DOWN_AL_ACK};

            template(value) ConfigParameters v_locaPsapSimCfg modifies m_defaultPsapSimulatorConfiguration := {automaticAlAck := true, alAckValue := c_clearDownAlAck};

            timer t_callbackDelay := PX_CTP_1_1_17_4_CALL_BACK_DELAY;



            // Test component configuration
@@ -1599,7 +1599,7 @@ module AtsECall_IVS_Testcases { 


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



            eCallControl.send(m_setAutomaticAlAck(PX_WORKER, true, POSITIVE_AL_ACK));

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

            f_expectFeedback(mw_anyConfigChanged);



            t_callbackDelay.start;
@@ -1612,7 +1612,7 @@ module AtsECall_IVS_Testcases { 
                "Call not answered automatically",

                c_mbYes);



            f_clearDown(NETWORK, NOW);

            f_clearDown(NETWORK, c_now);



            // Postamble

            f_configDown();
@@ -1645,7 +1645,7 @@ module AtsECall_IVS_Testcases { 
        testcase CTP_1_1_14_2() runs on PsapMtc system PsapSystem {

            

            // Test component configuration

            f_configIvsUp(c_defaultPsapSimulatorConfiguration);

            f_configIvsUp(m_defaultPsapSimulatorConfiguration);



            // Test Body

            f_establishCall("Trigger eCall");
@@ -1692,14 +1692,14 @@ module AtsECall_IVS_Testcases { 
            timer t_callbackDelay := PX_CTP_1_1_17_3_CALL_BACK_DELAY;



            // Test component configuration

            f_configIvsUp(c_defaultPsapSimulatorConfiguration);

            f_configIvsUp(m_defaultPsapSimulatorConfiguration);



            // Test Body

            f_establishCall("Trigger eCall");



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



            f_clearDown(NETWORK, NOW);

            f_clearDown(NETWORK, c_now);



            uiPort.send(ShowMessageBox: {

                    title := "Callback",
@@ -1769,7 +1769,7 @@ module AtsECall_IVS_Testcases { 
            timer t_redialWindowTimer := PX_IVS_REDIAL_WINDOW + PX_IVS_REDIAL_GUARD_TIMER;



            // Test component configuration

            f_configIvsUp(c_defaultPsapSimulatorConfiguration);

            f_configIvsUp(m_defaultPsapSimulatorConfiguration);

            

            // Test Body
@@ -1778,7 +1778,7 @@ module AtsECall_IVS_Testcases { 
            //

            f_establishCall("Trigger eCall");



            f_clearDown(NETWORK, NOW);

            f_clearDown(NETWORK, c_now);



            f_validateRedialAttempts();
@@ -1789,7 +1789,7 @@ module AtsECall_IVS_Testcases { 


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



            f_clearDown(NETWORK, NOW);

            f_clearDown(NETWORK, c_now);



            //

            // Call-back

ttcn/AtsECall_PSAP_Testcases.ttcn

+31 −31

File changed.

Preview size limit exceeded, changes collapsed.

ttcn/LibItsECall_Functions.ttcn

+26 −44
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
    function f_establishCall(in charstring p_establishMessage := "Establish IVS eCall") runs on PsapMtc return CallEstablishedEvent {

        template ShowMessageBox localMsg modifies m_stablishECallMgs := {msg := p_establishMessage}

        

        var Event v_event;    

        var CallEstablishedEvent v_callEstablishedEvent;

        timer t := PX_TIMEOUT;
@@ -67,7 +68,8 @@ 


        eCallControl.send(m_callAccept(PX_WORKER));

  

        v_callEstablishedEvent := f_expectFeedback(mw_callEstablished(PX_WORKER, ?, EXTERNAL)).callEstablished;  

        v_event := f_expectFeedback(mw_callEstablished(PX_WORKER, ?, EXTERNAL));

        v_callEstablishedEvent := v_event.callEstablished;  

        return v_callEstablishedEvent;

    }
@@ -95,7 +97,7 @@ 
            eCallControl.send(m_callHangUpC(PX_WORKER));

        }

        else {

            eCallControl.send(m_setAutomaticAlAck(PX_WORKER, true, CLEAR_DOWN_AL_ACK));

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

            f_expectFeedback(mw_anyConfigChanged);



            eCallControl.send(m_inbandRequestMsd(PX_WORKER));
@@ -109,8 +111,8 @@ 
        eCallControl.send(m_setConfig(PX_WORKERS[0].id, {eCallMessage := p_eCall}));

    }



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

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

    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);
@@ -118,22 +120,22 @@ 
        f_setMSD(vc_eCallMessage);

    }



    function f_verifyAckReceived(template(present) AckValueType p_alAckValue := POSITIVE_AL_ACK) runs on IvsMtc {

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

        timer t := PX_TIMEOUT;



        t.start;

        alt {

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

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

                t.start;

                repeat;

            }



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

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

                t.start;

                repeat;

            }



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

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

                t.stop;

            }
@@ -143,26 +145,6 @@ 
        }

    }



    /**

    * @desc Same as expandMsd but only works on values

    *

    * @return ECallMessageUnion with the decoded field set (if the input is valid), otherwise unchanged

    */

    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 v_msd;



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

                p_eCallMessageUnion.decoded := v_msd;

            }

        }



        return p_eCallMessageUnion;

    }

    





    altstep a_unexpectedEvents() runs on PsapMtc {

        var CallAbortedEvent v_callAborted;
@@ -203,7 +185,7 @@ 
        stop;

    }

      

    function f_setSimulatorConfiguration(in ConfigParameters p_configuration) runs on PsapMtc {

    function f_setSimulatorConfiguration(in template(value) ConfigParameters p_configuration) runs on PsapMtc {



		// Final configuration

	    p_configuration.t4Timer := PX_T4_TIMER;
@@ -224,8 +206,8 @@ 
* @param workerConf worker to use

* @param configuration configuration to use

*/

    function f_setSimulatorConfiguration2(in WorkerConf p_workerConf, in ConfigParameters p_configuration) runs on IvsMtc {

        var ECallMessageUnion v_eCallMessageExpanded := f_expandMsd(p_configuration.eCallMessage);

    function f_setSimulatorConfiguration2(in WorkerConf p_workerConf, in  template(value) ConfigParameters p_configuration) runs on IvsMtc {

        var ECallMessageUnion v_eCallMessageExpanded := valueof(f_expandMsd(p_configuration.eCallMessage));

        

        // Final configuration

        p_configuration.t3Timer := PX_T3_TIMER;
@@ -248,7 +230,7 @@ 
        timer t := p_event_timeout;

        var Event v_received := null;



        if (getverdict() == fail or getverdict() == inconc) {

        if (getverdict == fail or getverdict == inconc) {

            return v_received;

        }
@@ -308,7 +290,7 @@ 
                repeat;

            }



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

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

                repeat;

            }
@@ -359,13 +341,13 @@ 
          

    group configurationFunctions {

	 

        function f_configIvsUp(in ConfigParameters p_configuration) runs on PsapMtc {

        function f_configIvsUp(in template(value) ConfigParameters p_configuration) runs on PsapMtc {

            vc_logComponent := LogComponent.create("Log Component");

            vc_uiComponent := UIComponent.create("UIComponent");



            map(vc_logComponent:logPort, system:logPort);

            map(self:eCallFeedback, system:psapFeedback);

            map(self:eCallControl, system:psapControl);

            map(self:eCallFeedback, system:eCallFeedback);

            map(self:eCallControl, system:eCallControl);

            connect(self:uiPort, vc_uiComponent:uiPort);



            vc_logComponent.start(f_logBehaviour());
@@ -379,13 +361,13 @@ 
            

        } // end f_configIvsUp

      

        function f_configPsapUp(in ConfigParameters p_configuration) runs on IvsMtc {

        function f_configPsapUp(in template(value)ConfigParameters p_configuration) runs on IvsMtc {

            vc_logComponent := LogComponent.create("LogComponent");

            vc_uiComponent := UIComponent.create("UIComponent");



            map(vc_logComponent:logPort, system:logPort);

            map(self:eCallControl, system:ivsControl);

            map(self:eCallFeedback, system:ivsFeedback);

            map(self:eCallControl, system:eCallControl);

            map(self:eCallFeedback, system:eCallFeedback);

            connect(self:uiPort, vc_uiComponent:uiPort);



            vc_logComponent.start(f_logBehaviour());
@@ -401,7 +383,7 @@ 
        } // end f_configPsapUp



        function f_configDown() runs on ECallMtc {

            if (getverdict() == none) {

            if (getverdict == none) {

                setverdict(pass);

            }
@@ -413,8 +395,8 @@ 
            vc_uiComponent.stop;



            disconnect(self:uiPort, vc_uiComponent:uiPort);

            unmap(self:eCallControl, system:psapControl);

            unmap(self:eCallFeedback, system:psapFeedback);

            unmap(self:eCallControl, system:eCallControl);

            unmap(self:eCallFeedback, system:eCallFeedback);

            unmap(vc_logComponent:logPort, system:logPort);

            

        } // end f_configDown

ttcn/LibItsECall_Templates.ttcn

+55 −34

File changed.

Preview size limit exceeded, changes collapsed.

ttcn/LibItsECall_TestSystem.ttcn

+6 −6
Original line number Diff line number Diff line
@@ -48,16 +48,16 @@ module LibItsECall_TestSystem { 
        }



        type component PsapSystem {

            port AMQPPort psapControl;

            port AMQPPort psapFeedback;

            port AMQPPort eCallControl;

            port AMQPPort eCallFeedback;

            port LogMessagePort logPort;

        }

                        

        type component IvsSystem {

            port AMQPPort ivsControl;

            port AMQPPort ivsControl2;

            port AMQPPort ivsFeedback;

            port AMQPPort ivsFeedback2;

            port AMQPPort eCallControl;

            port AMQPPort eCallControl2;

            port AMQPPort eCallFeedback;

            port AMQPPort eCallFeedback2;

            port LogMessagePort logPort;

        }