diff --git a/ttcn/AtsCAM/ItsCam_TestCases.ttcn b/ttcn/AtsCAM/ItsCam_TestCases.ttcn index 04e3818b97f5714412b87ae9528d26fe7ef0a332..0ec0cf18f0f6190944e5753b9eb826072fcfe995 100644 --- a/ttcn/AtsCAM/ItsCam_TestCases.ttcn +++ b/ttcn/AtsCAM/ItsCam_TestCases.ttcn @@ -1578,7 +1578,7 @@ module ItsCam_TestCases { * @desc Check that publicTransportContainer is included if * vehicleRole is set to publicTransport(1). *
- * Pics Selection: PICS_CAM_GENERATION AND PICS_PUBLICTRANS + * Pics Selection: PICS_CAM_GENERATION AND NOT PIC_RSU AND PICS_PUBLICTRANS * Initial conditions: * with { * the IUT being in the "initial state" @@ -1612,7 +1612,7 @@ module ItsCam_TestCases { * @desc Check that specialTransportContainer is included if * vehicleRole is set to specialTransport(2). *- * Pics Selection: PICS_CAM_GENERATION AND PICS_SPECIALTRANS + * Pics Selection: PICS_CAM_GENERATION AND NOT PIC_RSU AND PICS_SPECIALTRANS * Initial conditions: * with { * the IUT being in the "initial state" @@ -1646,7 +1646,7 @@ module ItsCam_TestCases { * @desc Check that dangerousGoodsContainer is included if * vehicleRole is set to dangerousGoods(3). *- * Pics Selection: PICS_CAM_GENERATION AND PICS_DANGEROUSGOODS + * Pics Selection: PICS_CAM_GENERATION AND NOT PIC_RSU AND PICS_DANGEROUSGOODS * Initial conditions: * with { * the IUT being in the "initial state" @@ -1680,7 +1680,7 @@ module ItsCam_TestCases { * @desc Check that roadWorksContainerBasic is included if * vehicleRole is set to roadWork(4). *- * Pics Selection: PICS_CAM_GENERATION AND PICS_ROADWORKS + * Pics Selection: PICS_CAM_GENERATION AND NOT PIC_RSU AND PICS_ROADWORKS * Initial conditions: * with { * the IUT being in the "initial state" @@ -1714,7 +1714,7 @@ module ItsCam_TestCases { * @desc Check that rescueContainer is included if vehicleRole is * set to rescue(5). *- * Pics Selection: PICS_CAM_GENERATION AND PICS_RESCUE + * Pics Selection: PICS_CAM_GENERATION AND NOT PIC_RSU AND PICS_RESCUE * Initial conditions: * with { * the IUT being in the "initial state" @@ -1748,7 +1748,7 @@ module ItsCam_TestCases { * @desc Check that emergencyContainer is included if vehicleRole * is set to emergency(6). *- * Pics Selection: PICS_CAM_GENERATION AND PICS_EMERGENCY + * Pics Selection: PICS_CAM_GENERATION AND NOT PIC_RSU AND PICS_EMERGENCY * Initial conditions: * with { * the IUT being in the "initial state" @@ -1782,7 +1782,7 @@ module ItsCam_TestCases { * @desc Check that safetyCarContainer is included if vehicleRole * is set to safetyCar(7). *- * Pics Selection: PICS_CAM_GENERATION AND PICS_SAFETY_CAR + * Pics Selection: PICS_CAM_GENERATION AND NOT PIC_RSU AND PICS_SAFETY_CAR * Initial conditions: * with { * the IUT being in the "initial state" @@ -1820,7 +1820,7 @@ module ItsCam_TestCases { * @desc Check that CAMs are not generated more frequently than * T_GenCamMin. *- * Pics Selection: PICS_CAM_GENERATION AND PICS_T_GENCAMMIN + * Pics Selection: PICS_CAM_GENERATION AND NOT PIC_RSU * Initial conditions: * with { * the IUT being in the "initial state" @@ -1849,7 +1849,7 @@ module ItsCam_TestCases { * @desc Check that CAMs are not generated less frequently than * T_GenCamMax. *- * Pics Selection: PICS_CAM_GENERATION + * Pics Selection: PICS_CAM_GENERATION AND NOT PIC_RSU * Initial conditions: * with { * the IUT being in the "initial state" @@ -1878,7 +1878,7 @@ module ItsCam_TestCases { * @desc Check that TGenCam is set to T_GenCamMax after generating * N_GenCam due to condition 2. *- * Pics Selection: PICS_CAM_GENERATION + * Pics Selection: PICS_CAM_GENERATION AND NOT PIC_RSU * Initial conditions: * with { * the IUT being in the "initial state" @@ -1913,7 +1913,7 @@ module ItsCam_TestCases { * current direction of the originating ITS-S (towards North) * and direction included in previous CAM exceeds 4°. *- * Pics Selection: PICS_CAM_GENERATION + * Pics Selection: PICS_CAM_GENERATION AND NOT PIC_RSU * Initial conditions: * with { * the IUT being in the "initial state" @@ -1952,7 +1952,7 @@ module ItsCam_TestCases { * than T_GenCam_Dcc and the current position and position * included in previous CAM exceeds 4 m. *- * Pics Selection: PICS_CAM_GENERATION + * Pics Selection: PICS_CAM_GENERATION AND NOT PIC_RSU * Initial conditions: * with { * the IUT being in the "initial state" @@ -1991,7 +1991,7 @@ module ItsCam_TestCases { * current speed and speed included in previous CAM * exceeds 0,5 m/s. *- * Pics Selection: PICS_CAM_GENERATION + * Pics Selection: PICS_CAM_GENERATION AND NOT PIC_RSU * Initial conditions: * with { * the IUT being in the "initial state" @@ -2029,7 +2029,7 @@ module ItsCam_TestCases { * elapsed since the last CAM generation is equal or larger * than T_GenCam and equal or larger than T_GenCam_Dcc. *- * Pics Selection: PICS_CAM_GENERATION + * Pics Selection: PICS_CAM_GENERATION AND NOT PIC_RSU * Initial conditions: * with { * the IUT being in the "initial state" @@ -2092,7 +2092,7 @@ module ItsCam_TestCases { /** * @desc Check that CAM is encapsulated in BTP type B packet *- * Pics Selection: PICS_CAM_GENERATION + * Pics Selection: PICS_CAM_GENERATION AND NOT PICS_IS_IUT_SECURED * Initial conditions: * with { * the IUT being in the "initial state" @@ -2121,7 +2121,7 @@ module ItsCam_TestCases { /** * @desc Check that CAM is encapsulated in SHB packet *- * Pics Selection: PICS_CAM_GENERATION + * Pics Selection: PICS_CAM_GENERATION AND NOT PICS_IS_IUT_SECURED * Initial conditions: * with { * the IUT being in the "initial state" @@ -2150,7 +2150,7 @@ module ItsCam_TestCases { /** * @desc Check that CAM is encapsulated in GN packet with lifetime lower than 1s *- * Pics Selection: PICS_CAM_GENERATION + * Pics Selection: PICS_CAM_GENERATION AND NOT PICS_IS_IUT_SECURED * Initial conditions: * with { * the IUT being in the "initial state" @@ -2189,12 +2189,12 @@ module ItsCam_TestCases { ** Pics Selection: PICS_CAM_GENERATION AND PICS_IS_IUT_SECURED * Initial conditions: - * with { - * the IUT being in the "initial state" + * with { + * the IUT being in the "initial state" * the IUT is authorized to sign CAMs with the certificate * containing CAM SSP * indicating bit at position '1' set to 0 - * } + * } * Expected behaviour: * ensure that { * when { @@ -2223,12 +2223,12 @@ module ItsCam_TestCases { * Pics Selection: PICS_CAM_GENERATION AND PICS_IS_IUT_SECURED * AND PICS_SPECIALVEHICLECONTAINER AND PICS_PUBLICTRANS * Initial conditions: - * with { - * the IUT being in the "initial state" + * with { + * the IUT being in the "initial state" * the IUT is authorized to sign CAMs with the certificate * containing CAM SSP * indicating bit at position '2' set to 0 - * } + * } * Expected behaviour: * ensure that { * when { @@ -2248,7 +2248,7 @@ module ItsCam_TestCases { f_CAM_MSD_SSP_BO_02(); - } // end TC_CAM_MSD_SSP_BO_02 + } // end TC_CAM_MSD_SSP_BO_02 /** * @desc Check that the IUT does not send a CAM @@ -2257,12 +2257,12 @@ module ItsCam_TestCases { * Pics Selection: PICS_CAM_GENERATION AND PICS_IS_IUT_SECURED * AND PICS_SPECIALVEHICLECONTAINER AND PICS_SPECIALTRANS * Initial conditions: - * with { - * the IUT being in the "initial state" + * with { + * the IUT being in the "initial state" * the IUT is authorized to sign CAMs with the certificate * containing CAM SSP * indicating bit at position '3' set to 0 - * } + * } * Expected behaviour: * ensure that { * when { diff --git a/ttcn/AtsCAM/ItsCam_TestControl.ttcn b/ttcn/AtsCAM/ItsCam_TestControl.ttcn index 3957752df3c552fcf5b02815fb239c045339e1b9..5b63a8b6b073c74d560e1729cf1fd19590eab48c 100644 --- a/ttcn/AtsCAM/ItsCam_TestControl.ttcn +++ b/ttcn/AtsCAM/ItsCam_TestControl.ttcn @@ -21,84 +21,84 @@ module ItsCam_TestControl { control { if(PICS_CAM_GENERATION) { - if (not PICS_IS_IUT_SECURED) { - execute(TC_CAM_MSD_FMT_BV_01()); - if (not PICS_RSU) { - execute(TC_CAM_MSD_FMT_BV_02()); - execute(TC_CAM_MSD_FMT_BV_03()); - execute(TC_CAM_MSD_FMT_BV_04()); - execute(TC_CAM_MSD_FMT_BV_05()); - execute(TC_CAM_MSD_INA_BV_01_01()); - execute(TC_CAM_MSD_INA_BV_01_02()); - execute(TC_CAM_MSD_INA_BV_01_03()); - execute(TC_CAM_MSD_INA_BV_01_04()); - execute(TC_CAM_MSD_INA_BV_01_05()); - execute(TC_CAM_MSD_INA_BV_01_06()); - execute(TC_CAM_MSD_INA_BV_01_07()); - execute(TC_CAM_MSD_INA_BV_01_08()); - execute(TC_CAM_MSD_INA_BV_01_09()); - execute(TC_CAM_MSD_INA_BV_01_10()); - execute(TC_CAM_MSD_INA_BV_01_11()); - execute(TC_CAM_MSD_INA_BV_01_12()); - execute(TC_CAM_MSD_INA_BV_01_13()); - execute(TC_CAM_MSD_INA_BV_01_14()); - execute(TC_CAM_MSD_INA_BV_01_15()); - execute(TC_CAM_MSD_INA_BV_01_16()); - execute(TC_CAM_MSD_INA_BV_01_17()); - execute(TC_CAM_MSD_INA_BV_01_18()); - execute(TC_CAM_MSD_INA_BV_01_19()); - execute(TC_CAM_MSD_INA_BV_01_20()); - execute(TC_CAM_MSD_INA_BV_01_21()); - execute(TC_CAM_MSD_INA_BV_01_22()); - execute(TC_CAM_MSD_INA_BV_01_23()); - execute(TC_CAM_MSD_INA_BV_01_24()); - execute(TC_CAM_MSD_INA_BV_01_25()); - execute(TC_CAM_MSD_INA_BV_01_26()); - execute(TC_CAM_MSD_INA_BV_01_27()); - execute(TC_CAM_MSD_INA_BV_01_28()); - execute(TC_CAM_MSD_INA_BV_01_29()); - execute(TC_CAM_MSD_INA_BV_01_30()); - execute(TC_CAM_MSD_INA_BV_01_31()); - execute(TC_CAM_MSD_INA_BV_01_32()); - execute(TC_CAM_MSD_INA_BV_01_33()); - execute(TC_CAM_MSD_INA_BV_01_34()); - execute(TC_CAM_MSD_INA_BV_01_35()); - } - if (PICS_PUBLICTRANS) { - execute(TC_CAM_MSD_INA_BV_02()); - } - if (PICS_SPECIALTRANS) { - execute(TC_CAM_MSD_INA_BV_03()); - } - if (PICS_DANGEROUSGOODS) { - execute(TC_CAM_MSD_INA_BV_04()); - } - if (PICS_ROADWORKS) { - execute(TC_CAM_MSD_INA_BV_05()); - } - if (PICS_RESCUE) { - execute(TC_CAM_MSD_INA_BV_06()); - } - if (PICS_EMERGENCY) { - execute(TC_CAM_MSD_INA_BV_07()); - } - if (PICS_SAFETY_CAR) { - execute(TC_CAM_MSD_INA_BV_08()); - } - - execute(TC_CAM_MSD_GFQ_TI_01()); - execute(TC_CAM_MSD_GFQ_TI_02()); - execute(TC_CAM_MSD_GFQ_TI_03()); - execute(TC_CAM_MSD_GFQ_BV_04()); - execute(TC_CAM_MSD_GFQ_BV_05()); - execute(TC_CAM_MSD_GFQ_BV_06()); - execute(TC_CAM_MSD_GFQ_TI_07()); - execute(TC_CAM_MSD_GFQ_TI_08()); - - execute(TC_CAM_MSD_PAR_BV_01()); - execute(TC_CAM_MSD_PAR_BV_02()); - execute(TC_CAM_MSD_PAR_BV_03()); - } else { + execute(TC_CAM_MSD_FMT_BV_01()); + if (not PICS_RSU) { + execute(TC_CAM_MSD_FMT_BV_02()); + execute(TC_CAM_MSD_FMT_BV_03()); + execute(TC_CAM_MSD_FMT_BV_04()); + execute(TC_CAM_MSD_FMT_BV_05()); + execute(TC_CAM_MSD_INA_BV_01_01()); + execute(TC_CAM_MSD_INA_BV_01_02()); + execute(TC_CAM_MSD_INA_BV_01_03()); + execute(TC_CAM_MSD_INA_BV_01_04()); + execute(TC_CAM_MSD_INA_BV_01_05()); + execute(TC_CAM_MSD_INA_BV_01_06()); + execute(TC_CAM_MSD_INA_BV_01_07()); + execute(TC_CAM_MSD_INA_BV_01_08()); + execute(TC_CAM_MSD_INA_BV_01_09()); + execute(TC_CAM_MSD_INA_BV_01_10()); + execute(TC_CAM_MSD_INA_BV_01_11()); + execute(TC_CAM_MSD_INA_BV_01_12()); + execute(TC_CAM_MSD_INA_BV_01_13()); + execute(TC_CAM_MSD_INA_BV_01_14()); + execute(TC_CAM_MSD_INA_BV_01_15()); + execute(TC_CAM_MSD_INA_BV_01_16()); + execute(TC_CAM_MSD_INA_BV_01_17()); + execute(TC_CAM_MSD_INA_BV_01_18()); + execute(TC_CAM_MSD_INA_BV_01_19()); + execute(TC_CAM_MSD_INA_BV_01_20()); + execute(TC_CAM_MSD_INA_BV_01_21()); + execute(TC_CAM_MSD_INA_BV_01_22()); + execute(TC_CAM_MSD_INA_BV_01_23()); + execute(TC_CAM_MSD_INA_BV_01_24()); + execute(TC_CAM_MSD_INA_BV_01_25()); + execute(TC_CAM_MSD_INA_BV_01_26()); + execute(TC_CAM_MSD_INA_BV_01_27()); + execute(TC_CAM_MSD_INA_BV_01_28()); + execute(TC_CAM_MSD_INA_BV_01_29()); + execute(TC_CAM_MSD_INA_BV_01_30()); + execute(TC_CAM_MSD_INA_BV_01_31()); + execute(TC_CAM_MSD_INA_BV_01_32()); + execute(TC_CAM_MSD_INA_BV_01_33()); + execute(TC_CAM_MSD_INA_BV_01_34()); + execute(TC_CAM_MSD_INA_BV_01_35()); + } + if (PICS_PUBLICTRANS) { + execute(TC_CAM_MSD_INA_BV_02()); + } + if (PICS_SPECIALTRANS) { + execute(TC_CAM_MSD_INA_BV_03()); + } + if (PICS_DANGEROUSGOODS) { + execute(TC_CAM_MSD_INA_BV_04()); + } + if (PICS_ROADWORKS) { + execute(TC_CAM_MSD_INA_BV_05()); + } + if (PICS_RESCUE) { + execute(TC_CAM_MSD_INA_BV_06()); + } + if (PICS_EMERGENCY) { + execute(TC_CAM_MSD_INA_BV_07()); + } + if (PICS_SAFETY_CAR) { + execute(TC_CAM_MSD_INA_BV_08()); + } + + execute(TC_CAM_MSD_GFQ_TI_01()); + execute(TC_CAM_MSD_GFQ_TI_02()); + execute(TC_CAM_MSD_GFQ_TI_03()); + execute(TC_CAM_MSD_GFQ_BV_04()); + execute(TC_CAM_MSD_GFQ_BV_05()); + execute(TC_CAM_MSD_GFQ_BV_06()); + execute(TC_CAM_MSD_GFQ_TI_07()); + execute(TC_CAM_MSD_GFQ_TI_08()); + + execute(TC_CAM_MSD_PAR_BV_01()); + execute(TC_CAM_MSD_PAR_BV_02()); + execute(TC_CAM_MSD_PAR_BV_03()); + + if (PICS_IS_IUT_SECURED) { if (PICS_PUBLICTRANS and PICS_SPECIALVEHICLECONTAINER) { execute(TC_CAM_MSD_SSP_BO_02()); } @@ -109,9 +109,8 @@ module ItsCam_TestControl { } if(PICS_CAM_RECEPTION) { - if (not PICS_IS_IUT_SECURED) { - execute(TC_CAM_MSP_BV_01()); - } else { + execute(TC_CAM_MSP_BV_01()); + if (PICS_IS_IUT_SECURED) { execute(TC_CAM_MSP_SSP_BV_02()); execute(TC_CAM_MSP_SSP_BV_03()); } diff --git a/ttcn/AtsCAM/ItsCam_TpFunctions.ttcn b/ttcn/AtsCAM/ItsCam_TpFunctions.ttcn index 310ce8d47b2978137d8e5cc2824e471d0d6b08a8..aaa0fcafbfc908090bd4b45509ebd4b8a46c2f85 100644 --- a/ttcn/AtsCAM/ItsCam_TpFunctions.ttcn +++ b/ttcn/AtsCAM/ItsCam_TpFunctions.ttcn @@ -54,8 +54,8 @@ module ItsCam_TpFunctions { // Local variables // Test control - if (not PICS_CAM_GENERATION) { - log("*** " & testcasename() & ": PICS_CAM_GENERATION required for executing the TC ***"); + if (not PICS_CAM_GENERATION or PICS_RSU) { + log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***"); setverdict(inconc); stop; } @@ -245,8 +245,8 @@ module ItsCam_TpFunctions { log("*** " & testcasename() & ": PICS_CAM_GENERATION AND NOT PICS_RSU required for executing the TC ***"); setverdict(inconc); stop; - } - if (not (PICS_PUBLICTRANS OR PICS_SPECIALTRANS OR PICS_DANGEROUSGOODS OR PICS_ROADWORKS OR PICS_RESCUE OR PICS_EMERGENCY OR PICS_SAFETYCAR)) { + } + if (not (PICS_PUBLICTRANS or PICS_SPECIALTRANS or PICS_DANGEROUSGOODS or PICS_ROADWORKS or PICS_RESCUE or PICS_EMERGENCY or PICS_SAFETY_CAR)) { testcase.stop(testcasename() & ": (PICS_PUBLICTRANS OR PICS_SPECIALTRANS OR PICS_DANGEROUSGOODS OR PICS_ROADWORKS OR PICS_RESCUE OR PICS_EMERGENCY OR PICS_SAFETYCAR) needs to be set to true"); } @@ -302,8 +302,8 @@ module ItsCam_TpFunctions { setverdict(inconc); stop; } - if (not (PICS_PUBLICTRANS OR PICS_SPECIALTRANS OR PICS_DANGEROUSGOODS OR PICS_ROADWORKS OR PICS_RESCUE OR PICS_EMERGENCY OR PICS_SAFETYCAR)) { - testcase.stop(testcasename() & ": (PICS_PUBLICTRANS OR PICS_SPECIALTRANS OR PICS_DANGEROUSGOODS OR PICS_ROADWORKS OR PICS_RESCUE OR PICS_EMERGENCY OR PICS_SAFETYCAR) needs to be set to true"); + if (not (PICS_PUBLICTRANS or PICS_SPECIALTRANS or PICS_DANGEROUSGOODS or PICS_ROADWORKS or PICS_RESCUE or PICS_EMERGENCY or PICS_SAFETY_CAR)) { + testcase.stop(testcasename() & ": (PICS_PUBLICTRANS OR PICS_SPECIALTRANS OR PICS_DANGEROUSGOODS OR PICS_ROADWORKS OR PICS_RESCUE OR PICS_EMERGENCY OR PICS_SAFETY_CAR) needs to be set to true"); } // Test component configuration @@ -1845,14 +1845,13 @@ module ItsCam_TpFunctions { // Local variables // Test control - if (not PICS_CAM_GENERATION) { - log("*** " & testcasename() & ": PICS_CAM_GENERATION required for executing the TC ***"); + if (not PICS_CAM_GENERATION or PICS_RSU) { + log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***"); setverdict(inconc); stop; } - if (not PICS_SPECIALVEHICLECONTAINER and not PICS_PUBLICTRANS) { - testcase.stop(testcasename() - & ": PICS_SPECIALVEHICLECONTAINER and PICS_PUBLICTRANS need to be set to true"); + if (not PICS_PUBLICTRANS) { + testcase.stop(testcasename() & ": PICS_PUBLICTRANS need to be set to true"); } // Test component configuration @@ -1896,14 +1895,13 @@ module ItsCam_TpFunctions { // Local variables // Test control - if (not PICS_CAM_GENERATION) { - log("*** " & testcasename() & ": PICS_CAM_GENERATION required for executing the TC ***"); + if (not PICS_CAM_GENERATION or PICS_RSU) { + log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***"); setverdict(inconc); stop; } - if (not PICS_SPECIALVEHICLECONTAINER and not PICS_SPECIALTRANS) { - testcase.stop(testcasename() - & ": PICS_SPECIALVEHICLECONTAINER and PICS_SPECIALTRANS need to be set to true"); + if (not PICS_SPECIALTRANS) { + testcase.stop(testcasename() & ": PICS_SPECIALTRANS need to be set to true"); } // Test component configuration @@ -1946,14 +1944,13 @@ module ItsCam_TpFunctions { // Local variables // Test control - if (not PICS_CAM_GENERATION) { - log("*** " & testcasename() & ": PICS_CAM_GENERATION required for executing the TC ***"); + if (not PICS_CAM_GENERATION or PICS_RSU) { + log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***"); setverdict(inconc); stop; } - if (not PICS_SPECIALVEHICLECONTAINER and not PICS_DANGEROUSGOODS) { - testcase.stop(testcasename() - & ": PICS_SPECIALVEHICLECONTAINER and PICS_DANGEROUSGOODS need to be set to true"); + if (not PICS_DANGEROUSGOODS) { + testcase.stop(testcasename() & ": PICS_DANGEROUSGOODS need to be set to true"); } // Test component configuration @@ -1996,14 +1993,13 @@ module ItsCam_TpFunctions { // Local variables // Test control - if (not PICS_CAM_GENERATION) { - log("*** " & testcasename() & ": PICS_CAM_GENERATION required for executing the TC ***"); + if (not PICS_CAM_GENERATION or PICS_RSU) { + log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***"); setverdict(inconc); stop; } - if (not PICS_SPECIALVEHICLECONTAINER and not PICS_ROADWORKS) { - testcase.stop(testcasename() - & ": PICS_SPECIALVEHICLECONTAINER and PICS_ROADWORKS need to be set to true"); + if (not PICS_ROADWORKS) { + testcase.stop(testcasename() & ": PICS_ROADWORKS need to be set to true"); } // Test component configuration @@ -2046,14 +2042,13 @@ module ItsCam_TpFunctions { // Local variables // Test control - if (not PICS_CAM_GENERATION) { - log("*** " & testcasename() & ": PICS_CAM_GENERATION required for executing the TC ***"); + if (not PICS_CAM_GENERATION or PICS_RSU) { + log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***"); setverdict(inconc); stop; } - if (not PICS_SPECIALVEHICLECONTAINER and not PICS_RESCUE) { - testcase.stop(testcasename() - & ": PICS_SPECIALVEHICLECONTAINER and PICS_RESCUE need to be set to true"); + if (not PICS_RESCUE) { + testcase.stop(testcasename() & ": PICS_RESCUE need to be set to true"); } // Test component configuration @@ -2096,14 +2091,13 @@ module ItsCam_TpFunctions { // Local variables // Test control - if (not PICS_CAM_GENERATION) { - log("*** " & testcasename() & ": PICS_CAM_GENERATION required for executing the TC ***"); + if (not PICS_CAM_GENERATION or PICS_RSU) { + log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***"); setverdict(inconc); stop; } - if (not PICS_SPECIALVEHICLECONTAINER and not PICS_EMERGENCY) { - testcase.stop(testcasename() - & ": PICS_SPECIALVEHICLECONTAINER and PICS_EMERGENCY need to be set to true"); + if (not PICS_EMERGENCY) { + testcase.stop(testcasename() & ": PICS_EMERGENCY need to be set to true"); } // Test component configuration @@ -2146,14 +2140,13 @@ module ItsCam_TpFunctions { // Local variables // Test control - if (not PICS_CAM_GENERATION) { - log("*** " & testcasename() & ": PICS_CAM_GENERATION required for executing the TC ***"); + if (not PICS_CAM_GENERATION or PICS_RSU) { + log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***"); setverdict(inconc); stop; } - if (not PICS_SPECIALVEHICLECONTAINER and not PICS_SAFETY_CAR) { - testcase.stop(testcasename() - & ": PICS_SPECIALVEHICLECONTAINER and PICS_SAFETY_CAR need to be set to true"); + if (not PICS_SAFETY_CAR) { + testcase.stop(testcasename() & ": PICS_SAFETY_CAR need to be set to true"); } // Test component configuration @@ -2206,11 +2199,11 @@ module ItsCam_TpFunctions { var FncRetCode v_ret; // Test control - if (not PICS_CAM_GENERATION) { - log("*** " & testcasename() & ": PICS_CAM_GENERATION required for executing the TC ***"); + if (not PICS_CAM_GENERATION or PICS_RSU) { + log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***"); setverdict(inconc); stop; - } + } // Test component configuration f_cfUp(); @@ -2299,8 +2292,8 @@ module ItsCam_TpFunctions { var FncRetCode v_ret; // Test control - if (not PICS_CAM_GENERATION) { - log("*** " & testcasename() & ": PICS_CAM_GENERATION required for executing the TC ***"); + if (not PICS_CAM_GENERATION or PICS_RSU) { + log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***"); setverdict(inconc); stop; } @@ -2391,8 +2384,8 @@ module ItsCam_TpFunctions { var integer v_i; // Test control - if (not PICS_CAM_GENERATION) { - log("*** " & testcasename() & ": PICS_CAM_GENERATION required for executing the TC ***"); + if (not PICS_CAM_GENERATION or PICS_RSU) { + log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***"); setverdict(inconc); stop; } @@ -2497,8 +2490,8 @@ module ItsCam_TpFunctions { var HeadingValue v_changeHeadingValue := 50; // 4° == 40 // Test control - if (not PICS_CAM_GENERATION) { - log("*** " & testcasename() & ": PICS_CAM_GENERATION required for executing the TC ***"); + if (not PICS_CAM_GENERATION or PICS_RSU) { + log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***"); setverdict(inconc); stop; } @@ -2560,8 +2553,8 @@ module ItsCam_TpFunctions { var float v_changePosValue := 8.0; // 8 >> 4m // Test control - if (not PICS_CAM_GENERATION) { - log("*** " & testcasename() & ": PICS_CAM_GENERATION required for executing the TC ***"); + if (not PICS_CAM_GENERATION or PICS_RSU) { + log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***"); setverdict(inconc); stop; } @@ -2633,8 +2626,8 @@ module ItsCam_TpFunctions { var SpeedValue v_changeSpeedValue := 60; // 0,5 m/s << 0,6 m/s == 60 cm/s // Test control - if (not PICS_CAM_GENERATION) { - log("*** " & testcasename() & ": PICS_CAM_GENERATION required for executing the TC ***"); + if (not PICS_CAM_GENERATION or PICS_RSU) { + log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***"); setverdict(inconc); stop; } @@ -2699,8 +2692,8 @@ module ItsCam_TpFunctions { var float v_genCam_max; // Test control - if (not PICS_CAM_GENERATION) { - log("*** " & testcasename() & ": PICS_CAM_GENERATION required for executing the TC ***"); + if (not PICS_CAM_GENERATION or PICS_RSU) { + log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***"); setverdict(inconc); stop; } @@ -2781,7 +2774,7 @@ module ItsCam_TpFunctions { // Local variables if (not PICS_CAM_GENERATION or not PICS_RSU) { - log("*** " & testcasename() & ": PICS_CAM_GENERATION amd PICS_RSU required for executing the TC ***"); + log("*** " & testcasename() & ": PICS_CAM_GENERATION and PICS_RSU required for executing the TC ***"); setverdict(inconc); stop; } @@ -2845,11 +2838,11 @@ module ItsCam_TpFunctions { const UInt8 c_gnNhBtpB := 2; // Test control - if (not PICS_CAM_GENERATION) { - log("*** " & testcasename() & ": PICS_CAM_GENERATION required for executing the TC ***"); + if (not PICS_CAM_GENERATION or PICS_IS_IUT_SECURED) { + log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_IS_IUT_SECURED required for executing the TC ***"); setverdict(inconc); stop; - } + } // Test component configuration f_cfUp(); @@ -2900,8 +2893,8 @@ module ItsCam_TpFunctions { const UInt8 c_GnHstSingleHop := 0; // Test control - if (not PICS_CAM_GENERATION) { - log("*** " & testcasename() & ": PICS_CAM_GENERATION required for executing the TC ***"); + if (not PICS_CAM_GENERATION or PICS_IS_IUT_SECURED) { + log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_IS_IUT_SECURED required for executing the TC ***"); setverdict(inconc); stop; } @@ -2954,8 +2947,8 @@ module ItsCam_TpFunctions { var CamInd v_camInd; // Test control - if (not PICS_CAM_GENERATION) { - log("*** " & testcasename() & ": PICS_CAM_GENERATION required for executing the TC ***"); + if (not PICS_CAM_GENERATION or PICS_IS_IUT_SECURED) { + log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_IS_IUT_SECURED required for executing the TC ***"); setverdict(inconc); stop; }