From 8f6d350a077252769d17dbb28e4138f6785bda7f Mon Sep 17 00:00:00 2001 From: garciay Date: Fri, 22 Jul 2016 09:54:37 +0000 Subject: [PATCH] Add TestControl modules --- ttcn/AtsIVIM/ItsIvim_TestCases.ttcn | 120 +++++++------- ttcn/AtsIVIM/ItsIvim_TestControl.ttcn | 26 ++- ttcn/AtsIVIM/ItsIvim_TpFunctions.ttcn | 50 +++--- .../ItsMapemSpatem_TestControl.ttcn | 28 ++++ ttcn/AtsMapemSpatem/ItsMapem_TestCases.ttcn | 20 +-- ttcn/AtsMapemSpatem/ItsMapem_TpFunctions.ttcn | 34 ++-- ttcn/AtsMapemSpatem/ItsSpatem_TestCases.ttcn | 24 +-- .../AtsMapemSpatem/ItsSpatem_TpFunctions.ttcn | 33 ++-- ttcn/AtsSremSsem/ItsSrem_TestCases.ttcn | 95 +++++++++-- ttcn/AtsSremSsem/ItsSrem_TpFunctions.ttcn | 148 ++++++++++++++++-- 10 files changed, 418 insertions(+), 160 deletions(-) diff --git a/ttcn/AtsIVIM/ItsIvim_TestCases.ttcn b/ttcn/AtsIVIM/ItsIvim_TestCases.ttcn index 9d762d206..f6d60cc6c 100644 --- a/ttcn/AtsIVIM/ItsIvim_TestCases.ttcn +++ b/ttcn/AtsIVIM/ItsIvim_TestCases.ttcn @@ -249,13 +249,13 @@ module ItsIvim_TestCases { * } * * - * @see ETSI TS 103 191-2 TP_IS_IVI_EVUP_BV_05, ETSI TS 103 301, clause 7.4.2 + * @see ETSI TS 103 191-2 TP_IS_IVI_EVUP_BV_01, ETSI TS 103 301, clause 7.4.2 */ - testcase TC_IS_IVI_EVUP_BV_05() runs on ItsIvim system ItsIvimSystem { + testcase TC_IS_IVI_EVUP_BV_01() runs on ItsIvim system ItsIvimSystem { - f_IS_IVI_EVUP_BV_05(); + f_IS_IVI_EVUP_BV_01(); - } // End of TC_IS_IVI_EVUP_BV_05 + } // End of TC_IS_IVI_EVUP_BV_01 /** * @desc Check that an update can change the validity time to the IVIM - validTo information field @@ -288,13 +288,13 @@ module ItsIvim_TestCases { * } * * - * @see ETSI TS 103 191-2 TP_IS_IVI_EVUP_BV_06, ETSI TS 103 301, clause 7.4.2 + * @see ETSI TS 103 191-2 TP_IS_IVI_EVUP_BV_02, ETSI TS 103 301, clause 7.4.2 */ - testcase TC_IS_IVI_EVUP_BV_06() runs on ItsIvim system ItsIvimSystem { + testcase TC_IS_IVI_EVUP_BV_02() runs on ItsIvim system ItsIvimSystem { - f_IS_IVI_EVUP_BV_06(); + f_IS_IVI_EVUP_BV_02(); - } // End of TC_IS_IVI_EVUP_BV_06 + } // End of TC_IS_IVI_EVUP_BV_02 /** * @desc Check that an update can change the validity time to the IVIM - validFrom information field @@ -327,13 +327,13 @@ module ItsIvim_TestCases { * } * * - * @see ETSI TS 103 191-2 TP_IS_IVI_EVUP_BV_07, ETSI TS 103 301, clause 7.4.2 + * @see ETSI TS 103 191-2 TP_IS_IVI_EVUP_BV_03, ETSI TS 103 301, clause 7.4.2 */ - testcase TC_IS_IVI_EVUP_BV_07() runs on ItsIvim system ItsIvimSystem { + testcase TC_IS_IVI_EVUP_BV_03() runs on ItsIvim system ItsIvimSystem { - f_IS_IVI_EVUP_BV_07(); + f_IS_IVI_EVUP_BV_03(); - } // End of TC_IS_IVI_EVUP_BV_07 + } // End of TC_IS_IVI_EVUP_BV_03 /** * @desc Check that the timeStamp is set to the current time when generating an update with some change of information content @@ -366,13 +366,13 @@ module ItsIvim_TestCases { * } * * - * @see ETSI TS 103 191-2 TP_IS_IVI_EVUP_BV_08, ETSI TS 103 301, clause 7.4.2 + * @see ETSI TS 103 191-2 TP_IS_IVI_EVUP_BV_04, ETSI TS 103 301, clause 7.4.2 */ - testcase TC_IS_IVI_EVUP_BV_08() runs on ItsIvim system ItsIvimSystem { + testcase TC_IS_IVI_EVUP_BV_04() runs on ItsIvim system ItsIvimSystem { - f_IS_IVI_EVUP_BV_08(); + f_IS_IVI_EVUP_BV_04(); - } // End of TC_IS_IVI_EVUP_BV_08 + } // End of TC_IS_IVI_EVUP_BV_04 /** * @desc Check that the iviIdentificationNumber remains unchanged IVIM is updated @@ -406,13 +406,13 @@ module ItsIvim_TestCases { * } * * - * @see ETSI TS 103 191-2 TP_IS_IVI_EVUP_BV_09, ETSI TS 103 301, clause 7.4.2 + * @see ETSI TS 103 191-2 TP_IS_IVI_EVUP_BV_05, ETSI TS 103 301, clause 7.4.2 */ - testcase TC_IS_IVI_EVUP_BV_09() runs on ItsIvim system ItsIvimSystem { + testcase TC_IS_IVI_EVUP_BV_05() runs on ItsIvim system ItsIvimSystem { - f_IS_IVI_EVUP_BV_09(); + f_IS_IVI_EVUP_BV_05(); - } // End of TC_IS_IVI_EVUP_BV_09 + } // End of TC_IS_IVI_EVUP_BV_05 } // End of group iviEventUpdate @@ -421,7 +421,7 @@ module ItsIvim_TestCases { /** * @desc Check that the IUT terminates IVM genration on validity duration expery * 
-             * Pics Selection: PICS_IVIM_UPDATE
+             * Pics Selection: PICS_IVIM_GENERATION
              * Initial conditions: 
              *   with {
              *        the IUT being in the "initial state"
@@ -447,19 +447,19 @@ module ItsIvim_TestCases {
              *
* * @version 1.0.4 - * @see ETSI TS 103 191-2 v0.0.1 TP_IS_IVIM_EVTR_BV_01 + * @see ETSI TS 103 191-2 v0.0.1 TP_IS_IVI_EVTR_BV_01 * @reference ETSI TS 103 301 V1.0.4 Clause 7.4.2 */ - testcase TC_IS_IVIM_EVTR_BV_01 () runs on ItsIvim system ItsIvimSystem { + testcase TC_IS_IVI_EVTR_BV_01 () runs on ItsIvim system ItsIvimSystem { - f_IS_IVIM_EVTR_BV_01(); + f_IS_IVI_EVTR_BV_01(); - } // End of testcase TC_IS_IVIM_EVTR_BV_01 + } // End of testcase TC_IS_IVI_EVTR_BV_01 /** * @desc Check that the IUT terminates IVM genration on termination request * 
-             * Pics Selection: PICS_IVIM_UPDATE
+             * Pics Selection: PICS_IVIM_GENERATION
              * Initial conditions: 
              *   with {
              *        the IUT being in the "initial state"
@@ -484,18 +484,18 @@ module ItsIvim_TestCases {
              *
* * @version 1.0.4 - * @see ETSI TS 103 191-2 v0.0.1 TP_IS_IVIM_EVTR_BV_02 + * @see ETSI TS 103 191-2 v0.0.1 TP_IS_IVI_EVTR_BV_02 * @reference ETSI TS 103 301 V1.0.4 Clause 7.4.2 */ - testcase TC_IS_IVIM_EVTR_BV_02 () runs on ItsIvim system ItsIvimSystem { + testcase TC_IS_IVI_EVTR_BV_02 () runs on ItsIvim system ItsIvimSystem { - f_IS_IVIM_EVTR_BV_02(); + f_IS_IVI_EVTR_BV_02(); - } // End of testcase TC_IS_IVIM_EVTR_BV_02 + } // End of testcase TC_IS_IVI_EVTR_BV_02 } // End of group iviEventTermination - group iviMessageRepetition { + group iviEventRepetition { /** * @desc Check that the IUT activates repetition on reception of a valid AppIVIM_Update request @@ -526,14 +526,14 @@ module ItsIvim_TestCases { * * * @version 1.0.4 - * @see ETSI TS 103 191-2 v0.0.1 TP_IS_IVIM_EVRP_BV_01 + * @see ETSI TS 103 191-2 v0.0.1 TP_IS_IVI_EVRP_BV_01 * @reference ETSI TS 103 301 V1.0.4 Clause 7.4.2 */ - testcase TC_IS_IVIM_EVRP_BV_01 () runs on ItsIvim system ItsIvimSystem { + testcase TC_IS_IVI_EVRP_BV_01 () runs on ItsIvim system ItsIvimSystem { - f_IS_IVIM_EVRP_BV_01(); + f_IS_IVI_EVRP_BV_01(); - } // End of testcase TC_IS_IVIM_EVRP_BV_01 + } // End of testcase TC_IS_IVI_EVRP_BV_01 /** * @desc Check that the IUT activates repetition on reception of a valid AppIVIM_Update request @@ -560,16 +560,16 @@ module ItsIvim_TestCases { * * * @version 1.0.4 - * @see ETSI TS 103 191-2 v0.0.1 TP_IS_IVIM_EVRP_BV_02 + * @see ETSI TS 103 191-2 v0.0.1 TP_IS_IVI_EVRP_BV_02 * @reference ETSI TS 103 301 V1.0.4 Clause 7.4.2 */ - testcase TC_IS_IVIM_EVRP_BV_02 () runs on ItsIvim system ItsIvimSystem { + testcase TC_IS_IVI_EVRP_BV_02 () runs on ItsIvim system ItsIvimSystem { - f_IS_IVIM_EVRP_BV_02(); + f_IS_IVI_EVRP_BV_02(); - } // End of testcase TC_IS_IVIM_EVRP_BV_02 + } // End of testcase TC_IS_IVI_EVRP_BV_02 - } // End of group iviMessageRepetition + } // End of group iviEventRepetition group iviGenerationFrequency { @@ -594,14 +594,14 @@ module ItsIvim_TestCases { * * * @version 1.0.4 - * @see ETSI TS 103 191-2 v0.0.1 TP_IS_IVIM_GFQ_TI_01 + * @see ETSI TS 103 191-2 v0.0.1 TP_IS_IVI_GFQ_TI_01 * @reference ETSI TS 103 301 V1.0.4 Clause 7.4.2 */ - testcase TC_IS_IVIM_GFQ_TI_01 () runs on ItsIvim system ItsIvimSystem { + testcase TC_IS_IVI_GFQ_TI_01 () runs on ItsIvim system ItsIvimSystem { - f_IS_IVIM_GFQ_TI_01(); + f_IS_IVI_GFQ_TI_01(); - } // End of testcase TC_IS_IVIM_GFQ_TI_01 + } // End of testcase TC_IS_IVI_GFQ_TI_01 /** * @desc Check that IVIMs are not generated less frequently than T_GenIvimMax @@ -624,14 +624,14 @@ module ItsIvim_TestCases { * * * @version 1.0.4 - * @see ETSI TS 103 191-2 v0.0.1 TP_IS_IVIM_GFQ_TI_02 + * @see ETSI TS 103 191-2 v0.0.1 TP_IS_IVI_GFQ_TI_02 * @reference ETSI TS 103 301 V1.0.4 Clause 7.4.2 */ - testcase TC_IS_IVIM_GFQ_TI_02 () runs on ItsIvim system ItsIvimSystem { + testcase TC_IS_IVI_GFQ_TI_02 () runs on ItsIvim system ItsIvimSystem { - f_IS_IVIM_GFQ_TI_02(); + f_IS_IVI_GFQ_TI_02(); - } // End of testcase TC_IS_IVIM_GFQ_TI_02 + } // End of testcase TC_IS_IVI_GFQ_TI_02 } // End of group iviGenerationFrequency @@ -659,14 +659,14 @@ module ItsIvim_TestCases { * * * @version 1.0.4 - * @see ETSI TS 103 191-2 v0.0.1 TP_IS_IVIM_COMM_BV_01_01 + * @see ETSI TS 103 191-2 v0.0.1 TP_IS_IVI_COMM_BV_01_01 * @reference ETSI TS 103 301 V1.0.4 Clause 7.4.3.2 */ - testcase TC_IS_IVIM_COMM_BV_01_01 () runs on ItsIvim system ItsIvimSystem { + testcase TC_IS_IVI_COMM_BV_01_01 () runs on ItsIvim system ItsIvimSystem { - f_IS_IVIM_COMM_BV_01_01(); + f_IS_IVI_COMM_BV_01_01(); - } // End of testcase TC_IS_IVIM_COMM_BV_01_01 + } // End of testcase TC_IS_IVI_COMM_BV_01_01 /** * @desc Check that the destination port for IVIM is set to 2006 @@ -692,14 +692,14 @@ module ItsIvim_TestCases { * * * @version 1.0.4 - * @see ETSI TS 103 191-2 v0.0.1 TP_IS_IVIM_COMM_BV_01_02 + * @see ETSI TS 103 191-2 v0.0.1 TP_IS_IVI_COMM_BV_01_02 * @reference ETSI TS 103 301 V1.0.4 Clause 7.4.3.2 */ - testcase TC_IS_IVIM_COMM_BV_01_02 () runs on ItsIvim system ItsIvimSystem { + testcase TC_IS_IVI_COMM_BV_01_02 () runs on ItsIvim system ItsIvimSystem { - f_IS_IVIM_COMM_BV_01_02(); + f_IS_IVI_COMM_BV_01_02(); - } // End of testcase TC_IS_IVIM_COMM_BV_01_02 + } // End of testcase TC_IS_IVI_COMM_BV_01_02 /** * @desc Check that TLM service encapsulates IVIM in a UNC with the HeaderType field set to the value of 2 @@ -726,13 +726,13 @@ module ItsIvim_TestCases { * * * @version 1.0.4 - * @see ETSI TS 103 191-2 v0.0.1 TP_IS_IVIM_COMM_BV_02 + * @see ETSI TS 103 191-2 v0.0.1 TP_IS_IVI_COMM_BV_02 */ - testcase TC_IS_IVIM_COMM_BV_02 () runs on ItsIvim system ItsIvimSystem { + testcase TC_IS_IVI_COMM_BV_02 () runs on ItsIvim system ItsIvimSystem { - f_IS_IVIM_COMM_BV_02(); + f_IS_IVI_COMM_BV_02(); - } // End of testcase TC_IS_IVIM_COMM_BV_02 + } // End of testcase TC_IS_IVI_COMM_BV_02 } // End of group iviCommunication diff --git a/ttcn/AtsIVIM/ItsIvim_TestControl.ttcn b/ttcn/AtsIVIM/ItsIvim_TestControl.ttcn index 9ee243543..b39f7729b 100644 --- a/ttcn/AtsIVIM/ItsIvim_TestControl.ttcn +++ b/ttcn/AtsIVIM/ItsIvim_TestControl.ttcn @@ -11,7 +11,7 @@ module ItsIvim_TestControl { import from ItsIvim_TestCases all; // LibIts - import from LibItsIvim_Pics all; + import from LibItsIvim_Pics all; // Test Execution control { @@ -20,10 +20,28 @@ module ItsIvim_TestControl { execute(TC_IS_IVI_MSGF_BV_01()); execute(TC_IS_IVI_EVGN_BV_01()); execute(TC_IS_IVI_EVGN_BV_02()); + execute(TC_IS_IVI_EVGN_BV_03()); + execute(TC_IS_IVI_EVGN_BV_04()); + execute(TC_IS_IVI_EVGN_BV_05()); + execute(TC_IS_IVI_EVTR_BV_01()); + execute(TC_IS_IVI_EVTR_BV_01()); + execute(TC_IS_IVI_GFQ_TI_01()); + execute(TC_IS_IVI_GFQ_TI_02()); + execute(TC_IS_IVI_COMM_BV_01_01()); + execute(TC_IS_IVI_COMM_BV_01_02()); + execute(TC_IS_IVI_COMM_BV_02()); } - if (PICS_RSU_ROLE) { - } else { - + if(PICS_IVIM_UPDATE) { + execute(TC_IS_IVI_EVUP_BV_01()); + execute(TC_IS_IVI_EVUP_BV_02()); + execute(TC_IS_IVI_EVUP_BV_03()); + execute(TC_IS_IVI_EVUP_BV_04()); + execute(TC_IS_IVI_EVUP_BV_01()); + execute(TC_IS_IVI_EVRP_BV_01()); + execute(TC_IS_IVI_EVRP_BV_02()); + } + if (PICS_IVIM_RECEPTION) { + execute(TC_IVIM_MSP_BV_01()); } } diff --git a/ttcn/AtsIVIM/ItsIvim_TpFunctions.ttcn b/ttcn/AtsIVIM/ItsIvim_TpFunctions.ttcn index 260db16a4..3586a0e44 100644 --- a/ttcn/AtsIVIM/ItsIvim_TpFunctions.ttcn +++ b/ttcn/AtsIVIM/ItsIvim_TpFunctions.ttcn @@ -416,7 +416,7 @@ module ItsIvim_TpFunctions { group iviEventUpdate { - function f_IS_IVI_EVUP_BV_05() runs on ItsIvim { + function f_IS_IVI_EVUP_BV_01() runs on ItsIvim { // Local variables var IviIdentificationNumber v_iviIdentificationNumber; @@ -490,7 +490,7 @@ module ItsIvim_TpFunctions { } // End of function f_IVIM_MSD_FMT_BV_05 - function f_IS_IVI_EVUP_BV_06() runs on ItsIvim { + function f_IS_IVI_EVUP_BV_02() runs on ItsIvim { // Local variables var IviIdentificationNumber v_iviIdentificationNumber; @@ -580,7 +580,7 @@ module ItsIvim_TpFunctions { } // End of function f_IVIM_MSD_FMT_BV_06 - function f_IS_IVI_EVUP_BV_07() runs on ItsIvim { + function f_IS_IVI_EVUP_BV_03() runs on ItsIvim { // Local variables var IviIdentificationNumber v_iviIdentificationNumber; @@ -670,7 +670,7 @@ module ItsIvim_TpFunctions { } // End of function f_IVIM_MSD_FMT_BV_07 - function f_IS_IVI_EVUP_BV_08() runs on ItsIvim { + function f_IS_IVI_EVUP_BV_04() runs on ItsIvim { // Local variables const integer c_epsilon := 500; // maximum c_epsilon cannot exceed 500ms @@ -752,7 +752,7 @@ module ItsIvim_TpFunctions { } // End of function f_IVIM_MSD_FMT_BV_08 - function f_IS_IVI_EVUP_BV_09() runs on ItsIvim { + function f_IS_IVI_EVUP_BV_05() runs on ItsIvim { // Local variables var IviIdentificationNumber v_iviIdentificationNumber; @@ -828,9 +828,9 @@ module ItsIvim_TpFunctions { } // End of group iviEventUpdate - group iviMessageRepetition { + group iviEventRepetition { - function f_IS_IVIM_EVRP_BV_01() runs on ItsIvim { + function f_IS_IVI_EVRP_BV_01() runs on ItsIvim { // Local variables const integer c_maxLoopValue := 10; @@ -926,9 +926,9 @@ module ItsIvim_TpFunctions { f_poCancelEvent(e_iut, v_iviIdentificationNumber); f_cfDown(); - } // End of function f_IS_IVIM_EVRP_BV_01 + } // End of function f_IS_IVI_EVRP_BV_01 - function f_IS_IVIM_EVRP_BV_02() runs on ItsIvim { + function f_IS_IVI_EVRP_BV_02() runs on ItsIvim { // Local variables var IviIdentificationNumber v_iviIdentificationNumber; @@ -993,13 +993,13 @@ module ItsIvim_TpFunctions { f_poCancelEvent(e_iut, v_iviIdentificationNumber); f_cfDown(); - } // End of function f_IS_IVIM_EVRP_BV_02 + } // End of function f_IS_IVI_EVRP_BV_02 - } // End of group iviMessageRepetition + } // End of group iviEventRepetition group iviEventTermination { - function f_IS_IVIM_EVTR_BV_01() runs on ItsIvim { + function f_IS_IVI_EVTR_BV_01() runs on ItsIvim { // Local variables var IviIdentificationNumber v_iviIdentificationNumber; @@ -1061,9 +1061,9 @@ module ItsIvim_TpFunctions { // Postamble f_cfDown(); - } // End of function f_IS_IVIM_EVTR_BV_01 + } // End of function f_IS_IVI_EVTR_BV_01 - function f_IS_IVIM_EVTR_BV_02() runs on ItsIvim { + function f_IS_IVI_EVTR_BV_02() runs on ItsIvim { // Local variables var IviIdentificationNumber v_iviIdentificationNumber; @@ -1125,13 +1125,13 @@ module ItsIvim_TpFunctions { // Postamble f_cfDown(); - } // End of function f_IS_IVIM_EVTR_BV_02 + } // End of function f_IS_IVI_EVTR_BV_02 } // End of group iviEventTermination group iviGenerationFrequency { - function f_IS_IVIM_GFQ_TI_01() runs on ItsIvim { + function f_IS_IVI_GFQ_TI_01() runs on ItsIvim { // Local variables const integer c_maxLoopValue := 10; @@ -1218,9 +1218,9 @@ module ItsIvim_TpFunctions { f_poCancelEvent(e_iut, v_iviIdentificationNumber); f_cfDown(); - } // End of function f_IS_IVIM_GFQ_TI_01 + } // End of function f_IS_IVI_GFQ_TI_01 - function f_IS_IVIM_GFQ_TI_02() runs on ItsIvim { + function f_IS_IVI_GFQ_TI_02() runs on ItsIvim { // Local variables const integer c_maxLoopValue := 10; @@ -1305,13 +1305,13 @@ module ItsIvim_TpFunctions { f_poCancelEvent(e_iut, v_iviIdentificationNumber); f_cfDown(); - } // End of function f_IS_IVIM_GFQ_TI_02 + } // End of function f_IS_IVI_GFQ_TI_02 } // End of group iviGenerationFrequency group iviCommunication { - function f_IS_IVIM_COMM_BV_01_01() runs on ItsIvim { + function f_IS_IVI_COMM_BV_01_01() runs on ItsIvim { // Local variables const UInt8 c_gnNhBtpB := 2; @@ -1382,9 +1382,9 @@ module ItsIvim_TpFunctions { f_poCancelEvent(e_iut, v_iviIdentificationNumber); f_cfDown(); - } // End of function f_IS_IVIM_COMM_BV_01_01 + } // End of function f_IS_IVI_COMM_BV_01_01 - function f_IS_IVIM_COMM_BV_01_02() runs on ItsIvim { + function f_IS_IVI_COMM_BV_01_02() runs on ItsIvim { // Local variables const UInt16 c_gnNhBtpBPort := 2006; @@ -1454,9 +1454,9 @@ module ItsIvim_TpFunctions { f_poCancelEvent(e_iut, v_iviIdentificationNumber); f_cfDown(); - } // End of function f_IS_IVIM_COMM_BV_01_02 + } // End of function f_IS_IVI_COMM_BV_01_02 - function f_IS_IVIM_COMM_BV_02 () runs on ItsIvim { + function f_IS_IVI_COMM_BV_02 () runs on ItsIvim { // Local variables const UInt8 c_gnHtUnc := 2; @@ -1524,7 +1524,7 @@ module ItsIvim_TpFunctions { f_poCancelEvent(e_iut, v_iviIdentificationNumber); f_cfDown(); - } // End of function f_IS_IVIM_COMM_BV_02 + } // End of function f_IS_IVI_COMM_BV_02 } // End of group iviCommunication diff --git a/ttcn/AtsMapemSpatem/ItsMapemSpatem_TestControl.ttcn b/ttcn/AtsMapemSpatem/ItsMapemSpatem_TestControl.ttcn index 87df84d53..551348e27 100644 --- a/ttcn/AtsMapemSpatem/ItsMapemSpatem_TestControl.ttcn +++ b/ttcn/AtsMapemSpatem/ItsMapemSpatem_TestControl.ttcn @@ -17,6 +17,34 @@ module ItsMapemSpatem_TestControl { // Test Execution control { + if (PICS_MAPEM_GENERATION) { + execute(TC_IS_RLT_MSGF_BV_01 ()); + execute(TC_IS_RLT_EVGN_BV_01 ()); + execute(TC_IS_RLT_EVGN_BV_02 ()); + + if (PICS_SPATEM_GENERATION) { + execute(TC_IS_RLT_COMM_BV_01 ()); + } + + execute(TC_IS_RLT_COMM_BV_02_01 ()); + execute(TC_IS_RLT_COMM_BV_02_02 ()); + execute(TC_IS_RLT_COMM_BV_03 ()); + } + + if (PICS_SPATEM_GENERATION) { + execute(TC_IS_TLM_MSGF_BV_01 ()); + execute(TC_IS_TLM_EVGN_BV_01 ()); + execute(TC_IS_TLM_EVGN_BV_02 ()); + execute(TC_IS_TLM_EVGN_BV_03 ()); + execute(TC_IS_TLM_EVGN_BV_04 ()); + + execute(TC_IS_TLM_COMM_BV_01 ()); + execute(TC_IS_TLM_COMM_BV_02_01 ()); + execute(TC_IS_TLM_COMM_BV_02_02 ()); + execute(TC_IS_TLM_COMM_BV_03 ()); + execute(TC_IS_TLM_MSGF_BV_02 ()); + } + } // End of 'control' statement } // End of module ItsMapemSpatem_TestControl diff --git a/ttcn/AtsMapemSpatem/ItsMapem_TestCases.ttcn b/ttcn/AtsMapemSpatem/ItsMapem_TestCases.ttcn index c772f7264..19f4f4d3b 100644 --- a/ttcn/AtsMapemSpatem/ItsMapem_TestCases.ttcn +++ b/ttcn/AtsMapemSpatem/ItsMapem_TestCases.ttcn @@ -21,7 +21,7 @@ module ItsMapem_TestCases { /** * @desc Check that protocolVersion is set to 1 and messageID is set to 4 * 
-             * Pics Selection: PICS_RSU and PICS_MAPEM_GENERATION
+             * Pics Selection: PICS_MAPEM_GENERATION
              * Initial conditions: 
              *   with {
              *        the IUT being in the "initial state"
@@ -55,12 +55,12 @@ module ItsMapem_TestCases {
             
         } // End of group mapeMessageFormat
         
-        group mapeMessageEventGeneration { 
+        group mapeEventGeneration { 
             
             /**
              * @desc Check that IVI Service generates a new MAPEM on reception of a valid AppMAPEM_Trigger request
              * 
-             * Pics Selection: PICS_RSU and PICS_MAPEM_GENERATION
+             * Pics Selection: PICS_MAPEM_GENERATION
              * Initial conditions: 
              *   with {
              *        the IUT being in the "initial state"
@@ -90,7 +90,7 @@ module ItsMapem_TestCases {
             /**
              * @desc Check that IVI Service generates a new MAPEM on reception of a valid AppMAPEM_Trigger request
              * 
-             * Pics Selection: PICS_RSU and PICS_MAPEM_GENERATION
+             * Pics Selection: PICS_MAPEM_GENERATION
              * Initial conditions: 
              *   with {
              *        the IUT being in the "initial state"
@@ -127,14 +127,14 @@ module ItsMapem_TestCases {
                 
             } // End of testcase TC_IS_RLT_EVGN_BV_02
             
-        } // End of group mapeMessageEventGeneration
+        } // End of group mapeEventGeneration
         
         group mapeCommunication {
             
             /**
              * @desc Check that the RLT Service transmits continuously both MAPEM and SPATEM
              * 
-             * Pics Selection: PICS_RSU and PICS_MAPEM_GENERATION and PICS_SPATEM_GENERATION
+             * Pics Selection: PICS_MAPEM_GENERATION and PICS_SPATEM_GENERATION
              * Initial conditions: 
              *   with {
              *        the IUT being in the "initial state"
@@ -166,7 +166,7 @@ module ItsMapem_TestCases {
             /**
              * @desc Check that MAPEM uses BTP_B packet
              * 
-             * Pics Selection: PICS_RSU and PICS_MAPEM_GENERATION
+             * Pics Selection: PICS_MAPEM_GENERATION
              * Initial conditions: 
              *   with {
              *        the IUT being in the "initial state"
@@ -197,7 +197,7 @@ module ItsMapem_TestCases {
             /**
              * @desc Check that the destination port for MAPEM is set to 2003
              * 
-             * Pics Selection: PICS_RSU and PICS_MAPEM_GENERATION
+             * Pics Selection: PICS_MAPEM_GENERATION
              * Initial conditions: 
              *   with {
              *        the IUT being in the "initial state"
@@ -230,7 +230,7 @@ module ItsMapem_TestCases {
             /**
              * @desc Check that TLM service encapsulates MAPEM in a GBC with the HeaderType field set to the value of 4
              * 
-             * Pics Selection: PICS_RSU and PICS_MAPEM_GENERATION
+             * Pics Selection: PICS_MAPEM_GENERATION
              * Initial conditions: 
              *   with {
              *        the IUT being in the "initial state"
@@ -270,7 +270,7 @@ module ItsMapem_TestCases {
         /**
          * @desc Check that the IUT can successfully process all mandatory fields of MAPEM received
          * 
-         * Pics Selection: not PICS_RSU and PICS_MAPEM_RECEPTION
+         * Pics Selection: not PICS_MAPEM_RECEPTION
          * Initial conditions: 
          *   with {
          *        the IUT being in the "initial state"
diff --git a/ttcn/AtsMapemSpatem/ItsMapem_TpFunctions.ttcn b/ttcn/AtsMapemSpatem/ItsMapem_TpFunctions.ttcn
index 22a2ef529..9b01c9dff 100644
--- a/ttcn/AtsMapemSpatem/ItsMapem_TpFunctions.ttcn
+++ b/ttcn/AtsMapemSpatem/ItsMapem_TpFunctions.ttcn
@@ -43,8 +43,8 @@ module ItsMapem_TpFunctions {
                 // Local variables
                 
                 // Test control
-                if (not PICS_RSU or not PICS_MAPEM_GENERATION) {
-                    log("*** " & testcasename() & ": PICS_RSU  and PICS_MAPEM_GENERATION required for executing the TC ***");
+                if (not PICS_MAPEM_GENERATION) {
+                    log("*** " & testcasename() & ": PICS_MAPEM_GENERATION required for executing the TC ***");
                     setverdict(inconc);
                     stop;
                 }
@@ -53,6 +53,7 @@ module ItsMapem_TpFunctions {
                 f_cfUp();
                     
                 // Preamble
+                f_prInitialState();
                 f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
                     
                 // Test Body
@@ -80,7 +81,7 @@ module ItsMapem_TpFunctions {
             
         } // End of group mapeMessageFormat
         
-        group mapeMessageEventGeneration { 
+        group mapeEventGeneration { 
             
             /**
              * @desc    TP Function for TC_IS_RLT_EVGN_BV_01
@@ -90,8 +91,8 @@ module ItsMapem_TpFunctions {
                 // Local variables
                 
                 // Test control
-                if (not PICS_RSU or not PICS_MAPEM_GENERATION) {
-                    log("*** " & testcasename() & ": PICS_RSU  and PICS_MAPEM_GENERATION required for executing the TC ***");
+                if (not PICS_MAPEM_GENERATION) {
+                    log("*** " & testcasename() & ": PICS_MAPEM_GENERATION required for executing the TC ***");
                     setverdict(inconc);
                     stop;
                 }
@@ -100,6 +101,7 @@ module ItsMapem_TpFunctions {
                 f_cfUp();
                     
                 // Preamble
+                f_prInitialState();
                 f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
                     
                 // Test Body
@@ -144,8 +146,8 @@ module ItsMapem_TpFunctions {
                 var MapemInd v_mapem;
                 
                 // Test control
-                if (not PICS_RSU or not PICS_MAPEM_GENERATION) {
-                    log("*** " & testcasename() & ": PICS_RSU  and PICS_MAPEM_GENERATION required for executing the TC ***");
+                if (not PICS_MAPEM_GENERATION) {
+                    log("*** " & testcasename() & ": PICS_MAPEM_GENERATION required for executing the TC ***");
                     setverdict(inconc);
                     stop;
                 }
@@ -154,6 +156,7 @@ module ItsMapem_TpFunctions {
                 f_cfUp();
                     
                 // Preamble
+                f_prInitialState();
                 f_awaitMapeMessage(
                     mw_mapemInd(
                         mw_mapemPdu(
@@ -202,7 +205,7 @@ module ItsMapem_TpFunctions {
                 
             } // End of function f_IS_RLT_EVGN_BV_02
             
-        } // End of group mapeMessageEventGeneration
+        } // End of group mapeEventGeneration
         
         group mapeCommunication {
             
@@ -215,8 +218,8 @@ module ItsMapem_TpFunctions {
                 var boolean v_tlmServiceStarted := false;
                 
                 // Test control
-                if (not PICS_RSU or not PICS_MAPEM_GENERATION or not PICS_SPATEM_GENERATION) {
-                    log("*** " & testcasename() & ": PICS_RSU  and PICS_MAPEM_GENERATION and PICS_SPATEM_GENERATION required for executing the TC ***");
+                if (not PICS_MAPEM_GENERATION or not PICS_SPATEM_GENERATION) {
+                    log("*** " & testcasename() & ": PICS_MAPEM_GENERATION and PICS_SPATEM_GENERATION required for executing the TC ***");
                     setverdict(inconc);
                     stop;
                 }
@@ -225,6 +228,7 @@ module ItsMapem_TpFunctions {
                 f_cfUp();
                     
                 // Preamble
+                f_prInitialState();
                 f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
                     
                 // Test Body
@@ -275,6 +279,7 @@ module ItsMapem_TpFunctions {
                 f_cfUp();
                 
                 // Preamble
+                f_prInitialState();
                 f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
                 
                 // Test Body
@@ -325,6 +330,7 @@ module ItsMapem_TpFunctions {
                 f_cfUp();
                 
                 // Preamble
+                f_prInitialState();
                 f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
                 
                 // Test Body
@@ -366,8 +372,8 @@ module ItsMapem_TpFunctions {
                 const UInt8 c_gnHtGbc := 4;
                 
                 // Test control
-                if (not PICS_RSU or not PICS_MAPEM_GENERATION) {
-                    log("*** " & testcasename() & ": PICS_RSU  and PICS_MAPEM_GENERATION required for executing the TC ***");
+                if (not PICS_MAPEM_GENERATION) {
+                    log("*** " & testcasename() & ": PICS_MAPEM_GENERATION required for executing the TC ***");
                     setverdict(inconc);
                     stop;
                 }
@@ -376,6 +382,7 @@ module ItsMapem_TpFunctions {
                 f_cfUp();
                     
                 // Preamble
+                f_prInitialState();
                 f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
                     
                 // Test Body
@@ -441,7 +448,7 @@ module ItsMapem_TpFunctions {
             var MapemReq   v_mapemReq;
             var integer     i;
                 
-            if (PICS_RSU or not PICS_MAPEM_RECEPTION) {
+            if (not PICS_MAPEM_RECEPTION) {
                 log("*** " & testcasename() & ": not PICS_RSU and PICS_MAPEM_RECEPTION required for executing the TC ***");
                 setverdict(inconc);
                 stop;
@@ -451,6 +458,7 @@ module ItsMapem_TpFunctions {
             f_cfUp();
                 
             // Preamble
+            f_prInitialState();
             f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
                 
             // Test Body
diff --git a/ttcn/AtsMapemSpatem/ItsSpatem_TestCases.ttcn b/ttcn/AtsMapemSpatem/ItsSpatem_TestCases.ttcn
index 791dd2499..2b3be42bb 100644
--- a/ttcn/AtsMapemSpatem/ItsSpatem_TestCases.ttcn
+++ b/ttcn/AtsMapemSpatem/ItsSpatem_TestCases.ttcn
@@ -21,7 +21,7 @@ module ItsSpatem_TestCases {
             /**
              * @desc Check that protocolVersion is set to 1 and messageID is set to 4
              * 
-             * Pics Selection: PICS_RSU and PICS_SPATEM_GENERATION
+             * Pics Selection: PICS_SPATEM_GENERATION
              * Initial conditions: 
              *   with {
              *        the IUT being in the "initial state"
@@ -55,12 +55,12 @@ module ItsSpatem_TestCases {
             
         } // End of group spateMessageFormat
         
-        group spateMessageEventGeneration { 
+        group spateEventGeneration { 
             
             /**
              * @desc Check that TLM Service generates a new SPATEM on reception of a valid AppSPATEM _Start request
              * 
-             * Pics Selection: PICS_RSU and PICS_SPATEM_GENERATION
+             * Pics Selection: PICS_SPATEM_GENERATION
              * Initial conditions: 
              *   with {
              *        the IUT being in the "initial state"
@@ -90,7 +90,7 @@ module ItsSpatem_TestCases {
             /**
              * @desc Check that TLM Service generates SPATEM are time ordered
              * 
-             * Pics Selection: PICS_RSU and PICS_SPATEM_GENERATION
+             * Pics Selection: PICS_SPATEM_GENERATION
              * Initial conditions: 
              *   with {
              *        the IUT being in the "initial state"
@@ -120,7 +120,7 @@ module ItsSpatem_TestCases {
             /**
              * @desc Check that TLM Service terminates on reception of a valid AppSPATEM _Stop request
              * 
-             * Pics Selection: PICS_RSU and PICS_SPATEM_GENERATION
+             * Pics Selection: PICS_SPATEM_GENERATION
              * Initial conditions: 
              *   with {
              *        the IUT being in the "initial state"
@@ -150,7 +150,7 @@ module ItsSpatem_TestCases {
             /**
              * @desc Check that TLM Service generates a new SPATEM on reception of a valid AppSPATEM_Trigger request
              * 
-             * Pics Selection: PICS_RSU and PICS_SPATEM_GENERATION
+             * Pics Selection: PICS_SPATEM_GENERATION
              * Initial conditions: 
              *   with {
              *        the IUT being in the "initial state"
@@ -177,14 +177,14 @@ module ItsSpatem_TestCases {
                 
             } // End of testcase TC_IS_TLM_EVGN_BV_04
             
-        } // End of group spateMessageEventGeneration
+        } // End of group spateEventGeneration
         
         group spateCommunication {
             
             /**
              * @desc Check that TLM Service provides the destination area in SPATEM
              * 
-             * Pics Selection: PICS_RSU and PICS_SPATEM_GENERATION
+             * Pics Selection: PICS_SPATEM_GENERATION
              * Initial conditions: 
              *   with {
              *        the IUT being in the "initial state"
@@ -218,7 +218,7 @@ module ItsSpatem_TestCases {
             /**
              * @desc Check that SPATEM uses BTP_B packet
              * 
-             * Pics Selection: PICS_RSU and PICS_SPATEM_GENERATION
+             * Pics Selection: PICS_SPATEM_GENERATION
              * Initial conditions: 
              *   with {
              *        the IUT being in the "initial state"
@@ -249,7 +249,7 @@ module ItsSpatem_TestCases {
             /**
              * @desc Check that the destination port for SPATEM is set to 2004
              * 
-             * Pics Selection: PICS_RSU and PICS_SPATEM_GENERATION
+             * Pics Selection: PICS_SPATEM_GENERATION
              * Initial conditions: 
              *   with {
              *        the IUT being in the "initial state"
@@ -282,7 +282,7 @@ module ItsSpatem_TestCases {
             /**
              * @desc Check that TLM Service provides the destination area in SPATEM
              * 
-             * Pics Selection: PICS_RSU and PICS_SPATEM_GENERATION
+             * Pics Selection: PICS_SPATEM_GENERATION
              * Initial conditions: 
              *   with {
              *        the IUT being in the "initial state"
@@ -322,7 +322,7 @@ module ItsSpatem_TestCases {
             /**
              * @desc Check that the IUT can successfully process all mandatory fields of SPATEM received
              * 
-             * Pics Selection: not PICS_RSU and PICS_SPATEM_RECEPTION
+             * Pics Selection: PICS_SPATEM_RECEPTION
              * Initial conditions: 
              *   with {
              *        the IUT being in the "initial state"
diff --git a/ttcn/AtsMapemSpatem/ItsSpatem_TpFunctions.ttcn b/ttcn/AtsMapemSpatem/ItsSpatem_TpFunctions.ttcn
index 64fb297ed..17a0a9f96 100644
--- a/ttcn/AtsMapemSpatem/ItsSpatem_TpFunctions.ttcn
+++ b/ttcn/AtsMapemSpatem/ItsSpatem_TpFunctions.ttcn
@@ -43,7 +43,7 @@ module ItsSpatem_TpFunctions {
                 // Local variables
                 
                 // Test control
-                if (not PICS_RSU or not PICS_SPATEM_GENERATION) {
+                if (not not PICS_SPATEM_GENERATION) {
                     log("*** " & testcasename() & ": PICS_RSU  and PICS_SPATEM_GENERATION required for executing the TC ***");
                     setverdict(inconc);
                     stop;
@@ -53,7 +53,10 @@ module ItsSpatem_TpFunctions {
                 f_cfUp();
                     
                 // Preamble
+                f_prInitialState();
                 f_utTriggerEvent(m_utTriggerEvent(startTLMService));
+                // Wait for SPATEM sent
+                tc_ac.start(2.0);
                 f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
                     
                 // Test Body
@@ -82,7 +85,7 @@ module ItsSpatem_TpFunctions {
             
         } // End of group spateMessageFormat
         
-        group spateMessageEventGeneration { 
+        group spateEventGeneration { 
             
             /**
              * @desc    TP Function for f_IS_TLM_EVGN_BV_01
@@ -92,7 +95,7 @@ module ItsSpatem_TpFunctions {
                 // Local variables
                 
                 // Test control
-                if (not PICS_RSU or not PICS_SPATEM_GENERATION) {
+                if (not not PICS_SPATEM_GENERATION) {
                     log("*** " & testcasename() & ": PICS_RSU  and PICS_SPATEM_GENERATION required for executing the TC ***");
                     setverdict(inconc);
                     stop;
@@ -102,11 +105,11 @@ module ItsSpatem_TpFunctions {
                 f_cfUp();
                 
                 // Preamble
+                f_prInitialState();
                 f_utTriggerEvent(m_utTriggerEvent(startTLMService));
                 f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
                     
                 // Test Body
-                f_utTriggerEvent(m_utTriggerEvent(startTLMService));
                 tc_ac.start;
                 alt {
                     [] mapemSpatemPort.receive(
@@ -149,7 +152,7 @@ module ItsSpatem_TpFunctions {
                 var SpatemInd v_spatem;
                 
                 // Test control
-                if (not PICS_RSU or not PICS_SPATEM_GENERATION) {
+                if (not not PICS_SPATEM_GENERATION) {
                     log("*** " & testcasename() & ": PICS_RSU  and PICS_SPATEM_GENERATION required for executing the TC ***");
                     setverdict(inconc);
                     stop;
@@ -159,6 +162,7 @@ module ItsSpatem_TpFunctions {
                 f_cfUp();
                     
                 // Preamble
+                f_prInitialState();
                 f_utTriggerEvent(m_utTriggerEvent(startTLMService));
                 f_awaitSpateMessage(
                     mw_spatemInd(
@@ -217,7 +221,7 @@ module ItsSpatem_TpFunctions {
                 // Local variables
                 
                 // Test control
-                if (not PICS_RSU or not PICS_SPATEM_GENERATION) {
+                if (not not PICS_SPATEM_GENERATION) {
                     log("*** " & testcasename() & ": PICS_RSU  and PICS_SPATEM_GENERATION required for executing the TC ***");
                     setverdict(inconc);
                     stop;
@@ -227,9 +231,8 @@ module ItsSpatem_TpFunctions {
                 f_cfUp();
                 
                 // Preamble
+                f_prInitialState();
                 f_utTriggerEvent(m_utTriggerEvent(startTLMService));
-                // Wait for SPATEM sent
-                tc_ac.start(2.0);
                 f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
                     
                 // Test Body
@@ -267,7 +270,7 @@ module ItsSpatem_TpFunctions {
                 var SpatemInd v_spatem;
                 
                 // Test control
-                if (not PICS_RSU or not PICS_SPATEM_GENERATION) {
+                if (not not PICS_SPATEM_GENERATION) {
                     log("*** " & testcasename() & ": PICS_RSU  and PICS_SPATEM_GENERATION required for executing the TC ***");
                     setverdict(inconc);
                     stop;
@@ -277,6 +280,7 @@ module ItsSpatem_TpFunctions {
                 f_cfUp();
                     
                 // Preamble
+                f_prInitialState();
                 f_utTriggerEvent(m_utTriggerEvent(startTLMService));
                 f_awaitSpateMessage(
                     mw_spatemInd(
@@ -327,7 +331,7 @@ module ItsSpatem_TpFunctions {
                 
             } // End of function f_IS_TLM_EVGN_BV_04
             
-        } // End of group spateMessageEventGeneration
+        } // End of group spateEventGeneration
         
         group spateCommunication {
             
@@ -342,6 +346,7 @@ module ItsSpatem_TpFunctions {
                 f_cfUp();
                 
                 // Preamble
+                f_prInitialState();
                 f_utTriggerEvent(m_utTriggerEvent(startTLMService));
                 f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
                 
@@ -382,6 +387,7 @@ module ItsSpatem_TpFunctions {
                 f_cfUp();
                 
                 // Preamble
+                f_prInitialState();
                 f_utTriggerEvent(m_utTriggerEvent(startTLMService));
                 f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
                 
@@ -432,6 +438,7 @@ module ItsSpatem_TpFunctions {
                 f_cfUp();
                 
                 // Preamble
+                f_prInitialState();
                 f_utTriggerEvent(m_utTriggerEvent(startTLMService));
                 f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
                 
@@ -478,6 +485,7 @@ module ItsSpatem_TpFunctions {
                 f_cfUp();
                 
                 // Preamble
+                f_prInitialState();
                 f_utTriggerEvent(m_utTriggerEvent(startTLMService));
                 f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
                 
@@ -545,8 +553,8 @@ module ItsSpatem_TpFunctions {
                 var SpatemReq   v_spatemReq;
                 var integer     i;
                 
-                if (PICS_RSU or not PICS_SPATEM_RECEPTION) {
-                    log("*** " & testcasename() & ": not PICS_RSU and PICS_SPATEM_RECEPTION required for executing the TC ***");
+                if (not PICS_SPATEM_RECEPTION) {
+                    log("*** " & testcasename() & ": PICS_SPATEM_RECEPTION required for executing the TC ***");
                     setverdict(inconc);
                     stop;
                 }
@@ -555,6 +563,7 @@ module ItsSpatem_TpFunctions {
                 f_cfUp();
                 
                 // Preamble
+                f_prInitialState();
                 f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
                 
                 // Test Body
diff --git a/ttcn/AtsSremSsem/ItsSrem_TestCases.ttcn b/ttcn/AtsSremSsem/ItsSrem_TestCases.ttcn
index cc67df4ec..7354cc7f1 100644
--- a/ttcn/AtsSremSsem/ItsSrem_TestCases.ttcn
+++ b/ttcn/AtsSremSsem/ItsSrem_TestCases.ttcn
@@ -21,9 +21,9 @@ module ItsSrem_TestCases {
             group sreMessageFormat { 
                 
                  /**
-                 * @desc Check that protocolVersion is set to 1 and messageID is set to 9 (ITS-S)
+                 * @desc Check that protocolVersion is set to 1 and messageID is set to 9
                  * 
-                 * Pics Selection: not PICS_RSU
+                 * Pics Selection: not PICS_RSU and PICS_SREM_GENERATION
                  * Initial conditions: 
                  *   with {
                  *        the IUT being in the "initial state"
@@ -45,8 +45,8 @@ module ItsSrem_TestCases {
                  * 

                  * 
                  * @version   1.0.4
-                 * @see       ETSI TS 103 191-2 v0.0.1 TP_IS_RLT_MSGF_BV_01
-                 * @reference ETSI TS 103 301 V1.0.4 Clause 6.3
+                 * @see       ETSI TS 103 191-2 v0.0.1 TP_IS_TLC_MSGF_BV_01
+                 * @reference ETSI TS 103 301 V1.0.4 Clause 8.3
                  */
                 testcase TP_IS_TLC_MSGF_BV_01 () runs on ItsSremSsem system ItsSremSsemSystem {
                     
@@ -56,6 +56,73 @@ module ItsSrem_TestCases {
                 
             } // End of group sreMessageFormat 
             
+            group sreEventGeneration {
+                
+                 /**
+                 * @desc Check that IVI Service generates a new SREM on reception of a valid AppSREM_Trigger request
+                 * 
+                 * Pics Selection: not PICS_RSU and PICS_SREM_GENERATION
+                 * Initial conditions: 
+                 *   with {
+                 *        the IUT being in the "initial state"
+                 *    }
+                 * Expected behaviour:
+                 *    ensure that {
+                 *        when { 
+                 *            the IUT receives an AppSREM_Trigger request from the application layer
+                 *        }
+                 *        then {
+                 *            the IUT sends a valid SREM
+                 *        }
+                 *    }
+                 * 

+                 * 
+                 * @version   1.0.4
+                 * @see       ETSI TS 103 191-2 v0.0.1 TP_IS_TLC_EVGN_BV_01
+                 * @reference ETSI TS 103 301 V1.0.4 Clause 8.4.1
+                 */
+                testcase TP_IS_TLC_EVGN_BV_01 () runs on ItsSremSsem system ItsSremSsemSystem {
+                    
+                    f_IS_TLC_EVGN_BV_01();
+                    
+                } // End of testcase TP_IS_TLC_EVGN_BV_01
+                
+                 /**
+                 * @desc Check that the IUT identifies SREM with a unique request identifier
+                 * 
+                 * Pics Selection: not PICS_RSU and PICS_SREM_GENERATION
+                 * Initial conditions: 
+                 *   with {
+                 *        the IUT being in the "initial state"
+                 *        and the IUT having generated several SREM 
+                 *    }
+                 * Expected behaviour:
+                 *    ensure that {
+                 *        when { 
+                 *            the IUT is requested to generate a new SREM 
+                 *        }
+                 *        then {
+                 *            the IUT sends a valid SREM
+                 *                containing srm
+                 *                    containing requests[0]
+                 *                        containing requestID
+                 *                            indicating an unused value
+                 *        }
+                 *    }
+                 * 

+                 * 
+                 * @version   1.0.4
+                 * @see       ETSI TS 103 191-2 v0.0.1 TP_IS_TLC_EVGN_BV_02
+                 * @reference ETSI TS 103 301 V1.0.4 Clause 8.4.1
+                 */
+                testcase TP_IS_TLC_EVGN_BV_02 () runs on ItsSremSsem system ItsSremSsemSystem {
+                    
+                    f_IS_TLC_EVGN_BV_02();
+                    
+                } // End of testcase TP_IS_TLC_EVGN_BV_02
+                
+            } // End of group sreEventGeneration
+            
             group sreCommunication {
                 
                 /**
@@ -81,7 +148,7 @@ module ItsSrem_TestCases {
                  * 
                  * @version   1.0.4
                  * @see       ETSI TS 103 191-2 v0.0.1 TP_IS_TLC_COMM_BV_01_01
-                 * @reference ETSI TS 103 301 V1.0.4 Clause 6.4.3.2
+                 * @reference ETSI TS 103 301 V1.0.4 Clause 8.4.3.3
                  */
                 testcase TC_IS_TLC_COMM_BV_01_01 () runs on ItsSremSsem system ItsSremSsemSystem {
                     
@@ -114,7 +181,7 @@ module ItsSrem_TestCases {
                  * 
                  * @version   1.0.4
                  * @see       ETSI TS 103 191-2 v0.0.1 TP_IS_TLC_COMM_BV_01_02
-                 * @reference ETSI TS 103 301 V1.0.4 Clause 6.4.3.2
+                 * @reference ETSI TS 103 301 V1.0.4 Clause 8.4.3.3
                  */
                 testcase TC_IS_TLC_COMM_BV_01_02 () runs on ItsSremSsem system ItsSremSsemSystem {
                     
@@ -129,7 +196,7 @@ module ItsSrem_TestCases {
         group sreMessageProcessing {
             
             /**
-             * @desc Check that the IUT can successfully process all mandatory fields of SSEM received (ITS-S)
+             * @desc Check that the IUT can successfully process all mandatory fields of SSEM received
              * 
              * Pics Selection: not PICS_RSU and PICS_SSEM_RECEPTION
              * Initial conditions: 
@@ -172,7 +239,7 @@ module ItsSrem_TestCases {
                  /**
                  * @desc Check that protocolVersion is set to 1 and messageID is set to 10 (TLC-S)
                  * 
-                 * Pics Selection: PICS_RSU and PICS_SREM_GENERATION
+                 * Pics Selection: PICS_RSU and PICS_SSEM_GENERATION
                  * Initial conditions: 
                  *   with {
                  *        the IUT being in the "initial state"
@@ -183,7 +250,7 @@ module ItsSrem_TestCases {
                  *            the IUT having receive a valid SREM
                  *        }
                  *        then {
-                 *            the IUT sends a valid SREM
+                 *            the IUT sends a valid SSEM
                  *                containing ITS PDU header
                  *                    containing protocolVersion
                  *                        indicating value '1'
@@ -194,10 +261,10 @@ module ItsSrem_TestCases {
                  * 

                  * 
                  * @version   1.0.4
-                 * @see       ETSI TS 103 191-2 v0.0.1 TP_IS_RLT_MSGF_BV_04
-                 * @reference ETSI TS 103 301 V1.0.4 Clause 6.3
+                 * @see       ETSI TS 103 191-2 v0.0.1 TP_IS_TLC_MSGF_BV_04
+                 * @reference ETSI TS 103 301 V1.0.4 Clause 8.3
                  */
-                testcase TP_IS_TLC_MSGF_BV_04 () runs on ItsSremSsem system ItsSremSsemSystem {
+                testcase TC_IS_TLC_MSGF_BV_04 () runs on ItsSremSsem system ItsSremSsemSystem {
                     
                     f_IS_TLC_MSGF_BV_04();
                     
@@ -234,10 +301,10 @@ module ItsSrem_TestCases {
                  * 

                  * 
                  * @version   1.0.4
-                 * @see       ETSI TS 103 191-2 v0.0.1 TP_IS_RLT_MSGF_BV_02
+                 * @see       ETSI TS 103 191-2 v0.0.1 TP_IS_TLC_MSGF_BV_02
                  * @reference ETSI TS 103 301 V1.0.4 Clause 6.3
                  */
-                testcase TP_IS_TLC_MSGF_BV_02 () runs on ItsSremSsem system ItsSremSsemSystem {
+                testcase TC_IS_TLC_MSGF_BV_02 () runs on ItsSremSsem system ItsSremSsemSystem {
                     
                     f_IS_TLC_MSGF_BV_02();
                     
diff --git a/ttcn/AtsSremSsem/ItsSrem_TpFunctions.ttcn b/ttcn/AtsSremSsem/ItsSrem_TpFunctions.ttcn
index bdf5971db..6a486cdda 100644
--- a/ttcn/AtsSremSsem/ItsSrem_TpFunctions.ttcn
+++ b/ttcn/AtsSremSsem/ItsSrem_TpFunctions.ttcn
@@ -54,12 +54,13 @@ module ItsSrem_TpFunctions {
                     
                     // Test component configuration
                     f_cfUp();
-                        
+                    
                     // Preamble
+                    f_prInitialState();
                     f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
                         
                     // Test Body
-                    f_utTriggerEvent(m_utTriggerEvent(ssemNewContent));
+                    f_utTriggerEvent(m_utTriggerEvent(sremNewContent));
                     
                     tc_ac.start;
                     alt {
@@ -87,6 +88,127 @@ module ItsSrem_TpFunctions {
                 
             } // End of group sreMessageFormat 
             
+            group sreEventGeneration { 
+                
+                /**
+                 * @desc    TP Function for TC_IS_TLC_EVGN_BV_01
+                 */
+                function f_IS_TLC_EVGN_BV_01 () runs on ItsSremSsem {
+                    
+                    // Local variables
+                    var SremInd v_sremInd;
+                    
+                    // Test control
+                    if (PICS_RSU or not PICS_SREM_GENERATION) {
+                        log("*** " & testcasename() & ": not PICS_RSU  and PICS_SREM_GENERATION required for executing the TC ***");
+                        setverdict(inconc);
+                        stop;
+                    }
+                    
+                    // Test component configuration
+                    f_cfUp();
+                        
+                    // Preamble
+                    f_prInitialState();
+                    f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
+                    
+                    // Test Body
+                    f_utTriggerEvent(m_utTriggerEvent(sremNewContent));
+                    
+                    tc_ac.start;
+                    alt {
+                        [] sremSsemPort.receive(
+                            mw_sremInd(
+                                mw_sremPdu(
+                                    mw_sremWellFormatted
+                        ))) -> value v_sremInd { 
+                            tc_ac.stop;
+                            // Send SSEM
+                            f_sendSseMessage(v_sremInd.msgIn.srm);
+                            log("*** " & testcasename() & ": PASS: Successfully received SREM PDU header. ***");
+                            f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
+                        }
+                        [] tc_ac.timeout {
+                            log("*** " & testcasename() & ": INCONC: Timeout while awaiting the reception of a message. ***");
+                            f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);
+                        }
+                    }
+                    
+                    // Postamble
+                    f_poDefault();
+                    f_cfDown();
+                    
+                } // End of function f_IS_TLC_EVGN_BV_01
+                
+                /**
+                 * @desc    TP Function for TC_IS_TLC_EVGN_BV_02
+                 */
+                function f_IS_TLC_EVGN_BV_02 () runs on ItsSremSsem {
+                    
+                    // Local variables
+                    var template (value) UtSremSsemTriggerList v_utTriggers := {
+                        m_utTriggerEvent(sremNewContent),
+                        m_utTriggerEvent(sremNewContent),
+                        m_utTriggerEvent(sremNewContent)
+                    }
+                    var boolean v_success := true;
+                    var RequestIDList v_requestIDLists;
+                    var SremInds v_sremInds;
+                    var integer i;
+                    
+                    // Test control
+                    if (PICS_RSU or not PICS_SREM_GENERATION) {
+                        log("*** " & testcasename() & ": not PICS_RSU  and PICS_SREM_GENERATION required for executing the TC ***");
+                        setverdict(inconc);
+                        stop;
+                    }
+                    
+                    // Test component configuration
+                    f_cfUp();
+                        
+                    // Preamble
+                    f_prInitialState();
+                    for (i := 0; i < lengthof(v_utTriggers) - 1; i := i + 1) {
+                        f_utTriggerEvent(v_utTriggers[i]);
+                        f_awaitSreMessage(mw_sremInd(mw_sremPdu(mw_sremWellFormatted)), v_sremInds[i]);
+                        v_requestIDLists[i] := v_sremInds[i].msgIn.srm.requests[0].request.requestID;
+                    }
+                    f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
+                    
+                    // Test Body
+                    f_utTriggerEvent(m_utTriggerEvent(sremNewContent));
+                    
+                    f_utTriggerEvent(v_utTriggers[lengthof(v_utTriggers) - 1]);
+                    f_awaitSreMessage(mw_sremInd(mw_sremPdu(mw_sremWellFormatted)), v_sremInds[i]);
+                    v_requestIDLists[lengthof(v_requestIDLists) - 1] := v_sremInds[i].msgIn.srm.requests[0].request.requestID;
+                    
+                    //check the action id
+                    for (i := 0; i < lengthof(v_requestIDLists) - 1; i := i + 1) {
+                        if (v_requestIDLists[lengthof(v_requestIDLists) - 1] == v_requestIDLists[i]) {
+                            v_success := false;
+                        }
+                    }
+                    if (v_success==true) {
+                        log("*** " & testcasename() & ": PASS: RequestID field indicating unused value. ***");
+                        f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
+                    }
+                    else {
+                        log("*** " & testcasename() & ": FAIL: RequestID field indicating used value. ***");
+                        f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
+                    }
+                    
+                    // Postamble
+                    for (i := 0; i < lengthof(v_sremInds); i := i + 1) {
+                        // Send SSEM
+                        f_sendSseMessage(v_sremInds[i].msgIn.srm);
+                    }
+                    f_poDefault();
+                    f_cfDown();
+                    
+                } // End of function f_IS_TLC_EVGN_BV_02
+                
+            } // End of group sreEventGeneration 
+            
             group sreCommunication {
                 
                 /**
@@ -102,10 +224,11 @@ module ItsSrem_TpFunctions {
                     f_cfUp();
                     
                     // Preamble
+                    f_prInitialState();
                     f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
                     
                     // Test Body
-                    f_utTriggerEvent(m_utTriggerEvent(ssemNewContent));
+                    f_utTriggerEvent(m_utTriggerEvent(sremNewContent));
                     
                     tc_ac.start;
                     alt {
@@ -161,10 +284,11 @@ module ItsSrem_TpFunctions {
                     f_cfUp();
                     
                     // Preamble
+                    f_prInitialState();
                     f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
                     
                     // Test Body
-                    f_utTriggerEvent(m_utTriggerEvent(ssemNewContent));
+                    f_utTriggerEvent(m_utTriggerEvent(sremNewContent));
                     
                     tc_ac.start;
                     alt {
@@ -219,10 +343,11 @@ module ItsSrem_TpFunctions {
                     f_cfUp();
                         
                     // Preamble
+                    f_prInitialState();
                     f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
                         
                     // Test Body
-                    f_utTriggerEvent(m_utTriggerEvent(ssemNewContent));
+                    f_utTriggerEvent(m_utTriggerEvent(sremNewContent));
                     
                     tc_ac.start;
                     alt {
@@ -302,6 +427,7 @@ module ItsSrem_TpFunctions {
                 f_cfUp();
                     
                 // Preamble
+                    f_prInitialState();
                 f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
                     
                 // Test Body
@@ -309,7 +435,7 @@ module ItsSrem_TpFunctions {
                 sremSsemPort.send(v_ssemReq) ;
                     
                 f_sleep(PX_TAC);
-                for (i := 0; i < lengthof(vc_utSremEvents) and not match (v_ssemReq.msgOut , vc_utSsemEvents[i].sreMsg); i := i + 1) {
+                for (i := 0; i < lengthof(vc_utSsemEvents) and not match (v_ssemReq.msgOut , vc_utSsemEvents[i].sseMsg); i := i + 1) {
                     // empty on purpose 
                 }
                 if (i < lengthof(vc_utSsemEvents) ) {
@@ -354,14 +480,15 @@ module ItsSrem_TpFunctions {
                     f_cfUp();
                         
                     // Preamble
+                    f_prInitialState();
                     f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
                         
                     // Test Body
                     // Send SSEM
                     sremSsemPort.send(
                         m_sremReq(
-                            m_ssemPdu(
-                                m_ssemPdu
+                            m_sremPdu(
+                                m_defaultSrem
                     )));
                     
                     tc_ac.start;
@@ -402,7 +529,7 @@ module ItsSrem_TpFunctions {
             function f_IS_TLC_MSGF_BV_02 () runs on ItsSremSsem {
                 
                 // Local variables
-                var SsemReq   v_sremReq;
+                var SremReq   v_sremReq;
                 var integer   i;
                     
                 if (PICS_RSU or not PICS_SREM_RECEPTION) {
@@ -415,10 +542,11 @@ module ItsSrem_TpFunctions {
                 f_cfUp();
                     
                 // Preamble
+                    f_prInitialState();
                 f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
                     
                 // Test Body
-                v_sremReq := valueof(m_ssemReq(m_sremPdu(m_defaultSrem)));
+                v_sremReq := valueof(m_sremReq(m_sremPdu(m_defaultSrem)));
                 sremSsemPort.send(v_sremReq) ;
                     
                 f_sleep(PX_TAC);
-- 
GitLab