Commit af981474 authored by tepelmann's avatar tepelmann
Browse files

Fixed missing restarting of timers in "repeat" case. 

Removed ut trigger in TC_CAM_MSD_INA_BV_04.
Fixed UT trigger/trigger result usage.
UtCheck still have to be changed.
parent cdf73ead

ttcn/CAM/LibItsCam_Functions.ttcn

+5 −5
Original line number Original line Diff line number Diff line
@@ -32,7 +32,7 @@ module LibItsCam_Functions { 
            utPort.send(p_init);

            utPort.send(p_init);

            tc_wait.start;

            tc_wait.start;

            alt {

            alt {

                [] utPort.receive(UtResult:true) {

                [] utPort.receive(UtInitializeResult:true) {

                    tc_wait.stop;

                    tc_wait.stop;

                    log("*** f_utInitializeIut: INFO: IUT initialized ***");

                    log("*** f_utInitializeIut: INFO: IUT initialized ***");

                }

                }
@@ -61,7 +61,7 @@ module LibItsCam_Functions { 
            utPort.send(p_event);

            utPort.send(p_event);

            tc_wait.start;

            tc_wait.start;

            alt {

            alt {

                [] utPort.receive(UtResult:true) {

                [] utPort.receive(UtCamTriggerResult:true) {

                    tc_wait.stop;

                    tc_wait.stop;

                }

                }

                [] utPort.receive {

                [] utPort.receive {
@@ -86,7 +86,7 @@ module LibItsCam_Functions { 
            utPort.send(v_utMsg);

            utPort.send(v_utMsg);

            tc_wait.start;

            tc_wait.start;

            alt {

            alt {

                [] utPort.receive(UtResult:true) {

                [] utPort.receive(UtCamTriggerResult:true) {

                    tc_wait.stop;

                    tc_wait.stop;

                    if (p_discard == false) {

                    if (p_discard == false) {

                        log("*** f_utCheckEvent: INFO: Event correctly indicated at application layer ***");

                        log("*** f_utCheckEvent: INFO: Event correctly indicated at application layer ***");
@@ -96,7 +96,7 @@ module LibItsCam_Functions { 
                        f_selfOrClientSyncAndVerdict("error", e_error);

                        f_selfOrClientSyncAndVerdict("error", e_error);

                    }

                    }

                }

                }

                [] utPort.receive(UtResult:false) {

                [] utPort.receive(UtCamTriggerResult:false) {

                    tc_wait.stop;

                    tc_wait.stop;

                    if (p_discard == false) {

                    if (p_discard == false) {

                        log("*** f_utCheckEvent: ERROR: Event not correctly indicated at application layer ***");

                        log("*** f_utCheckEvent: ERROR: Event not correctly indicated at application layer ***");

ttcn/CAM/LibItsCam_TestSystem.ttcn

+1 −1
Original line number Original line Diff line number Diff line
@@ -28,7 +28,7 @@ module LibItsCam_TestSystem { 
            out 

            out 

                UtInitialize, UtCamTrigger, UtCheck;

                UtInitialize, UtCamTrigger, UtCheck;

            in 

            in 

                UtInitializeResult, UtResult;

                UtInitializeResult, UtCamTriggerResult;

        } // end UpperTesterPort

        } // end UpperTesterPort

        

        

    } // end portDefinitions

    } // end portDefinitions

ttcn/CAM/LibItsCam_TypesAndValues.ttcn

+0 −4
Original line number Original line Diff line number Diff line
@@ -87,10 +87,6 @@ module LibItsCam_TypesAndValues { 
                encode (utEvent) "UpperTester"

                encode (utEvent) "UpperTester"

            }

            }

            

            

            /**

             * @desc Upper Tester response message  

             */    

            type boolean UtResult;

        }

        }

        with {

        with {

            encode "LibItsCommon"

            encode "LibItsCommon"