PICS & TSS&TPs review (ac41f624) · Commits · ITS - Intelligent Transport Systems / ITS

ttcn/AtsCAM/ItsCam_TestCases.ttcn

+17 −17

Changes for ttcn/AtsCAM/ItsCam_TestCases.ttcn: 17 added lines, 17 removed lines.
Original line number	Diff line number	Diff line
		@@ -1578,7 +1578,7 @@ module ItsCam_TestCases {
		* @desc Check that publicTransportContainer is included if
		* vehicleRole is set to publicTransport(1).
		* <pre>
		* 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).
		* <pre>
		* 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).
		* <pre>
		* 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).
		* <pre>
		* 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).
		* <pre>
		* 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).
		* <pre>
		* 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).
		* <pre>
		* 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.
		* <pre>
		* 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.
		* <pre>
		* 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.
		* <pre>
		* 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°.
		* <pre>
		* 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.
		* <pre>
		* 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.
		* <pre>
		* 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.
		* <pre>
		* 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
		* <pre>
		* 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
		* <pre>
		* 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
		* <pre>
		* 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"

ttcn/AtsCAM/ItsCam_TestControl.ttcn

+3 −4

Changes for ttcn/AtsCAM/ItsCam_TestControl.ttcn: 3 added lines, 4 removed lines.
Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ 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());
		@@ -98,7 +97,8 @@ module ItsCam_TestControl {
		execute(TC_CAM_MSD_PAR_BV_01());
		execute(TC_CAM_MSD_PAR_BV_02());
		execute(TC_CAM_MSD_PAR_BV_03());
		} else {

		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 {
		if (PICS_IS_IUT_SECURED) {
		execute(TC_CAM_MSP_SSP_BV_02());
		execute(TC_CAM_MSP_SSP_BV_03());
		}

ttcn/AtsCAM/ItsCam_TpFunctions.ttcn

+54 −61

Changes for ttcn/AtsCAM/ItsCam_TpFunctions.ttcn: 54 added lines, 61 removed lines.
Original line number	Diff line number	Diff line
		@@ -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;
		}
		@@ -246,7 +246,7 @@ 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)) {
		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,8 +2199,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;
		}
		@@ -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,8 +2838,8 @@ 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;
		}
		@@ -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;
		}