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

Use __SCOPE__

parent dcf18974
Loading
Loading
Loading
Loading
+10 −10
Original line number Original line Diff line number Diff line
@@ -37,7 +37,7 @@ module LibItsDenm_Functions {
            alt {
            alt {
                [] utPort.receive(UtInitializeResult:true) {
                [] utPort.receive(UtInitializeResult:true) {
                    tc_wait.stop;
                    tc_wait.stop;
                    log("*** f_utInitializeIut: INFO: IUT initialized ***");
                    log("*** " & __SCOPE__ & ": INFO: IUT initialized ***");
                }
                }
                [] a_utDefault();
                [] a_utDefault();
            }
            }
@@ -130,26 +130,26 @@ module LibItsDenm_Functions {
         */
         */
        altstep a_default() runs on ItsDenm {
        altstep a_default() runs on ItsDenm {
            [] denmPort.receive(mw_denmInd(mw_denmPdu(mw_anyDenm))) { 
            [] denmPort.receive(mw_denmInd(mw_denmPdu(mw_anyDenm))) { 
                log("*** a_default: INFO: DENM message received in default ***");
                log("*** " & __SCOPE__ & ": INFO: DENM message received in default ***");
                vc_denmReceived := true;
                vc_denmReceived := true;
                repeat;
                repeat;
            }
            }
            [] denmPort.receive {
            [] denmPort.receive {
                log("*** a_default: ERROR: Received an unexpected message ***");
                log("*** " & __SCOPE__ & ": ERROR: Received an unexpected message ***");
                f_selfOrClientSyncAndVerdict("error", e_error);
                f_selfOrClientSyncAndVerdict("error", e_error);
            }
            }
            [] tc_wait.timeout {
            [] tc_wait.timeout {
                log("*** a_default: INCONC: Timeout while awaiting reaction of the IUT prior to Upper Tester action ***");
                log("*** " & __SCOPE__ & ": INCONC: Timeout while awaiting reaction of the IUT prior to Upper Tester action ***");
                f_selfOrClientSyncAndVerdict("error", e_timeout);
                f_selfOrClientSyncAndVerdict("error", e_timeout);
            }
            }
            [] tc_ac.timeout {
            [] tc_ac.timeout {
                log("*** a_default: INCONC: Timeout while awaiting the reception of a message ***");
                log("*** " & __SCOPE__ & ": INCONC: Timeout while awaiting the reception of a message ***");
                f_selfOrClientSyncAndVerdict("error", e_timeout);
                f_selfOrClientSyncAndVerdict("error", e_timeout);
            }
            }
            [] a_shutdown() {
            [] a_shutdown() {
                f_poDefault();
                f_poDefault();
                f_cfDown();
                f_cfDown();
                log("*** a_default: INFO: TEST COMPONENT NOW STOPPING ITSELF! ***");
                log("*** " & __SCOPE__ & ": INFO: TEST COMPONENT NOW STOPPING ITSELF! ***");
                stop;   
                stop;   
            }
            }
        }
        }
@@ -166,7 +166,7 @@ module LibItsDenm_Functions {
            [] a_shutdown() {
            [] a_shutdown() {
                f_poCancelEvent(p_trigger, p_event, p_actionId);
                f_poCancelEvent(p_trigger, p_event, p_actionId);
                f_cfDown();
                f_cfDown();
                log("*** a_cancelEvent: INFO: TEST COMPONENT NOW STOPPING ITSELF! ***");
                log("*** " & __SCOPE__ & ": INFO: TEST COMPONENT NOW STOPPING ITSELF! ***");
                stop;   
                stop;   
            }
            }
        }
        }
@@ -183,11 +183,11 @@ module LibItsDenm_Functions {
            }
            }
            [] utPort.receive {
            [] utPort.receive {
                tc_wait.stop;
                tc_wait.stop;
                log("*** a_utDefault: INFO: Received unexpected UT message from IUT ***");
                log("*** " & __SCOPE__ & ": INFO: Received unexpected UT message from IUT ***");
                f_selfOrClientSyncAndVerdict("error", e_error);
                f_selfOrClientSyncAndVerdict("error", e_error);
            }
            }
            [] tc_wait.timeout {
            [] tc_wait.timeout {
                log("*** a_utDefault: INFO: Could not receive expected UT message from IUT in time ***");
                log("*** " & __SCOPE__ & ": INFO: Could not receive expected UT message from IUT in time ***");
                f_selfOrClientSyncAndVerdict("error", e_timeout);
                f_selfOrClientSyncAndVerdict("error", e_timeout);
            }
            }
            [else] { // Shortcut defaults
            [else] { // Shortcut defaults
@@ -296,7 +296,7 @@ module LibItsDenm_Functions {
                    tc_ac.stop;
                    tc_ac.stop;
                }
                }
                [] tc_ac.timeout {
                [] tc_ac.timeout {
                    log("*** f_awaitDenMessage: INFO: Timeout while awaiting the reception of a message ***");
                    log("*** " & __SCOPE__ & ": INFO: Timeout while awaiting the reception of a message ***");
                    f_selfOrClientSyncAndVerdict("error", e_timeout);
                    f_selfOrClientSyncAndVerdict("error", e_timeout);
                }
                }
            }
            }