Renumbering of tests due to some removed tests. (cd2e3970) · Commits · ITS - Intelligent Transport Systems / ITS

ttcn/AtsIVIM/ItsIvim_TestCases.ttcn

+3 −36

Original line number	Diff line number	Diff line
		@@ -943,39 +943,6 @@ module ItsIvim_TestCases {

		} // End of TC_IS_IVI_GEN_GENAPP_BV_04

		/**
		* @desc Check that ISO14823 attributes SET and NOL are not exists in the General Application Container.
		* <pre>
		* Pics Selection: PICS_IVIM_GENERATION AND PICS_IVIM_RSCODE_ISO14823
		* Initial conditions:
		* with {
		* the IUT being in the "initial state"
		* and the IUT sending IVIM
		* }
		* Expected behaviour:
		* ensure that {
		* when {
		* the IUT is requested to generate an IVIM
		* containing General Application Containers
		* }
		* then {
		* the IUT sends a valid IVIM
		* containing ivi
		* containing optional
		* TODO
		* }
		* }
		* </pre>
		*
		* @see ETSI TS 103 191-2 v1.2.5 TP_IS_IVI_GEN_GENAPP_BV_05
		* @reference CEN ISO TS/19321 [5], clause 7.2.8
		*/
		testcase TC_IS_IVI_GEN_GENAPP_BV_05() runs on ItsIvim system ItsIvimSystem {

		f_IS_IVI_GEN_GENAPP_BV_05();

		} // End of TC_IS_IVI_GEN_GENAPP_BV_05

		/**
		* @desc Check that all layoutID of the General Application Containers references existing layouts
		* in the Layout Containers of the same IVIM Structure
		@@ -1010,11 +977,11 @@ module ItsIvim_TestCases {
		* @see ETSI TS 103 191-2 v1.2.5 TP_IS_IVI_GEN_GENAPP_BV_06
		* @reference CEN ISO TS/19321 [5], clause 6.3.4.2
		*/
		testcase TC_IS_IVI_GEN_GENAPP_BV_06() runs on ItsIvim system ItsIvimSystem {
		testcase TC_IS_IVI_GEN_GENAPP_BV_05() runs on ItsIvim system ItsIvimSystem {

		f_IS_IVI_GEN_GENAPP_BV_06();
		f_IS_IVI_GEN_GENAPP_BV_05();

		} // End of TC_IS_IVI_GEN_GENAPP_BV_06
		} // End of TC_IS_IVI_GEN_GENAPP_BV_05

		} // End of group iviGeneralApplicationContainer

ttcn/AtsIVIM/ItsIvim_TestControl.ttcn

+1 −61

Original line number	Diff line number	Diff line
		@@ -17,63 +17,6 @@ module ItsIvim_TestControl {
		// LibIts
		import from LibItsIvim_Pics all;

		//TODO pics group will be removed when it is moved to ITS lib
		group pics {
		/**
		* @desc Support for IVIM fragmentation
		* @see TODO
		*/
		modulepar boolean PICS_IVIM_FRAGMENTATION := false;

		/**
		* @desc Support for IVIM general container
		* @see TODO
		*/
		modulepar boolean PICS_IVIM_HAS_GENERAL_CONTAINER := false;

		/**
		* @desc Support for IVIM has layout container
		* @see TODO
		*/
		modulepar boolean PICS_IVIM_HAS_LAYOUT_CONTAINER := false;

		/**
		* @desc Support for IVIM has road cfg container
		* @see TODO
		*/
		modulepar boolean PICS_IVIM_HAS_ROAD_CFG_CONTAINER := false;

		/**
		* @desc Support for IVIM has text container
		* @see TODO
		*/
		modulepar boolean PICS_IVIM_HAS_TEXT_CONTAINER := false;

		/**
		* @desc Support for IVIM rscode viennaconv
		* @see TODO
		*/
		modulepar boolean PICS_IVIM_RSCODE_VIENNACONV := false;

		/**
		* @desc Support for IVIM rscode ISO14823
		* @see TODO
		*/
		modulepar boolean PICS_IVIM_RSCODE_ISO14823 := false;

		/**
		* @desc Support for IVIM rscode saej2540
		* @see TODO
		*/
		modulepar boolean PICS_IVIM_RSCODE_SAEJ2540 := false;

		/**
		* @desc Support for IVIM rscode anz catalogue
		* @see TODO
		*/
		modulepar boolean PICS_IVIM_RSCODE_ANY_CATALOGUE := false;
		}//end group pics

		// Test Execution
		control {

		@@ -112,11 +55,8 @@ module ItsIvim_TestControl {
		if(PICS_IVIM_GENERATION and PICS_IVIM_HAS_GENERAL_CONTAINER and PICS_IVIM_RSCODE_VIENNACONV and PICS_IVIM_RSCODE_ISO14823 and PICS_IVIM_RSCODE_SAEJ2540 and PICS_IVIM_RSCODE_ANY_CATALOGUE) {
		execute(TC_IS_IVI_GEN_GENAPP_BV_04());
		}
		if(PICS_IVIM_GENERATION and PICS_IVIM_RSCODE_ISO14823) {
		execute(TC_IS_IVI_GEN_GENAPP_BV_05());
		}
		if(PICS_IVIM_GENERATION and PICS_IVIM_HAS_GENERAL_CONTAINER and PICS_IVIM_HAS_LAYOUT_CONTAINER) {
		execute(TC_IS_IVI_GEN_GENAPP_BV_06());
		execute(TC_IS_IVI_GEN_GENAPP_BV_05());
		}
		if(PICS_IVIM_GENERATION and PICS_IVIM_HAS_ROAD_CFG_CONTAINER) {
		execute(TC_IS_IVI_GEN_RCC_BV_01());

ttcn/AtsIVIM/ItsIvim_TpFunctions.ttcn

+2 −8

Original line number	Diff line number	Diff line
		@@ -1615,12 +1615,6 @@ module ItsIvim_TpFunctions {

		function f_IS_IVI_GEN_GENAPP_BV_05() runs on ItsIvim {

		log("Removed from TP document. Maybe renumbering required");

		} // End of function f_IS_IVI_GEN_GENAPP_BV_05

		function f_IS_IVI_GEN_GENAPP_BV_06() runs on ItsIvim {

		// Local variables
		var IviIdentificationNumber v_iviIdentificationNumber;

		@@ -1673,7 +1667,7 @@ module ItsIvim_TpFunctions {
		f_poCancelEvent(e_iut, v_iviIdentificationNumber);
		f_cfDown();

		} // End of function f_IS_IVI_GEN_GENAPP_BV_06
		} // End of function f_IS_IVI_GEN_GENAPP_BV_05

		} // End of group iviGeneralApplicationContainer

ttcn/AtsMapemSpatem/ItsMapemSpatem_TestControl.ttcn

+7 −12

Original line number	Diff line number	Diff line
		@@ -90,29 +90,24 @@ module ItsMapemSpatem_TestControl {
		execute(TC_IS_TLM_GEN_MSGF_BV_07 ());
		}

		if (PICS_SPATEM_SPECIALIZED_MANOEUVRES) {
		execute(TC_IS_TLM_GEN_MSGF_BV_08 ());
		}
		execute(TC_IS_TLM_GEN_MSGF_BV_09 ());
		if (PICS_SPATEM_HAS_TIMING) {
		execute(TC_IS_TLM_GEN_MSGF_BV_10 ());
		execute(TC_IS_TLM_GEN_MSGF_BV_09 ());
		}
		if (PICS_SPATEM_PRIORITIZATION ) {
		execute(TC_IS_TLM_GEN_MSGF_BV_11 ());
		execute(TC_IS_TLM_GEN_MSGF_BV_10 ());
		}
		if (PICS_SPATEM_PEDESTRIAN_MAOEUVRES ) {
		execute(TC_IS_TLM_GEN_MSGF_BV_12 ());
		execute(TC_IS_TLM_GEN_MSGF_BV_13 ());
		execute(TC_IS_TLM_GEN_MSGF_BV_11 ());
		}
		if (PICS_SPATEM_HAS_OPTIMAL_SPEED ) {
		execute(TC_IS_TLM_GEN_MSGF_BV_14 ());
		execute(TC_IS_TLM_GEN_MSGF_BV_12 ());
		}
		if (PICS_SPATEM_HAS_SIGNAL_PROGRESSION_SPEED ) {
		execute(TC_IS_TLM_GEN_MSGF_BV_15 ());
		execute(TC_IS_TLM_GEN_MSGF_BV_13 ());
		}
		if (PICS_SPATEM_HAS_EGRESS_QUEUE ) {
		execute(TC_IS_TLM_GEN_MSGF_BV_16 ());
		execute(TC_IS_TLM_GEN_MSGF_BV_17 ());
		execute(TC_IS_TLM_GEN_MSGF_BV_14 ());
		}
		execute(TC_IS_TLM_GEN_EVGN_BV_01 ());
		execute(TC_IS_TLM_GEN_EVGN_BV_02 ());

ttcn/AtsMapemSpatem/ItsSpatem_TestCases.ttcn

+123 −133

File changed.

Preview size limit exceeded, changes collapsed.