Commit 5921b519 authored by tepelmann's avatar tepelmann
Browse files

Also expect unsuccessful ut responses.

parent ff527586

ttcn/GeoNetworking/LibItsGeoNetworking_Functions.ttcn

+15 −3
Original line number Diff line number Diff line
@@ -76,6 +76,13 @@ module LibItsGeoNetworking_Functions { 
                    tc_wait.stop;

                    log("*** f_utChangePosition: INFO: IUT position changed ***");

                }

                [] utPort.receive(UtChangePositionResult:false) {

                    tc_wait.stop;

                    log("*** f_utChangePosition: INFO: IUT position change was not successful ***");

                    f_selfOrClientSyncAndVerdict("error", e_error);

                }

                [] a_utDefault() {

                }

                [] tc_wait.timeout {

                    log("*** f_utChangePosition: INFO: IUT position not changed in time ***");

                    f_selfOrClientSyncAndVerdict("error", e_timeout);
@@ -102,11 +109,16 @@ module LibItsGeoNetworking_Functions { 
                [] utPort.receive(UtGnTriggerResult:true) {

                    tc_wait.stop;

                }

                [] tc_wait.timeout {

                    v_return := false;

                [] utPort.receive(UtGnTriggerResult:false) {

                    tc_wait.stop;

                    log("*** UtGnTriggerResult: INFO: UT trigger was not successful ***");

                    f_selfOrClientSyncAndVerdict("error", e_error);

                }

                [] a_utDefault() {

                }

                [] tc_wait.timeout {

                    v_return := false;

                }

                [else] { // Shortcut defaults

                    //f_sleep(0.050); // 50 ms

                    repeat;
@@ -1192,7 +1204,7 @@ module LibItsGeoNetworking_Functions { 
        /**

         * @desc The default for handling upper tester messages.

         */

        altstep a_utDefault() runs on ItsGeoNetworking {

        altstep a_utDefault() runs on ItsBaseGeoNetworking {

            var UtGnEventInd v_ind;

            [] utPort.receive(UtGnEventInd:?) -> value v_ind {

                //store every upper tester indication received

ttcn/GeoNetworking/LibItsGeoNetworking_TestSystem.ttcn

+6 −3
Original line number Diff line number Diff line
@@ -84,6 +84,9 @@ module LibItsGeoNetworking_TestSystem { 
            

            var ComponentTable vc_componentTable := {};

            

            // UT indications

            var UtGnEventIndList vc_utInds := {};

            

        } // end ItsMtc

        

        /**
@@ -106,6 +109,9 @@ module LibItsGeoNetworking_TestSystem { 
        port UpperTesterPort utPort;

        port AdapterControlPort acPort;

        

        // UT indications

        var UtGnEventIndList vc_utInds := {};

        

    }

    

    /**
@@ -124,9 +130,6 @@ module LibItsGeoNetworking_TestSystem { 
        var default vc_neighbourDefault;

        var integer vc_multipleMessagesCount := 0; 

        

        // UT indications

        var UtGnEventIndList vc_utInds := {};

        

    } // End of component ItsGeoNetworking

    

    group networkAndTransportPrimitives {