Commit 8a849417 authored by Yann Garcia's avatar Yann Garcia
Browse files

Enhance f_MIM_DISS_TI_01_02 function

parent dd683332

ItsAvm_TpFunctions.ttcn

+13 −3
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ module ItsAvm_TpFunctions { 
                            var octetstring v_asn1EncodedMim := bit2oct(encvalue(v_mimInd.msgIn));

                            if (lengthof(v_asn1EncodedMim) <= PICS_MIM_MTU) {

                                v_repetition := v_repetition + 1;

                                if (v_repetition == PX_MAX_REPETITION) {

                                if (v_repetition == PX_REPEATITION_BEFORE_VERDICT) {

                                    log("*** " & testcasename() & ": PASS: Expected MIM received with ASN.1 encoded size within the MTU limit ***");

                                    f_selfOrClientSyncAndVerdict(c_tbDone, e_success);

                                } else {
@@ -307,6 +307,7 @@ module ItsAvm_TpFunctions { 
                    // Local variables

                    timer t_minTransInterval := PICS_T_GENMIMMIN * PX_INC_TIMER_CONTROL_FACTOR;

                    timer t_maxTransInterval := PICS_T_GENMIMMAX * PX_INC_TIMER_CONTROL_FACTOR;

                    var integer v_counter := 0;

                    var MimInd v_avmInd_i, v_avmInd;



                    // Test control
@@ -361,9 +362,18 @@ module ItsAvm_TpFunctions { 
                                f_selfOrClientSyncAndVerdict(c_tbDone, e_error);

                            } else if (not t_minTransInterval.running and t_maxTransInterval.running) {

                                // TODO FSCOM: Compare v_avmInd_i & v_avmInd

                                log("*** " & testcasename() & ": PASS: MIM received after T_GenMIMMin and before T_GenMIMMax ***");

                                t_maxTransInterval.stop;

                                if (v_counter == PX_REPEATITION_BEFORE_VERDICT) {

                                    log("*** " & testcasename() & ": PASS: MIM received after T_GenMIMMin and before T_GenMIMMax ***");

                                    f_selfOrClientSyncAndVerdict(c_tbDone, e_success);

                                } else {

                                    log("*** " & testcasename() & ": INFO: MIM received after T_GenMIMMin and before T_GenMIMMax, round #", v_counter, " ***");

                                    v_counter := v_counter + 1;

                                    t_minTransInterval.start;

                                    t_maxTransInterval.start;

                                    tc_ac.start;

                                    repeat;

                                }

                            } else {

                                log("*** " & testcasename() & ": FAIL: MIM message received but timers not running ***"); // This case should not happen, but added for completeness

                                f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);

lib/LibItsAvm_Pixits.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ module LibItsAvm_Pixits { 


    modulepar UInt32 PX_DATA_ID := 0;



    modulepar integer PX_MAX_REPETITION := 10;

    modulepar integer PX_REPEATITION_BEFORE_VERDICT := 10;



    /**

     * @desc Multiply timer value by this control factor to increase it