Commit 9ee2927d authored by YannGarcia's avatar YannGarcia
Browse files

Review TTCN-3 code

parent afb30ae0

ttcn/Common/LibItsCommon_Templates.ttcn

+9 −13
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ module LibItsCommon_Templates { 
    

    group taPrimitives {

        

//FIXME RGY the simple boolean result has been changed to a union

//        template (value) AcSecResponse m_acSecResponseSuccess := true;

        template (value) AdapterControlResults m_acSecResponseSuccess := {acSecResponse:=true};

        

        /**
@@ -44,18 +42,16 @@ module LibItsCommon_Templates { 
            }

        } // End of template m_acDisableSecurity

        

//FIXME RGY As discussed, port in type is changed to a top-level union type 

//        template AcGnssResponse m_acGnssResponseSuccess := true;

        template AdapterControlResults m_acGnssResponseSuccess := {acGnssResponse:=true};



//FIXME RGY As discussed, port in type is changed to a top-level union type 

//        template AcGnssDistanceCovered m_acGnssDistanceCovered := true;

        template AdapterControlResults m_acGnssDistanceCovered := {acGnssDistanceCovered:=true};

        template (value) AdapterControlResults m_acGnssDistanceCovered := {

            acGnssDistanceCovered:=true

        };

        

        /**

         * @desc Testsystem will load GNSS scenario

         */

        template AcGnssPrimitive m_loadScenario(Scenario p_scenario) := {

        template (value) AcGnssPrimitive m_loadScenario(Scenario p_scenario) := {

            loadScenario := {

                scenario := p_scenario

            }
@@ -64,7 +60,7 @@ module LibItsCommon_Templates { 
        /**

         * @desc Testsystem will start GNSS scenario

         */

        template AcGnssPrimitive m_startScenario := {

        template (value) AcGnssPrimitive m_startScenario := {

            startScenario := {

            }

        }
@@ -72,7 +68,7 @@ module LibItsCommon_Templates { 
        /**

         * @desc Testsystem will stop GNSS scenario

         */

        template AcGnssPrimitive m_stopScenario := {

        template (value) AcGnssPrimitive m_stopScenario := {

            stopScenario := {

            }

        }
@@ -80,7 +76,7 @@ module LibItsCommon_Templates { 
        /**

         * @desc Testsystem will request indication if distance was covered

         */

        template AcGnssPrimitive m_distanceToCover(float p_distance) := {

        template (value) AcGnssPrimitive m_distanceToCover(float p_distance) := {

            distanceToCover := {

                distance := p_distance

            }
@@ -89,7 +85,7 @@ module LibItsCommon_Templates { 
        /**

         * @desc Testsystem will change the speed (delta value)

         */

        template AcGnssPrimitive m_changeScenarioSpeed(SpeedValue p_deltaSpeedValue) := {

        template (value) AcGnssPrimitive m_changeScenarioSpeed(SpeedValue p_deltaSpeedValue) := {

            changeSpeed := {

                deltaSpeed := p_deltaSpeedValue

            }
@@ -98,7 +94,7 @@ module LibItsCommon_Templates { 
        /**

         * @desc Testsystem will change the heading (delta value)

         */

        template AcGnssPrimitive m_changeScenarioHeading(HeadingValue p_deltaHeadingValue) := {

        template (value) AcGnssPrimitive m_changeScenarioHeading(HeadingValue p_deltaHeadingValue) := {

            changeHeading := {

                deltaHeading := p_deltaHeadingValue

            }

ttcn/DENM/LibItsDenm_Templates.ttcn

+5 −5
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ module LibItsDenm_Templates { 
         * @param   p_protocolVersion   The expected protocol version (Default: current DEN protocol version)

         * @param   p_messageID         The expected message id (Default: DEN message id)

         */

        template ItsPduHeader mw_itsPduHeader(

        template (present) ItsPduHeader mw_itsPduHeader(

            template (present) StationID p_stationID := ?,

            template (present) ItsPduHeader.protocolVersion p_protocolVersion := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_protocolVersion_currentVersion_,

            template (present) ItsPduHeader.messageID p_messageID := LibItsCommon_ASN1_NamedNumbers.ItsPduHeader_messageID_denm_
@@ -431,7 +431,7 @@ module LibItsDenm_Templates { 
         * @param   p_location      The expected location Container (Default: any or omit)

         * @param   p_alacarte      The expected Alacarte Container (Default: any or omit)

         */

        template (present) DecentralizedEnvironmentalNotificationMessage mw_denm(

        template DecentralizedEnvironmentalNotificationMessage mw_denm(

            template (present) ManagementContainer p_management := ?,

            template SituationContainer p_situation := *,

            template LocationContainer p_location := *,
@@ -500,7 +500,7 @@ module LibItsDenm_Templates { 
         * @param   p_detectionTime         The detection time (Default: current time)

         * @param   p_referenceTime         The reference time (Default: current time)

         */

        template (value) ManagementContainer m_denmMgmtConTermination (

        template (omit) ManagementContainer m_denmMgmtConTermination (

            template (value) ActionID p_actionID,

            template (value) StationType p_stationType := f_getTsStationType(),

            template (value) ValidityDuration p_validityDuration := defaultValidity,
@@ -522,7 +522,7 @@ module LibItsDenm_Templates { 
         * @param   p_detectionTime         The detection time (Default: current time)

         * @param   p_referenceTime         The reference time (Default: current time)

         */

        template (present) ManagementContainer mw_denmMgmtConTermination (

        template ManagementContainer mw_denmMgmtConTermination (

            template (present) ActionID p_actionID,

            template (present) StationType p_stationType := f_getIutStationType(),

            template (present) TimestampIts p_referenceTime := ?,
@@ -541,7 +541,7 @@ module LibItsDenm_Templates { 
         * @param   p_validityDuration      The expected validity duration (Default: any or omit)

         * @param   p_transmissionInterval  The expected transmission interval (Default: any or omit)

         */

        template (present) ManagementContainer mw_denmMgmtCon(

        template ManagementContainer mw_denmMgmtCon(

            template (present) ActionID p_actionID,

            template (present) StationType p_stationType := f_getIutStationType(),

            template (present) TimestampIts p_referenceTime := ?,

ttcn/GeoNetworking/LibItsGeoNetworking_Functions.ttcn

+23 −24
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ module LibItsGeoNetworking_Functions { 
     *         NodeB being close to the area center

     */

    //FIXME RGY Titan doesn't support mtc and system clauses yet

    function f_cf01Up(Scenario p_scenario := e_staticPosition) runs on ItsGeoNetworking /* TITAN TODO: system ItsGeoNetworkingSystem */ {

    function f_cf01Up(Scenario p_scenario := e_staticPosition) runs on ItsGeoNetworking system ItsGeoNetworkingSystem {

            

      // Variables

      var PositionTable v_positionTable := {};
@@ -190,7 +190,7 @@ module LibItsGeoNetworking_Functions { 
    } // end f_cf01Up

        

    //FIXME RGY Titan doesn't support mtc and system clauses yet

    function f_cf01Down() runs on ItsGeoNetworking /* TITAN TODO: system ItsGeoNetworkingSystem */ {

    function f_cf01Down() runs on ItsGeoNetworking system ItsGeoNetworkingSystem {

            

      f_uninitialiseSecuredMode();
@@ -217,7 +217,7 @@ module LibItsGeoNetworking_Functions { 
     */



    //FIXME RGY Titan doesn't support mtc and system clauses yet

    function f_cf02Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsGeoNetworkingSystem */ {

    function f_cf02Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {

            

      // Variables

      var LongPosVector v_longPosVectorIut := valueof(m_dummyLongPosVector);
@@ -286,7 +286,7 @@ module LibItsGeoNetworking_Functions { 
     */



    //FIXME RGY Titan doesn't support mtc and system clauses yet

    function f_cf02Down() runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsGeoNetworkingSystem */ {

    function f_cf02Down() runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {

            

      // Local variables

      var integer i;
@@ -318,7 +318,7 @@ module LibItsGeoNetworking_Functions { 
     * @param p_mainUtComponent Name of the component that will initialize IUT and handle default UT messages

     */

    //FIXME RGY Titan doesn't support mtc and system clauses yet

    function f_cf03Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsGeoNetworkingSystem */ {

    function f_cf03Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {

            

      // Variables

      var LongPosVector v_longPosVectorIut := valueof(m_dummyLongPosVector);
@@ -386,7 +386,7 @@ module LibItsGeoNetworking_Functions { 
     */



    //FIXME RGY Titan doesn't support mtc and system clauses yet

    function f_cf03Down() runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsGeoNetworkingSystem */ {

    function f_cf03Down() runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {

            

      // Local variables

      var integer i;
@@ -421,7 +421,7 @@ module LibItsGeoNetworking_Functions { 
     */



    //FIXME RGY Titan doesn't support mtc and system clauses yet

    function f_cf04Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsGeoNetworkingSystem */ {

    function f_cf04Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {

            

      // Variables

      var LongPosVector v_longPosVectorIut := valueof(m_dummyLongPosVector);
@@ -489,7 +489,7 @@ module LibItsGeoNetworking_Functions { 
     */



    //FIXME RGY Titan doesn't support mtc and system clauses yet

    function f_cf04Down() runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsGeoNetworkingSystem */{

    function f_cf04Down() runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {

            

      // Local variables

      var integer i;
@@ -520,7 +520,7 @@ module LibItsGeoNetworking_Functions { 
     */



    //FIXME RGY Titan doesn't support mtc and system clauses yet

    function f_cf05Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsGeoNetworkingSystem */ {

    function f_cf05Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {

            

      // Variables

      var LongPosVector v_longPosVectorIut := valueof(m_dummyLongPosVector);
@@ -587,7 +587,7 @@ module LibItsGeoNetworking_Functions { 
     */



    //FIXME RGY Titan doesn't support mtc and system clauses yet

    function f_cf05Down() runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsGeoNetworkingSystem */ {

    function f_cf05Down() runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {

            

      // Local variables

      var integer i;
@@ -618,7 +618,7 @@ module LibItsGeoNetworking_Functions { 
     * @param p_mainUtComponent Name of the component that will initialize IUT and handle default UT messages

     */

    //FIXME RGY Titan doesn't support mtc and system clauses yet

    function f_cf06Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsGeoNetworkingSystem */ {

    function f_cf06Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {

                    

      // Variables

      var LongPosVector v_longPosVectorIut := valueof(m_dummyLongPosVector);
@@ -685,7 +685,7 @@ module LibItsGeoNetworking_Functions { 
     */



    //FIXME RGY Titan doesn't support mtc and system clauses yet

    function f_cf06Down() runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsGeoNetworkingSystem */ {

    function f_cf06Down() runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {

            

      // Local variables

      var integer i;
@@ -716,7 +716,7 @@ module LibItsGeoNetworking_Functions { 
     */



    //FIXME RGY Titan doesn't support mtc and system clauses yet

    function f_cf07Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc /* TITAN TODO mtc ItsMtc system ItsGeoNetworkingSystem */{

    function f_cf07Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {

                    

      // Variables

      var LongPosVector v_longPosVectorIut := valueof(m_dummyLongPosVector);
@@ -782,7 +782,7 @@ module LibItsGeoNetworking_Functions { 
     * @desc Deletes configuration cf06

     */

    //FIXME RGY Titan doesn't support mtc and system clauses yet

    function f_cf07Down() runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsGeoNetworkingSystem */ {

    function f_cf07Down() runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {

            

      // Local variables

      var integer i;
@@ -978,9 +978,8 @@ module LibItsGeoNetworking_Functions { 
      position := p_positionValue

      };

    }

    //FIXME RGY Titan doesn't support @deterministic yet   

    //        function @deterministic f_fillTimestamp(inout LongPosVector v_vector) 

    function f_fillTimestamp(inout LongPosVector v_vector) 

    

    function @deterministic f_fillTimestamp(in LongPosVector v_vector) 

    return LongPosVector {

      if (v_vector.timestamp_ == 0) {

      v_vector.timestamp_ := f_computeGnTimestamp();
@@ -1339,7 +1338,7 @@ module LibItsGeoNetworking_Functions { 
    /**

     * @desc Default handling cf01 de-initialisation.

     */

    altstep a_cf01Down() runs on ItsGeoNetworking {

    altstep a_cf01Down() runs on ItsGeoNetworking system ItsGeoNetworkingSystem {

      [] a_shutdown() {

        f_poDefault();

        f_cf01Down();
@@ -1351,7 +1350,7 @@ module LibItsGeoNetworking_Functions { 
    /**

     * @desc Default handling cf02 de-initialisation.

     */

    altstep a_cf02Down() runs on ItsMtc {

    altstep a_cf02Down() runs on ItsMtc system ItsGeoNetworkingSystem {

      [] a_shutdown() {

        f_cf02Down();

        log("*** a_cf02Down: INFO: TEST COMPONENT NOW STOPPING ITSELF! ***");
@@ -1362,7 +1361,7 @@ module LibItsGeoNetworking_Functions { 
    /**

     * @desc Default handling cf03 de-initialisation.

     */

    altstep a_cf03Down() runs on ItsMtc {

    altstep a_cf03Down() runs on ItsMtc system ItsGeoNetworkingSystem {

      [] a_shutdown() {

        f_cf03Down();

        log("*** a_cf03Down: INFO: TEST COMPONENT NOW STOPPING ITSELF! ***");
@@ -1373,7 +1372,7 @@ module LibItsGeoNetworking_Functions { 
    /**

     * @desc Default handling cf04 de-initialisation.

     */

    altstep a_cf04Down() runs on ItsMtc {

    altstep a_cf04Down() runs on ItsMtc system ItsGeoNetworkingSystem {

      [] a_shutdown() {

        f_cf04Down();

        log("*** a_cf04Down: INFO: TEST COMPONENT NOW STOPPING ITSELF! ***");
@@ -1384,7 +1383,7 @@ module LibItsGeoNetworking_Functions { 
    /**

     * @desc Default handling cf05 de-initialisation.

     */

    altstep a_cf05Down() runs on ItsMtc {

    altstep a_cf05Down() runs on ItsMtc system ItsGeoNetworkingSystem {

      [] a_shutdown() {

        f_cf05Down();

        log("*** a_cf05Down: INFO: TEST COMPONENT NOW STOPPING ITSELF! ***");
@@ -1395,7 +1394,7 @@ module LibItsGeoNetworking_Functions { 
    /**

     * @desc Default handling cf06 de-initialisation.

     */

    altstep a_cf06Down() runs on ItsMtc {

    altstep a_cf06Down() runs on ItsMtc system ItsGeoNetworkingSystem {

      [] a_shutdown() {

        f_cf06Down();

        log("*** a_cf06Down: INFO: TEST COMPONENT NOW STOPPING ITSELF! ***");
@@ -1406,7 +1405,7 @@ module LibItsGeoNetworking_Functions { 
    /**

     * @desc Default handling cf07 de-initialisation.

     */

    altstep a_cf07Down() runs on ItsMtc {

    altstep a_cf07Down() runs on ItsMtc system ItsGeoNetworkingSystem {

      [] a_shutdown() {

        f_cf07Down();

        log("*** a_cf07Down: INFO: TEST COMPONENT NOW STOPPING ITSELF! ***");

ttcn/GeoNetworking/LibItsGeoNetworking_Templates.ttcn

+87 −85

File changed.

Preview size limit exceeded, changes collapsed.

ttcn/Http/LibItsHttp_TestSystem.ttcn

+2 −1
Original line number Diff line number Diff line
@@ -25,9 +25,10 @@ module LibItsHttp_TestSystem { 
  type component HttpComponent extends SelfSyncComp { // FIXME To be rename into HttpTest

    port HttpPort httpPort;

    port HttpPort httpPort_notif;

    // timers

    timer tc_wait := PX_TWAIT;

    timer tc_ac := PX_TAC;

    timer tc_noac := PX_TNOAC;

    timer tc_wait := PX_TWAIT;



  } // End of component HttpComponent