tct3_ttcn.patch 14.1 KB
Newer Older
Index: AtsCAM/ItsCam_TpFunctions.ttcn
===================================================================
garciay's avatar
garciay committed
--- AtsCAM/ItsCam_TpFunctions.ttcn	(revision 2612)
+++ AtsCAM/ItsCam_TpFunctions.ttcn	(working copy)
@@ -1061,7 +1061,7 @@
                     f_CAM_MSD_INA_BV_01(
                         "Low beam headlights being deactivated", 
                         { m_setExteriorLightsStatus(ExteriorLights_lowBeamHeadlightsOn_), m_setExteriorLightsStatus(c_elAllLightsOff) },
-                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_lowBeamLightsOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_lowBeamLightsOff))) }
+                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_lowBeamLightsOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_lowBeamLightsOff)) }
                     );
                     
                     // Postamble
@@ -1133,7 +1133,7 @@
                     f_CAM_MSD_INA_BV_01(
                         "High beam headlights being deactivated", 
                         { m_setExteriorLightsStatus(ExteriorLights_highBeamHeadlightsOn_), m_setExteriorLightsStatus(c_elAllLightsOff) },
-                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_highBeamLightsOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_highBeamLightsOff))) }
+                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_highBeamLightsOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_highBeamLightsOff)) }
                     );
                     
                     // Postamble
@@ -1205,7 +1205,7 @@
                     f_CAM_MSD_INA_BV_01( 
                         "Left turn signal being deactivated", 
                         { m_setExteriorLightsStatus(ExteriorLights_leftTurnSignalOn_), m_setExteriorLightsStatus(c_elAllLightsOff) },
-                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_leftTurnSignalOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_leftTurnSignalOff))) }
+                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_leftTurnSignalOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_leftTurnSignalOff)) }
                     );
                     
                     // Postamble
@@ -1277,7 +1277,7 @@
                     f_CAM_MSD_INA_BV_01(
                         "Right turn signal being deactivated", 
                         { m_setExteriorLightsStatus(ExteriorLights_rightTurnSignalOn_), m_setExteriorLightsStatus(c_elAllLightsOff) },
-                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_rightTurnSignalOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_rightTurnSignalOff))) }
+                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_rightTurnSignalOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_rightTurnSignalOff)) }
                     );
                     
                     // Postamble
@@ -1349,7 +1349,7 @@
                     f_CAM_MSD_INA_BV_01(
                         "Daytime running lights being deactivated", 
                         { m_setExteriorLightsStatus(ExteriorLights_daytimeRunningLightsOn_), m_setExteriorLightsStatus(c_elAllLightsOff) },
-                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_daytimeRunningLightsOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_daytimeRunningLightsOff))) }
+                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_daytimeRunningLightsOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_daytimeRunningLightsOff)) }
                     );
                     
                     // Postamble
@@ -1421,7 +1421,7 @@
                     f_CAM_MSD_INA_BV_01(
                         "Reverese light being deactivated", 
                         { m_setExteriorLightsStatus(ExteriorLights_reverseLightOn_), m_setExteriorLightsStatus(c_elAllLightsOff) },
-                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_reverseLightOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_reverseLightOff))) }
+                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_reverseLightOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_reverseLightOff)) }
                     );
                     
                     // Postamble
@@ -1493,7 +1493,7 @@
                     f_CAM_MSD_INA_BV_01(
                         "Fog lights being deactivated", 
                         { m_setExteriorLightsStatus(ExteriorLights_fogLightOn_), m_setExteriorLightsStatus(c_elAllLightsOff) },
-                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_fogLightOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_fogLightOff))) }
+                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_fogLightOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_fogLightOff)) }
                     );
                     
                     // Postamble
@@ -1565,7 +1565,7 @@
                     f_CAM_MSD_INA_BV_01(
                         "Parking lights being deactivated", 
                         { m_setExteriorLightsStatus(ExteriorLights_parkingLightsOn_), m_setExteriorLightsStatus(c_elAllLightsOff) },
-                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_parkingLightsOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_parkingLightsOff))) }
+                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_parkingLightsOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_parkingLightsOff)) }
                     );
                     
                     // Postamble
@@ -3128,14 +3128,14 @@
             
             // Test Body
             v_camReq := valueof(
-                            m_camReq(
-                                m_camMsg_vehicle(
-                                    f_getTsStationId(),
-                                    f_getCurrentTime() mod 65536, // See ETSI EN 302 637-2 V1.3.0 - Clause B.3 generationDelatTime
-                                    m_tsPosition
-                                )
-                            )
-                        );
+                m_camReq(
+                    m_camMsg_vehicle(
+                        f_getTsStationId(),
+                        f_getCurrentTime() mod 65536, // See ETSI EN 302 637-2 V1.3.0 - Clause B.3 generationDelatTime
+                        m_tsPosition
+                    )
+                )
+            );
             camPort.send( v_camReq ) ;
             
             f_sleep(PX_TNOAC);
garciay's avatar
garciay committed
Index: AtsSecurity/ItsSecurity_TestControl.ttcn
===================================================================
garciay's avatar
garciay committed
--- AtsSecurity/ItsSecurity_TestControl.ttcn	(revision 2612)
+++ AtsSecurity/ItsSecurity_TestControl.ttcn	(working copy)
@@ -22,35 +22,35 @@
          * @see ETSI TS 103 096-2 V1.2.2 (2016-01) Clause 5.2 Sending behaviour
          */
         if (PICS_GN_SECURITY) {
-            execute(TC_SEC_ITSS_SND_MSG_01_01_BV());
+            /*execute(TC_SEC_ITSS_SND_MSG_01_01_BV());
garciay's avatar
garciay committed
             execute(TC_SEC_ITSS_SND_MSG_04_01_BV());
             execute(TC_SEC_ITSS_SND_MSG_04_02_BV());
-            execute(TC_SEC_ITSS_SND_MSG_05_01_BV());
+            /*execute(TC_SEC_ITSS_SND_MSG_05_01_BV());*/
             
             /**
              * @desc Sending behaviour test cases for CAM profile
              * @see ETSI TS 103 096-2 V1.2.2 (2016-01) Clause 5.2.4 CAM profile
              */
-            execute(TC_SEC_ITSS_SND_CAM_01_01_BV());
+            /*execute(TC_SEC_ITSS_SND_CAM_01_01_BV());
             execute(TC_SEC_ITSS_SND_CAM_02_01_BV());
             execute(TC_SEC_ITSS_SND_CAM_05_01_BV());
             execute(TC_SEC_ITSS_SND_CAM_05_02_BV());
garciay's avatar
garciay committed
             execute(TC_SEC_ITSS_SND_CAM_06_01_BV());
-            execute(TC_SEC_ITSS_SND_CAM_07_01_TI());
+            execute(TC_SEC_ITSS_SND_CAM_07_01_TI());*/
             execute(TC_SEC_ITSS_SND_CAM_08_01_BV());
garciay's avatar
garciay committed
-            execute(TC_SEC_ITSS_SND_CAM_09_01_BV());
+            /*execute(TC_SEC_ITSS_SND_CAM_09_01_BV());
             execute(TC_SEC_ITSS_SND_CAM_09_02_BV());
             execute(TC_SEC_ITSS_SND_CAM_10_01_BV());
             execute(TC_SEC_ITSS_SND_CAM_12_01_BV());
garciay's avatar
garciay committed
             execute(TC_SEC_ITSS_SND_CAM_14_01_BV());
             execute(TC_SEC_ITSS_SND_CAM_15_01_BV());
-            execute(TC_SEC_ITSS_SND_CAM_16_01_BV());
garciay's avatar
garciay committed
+            execute(TC_SEC_ITSS_SND_CAM_16_01_BV());*/
             
             /**
              * @desc Sending behaviour test cases for DENM profile
              * @see ETSI TS 103 096-2 V1.2.2 (2016-01) Clause 5.2.5 DENM profile
              */
-            execute(TC_SEC_ITSS_SND_DENM_01_01_BV());
+            /*execute(TC_SEC_ITSS_SND_DENM_01_01_BV());
             execute(TC_SEC_ITSS_SND_DENM_02_01_BV());
             execute(TC_SEC_ITSS_SND_DENM_03_01_BV());
             execute(TC_SEC_ITSS_SND_DENM_04_01_BV());
garciay's avatar
garciay committed
@@ -96,13 +96,13 @@
                 }
                 execute(TC_SEC_ITSS_SND_GENMSG_06_01_BV());
                 execute(TC_SEC_ITSS_SND_GENMSG_07_01_BV());
-            }
+            }*/
             
             /**
              * @desc Sending behaviour test cases for certificates profile
              * @see ETSI TS 103 096-2 V1.2.2 (2016-01) Clause 5.2.7 Profiles for certificates
              */
-            execute(TC_SEC_ITSS_SND_CERT_01_01_BV());
+            /*execute(TC_SEC_ITSS_SND_CERT_01_01_BV());
             execute(TC_SEC_ITSS_SND_CERT_01_02_BV());
             execute(TC_SEC_ITSS_SND_CERT_02_01_BV());
             if (PICS_CERTIFICATE_SELECTION) {
garciay's avatar
garciay committed
@@ -130,24 +130,24 @@
             execute(TC_SEC_ITSS_SND_CERT_10_02_BV());
             execute(TC_SEC_ITSS_SND_CERT_11_01_BV());
             execute(TC_SEC_ITSS_SND_CERT_11_02_BV());
-            execute(TC_SEC_ITSS_SND_CERT_12_01_BV());
+            execute(TC_SEC_ITSS_SND_CERT_12_01_BV());*/
             
             /**
              * @desc Sending behaviour test cases for AA certificate profil
              * @see ETSI TS 103 096-2 V1.2.2 (2016-01) Clause 5.2.7.7 AA certificate profile
              */
-            execute(TC_SEC_ITSS_SND_CERT_AA_01_01_BV());
+            /*execute(TC_SEC_ITSS_SND_CERT_AA_01_01_BV());
             execute(TC_SEC_ITSS_SND_CERT_AA_02_01_BV());
             execute(TC_SEC_ITSS_SND_CERT_AA_03_01_BV());
             execute(TC_SEC_ITSS_SND_CERT_AA_04_01_BV());
             execute(TC_SEC_ITSS_SND_CERT_AA_05_01_BV());
             execute(TC_SEC_ITSS_SND_CERT_AA_08_01_BV());
-            execute(TC_SEC_ITSS_SND_CERT_AA_10_01_BV());
+            execute(TC_SEC_ITSS_SND_CERT_AA_10_01_BV());*/
             /**
              * @desc Sending behaviour test cases for AT certificate profil
              * @see ETSI TS 103 096-2 V1.2.2 (2016-01) Clause 5.2.7.8 AT certificate profile
              */
-            execute(TC_SEC_ITSS_SND_CERT_AT_01_01_BV());
+            /*execute(TC_SEC_ITSS_SND_CERT_AT_01_01_BV());
             execute(TC_SEC_ITSS_SND_CERT_AT_02_01_BV());
             execute(TC_SEC_ITSS_SND_CERT_AT_03_01_BV());
             execute(TC_SEC_ITSS_SND_CERT_AT_04_01_BV());
garciay's avatar
garciay committed
@@ -154,7 +154,7 @@
             execute(TC_SEC_ITSS_SND_CERT_AT_05_01_BV());
             execute(TC_SEC_ITSS_SND_CERT_AT_07_01_BV());
             execute(TC_SEC_ITSS_SND_CERT_AT_08_01_BV());
-            execute(TC_SEC_ITSS_SND_CERT_AT_10_01_BV());
+            execute(TC_SEC_ITSS_SND_CERT_AT_10_01_BV());*/
         }
             
         /**
garciay's avatar
garciay committed
@@ -166,7 +166,7 @@
              * @desc Sending behaviour test cases for CAM profile
              * @see ETSI TS 103 096-2 V1.2.2 (2016-01) Clause 5.3.2 CAM Profile
              */
garciay's avatar
garciay committed
-            execute(TC_SEC_ITSS_RCV_CAM_01_01_BV());
+            /*execute(TC_SEC_ITSS_RCV_CAM_01_01_BV());
             execute(TC_SEC_ITSS_RCV_CAM_01_02_BV());
             execute(TC_SEC_ITSS_RCV_CAM_01_03_BV());
             execute(TC_SEC_ITSS_RCV_CAM_02_01_BO());
garciay's avatar
garciay committed
@@ -214,13 +214,13 @@
             execute(TC_SEC_ITSS_RCV_CAM_13_03_BO());
             execute(TC_SEC_ITSS_RCV_CAM_13_04_BO());
             execute(TC_SEC_ITSS_RCV_CAM_13_05_BO());
-            execute(TC_SEC_ITSS_RCV_CAM_13_06_BO());
+            execute(TC_SEC_ITSS_RCV_CAM_13_06_BO());*/
             
             /**
              * @desc Sending behaviour test cases for DENM profile
              * @see ETSI TS 103 096-2 V1.2.2 (2016-01) Clause 5.3.3 DENM Profile
              */
-            execute(TC_SEC_ITSS_RCV_DENM_01_01_BV());
+            /*execute(TC_SEC_ITSS_RCV_DENM_01_01_BV());
             execute(TC_SEC_ITSS_RCV_DENM_01_02_BV());
             execute(TC_SEC_ITSS_RCV_DENM_01_03_BV());
             execute(TC_SEC_ITSS_RCV_DENM_01_04_BV());
garciay's avatar
garciay committed
@@ -280,12 +280,12 @@
             execute(TC_SEC_ITSS_RCV_DENM_13_03_BO());
             execute(TC_SEC_ITSS_RCV_DENM_13_04_BO());
             execute(TC_SEC_ITSS_RCV_DENM_13_05_BO());
-            execute(TC_SEC_ITSS_RCV_DENM_13_06_BO());
+            execute(TC_SEC_ITSS_RCV_DENM_13_06_BO());*/
             /**
              * @desc Receiving behaviour test cases for Other profile
              * @see ETSI TS 103 096-2 V1.2.2 (2016-01) Clause 5.3.4 Generic Signed Message Profile
              */
-            if (PICS_GN_GBC_SRC) {
+            /*if (PICS_GN_GBC_SRC) {
                 execute(TC_SEC_ITSS_RCV_GENMSG_01_01_BV());
                 execute(TC_SEC_ITSS_RCV_GENMSG_01_02_BV());
                 execute(TC_SEC_ITSS_RCV_GENMSG_01_03_BV());
garciay's avatar
garciay committed
@@ -344,13 +344,13 @@
                 execute(TC_SEC_ITSS_RCV_GENMSG_13_04_BO());
                 execute(TC_SEC_ITSS_RCV_GENMSG_13_05_BO());
garciay's avatar
garciay committed
                 execute(TC_SEC_ITSS_RCV_GENMSG_13_06_BO());
-            }
+            }*/
             
             /**
              * @desc Receiving behaviour test cases for certificates profile
              * @see ETSI TS 103 096-2 V1.2.2 (2016-01) Clause 5.3.5 Profiles for certificates
              */
-            execute(TC_SEC_ITSS_RCV_CERT_01_01_BO());
+            /*execute(TC_SEC_ITSS_RCV_CERT_01_01_BO());
             execute(TC_SEC_ITSS_RCV_CERT_01_02_BO());
             execute(TC_SEC_ITSS_RCV_CERT_01_03_BO());
             execute(TC_SEC_ITSS_RCV_CERT_01_04_BO());
garciay's avatar
garciay committed
@@ -437,7 +437,7 @@
             execute(TC_SEC_ITSS_RCV_CERT_17_04_BO());
             execute(TC_SEC_ITSS_RCV_CERT_18_01_BO());
             execute(TC_SEC_ITSS_RCV_CERT_18_02_BO());
garciay's avatar
garciay committed
-            execute(TC_SEC_ITSS_RCV_CERT_19_01_BO());
+            execute(TC_SEC_ITSS_RCV_CERT_19_01_BO());*/
         }
         
     } // End of 'control' statement