Commit bd535303 authored by tepelmann's avatar tepelmann
Browse files

Introduced new verdict management in CAM.

parent 84b6789a
Loading
Loading
Loading
Loading
+12 −15
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ module LibItsCam_Functions {
        /**
         * @desc    Setups default configuration   
         */
        function f_cfUp() runs on ItsNt {
        function f_cfUp() runs on ItsFa {
            
            map(self:utPort, system:utPort);
            map(self:camPort, system:camPort);
@@ -40,7 +40,7 @@ module LibItsCam_Functions {
        /**
         * @desc    Deletes default configuration 
         */
        function f_cfDown() runs on ItsNt {
        function f_cfDown() runs on ItsFa {
            
            unmap(self:utPort, system:utPort);
            unmap(self:camPort, system:camPort);
@@ -58,16 +58,13 @@ module LibItsCam_Functions {
        altstep a_basicDefault() runs on ItsFa {
    
            [] camPort.receive(mw_camInd ( mw_camMsg_any )){ 
                setverdict(fail, "*** a_basicDefault: FAIL: CAM message received in default ***");
                stop;
                f_selfOrClientSyncAndVerdict("error", e_error, "*** a_basicDefault: FAIL: CAM message received in default ***");
            }
            [] camPort.receive {
                setverdict(fail, "*** a_basicDefault: FAIL: event received on CAM port in default ***");
                stop;
                f_selfOrClientSyncAndVerdict("error", e_error, "*** a_basicDefault: FAIL: event received on CAM port in default ***");
            }
            [] any timer.timeout { 
                setverdict(fail, "*** a_basicDefault: FAIL: a timer expired in default ***");
                stop;
                f_selfOrClientSyncAndVerdict("error", e_timeout, "*** a_basicDefault: FAIL: a timer expired in default ***");
            }
        }//end altstep a_basicDefault
         
@@ -139,14 +136,14 @@ module LibItsCam_Functions {
            tc_ac.start;
            alt {
                [] utPort.receive(UtCamResult:true) {
                    setverdict (pass, "*** f_utInitializeIut: PASS: IUT initialized ***");
                    log("*** f_utInitializeIut: PASS: IUT initialized ***");
                }
                [] utPort.receive {
                    setverdict (inconc, "*** f_utInitializeIut: INCONC: IUT could not be initialized ***");
                    f_selfOrClientSyncAndVerdict("error", e_error, "*** f_utInitializeIut: INCONC: IUT could not be initialized ***");
                    stop;
                }
                [] tc_ac.timeout {
                    setverdict (inconc, "*** f_utInitializeIut: INCONC: IUT could not be initialized in time ***");
                    f_selfOrClientSyncAndVerdict("error", e_timeout, "*** f_utInitializeIut: INCONC: IUT could not be initialized in time ***");
                    stop;
                }
            }
@@ -178,15 +175,15 @@ module LibItsCam_Functions {
            tc_ac.start;
            alt {
                [] utPort.receive(UtCamResult:true) {
                    setverdict (pass, "*** f_utCheckEvent: PASS: Event correctly indicated at application layer ***");
                    log("*** f_utCheckEvent: PASS: Event correctly indicated at application layer ***");
                    v_ret := e_success;
                }
                [] utPort.receive {
                    setverdict (fail, "*** f_utCheckEvent: FAIL: Event not correctly indicated at application layer ***");
                    f_selfOrClientSyncAndVerdict("error", e_error, "*** f_utCheckEvent: FAIL: Event not correctly indicated at application layer ***");
                    v_ret := e_error;
                }
                [] tc_ac.timeout {
                    setverdict (inconc, "*** f_utCheckEvent: INCONC: Timeout while waiting for event check result ***");
                    f_selfOrClientSyncAndVerdict("error", e_timeout, "*** f_utCheckEvent: INCONC: Timeout while waiting for event check result ***");
                    v_ret := e_timeout;
                }
            }