Commit 3ba86213 authored by garciay's avatar garciay
Browse files

Review hazard tests

parent b1b16cb4
Loading
Loading
Loading
Loading
+38 −34
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ module ItsAutoInterop_Functions {
    import from LibItsGeoNetworking_TypesAndValues all;
    import from LibItsGeoNetworking_Templates all;
    import from LibItsGeoNetworking_Pics all;
    
    import from LibItsGeoNetworking_TestSystem all;    
    // LibItsSecurity
    import from LibItsSecurity_TypesAndValues all;
    import from LibItsSecurity_Templates all;
@@ -79,7 +79,7 @@ module ItsAutoInterop_Functions {
            alt {
    //FIXME RGY As discussed, port in type is changed to a top-level union type 
    //                [] utPort.receive(UtAutoInteropTriggerResult:true) {
                [] utPort.receive(UpperTesterAutoInteropResults:{utInitializeResult:=true}) {
                [] utPort.receive(UtAutoInteropTriggerResult:true) {
                    tc_wait.stop;
                }
                [] utPort.receive {
@@ -189,14 +189,13 @@ module ItsAutoInterop_Functions {
            connect(self:syncPort, mtc:syncPort);
            
            // EUT1/EUT2/EUT3/EUT4
            disconnect(p_eut1:eutGeoNetworkingPort, p_eut2:eutGeoNetworkingPort); // EUT1 & EUT2 are on-link
            disconnect(p_eut1:eutGeoNetworkingPort, p_eut3:eutGeoNetworkingPort); // EUT1 & EUT3 are on-link
            disconnect(p_eut2:eutGeoNetworkingPort, p_eut3:eutGeoNetworkingPort); // EUT2 & EUT3 are on-link
            disconnect(p_eut2:eutGeoNetworkingPort, p_eut4:eutGeoNetworkingPort); // EUT2 & EUT4 are on-link
            disconnect(p_eut3:eutGeoNetworkingPort, p_eut3:eutGeoNetworkingPort); // EUT3 & EUT4 are on-link
            connect(p_eut1:eutGeoNetworkingPort, p_eut2:eutGeoNetworkingPort); // EUT1 & EUT2 are on-link
            connect(p_eut1:eutGeoNetworkingPort, p_eut3:eutGeoNetworkingPort); // EUT1 & EUT3 are on-link
            connect(p_eut2:eutGeoNetworkingPort, p_eut3:eutGeoNetworkingPort); // EUT2 & EUT3 are on-link
            connect(p_eut2:eutGeoNetworkingPort, p_eut4:eutGeoNetworkingPort); // EUT2 & EUT4 are on-link
            connect(p_eut3:eutGeoNetworkingPort, p_eut3:eutGeoNetworkingPort); // EUT3 & EUT4 are on-link
                                                                                  // EUT1 & EUT4 are of-link
            
            activate(a_mtcCf01Down(p_eut1, p_eut2, p_eut3, p_eut4));
            activate(a_mtcCf01Down());
            
        } // End of function f_mtcCf01Up
        
@@ -223,7 +222,7 @@ module ItsAutoInterop_Functions {
            // EUT1/EUT2
            connect(p_eut1:eutGeoNetworkingPort, p_eut2:eutGeoNetworkingPort); 
            
            activate(a_mtcCf02Down(p_eut1, p_eut2));
            activate(a_mtcCf02Down());
            
        } // End of function f_mtcCf02Up
        
@@ -255,7 +254,7 @@ module ItsAutoInterop_Functions {
            connect(p_eut1:eutGeoNetworkingPort, p_eut3:eutGeoNetworkingPort);
            connect(p_eut2:eutGeoNetworkingPort, p_eut3:eutGeoNetworkingPort);
            
            activate(a_mtcCf03Down(p_eut1, p_eut2, p_eut3));
            activate(a_mtcCf03Down());
            
        } // End of function f_mtcCf03Up
        
@@ -392,10 +391,7 @@ module ItsAutoInterop_Functions {
         */
        function f_poDefault() runs on ItsAutoInteropGeonetworking {
          deactivate;
//            deactivate(a_default());
//            deactivate(a_utDefault());
//            deactivate(a_hmiDefault());
            // TODO f_acStopScenario();
          f_acStopScenario();
        }
        
    } // End of group postambles
@@ -603,6 +599,8 @@ module ItsAutoInterop_Functions {
         * @desc The base default.
         */
        altstep a_default() runs on ItsAutoInteropGeonetworking {
            // Local variables
            var GeoNetworkingInd v_gnInd;
            
            [vc_autoInteropDefaultActive] geoNetworkingPort.receive( // Filtering LSRequest
                mw_geoNwInd(
@@ -611,7 +609,7 @@ module ItsAutoInterop_Functions {
                            ?,
                            ?
            )))) {
                // Nothing to do
                // Skip LS messages
                repeat;
            }
            [vc_autoInteropDefaultActive] geoNetworkingPort.receive( // Filtering LSReply
@@ -621,7 +619,7 @@ module ItsAutoInterop_Functions {
                            ?,
                            ?
            )))) {
                // Nothing to do
                // Skip LS messages
                repeat;
            }
            [vc_autoInteropDefaultActive] geoNetworkingPort.receive( // Filtering Secured CA messages
@@ -630,8 +628,8 @@ module ItsAutoInterop_Functions {
                        mdw_securedMessage_CAMs,
                        ?
            ))) {
                // Skip CAM messages
                log("*** a_default: WARNING: Skip secured CAM messages ***");
                // Skip CA messages
                log("*** a_default: WARNING: Skip secured CA messages ***");
                repeat;
            }
            [vc_autoInteropDefaultActive] geoNetworkingPort.receive( // Filtering Secured DEN messages
@@ -640,17 +638,23 @@ module ItsAutoInterop_Functions {
                        mdw_securedMessage_DENMs,
                        ?
            ))) {
                // Skip DENM messages
                log("*** a_default: WARNING: Skip secured DENM messages ***");
                // Skip DEN messages
                log("*** a_default: WARNING: Skip secured DEN messages ***");
                repeat;
            }
            [vc_autoInteropDefaultActive] geoNetworkingPort.receive { // Unexpected GeoNetworking message ==> require refine filtering above
                log("*** a_default: ERROR: Received an unexpected message ***");
                f_selfOrClientSyncAndVerdict("error", e_timeout);
            [vc_autoInteropDefaultActive] geoNetworkingPort.receive(
                mw_geoNwInd(
                    ?
            )) -> value v_gnInd { // Unexpected GeoNetworking message ==> require refine filtering above
                // Re-send DEN message to the other EUTs
                eutGeoNetworkingPort.send(
                                          m_forward_geoNetworkingInd(
                                              v_gnInd
                ));
            }
            [vc_autoInteropDefaultActive] eutGeoNetworkingPort.receive { // Unexpected EutGeoNetworking message ==> require refine filtering above
                log("*** a_default: ERROR: Received an unexpected message ***");
                f_selfOrClientSyncAndVerdict("error", e_timeout);
                f_selfOrClientSyncAndVerdict("error", e_error);
            }
            [] tc_wait.timeout {
                log("*** a_default: ERROR: Timeout while awaiting reaction of the IUT prior to Upper Tester action ***");
@@ -711,14 +715,14 @@ module ItsAutoInterop_Functions {
        /**
         * @desc Default handling cf01 de-initialisation.
         */
        altstep a_mtcCf01Down(
        altstep a_mtcCf01Down(/*
                              inout ItsAutoInteropGeonetworking p_eut1,
                              inout ItsAutoInteropGeonetworking p_eut2,
                              inout ItsAutoInteropGeonetworking p_eut3,
                              inout ItsAutoInteropGeonetworking p_eut4
                              inout ItsAutoInteropGeonetworking p_eut4*/
        ) runs on ItsAutoInteropGeoNetworkingMtc /* TITAN TODO: mtc ItsAutoInteropGeoNetworkingMtc system ItsAutoInteropGeoNetworkingSystem */ {
            [] a_shutdown() {
                f_mtcCf01Down(p_eut1, p_eut2, p_eut3, p_eut4);
//                f_mtcCf01Down(p_eut1, p_eut2, p_eut3, p_eut4);
                log("*** a_mtcCf01Down: INFO: TEST COMPONENT NOW STOPPING ITSELF! ***");
                stop;
            }
@@ -728,11 +732,11 @@ module ItsAutoInterop_Functions {
         * @desc Default handling cf02 de-initialisation.
         */
        altstep a_mtcCf02Down(
                              inout ItsAutoInteropGeonetworking p_eut1,
                              inout ItsAutoInteropGeonetworking p_eut2
                              /*inout ItsAutoInteropGeonetworking p_eut1,
                              inout ItsAutoInteropGeonetworking p_eut2*/
        ) runs on ItsAutoInteropGeoNetworkingMtc /* TITAN TODO: mtc ItsAutoInteropGeoNetworkingMtc system ItsAutoInteropGeoNetworkingSystem */ {
            [] a_shutdown() {
                f_mtcCf02Down(p_eut1, p_eut2);
//                f_mtcCf02Down(p_eut1, p_eut2);
                log("*** a_mtcCf02Down: INFO: TEST COMPONENT NOW STOPPING ITSELF! ***");
                stop;
            }
@@ -742,12 +746,12 @@ module ItsAutoInterop_Functions {
         * @desc Default handling cf03 de-initialisation.
         */
        altstep a_mtcCf03Down(
                              inout ItsAutoInteropGeonetworking p_eut1,
                              /*inout ItsAutoInteropGeonetworking p_eut1,
                              inout ItsAutoInteropGeonetworking p_eut2,
                              inout ItsAutoInteropGeonetworking p_eut3
                              inout ItsAutoInteropGeonetworking p_eut3*/
        ) runs on ItsAutoInteropGeoNetworkingMtc /* TITAN TODO: mtc ItsAutoInteropGeoNetworkingMtc system ItsAutoInteropGeoNetworkingSystem */ {
            [] a_shutdown() {
                f_mtcCf03Down(p_eut1, p_eut2, p_eut3);
//                f_mtcCf03Down(p_eut1, p_eut2, p_eut3);
                log("*** a_mtcCf03Down: INFO: TEST COMPONENT NOW STOPPING ITSELF! ***");
                stop;
            }
+10 −0
Original line number Diff line number Diff line
@@ -94,4 +94,14 @@ module ItsAutoInterop_Pics {
        elevation                                       := '0000'O
    }
    
    /**
     * @desc Absolute coordinate for position 4 
     * @see  TODO
     */
    modulepar ThreeDLocation PICS_POS4 := {
        latitude                                        := 435522970,
        longitude                                       := 103000170,
        elevation                                       := '0000'O
    }
    
} // End of module ItsAutoInterop_Pics 
+25 −0
Original line number Diff line number Diff line
@@ -53,6 +53,31 @@ module ItsAutoInterop_Pixits {
        } // EUT_4
    }
    
    /**
     * @desc EUT1 identifier to refer to its @see EutDescriptions
     */
    modulepar integer PX_EUT1_ID := 0;
    
    /**
     * @desc EUT2 identifier to refer to its @see EutDescriptions
     */
    modulepar integer PX_EUT2_ID := 1;
    
    /**
     * @desc EUT3 identifier to refer to its @see EutDescriptions
     */
    modulepar integer PX_EUT3_ID := 2;
   
    /**
     * @desc EUT4 identifier to refer to its @see EutDescriptions
     */
    modulepar integer PX_EUT4_ID := 3;
    
    /**
     * @desc Epsilon distance between the vehicule and a position
     */
    modulepar float PX_EPSILON_DISTANCE := 1.0;
    
    /**
     * @desc Pre-defined security distance for forward collision risk condition
     */
+33 −13
Original line number Diff line number Diff line
@@ -257,36 +257,56 @@ module ItsAutoInterop_Templates {
        } // End of template mw_hmiNeighborEventInd
        
        /**
         * @desc    Received indication template for Stationary Vehicle Information
         * @desc    Received indication generic template HMI indications
         */
        template (present) HmiSignageEventInd mw_hmiSignageEventInd_stationaryVehicleInformation := {
        template (present) HmiSignageEventInd mw_hmiSignageEventInd := {
            countryCode                             := ?,
            trafficSignPictogramClass               := *,
            trafficSignPictogramNature              := *, 
            ambientOrRoadConditionPictogramClass    := *,
            ambientOrRoadConditionPictogramNature   := *
        } // End of template mw_hmiSignageEventInd
        
        /**
         * @desc    Received indication template for Road Work Warning/Speed limit
         */
        template (present) HmiSignageEventInd mw_hmiSignageEventInd_roadworks_limitedspeed(
                                                                                           template (present) integer p_seed := 30
        ) modifies mw_hmiSignageEventInd := {
            ambientOrRoadConditionPictogramClass    := e_roadCondition,
            ambientOrRoadConditionPictogramNature   := (1..9)
        } // End of template mw_hmiSignageEventInd_stationaryVehicleInformation
        } // End of template mw_hmiSignageEventInd_roadworks_limitedspeed
        
        /**
         * @desc    Received indication template for Road Hazard Signals
         */
        template (present) HmiSignageEventInd mw_hmiSignageEventInd_roadHazardSignal modifies mw_hmiSignageEventInd := {
            ambientOrRoadConditionPictogramClass    := e_roadCondition,
            ambientOrRoadConditionPictogramNature   := (1..9)
        } // End of template mw_hmiSignageEventInd_roadHazardSignal
        
        /**
         * @desc    Received indication template for Stationary Vehicle Information
         */
        template (present) HmiSignageEventInd mw_hmiSignageEventInd_stationaryVehicleWarning modifies mw_hmiSignageEventInd := {
            ambientOrRoadConditionPictogramClass    := e_roadCondition,
            ambientOrRoadConditionPictogramNature   := (1..9)
        } // End of template mw_hmiSignageEventInd_stationaryVehicleWarning
        
        /**
         * @desc    Received indication template for Forward Collision Risk
         */
        template (present) HmiSignageEventInd mw_hmiSignageEventInd_forwardCollisionRisk := {
            countryCode                             := ?,
        template (present) HmiSignageEventInd mw_hmiSignageEventInd_forwardCollisionRisk modifies mw_hmiSignageEventInd := {
            trafficSignPictogramClass               := e_dangerWarning,
            trafficSignPictogramNature              := (1..9), 
            ambientOrRoadConditionPictogramClass    := *,
            ambientOrRoadConditionPictogramNature   := *
            trafficSignPictogramNature              := (1..9)
        } // End of template mw_hmiSignageEventInd_forwardCollisionRisk
        
        /**
         * @desc    Received indication template for Lateral Collision Risk
         */
        template (present) HmiSignageEventInd mw_hmiSignageEventInd_lateralCollisionRisk := {
            countryCode                             := ?,
        template (present) HmiSignageEventInd mw_hmiSignageEventInd_lateralCollisionRisk modifies mw_hmiSignageEventInd := {
            trafficSignPictogramClass               := e_dangerWarning,
            trafficSignPictogramNature              := (1..9), 
            ambientOrRoadConditionPictogramClass    := *,
            ambientOrRoadConditionPictogramNature   := *
            trafficSignPictogramNature              := (1..9)
        } // End of template mw_hmiSignageEventInd_lateralCollisionRisk
        
    } // End of group hmiPrimitiveTemplates
+223 −223

File changed.

Preview size limit exceeded, changes collapsed.

Loading