Commit 5c701ecc authored by berge's avatar berge
Browse files

Fixed logs format

parent 3a330a9c
Loading
Loading
Loading
Loading
+15 −18
Original line number Original line Diff line number Diff line
@@ -64,17 +64,17 @@ module LibItsDenm_Functions {
         */
         */
        altstep a_default() runs on ItsFa {
        altstep a_default() runs on ItsFa {
            [] denmPort.receive {
            [] denmPort.receive {
                setverdict (inconc, "Received an unexpected message");
                setverdict (inconc, "*** a_default: INCONC: Received an unexpected message ***");
                //TODO shall stop be called here?
                //TODO shall stop be called here?
                stop;
                stop;
            }
            }
            [] tc_wait.timeout {
            [] tc_wait.timeout {
                setverdict (inconc, "Timeout while awaiting reaction of the IUT prior to Upper Tester action");
                setverdict (inconc, "*** a_default: INCONC: Timeout while awaiting reaction of the IUT prior to Upper Tester action ***");
                //TODO shall stop be called here?
                //TODO shall stop be called here?
                stop;
                stop;
            }
            }
            [] tc_ac.timeout {
            [] tc_ac.timeout {
                setverdict (inconc, "Timeout while awaiting the reception of a message");
                setverdict (inconc, "*** a_default: INCONC: Timeout while awaiting the reception of a message ***");
                //TODO shall stop be called here?
                //TODO shall stop be called here?
                stop;
                stop;
            }
            }
@@ -126,7 +126,6 @@ module LibItsDenm_Functions {
         * @param p_trigger Indicates if the cancellation have to be raised by the test system(e_ets) 
         * @param p_trigger Indicates if the cancellation have to be raised by the test system(e_ets) 
         *                  or at the application layer of the IUT(e_iut).
         *                  or at the application layer of the IUT(e_iut).
         * @param p_event The event to cancel.
         * @param p_event The event to cancel.
         * @verdict 
         */
         */
        function f_poCancelEvent(template (value) Trigger p_trigger, template (value) Situation p_event) runs on ItsFa {
        function f_poCancelEvent(template (value) Trigger p_trigger, template (value) Situation p_event) runs on ItsFa {
            var FncRetCode v_ret := e_success;
            var FncRetCode v_ret := e_success;
@@ -154,7 +153,6 @@ module LibItsDenm_Functions {
        
        
        /**
        /**
         * @desc    Requests to bring the IUT in an initial state
         * @desc    Requests to bring the IUT in an initial state
         * @return 
         */
         */
        function f_utInitializeIut() runs on ItsFa {
        function f_utInitializeIut() runs on ItsFa {
            
            
@@ -162,14 +160,14 @@ module LibItsDenm_Functions {
            tc_ac.start;
            tc_ac.start;
            alt {
            alt {
                [] utPort.receive(UtDenmResult:true) {
                [] utPort.receive(UtDenmResult:true) {
                    setverdict (pass, "IUT initialized");
                    setverdict (pass, "*** f_utInitializeIut: PASS: IUT initialized ***");
                }
                }
                [] utPort.receive {
                [] utPort.receive {
                    setverdict (inconc, "IUT could not be initialized");
                    setverdict (inconc, "*** f_utInitializeIut: INCONC: IUT could not be initialized ***");
                    stop;
                    stop;
                }
                }
                [] tc_ac.timeout {
                [] tc_ac.timeout {
                    setverdict (inconc, "IUT could not be initialized in time");
                    setverdict (inconc, "*** f_utInitializeIut: INCONC: IUT could not be initialized in time ***");
                    stop;
                    stop;
                }
                }
            }
            }
@@ -203,15 +201,15 @@ module LibItsDenm_Functions {
            tc_ac.start;
            tc_ac.start;
            alt {
            alt {
                [] utPort.receive(UtDenmResult:true) {
                [] utPort.receive(UtDenmResult:true) {
                    setverdict (pass, "Event correctly indicated at application layer");
                    setverdict (pass, "*** f_utCheckEvent: PASS: Event correctly indicated at application layer ***");
                    v_ret := e_success;
                    v_ret := e_success;
                }
                }
                [] utPort.receive {
                [] utPort.receive {
                    setverdict (fail, "Event not correctly indicated at application layer");
                    setverdict (fail, "*** f_utCheckEvent: FAIL: Event not correctly indicated at application layer ***");
                    v_ret := e_error;
                    v_ret := e_error;
                }
                }
                [] tc_ac.timeout {
                [] tc_ac.timeout {
                    setverdict (inconc, "Timeout while waiting for event check result");
                    setverdict (inconc, "*** f_utCheckEvent: INCONC: Timeout while waiting for event check result ***");
                    v_ret := e_timeout;
                    v_ret := e_timeout;
                }
                }
            }
            }
@@ -226,7 +224,6 @@ module LibItsDenm_Functions {
        /**
        /**
         * @desc Sends a DEN message
         * @desc Sends a DEN message
         * @param p_sendMsg The DEN message to send.
         * @param p_sendMsg The DEN message to send.
         * @return 
         */
         */
        function f_sendDenMessage(template (value) DenmReq p_sendMsg) runs on ItsFa {
        function f_sendDenMessage(template (value) DenmReq p_sendMsg) runs on ItsFa {
            p_sendMsg.msgOut.denm.management.actionID.sequenceNo := vc_sequenceNo;
            p_sendMsg.msgOut.denm.management.actionID.sequenceNo := vc_sequenceNo;
@@ -241,7 +238,7 @@ module LibItsDenm_Functions {
        /**
        /**
         * @desc Awaits a DEN message
         * @desc Awaits a DEN message
         * @param p_rcvMsg The expected message to be received.
         * @param p_rcvMsg The expected message to be received.
         * @return 

         */
         */
        function f_awaitDenMessage(template (present) DenmInd p_rcvMsg) runs on ItsFa return FncRetCode {
        function f_awaitDenMessage(template (present) DenmInd p_rcvMsg) runs on ItsFa return FncRetCode {
            var DenmInd v_denmInd;
            var DenmInd v_denmInd;
@@ -264,7 +261,7 @@ module LibItsDenm_Functions {
                    v_ret := e_success;
                    v_ret := e_success;
                }
                }
                [] tc_ac.timeout {
                [] tc_ac.timeout {
                	log("Timeout while awaiting the reception of a message");
                	log("*** f_awaitDenMessageOut: INFO: Timeout while awaiting the reception of a message ***");
                	v_ret := e_timeout;
                	v_ret := e_timeout;
           		}
           		}
            }
            }