Commit 0be31c6d authored by Yann Garcia's avatar Yann Garcia
Browse files

Unify STF525 TTCN-3 code

parent 4441b867

ttcn/BTP/LibItsBtp_TypesAndValues.ttcn

+33 −35
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ module LibItsBtp_TypesAndValues { 
      }

    with {

      variant "FIELDORDER(msb)"

      encode "LibIts_Interface"

      }

        

  } // end btpPdus
@@ -65,7 +64,6 @@ module LibItsBtp_TypesAndValues { 
      variant "FIELDORDER(msb)"

    }





    /**

     * @desc BTP-B Header

     * @see ETSI TS 102 636-5-1 chapter 7.3
@@ -163,8 +161,8 @@ module LibItsBtp_TypesAndValues { 
       * @desc List of Upper Tester messages to check event/status on CAM IUT 

       */    

      type record of UtBtpEventInd UtBtpEventIndList;

    }

      

    }

    

  } // end utPrimitives

  with {

ttcn/CAM/LibItsCam_Functions.ttcn

+0 −1
Original line number Diff line number Diff line
@@ -109,7 +109,6 @@ module LibItsCam_Functions { 
                }

                [] utPort.receive(UtCamResults: { utCamChangePositionResult := ? }) {

                    tc_wait.stop;

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

                    f_selfOrClientSyncAndVerdict("error", e_error);

                }

                [] tc_wait.timeout {

ttcn/CAM/LibItsCam_TypesAndValues.ttcn

+4 −4
Original line number Diff line number Diff line 
/**

 *    @author   ETSI / STF405 / STF449 / STF484 / STF517

 *    @version  $URL$

 *              $Id$

 *    @version  $Url: https://oldforge.etsi.org/svn/LibIts/tags/20170222_STF527_Final/ttcn/CAM/LibItsCam_TypesAndValues.ttcn $

 *              $Id: LibItsCam_TypesAndValues.ttcn 1318 2017-01-26 10:20:53Z filatov $

 *    @desc     Module containing types and values for CAM Protocol

 *    @copyright   ETSI Copyright Notification

 *                 No part may be reproduced except as authorized by written permission.

ttcn/Common/LibItsCommon_TypesAndValues.ttcn

+7 −6
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ module LibItsCommon_TypesAndValues { 
        } // End of type AcDisableSecurity

        

        /**

         * @desc    Primitive for receiving response from TA

         * @desc    TA primitives for GNSS

         * @member  loadScenario                -

         * @member  startScenario               -

ttcn/DENM/LibItsDenm_Functions.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ module LibItsDenm_Functions { 
                }

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

                    tc_wait.stop;

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

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

                    f_selfOrClientSyncAndVerdict("error", e_error);

                }

                [] a_utDefault() {