Commit 6ff485bc authored by berge's avatar berge
Browse files

Fixed f_ut* functions in DENM

parent af981474

ttcn/DENM/LibItsDenm_Functions.ttcn

+7 −0
Original line number Original line Diff line number Diff line
@@ -56,10 +56,15 @@ module LibItsDenm_Functions { 
            var UtDenmTriggerResult v_result;

            var UtDenmTriggerResult v_result;

            

            

            utPort.send(p_event);

            utPort.send(p_event);

            tc_wait.start;

            alt {

            alt {

                [] utPort.receive(UtDenmTriggerResult:?) -> value v_result {

                [] utPort.receive(UtDenmTriggerResult:?) -> value v_result {

                    tc_wait.stop;

                    tc_wait.stop;

                    v_actionId := v_result.actionId;

                    v_actionId := v_result.actionId;

                }

                [] utPort.receive {

                    tc_wait.stop;

                    f_selfOrClientSyncAndVerdict("DENM Trigger failed", e_timeout);

                }

                }

	            [] tc_wait.timeout {

	            [] tc_wait.timeout {

	                log("*** " & __SCOPE__ & ": INFO: Could not receive expected UT message from IUT in time ***");

	                log("*** " & __SCOPE__ & ": INFO: Could not receive expected UT message from IUT in time ***");
@@ -82,6 +87,7 @@ module LibItsDenm_Functions { 
            var UtDenmTriggerResult v_result;

            var UtDenmTriggerResult v_result;

            

            

            utPort.send(p_event);

            utPort.send(p_event);

            tc_wait.start;

            alt {

            alt {

                [] utPort.receive(UtDenmUpdateResult:?) -> value v_result {

                [] utPort.receive(UtDenmUpdateResult:?) -> value v_result {

                    tc_wait.stop;

                    tc_wait.stop;
@@ -106,6 +112,7 @@ module LibItsDenm_Functions { 
        function f_utTerminateEvent(template (value) UtDenmTermination p_event) runs on ItsDenm {

        function f_utTerminateEvent(template (value) UtDenmTermination p_event) runs on ItsDenm {

            

            

            utPort.send(p_event);

            utPort.send(p_event);

            tc_wait.start;

            alt {

            alt {

                [] utPort.receive(UtDenmTerminationResult:?) {

                [] utPort.receive(UtDenmTerminationResult:?) {

                    tc_wait.stop;

                    tc_wait.stop;