Commit ec9eb8a4 authored by garciay's avatar garciay
Browse files

UpperTester changes

parent 99204451

ttcn/DENM/LibItsDenm_EncdecDeclarations.ttcn

+6 −0
Original line number Diff line number Diff line
@@ -22,4 +22,10 @@ module LibItsDenm_EncdecDeclarations { 
    external function fx_enc_UtDenmInitialize (UtDenmInitialize p) return bitstring

        with {extension "prototype(convert) encode(UpperTester)"}

    

    external function fx_enc_UtDenmChangePosition (UtDenmChangePosition p) return bitstring

        with {extension "prototype(convert) encode(UpperTester)"}

    

    external function fx_enc_UtDenmChangePseudonym (UtDenmChangePseudonym p) return bitstring

        with {extension "prototype(convert) encode(UpperTester)"}

    

} // End of module LibItsDenm_EncdecDeclarations

ttcn/DENM/LibItsDenm_Functions.ttcn

+4 −4
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ module LibItsDenm_Functions { 
         * @desc    Requests to change the IUT with a new pseudonym

         * @param   p_change The change to trigger.

         */

        function f_utChangePseudonym ( template (value) UtChangePseudonym p_change ) runs on ItsDenm {

        function f_utChangePseudonym ( template (value) UtDenmChangePseudonym p_change ) runs on ItsDenm {

            

            //deactivate denmPort default alts

            vc_denmDefaultActive := false;
@@ -77,11 +77,11 @@ module LibItsDenm_Functions { 
            utPort.send(p_change);

            tc_wait.start;

            alt {

                [] utPort.receive(UtDenmResults: { utChangePseudonymResult := true}) {

                [] utPort.receive(UtDenmResults: { utDenmChangePseudonymResult := true}) {

                    tc_wait.stop;

                    log("*** " & testcasename() & ": INFO: IUT pseudonym changed ***");

                }

                [] utPort.receive(UtDenmResults: { utChangePseudonymResult := false}) {

                [] utPort.receive(UtDenmResults: { utDenmChangePseudonymResult := false}) {

                    tc_wait.stop;

                    log("*** " & testcasename() & ": INFO: IUT pseudonym changed ***");

                    f_selfOrClientSyncAndVerdict("error", e_error);

ttcn/DENM/LibItsDenm_Templates.ttcn

+2 −2
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ module LibItsDenm_Templates { 
            /**

             * @desc    Send template for Upper Tester event changePseudonym

             */

            template (value) UtChangePseudonym m_utChangePseudonym := {

            template (value) UtDenmChangePseudonym m_utDenmChangePseudonym := {

            }

            

            /**
@@ -231,7 +231,7 @@ module LibItsDenm_Templates { 
             * @param p_longitude   The new longitude

             * @param p_elevation   The new elevation (Default: 0)

             */

            template (value) UtDenmChangePosition m_utChangePosition(

            template (value) UtDenmChangePosition m_utDenmChangePosition(

                template (value) integer p_latitude,

                template (value) integer p_longitude,

                template (value) integer p_elevation := 0

ttcn/DENM/LibItsDenm_TestSystem.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ module LibItsDenm_TestSystem { 
         */

        type port UpperTesterPort message {

            out 

                UtDenmInitialize, UtDenmTrigger, UtDenmUpdate, UtDenmTermination, UtDenmChangePosition, UtChangePseudonym;

                UtDenmInitialize, UtDenmTrigger, UtDenmUpdate, UtDenmTermination, UtDenmChangePosition, UtDenmChangePseudonym;

            in 

                UtDenmResults, UtDenmEventInd;

        } // end UpperTesterPort

ttcn/DENM/LibItsDenm_TypesAndValues.ttcn

+3 −3
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ module LibItsDenm_TypesAndValues { 
     * @member utDenmTriggerResult          -

     * @member utDenmUpdateResult,          -

     * @member utDenmChangePositionResult   -

     * @member utChangePseudonymResult      -

     * @member utDenmChangePseudonymResult      -

     */

    type union UtDenmResults {

      boolean utDenmInitializeResult,
@@ -88,7 +88,7 @@ module LibItsDenm_TypesAndValues { 
        UtDenmUpdateResult utDenmUpdateResult,

        boolean utDenmTerminationResult,

        boolean utDenmChangePositionResult,

        boolean utChangePseudonymResult

        boolean utDenmChangePseudonymResult

      } with {

      variant ""

      } // End of type UtDenmResults
@@ -171,7 +171,7 @@ module LibItsDenm_TypesAndValues { 
    /**

     * @desc Upper Tester message to change the pseudonym of the DENM IUT 

     */

    type record UtChangePseudonym {

    type record UtDenmChangePseudonym {

      // empty on purpose

    } with {

      variant "FIELDORDER(msb)"