Commit 5b8db9db authored by garciay's avatar garciay
Browse files

Remove PICS_RSU

IS PICS reviews
Remove some TODOs
parent 2a71543e
...@@ -431,7 +431,6 @@ module ItsCam_TpFunctions { ...@@ -431,7 +431,6 @@ module ItsCam_TpFunctions {
/** /**
* @desc TP Function for TC_CAM_MSD_INA_BV_01_01 * @desc TP Function for TC_CAM_MSD_INA_BV_01_01
*/ */
// TODO yann/ifsttar: why 3601? 0 and 3600 indicates the north!!!!
function f_CAM_MSD_INA_BV_01_01() runs on ItsCam { function f_CAM_MSD_INA_BV_01_01() runs on ItsCam {
// Local variables // Local variables
...@@ -476,10 +475,10 @@ module ItsCam_TpFunctions { ...@@ -476,10 +475,10 @@ module ItsCam_TpFunctions {
//change again the curvature value and set the expectation to the measured value //change again the curvature value and set the expectation to the measured value
if (v_camInd.msgIn.cam.camParameters.highFrequencyContainer.basicVehicleContainerHighFrequency.curvature.curvatureValue >= 0) { if (v_camInd.msgIn.cam.camParameters.highFrequencyContainer.basicVehicleContainerHighFrequency.curvature.curvatureValue >= 0) {
v_curVal := (v_camInd.msgIn.cam.camParameters.highFrequencyContainer.basicVehicleContainerHighFrequency.curvature.curvatureValue + c_curValOffset) mod 30001; v_curVal := (v_camInd.msgIn.cam.camParameters.highFrequencyContainer.basicVehicleContainerHighFrequency.curvature.curvatureValue + c_curValOffset) mod 30001;
} else { // TODO Add negative value case } else {
v_curVal := v_camInd.msgIn.cam.camParameters.highFrequencyContainer.basicVehicleContainerHighFrequency.curvature.curvatureValue - c_curValOffset; v_curVal := v_camInd.msgIn.cam.camParameters.highFrequencyContainer.basicVehicleContainerHighFrequency.curvature.curvatureValue - c_curValOffset;
if (valueof(v_curVal) < -30000) { if (valueof(v_curVal) < -30000) {
v_curVal := 0; // yann/ifsttar TODO It's not a true negative modulus operation v_curVal := 0;
} }
} }
f_utTriggerEvent(m_changeCurvature(c_curValOffset)); f_utTriggerEvent(m_changeCurvature(c_curValOffset));
......
...@@ -586,7 +586,7 @@ module ItsIvim_TestCases { ...@@ -586,7 +586,7 @@ module ItsIvim_TestCases {
/** /**
* @desc Check that IVIMs are not generated more frequently than T_GenIvimMin * @desc Check that IVIMs are not generated more frequently than T_GenIvimMin
* <pre> * <pre>
* Pics Selection: PICS_IVIM_GENERATION * Pics Selection: PICS_T_GENIVIMMIN and PICS_IVIM_GENERATION
* Initial conditions: * Initial conditions:
* with { * with {
* the IUT being in the "initial state" * the IUT being in the "initial state"
...@@ -615,7 +615,7 @@ module ItsIvim_TestCases { ...@@ -615,7 +615,7 @@ module ItsIvim_TestCases {
/** /**
* @desc Check that IVIMs are not generated less frequently than T_GenIvimMax * @desc Check that IVIMs are not generated less frequently than T_GenIvimMax
* <pre> * <pre>
* Pics Selection: PICS_IVIM_GENERATION * Pics Selection: PICS_T_GENIVIMMAX and PICS_IVIM_GENERATION
* Initial conditions: * Initial conditions:
* with { * with {
* the IUT being in the "initial state" * the IUT being in the "initial state"
......
...@@ -22,15 +22,19 @@ module ItsIvim_TestControl { ...@@ -22,15 +22,19 @@ module ItsIvim_TestControl {
if(PICS_IVIM_GENERATION) { if(PICS_IVIM_GENERATION) {
execute(TC_IS_IVI_MSGF_BV_01()); execute(TC_IS_IVI_MSGF_BV_01());
execute(TC_IS_IVI_EVGN_BV_01()); execute(TC_IS_IVI_EVGN_BV_01());
execute(TC_IS_IVI_EVGN_BV_02()); execute(TC_IS_IVI_EVGN_BV_02());
execute(TC_IS_IVI_EVGN_BV_03()); execute(TC_IS_IVI_EVGN_BV_03());
execute(TC_IS_IVI_EVGN_BV_04()); execute(TC_IS_IVI_EVGN_BV_04());
execute(TC_IS_IVI_EVGN_BV_05()); 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_EVTR_BV_01()); execute(TC_IS_IVI_EVTR_BV_02());
execute(TC_IS_IVI_GFQ_TI_01()); execute(TC_IS_IVI_GFQ_TI_01());
execute(TC_IS_IVI_GFQ_TI_02()); execute(TC_IS_IVI_GFQ_TI_02());
execute(TC_IS_IVI_COMM_BV_01_01()); execute(TC_IS_IVI_COMM_BV_01_01());
execute(TC_IS_IVI_COMM_BV_01_02()); execute(TC_IS_IVI_COMM_BV_01_02());
execute(TC_IS_IVI_COMM_BV_02()); execute(TC_IS_IVI_COMM_BV_02());
......
...@@ -37,6 +37,7 @@ module ItsMapemSpatem_TestControl { ...@@ -37,6 +37,7 @@ module ItsMapemSpatem_TestControl {
if (PICS_SPATEM_GENERATION) { if (PICS_SPATEM_GENERATION) {
execute(TC_IS_TLM_MSGF_BV_01 ()); execute(TC_IS_TLM_MSGF_BV_01 ());
execute(TC_IS_TLM_EVGN_BV_01 ()); execute(TC_IS_TLM_EVGN_BV_01 ());
execute(TC_IS_TLM_EVGN_BV_02 ()); execute(TC_IS_TLM_EVGN_BV_02 ());
execute(TC_IS_TLM_EVGN_BV_03 ()); execute(TC_IS_TLM_EVGN_BV_03 ());
...@@ -46,6 +47,8 @@ module ItsMapemSpatem_TestControl { ...@@ -46,6 +47,8 @@ module ItsMapemSpatem_TestControl {
execute(TC_IS_TLM_COMM_BV_02_01 ()); execute(TC_IS_TLM_COMM_BV_02_01 ());
execute(TC_IS_TLM_COMM_BV_02_02 ()); execute(TC_IS_TLM_COMM_BV_02_02 ());
execute(TC_IS_TLM_COMM_BV_03 ()); execute(TC_IS_TLM_COMM_BV_03 ());
}
if (PICS_SPATEM_RECEPTION) {
execute(TC_IS_TLM_MSGF_BV_02 ()); execute(TC_IS_TLM_MSGF_BV_02 ());
} }
......
This diff is collapsed.
...@@ -47,8 +47,8 @@ module ItsMapem_TpFunctions { ...@@ -47,8 +47,8 @@ module ItsMapem_TpFunctions {
// Local variables // Local variables
// Test control // Test control
if (not PICS_RSU_ROLE or not PICS_MAPEM_GENERATION) { if (not PICS_MAPEM_GENERATION) {
log("*** " & testcasename() & ": PICS_RSU_ROLE and PICS_MAPEM_GENERATION required for executing the TC ***"); log("*** " & testcasename() & ": PICS_MAPEM_GENERATION required for executing the TC ***");
setverdict(inconc); setverdict(inconc);
stop; stop;
} }
...@@ -95,8 +95,8 @@ module ItsMapem_TpFunctions { ...@@ -95,8 +95,8 @@ module ItsMapem_TpFunctions {
// Local variables // Local variables
// Test control // Test control
if (not PICS_RSU_ROLE or not PICS_MAPEM_GENERATION) { if (not PICS_MAPEM_GENERATION) {
log("*** " & testcasename() & ": PICS_RSU_ROLE and PICS_MAPEM_GENERATION required for executing the TC ***"); log("*** " & testcasename() & ": PICS_MAPEM_GENERATION required for executing the TC ***");
setverdict(inconc); setverdict(inconc);
stop; stop;
} }
...@@ -150,8 +150,8 @@ module ItsMapem_TpFunctions { ...@@ -150,8 +150,8 @@ module ItsMapem_TpFunctions {
var MapemInd v_mapem; var MapemInd v_mapem;
// Test control // Test control
if (not PICS_RSU_ROLE or not PICS_MAPEM_GENERATION) { if (not PICS_MAPEM_GENERATION) {
log("*** " & testcasename() & ": PICS_RSU_ROLE and PICS_MAPEM_GENERATION required for executing the TC ***"); log("*** " & testcasename() & ": PICS_MAPEM_GENERATION required for executing the TC ***");
setverdict(inconc); setverdict(inconc);
stop; stop;
} }
...@@ -218,8 +218,8 @@ module ItsMapem_TpFunctions { ...@@ -218,8 +218,8 @@ module ItsMapem_TpFunctions {
var MapemInd v_mapem; var MapemInd v_mapem;
// Test control // Test control
if (not PICS_RSU_ROLE or not PICS_MAPEM_GENERATION) { if (not PICS_MAPEM_GENERATION) {
log("*** " & testcasename() & ": PICS_RSU_ROLE and PICS_MAPEM_GENERATION required for executing the TC ***"); log("*** " & testcasename() & ": PICS_MAPEM_GENERATION required for executing the TC ***");
setverdict(inconc); setverdict(inconc);
stop; stop;
} }
...@@ -295,8 +295,8 @@ module ItsMapem_TpFunctions { ...@@ -295,8 +295,8 @@ module ItsMapem_TpFunctions {
var boolean v_tlmServiceStarted := false; var boolean v_tlmServiceStarted := false;
// Test control // Test control
if (not PICS_RSU_ROLE or not PICS_SPATEM_GENERATION or not PICS_SPATEM_GENERATION) { if (not PICS_SPATEM_GENERATION or not PICS_SPATEM_GENERATION) {
log("*** " & testcasename() & ": PICS_RSU_ROLE and PICS_MAPEM_GENERATION and PICS_SPATEM_GENERATION required for executing the TC ***"); log("*** " & testcasename() & ": PICS_MAPEM_GENERATION and PICS_SPATEM_GENERATION required for executing the TC ***");
setverdict(inconc); setverdict(inconc);
stop; stop;
} }
...@@ -354,8 +354,8 @@ module ItsMapem_TpFunctions { ...@@ -354,8 +354,8 @@ module ItsMapem_TpFunctions {
const UInt8 c_gnNhBtpB := 2; const UInt8 c_gnNhBtpB := 2;
// Test control // Test control
if (not PICS_RSU_ROLE or not PICS_MAPEM_GENERATION) { if (not PICS_MAPEM_GENERATION) {
log("*** " & testcasename() & ": PICS_RSU_ROLE and PICS_MAPEM_GENERATION required for executing the TC ***"); log("*** " & testcasename() & ": PICS_MAPEM_GENERATION required for executing the TC ***");
setverdict(inconc); setverdict(inconc);
stop; stop;
} }
...@@ -412,8 +412,8 @@ module ItsMapem_TpFunctions { ...@@ -412,8 +412,8 @@ module ItsMapem_TpFunctions {
const UInt16 c_gnNhBtpBPort := 2003; const UInt16 c_gnNhBtpBPort := 2003;
// Test control // Test control
if (not PICS_RSU_ROLE or not PICS_MAPEM_GENERATION) { if (not PICS_MAPEM_GENERATION) {
log("*** " & testcasename() & ": PICS_RSU_ROLE and PICS_MAPEM_GENERATION required for executing the TC ***"); log("*** " & testcasename() & ": PICS_MAPEM_GENERATION required for executing the TC ***");
setverdict(inconc); setverdict(inconc);
stop; stop;
} }
...@@ -464,8 +464,8 @@ module ItsMapem_TpFunctions { ...@@ -464,8 +464,8 @@ module ItsMapem_TpFunctions {
const UInt8 c_gnHtGbc := 4; const UInt8 c_gnHtGbc := 4;
// Test control // Test control
if (not PICS_RSU_ROLE or not PICS_MAPEM_GENERATION) { if (not PICS_MAPEM_GENERATION) {
log("*** " & testcasename() & ": PICS_RSU_ROLE and PICS_MAPEM_GENERATION required for executing the TC ***"); log("*** " & testcasename() & ": PICS_MAPEM_GENERATION required for executing the TC ***");
setverdict(inconc); setverdict(inconc);
stop; stop;
} }
...@@ -540,8 +540,8 @@ module ItsMapem_TpFunctions { ...@@ -540,8 +540,8 @@ module ItsMapem_TpFunctions {
var MapemReq v_mapemReq; var MapemReq v_mapemReq;
var integer i; var integer i;
if (PICS_RSU_ROLE or not PICS_MAPEM_RECEPTION) { if (not PICS_MAPEM_RECEPTION) {
log("*** " & testcasename() & ": not PICS_RSU_ROLE and PICS_MAPEM_RECEPTION required for executing the TC ***"); log("*** " & testcasename() & ": PICS_MAPEM_RECEPTION required for executing the TC ***");
setverdict(inconc); setverdict(inconc);
stop; stop;
} }
......
...@@ -25,7 +25,7 @@ module ItsSpatem_TestCases { ...@@ -25,7 +25,7 @@ module ItsSpatem_TestCases {
/** /**
* @desc Check that protocolVersion is set to 1 and messageID is set to 4 * @desc Check that protocolVersion is set to 1 and messageID is set to 4
* <pre> * <pre>
* Pics Selection: PICS_RSU_ROLE and PICS_SPATEM_GENERATION * Pics Selection: PICS_SPATEM_GENERATION
* Initial conditions: * Initial conditions:
* with { * with {
* the IUT being in the "initial state" * the IUT being in the "initial state"
...@@ -64,7 +64,7 @@ module ItsSpatem_TestCases { ...@@ -64,7 +64,7 @@ module ItsSpatem_TestCases {
/** /**
* @desc Check that TLM Service generates a new SPATEM on reception of a valid AppSPATEM _Start request * @desc Check that TLM Service generates a new SPATEM on reception of a valid AppSPATEM _Start request
* <pre> * <pre>
* Pics Selection: PICS_RSU_ROLE and PICS_SPATEM_GENERATION * Pics Selection: PICS_SPATEM_GENERATION
* Initial conditions: * Initial conditions:
* with { * with {
* the IUT being in the "initial state" * the IUT being in the "initial state"
...@@ -94,7 +94,7 @@ module ItsSpatem_TestCases { ...@@ -94,7 +94,7 @@ module ItsSpatem_TestCases {
/** /**
* @desc Check that TLM Service generates SPATEM are time ordered * @desc Check that TLM Service generates SPATEM are time ordered
* <pre> * <pre>
* Pics Selection: PICS_RSU_ROLE and PICS_SPATEM_GENERATION * Pics Selection: PICS_SPATEM_GENERATION
* Initial conditions: * Initial conditions:
* with { * with {
* the IUT being in the "initial state" * the IUT being in the "initial state"
...@@ -124,7 +124,7 @@ module ItsSpatem_TestCases { ...@@ -124,7 +124,7 @@ module ItsSpatem_TestCases {
/** /**
* @desc Check that TLM Service terminates on reception of a valid AppSPATEM _Stop request * @desc Check that TLM Service terminates on reception of a valid AppSPATEM _Stop request
* <pre> * <pre>
* Pics Selection: PICS_RSU_ROLE and PICS_SPATEM_GENERATION * Pics Selection: PICS_SPATEM_GENERATION
* Initial conditions: * Initial conditions:
* with { * with {
* the IUT being in the "initial state" * the IUT being in the "initial state"
...@@ -145,7 +145,7 @@ module ItsSpatem_TestCases { ...@@ -145,7 +145,7 @@ module ItsSpatem_TestCases {
* @see ETSI TS 103 191-2 v1.2.1 TP_IS_TLM_EVGN_BV_03 * @see ETSI TS 103 191-2 v1.2.1 TP_IS_TLM_EVGN_BV_03
* @reference ETSI TS 103 301 v1.0.4 Clause 5.4.2 * @reference ETSI TS 103 301 v1.0.4 Clause 5.4.2
*/ */
testcase TC_IS_TLM_EVGN_BV_03() runs on ItsMapemSpatem system ItsMapemSpatemSystem { // TODO Move ito spateEventTermination goup testcase TC_IS_TLM_EVGN_BV_03() runs on ItsMapemSpatem system ItsMapemSpatemSystem {
f_IS_TLM_EVGN_BV_03(); f_IS_TLM_EVGN_BV_03();
...@@ -154,7 +154,7 @@ module ItsSpatem_TestCases { ...@@ -154,7 +154,7 @@ module ItsSpatem_TestCases {
/** /**
* @desc Check that TLM Service generates a new SPATEM on reception of a valid AppSPATEM_Trigger request * @desc Check that TLM Service generates a new SPATEM on reception of a valid AppSPATEM_Trigger request
* <pre> * <pre>
* Pics Selection: PICS_RSU_ROLE and PICS_SPATEM_GENERATION * Pics Selection: PICS_SPATEM_GENERATION
* Initial conditions: * Initial conditions:
* with { * with {
* the IUT being in the "initial state" * the IUT being in the "initial state"
...@@ -188,7 +188,7 @@ module ItsSpatem_TestCases { ...@@ -188,7 +188,7 @@ module ItsSpatem_TestCases {
/** /**
* @desc Check that TLM Service provides the destination area in SPATEM * @desc Check that TLM Service provides the destination area in SPATEM
* <pre> * <pre>
* Pics Selection: PICS_RSU_ROLE and PICS_SPATEM_GENERATION * Pics Selection: PICS_SPATEM_GENERATION
* Initial conditions: * Initial conditions:
* with { * with {
* the IUT being in the "initial state" * the IUT being in the "initial state"
...@@ -223,7 +223,7 @@ module ItsSpatem_TestCases { ...@@ -223,7 +223,7 @@ module ItsSpatem_TestCases {
/** /**
* @desc Check that SPATEM uses BTP_B packet * @desc Check that SPATEM uses BTP_B packet
* <pre> * <pre>
* Pics Selection: PICS_RSU_ROLE and PICS_SPATEM_GENERATION * Pics Selection: PICS_SPATEM_GENERATION
* Initial conditions: * Initial conditions:
* with { * with {
* the IUT being in the "initial state" * the IUT being in the "initial state"
...@@ -254,7 +254,7 @@ module ItsSpatem_TestCases { ...@@ -254,7 +254,7 @@ module ItsSpatem_TestCases {
/** /**
* @desc Check that the destination port for SPATEM is set to 2004 * @desc Check that the destination port for SPATEM is set to 2004
* <pre> * <pre>
* Pics Selection: PICS_RSU_ROLE and PICS_SPATEM_GENERATION * Pics Selection: PICS_SPATEM_GENERATION
* Initial conditions: * Initial conditions:
* with { * with {
* the IUT being in the "initial state" * the IUT being in the "initial state"
...@@ -287,7 +287,7 @@ module ItsSpatem_TestCases { ...@@ -287,7 +287,7 @@ module ItsSpatem_TestCases {
/** /**
* @desc Check that TLM service encapsulates SPATEM in a GBC with the HeaderType field set to the value of 4 * @desc Check that TLM service encapsulates SPATEM in a GBC with the HeaderType field set to the value of 4
* <pre> * <pre>
* Pics Selection: PICS_RSU_ROLE and PICS_SPATEM_GENERATION * Pics Selection: PICS_SPATEM_GENERATION
* Initial conditions: * Initial conditions:
* with { * with {
* the IUT being in the "initial state" * the IUT being in the "initial state"
...@@ -327,7 +327,7 @@ module ItsSpatem_TestCases { ...@@ -327,7 +327,7 @@ module ItsSpatem_TestCases {
/** /**
* @desc Check that the IUT can successfully process all mandatory fields of SPATEM received * @desc Check that the IUT can successfully process all mandatory fields of SPATEM received
* <pre> * <pre>
* Pics Selection: not PICS_RSU_ROLE and PICS_SPATEM_RECEPTION * Pics Selection: PICS_SPATEM_RECEPTION
* Initial conditions: * Initial conditions:
* with { * with {
* the IUT being in the "initial state" * the IUT being in the "initial state"
......
...@@ -47,8 +47,8 @@ module ItsSpatem_TpFunctions { ...@@ -47,8 +47,8 @@ module ItsSpatem_TpFunctions {
// Local variables // Local variables
// Test control // Test control
if (not PICS_RSU_ROLE or not PICS_SPATEM_GENERATION) { if (not PICS_SPATEM_GENERATION) {
log("*** " & testcasename() & ": PICS_RSU_ROLE and PICS_SPATEM_GENERATION required for executing the TC ***"); log("*** " & testcasename() & ": PICS_SPATEM_GENERATION required for executing the TC ***");
setverdict(inconc); setverdict(inconc);
stop; stop;
} }
...@@ -99,8 +99,8 @@ module ItsSpatem_TpFunctions { ...@@ -99,8 +99,8 @@ module ItsSpatem_TpFunctions {
// Local variables // Local variables
// Test control // Test control
if (not PICS_RSU_ROLE or not PICS_SPATEM_GENERATION) { if (not PICS_SPATEM_GENERATION) {
log("*** " & testcasename() & ": PICS_RSU_ROLE and PICS_SPATEM_GENERATION required for executing the TC ***"); log("*** " & testcasename() & ": PICS_SPATEM_GENERATION required for executing the TC ***");
setverdict(inconc); setverdict(inconc);
stop; stop;
} }
...@@ -156,8 +156,8 @@ module ItsSpatem_TpFunctions { ...@@ -156,8 +156,8 @@ module ItsSpatem_TpFunctions {
var SpatemInd v_spatem; var SpatemInd v_spatem;
// Test control // Test control
if (not PICS_RSU_ROLE or not PICS_SPATEM_GENERATION) { if (not PICS_SPATEM_GENERATION) {
log("*** " & testcasename() & ": PICS_RSU_ROLE and PICS_SPATEM_GENERATION required for executing the TC ***"); log("*** " & testcasename() & ": PICS_SPATEM_GENERATION required for executing the TC ***");
setverdict(inconc); setverdict(inconc);
stop; stop;
} }
...@@ -220,13 +220,13 @@ module ItsSpatem_TpFunctions { ...@@ -220,13 +220,13 @@ module ItsSpatem_TpFunctions {
/** /**
* @desc TP Function for f_IS_TLM_EVGN_BV_03 * @desc TP Function for f_IS_TLM_EVGN_BV_03
*/ */
function f_IS_TLM_EVGN_BV_03() runs on ItsMapemSpatem { // TODO Move ito spateEventTermination goup function f_IS_TLM_EVGN_BV_03() runs on ItsMapemSpatem {
// Local variables // Local variables
// Test control // Test control
if (not PICS_RSU_ROLE or not PICS_SPATEM_GENERATION) { if (not PICS_SPATEM_GENERATION) {
log("*** " & testcasename() & ": PICS_RSU_ROLE and PICS_SPATEM_GENERATION required for executing the TC ***"); log("*** " & testcasename() & ": PICS_SPATEM_GENERATION required for executing the TC ***");
setverdict(inconc); setverdict(inconc);
stop; stop;
} }
...@@ -274,8 +274,8 @@ module ItsSpatem_TpFunctions { ...@@ -274,8 +274,8 @@ module ItsSpatem_TpFunctions {
var SpatemInd v_spatem; var SpatemInd v_spatem;
// Test control // Test control
if (not PICS_RSU_ROLE or not PICS_SPATEM_GENERATION) { if (not PICS_SPATEM_GENERATION) {
log("*** " & testcasename() & ": PICS_RSU_ROLE and PICS_SPATEM_GENERATION required for executing the TC ***"); log("*** " & testcasename() & ": PICS_SPATEM_GENERATION required for executing the TC ***");
setverdict(inconc); setverdict(inconc);
stop; stop;
} }
...@@ -347,8 +347,8 @@ module ItsSpatem_TpFunctions { ...@@ -347,8 +347,8 @@ module ItsSpatem_TpFunctions {
// Local variables // Local variables
// Test control // Test control
if (not PICS_RSU_ROLE or not PICS_SPATEM_GENERATION) { if (not PICS_SPATEM_GENERATION) {
log("*** " & testcasename() & ": PICS_RSU_ROLE and PICS_SPATEM_GENERATION required for executing the TC ***"); log("*** " & testcasename() & ": PICS_SPATEM_GENERATION required for executing the TC ***");
setverdict(inconc); setverdict(inconc);
stop; stop;
} }
...@@ -395,8 +395,8 @@ module ItsSpatem_TpFunctions { ...@@ -395,8 +395,8 @@ module ItsSpatem_TpFunctions {
const UInt8 c_gnNhBtpB := 2; const UInt8 c_gnNhBtpB := 2;
// Test control // Test control
if (not PICS_RSU_ROLE or not PICS_SPATEM_GENERATION) { if (not PICS_SPATEM_GENERATION) {
log("*** " & testcasename() & ": PICS_RSU_ROLE and PICS_SPATEM_GENERATION required for executing the TC ***"); log("*** " & testcasename() & ": PICS_SPATEM_GENERATION required for executing the TC ***");
setverdict(inconc); setverdict(inconc);
stop; stop;
} }
...@@ -453,8 +453,8 @@ module ItsSpatem_TpFunctions { ...@@ -453,8 +453,8 @@ module ItsSpatem_TpFunctions {
const UInt16 c_gnNhBtpBPort := 2004; const UInt16 c_gnNhBtpBPort := 2004;
// Test control // Test control
if (not PICS_RSU_ROLE or not PICS_SPATEM_GENERATION) { if (not PICS_SPATEM_GENERATION) {
log("*** " & testcasename() & ": PICS_RSU_ROLE and PICS_SPATEM_GENERATION required for executing the TC ***"); log("*** " & testcasename() & ": PICS_SPATEM_GENERATION required for executing the TC ***");
setverdict(inconc); setverdict(inconc);
stop; stop;
} }
...@@ -507,8 +507,8 @@ module ItsSpatem_TpFunctions { ...@@ -507,8 +507,8 @@ module ItsSpatem_TpFunctions {
const UInt8 c_gnHtGbc := 4; const UInt8 c_gnHtGbc := 4;
// Test control // Test control
if (not PICS_RSU_ROLE or not PICS_SPATEM_GENERATION) { if (not PICS_SPATEM_GENERATION) {
log("*** " & testcasename() & ": PICS_RSU_ROLE and PICS_SPATEM_GENERATION required for executing the TC ***"); log("*** " & testcasename() & ": PICS_SPATEM_GENERATION required for executing the TC ***");
setverdict(inconc); setverdict(inconc);
stop; stop;
} }
...@@ -585,8 +585,8 @@ module ItsSpatem_TpFunctions { ...@@ -585,8 +585,8 @@ module ItsSpatem_TpFunctions {
var SpatemReq v_spatemReq; var SpatemReq v_spatemReq;
var integer i; var integer i;
if (PICS_RSU_ROLE and not PICS_SPATEM_RECEPTION) { if (not PICS_SPATEM_RECEPTION) {
log("*** " & testcasename() & ": not PICS_RSU_ROLE and PICS_SPATEM_RECEPTION required for executing the TC ***"); log("*** " & testcasename() & ": PICS_SPATEM_RECEPTION required for executing the TC ***");
setverdict(inconc); setverdict(inconc);
stop; stop;
} }
......
...@@ -27,7 +27,7 @@ module ItsSrem_TestCases { ...@@ -27,7 +27,7 @@ module ItsSrem_TestCases {
/** /**
* @desc Check that protocolVersion is set to 1 and messageID is set to 9 * @desc Check that protocolVersion is set to 1 and messageID is set to 9
* <pre> * <pre>
* Pics Selection: not PICS_RSU and PICS_SREM_GENERATION * Pics Selection: PICS_SREM_GENERATION
* Initial conditions: * Initial conditions:
* with { * with {
* the IUT being in the "initial state" * the IUT being in the "initial state"
...@@ -64,7 +64,7 @@ module ItsSrem_TestCases { ...@@ -64,7 +64,7 @@ module ItsSrem_TestCases {
/** /**
* @desc Check that IVI Service generates a new SREM on reception of a valid AppSREM_Trigger request * @desc Check that IVI Service generates a new SREM on reception of a valid AppSREM_Trigger request
* <pre> * <pre>
* Pics Selection: not PICS_RSU and PICS_SREM_GENERATION * Pics Selection: PICS_SREM_GENERATION
* Initial conditions: * Initial conditions:
* with { * with {
* the IUT being in the "initial state" * the IUT being in the "initial state"
...@@ -92,7 +92,7 @@ module ItsSrem_TestCases { ...@@ -92,7 +92,7 @@ module ItsSrem_TestCases {
/** /**
* @desc Check that the IUT identifies SREM with a unique request identifier * @desc Check that the IUT identifies SREM with a unique request identifier
* <pre> * <pre>
* Pics Selection: not PICS_RSU and PICS_SREM_GENERATION * Pics Selection: PICS_SREM_GENERATION
* Initial conditions: * Initial conditions:
* with { * with {
* the IUT being in the "initial state" * the IUT being in the "initial state"
...@@ -129,7 +129,7 @@ module ItsSrem_TestCases { ...@@ -129,7 +129,7 @@ module ItsSrem_TestCases {
/**