diff --git a/ttcn/AtsDENM/ItsDenm_TestCases.ttcn b/ttcn/AtsDENM/ItsDenm_TestCases.ttcn index 00f50f2a270485b3f8149337fbaee9f31c682290..b44b120ab314ce9a677a65870498c4da762319fc 100644 --- a/ttcn/AtsDENM/ItsDenm_TestCases.ttcn +++ b/ttcn/AtsDENM/ItsDenm_TestCases.ttcn @@ -26,7 +26,7 @@ module ItsDenm_TestCases { /** * @desc Check that protocolVersion is set to 1 and messageID is set to 1 *
- * PICS Selection: none + * PICS Selection: PICS_DENM_GENERATION * Initial conditions: * with { * the IUT being in the "initial state" @@ -59,7 +59,7 @@ module ItsDenm_TestCases { /** * @desc Check that sent DENM contains at least one 'trace' DE *- * PICS Selection: none + * PICS Selection: PICS_DENM_GENERATION * Initial conditions: * with { * the IUT being in the "initial state" @@ -94,7 +94,7 @@ module ItsDenm_TestCases { /** * @desc Check that DEN Basic Service generates a new DENM on reception of a valid AppDENM_Trigger request *- * PICS Selection: none + * PICS Selection: PICS_DENM_GENERATION * Initial conditions: * with { * the IUT being in the "initial state" @@ -122,7 +122,7 @@ module ItsDenm_TestCases { /** * @desc Check that a new ActionID value is assigned for each newly generated DENM *- * PICS Selection: none + * PICS Selection: PICS_DENM_GENERATION * Initial conditions: * with { * the IUT being in the "initial state" @@ -154,7 +154,7 @@ module ItsDenm_TestCases { /** * @desc Check that a newly created ActionID contains the StationID of the originating ITS-S that detected the event *- * PICS Selection: none + * PICS Selection: PICS_DENM_GENERATION * Initial conditions: * with { * the IUT being in the "initial state" @@ -186,7 +186,7 @@ module ItsDenm_TestCases { /** * @desc Check that Cause and subcause values included in DENM as provided by application *- * PICS Selection: none + * PICS Selection: PICS_DENM_GENERATION * Initial conditions: * with { * the IUT being in the "initial state" @@ -226,7 +226,7 @@ module ItsDenm_TestCases { /** * @desc Check that referenceTime is set to the current time when generating a DENM for a new event *- * PICS Selection: none + * PICS Selection: PICS_DENM_GENERATION * Initial conditions: * with { * the IUT being in the "initial state" @@ -258,7 +258,7 @@ module ItsDenm_TestCases { /** * @desc Check that sequenceNumber is set to a next unused value each time an event is detected *- * PICS Selection: none + * PICS Selection: PICS_DENM_GENERATION * Initial conditions: * with { * the IUT being in the "initial state" @@ -297,7 +297,7 @@ module ItsDenm_TestCases { /** * @desc Check that actionID are generated using newly assigned stationID when a pseudonym change occurs *- * PICS Selection: none + * PICS Selection: PICS_DENM_GENERATION * Initial conditions: * with { * the IUT being in the "initial state" @@ -340,7 +340,7 @@ module ItsDenm_TestCases { /** * @desc Check that DEN Basic Service generates an update DENM on reception of a valid AppDENM_update request *- * PICS Selection: none + * PICS Selection: PICS_DENM_UPDATE * Initial conditions: * with { * the IUT being in the "initial state" @@ -369,7 +369,7 @@ module ItsDenm_TestCases { /** * @desc Check that the actionID is not changed by DENM update, as long as the stationID of the originating ITS-S remains unchanged *- * PICS Selection: none + * PICS Selection: PICS_DENM_UPDATE * Initial conditions: * with { * the IUT being in the "initial state" @@ -405,7 +405,7 @@ module ItsDenm_TestCases { /** * @desc Check that referenceTime is set to the current time when generating a DENM for an updated eventCheck *- * PICS Selection: none + * PICS Selection: PICS_DENM_UPDATE * Initial conditions: * with { * the IUT being in the "initial state" @@ -444,7 +444,7 @@ module ItsDenm_TestCases { /** * @desc Check that DEN Basic Service does not send any update DENM if actionID is not in originating ITS-S message table *- * PICS Selection: none + * PICS Selection: PICS_DENM_UPDATE * Initial conditions: * with { * the IUT being in the "initial state" @@ -484,7 +484,7 @@ module ItsDenm_TestCases { * @desc Check that DEN Basic Service generates a cancellation DENM when application indicates the * premature termination of an event for which it is the originator *- * PICS Selection: none + * PICS Selection: PICS_DENM_CANCELLATION * Initial conditions: * with { * the IUT being in the "initial state" @@ -524,7 +524,7 @@ module ItsDenm_TestCases { * @desc Check that DEN Basic Service generates a negation DENM when application indicates the * premature termination of an event for which it is not the originator *- * PICS Selection: none + * PICS Selection: PICS_DENM_NEGATION * Initial conditions: * with { * the IUT being in the "initial state" @@ -563,7 +563,7 @@ module ItsDenm_TestCases { /** * @desc Check that referenceTime is set to the latest value received for this event in negation DENM *- * PICS Selection: none + * PICS Selection: PICS_DENM_NEGATION * Initial conditions: * with { * the IUT being in the "initial state" @@ -611,7 +611,7 @@ module ItsDenm_TestCases { /** * @desc Check that situation container, location container and alacarte container are not present in a cancellation DENM *- * PICS Selection: none + * PICS Selection: PICS_DENM_CANCELLATION * Initial conditions: * with { * the IUT being in the "initial state" @@ -651,7 +651,7 @@ module ItsDenm_TestCases { /** * @desc Check that situation container, location container and alacarte container are not present in a negation DENM *- * PICS Selection: none + * PICS Selection: PICS_DENM_NEGATION * Initial conditions: * with { * the IUT being in the "initial state" @@ -694,7 +694,7 @@ module ItsDenm_TestCases { * @desc Check that DEN Basic Service does not send any termination DENM if actionID is not in * originating ITS-S message table or receiving ITS-S message table (own stationID) *- * PICS Selection: none + * PICS Selection: PICS_DENM_NEGATION OR PICS_DENM_CANCELLATION * Initial conditions: * with { * the IUT being in the "initial state" @@ -735,7 +735,7 @@ module ItsDenm_TestCases { * @desc Check that DEN Basic Service does not send any termination DENM if actionID is not in * originating ITS-S message table or receiving ITS-S message table (other stationID) *- * PICS Selection: none + * PICS Selection: PICS_DENM_CANCELLATION * Initial conditions: * with { * the IUT being in the "initial state" @@ -775,7 +775,7 @@ module ItsDenm_TestCases { /** * @desc Check that referenceTime is set to to the current time when generating a cancellation DENM *- * PICS Selection: none + * PICS Selection: PICS_DENM_CANCELLATION * Initial conditions: * with { * the IUT being in the "initial state" @@ -823,7 +823,7 @@ module ItsDenm_TestCases { /** * @desc Check that DEN Basic Sercive repeats DENM transmission according to repetitionInterval parameter provided by application *- * PICS Selection: none + * PICS Selection: PICS_DENM_REPETITION * Initial conditions: * with { * the IUT being in the "initial state" @@ -866,7 +866,7 @@ module ItsDenm_TestCases { /** * @desc Check that the repeated DENM is always the most up-to-date message *- * PICS Selection: none + * PICS Selection: PICS_DENM_REPETITION * Initial conditions: * with { * the IUT being in the "initial state" @@ -907,7 +907,7 @@ module ItsDenm_TestCases { * @desc Check that DEN Basic Service stops retransmitting DENM after event’s validityDuration * expiration *- * PICS Selection: none + * PICS Selection: PICS_DENM_REPETITION * Initial conditions: * with { * the IUT being in the "initial state" @@ -950,7 +950,7 @@ module ItsDenm_TestCases { * @desc Check that DEN Basic Service stops retransmitting DENM after event’s repetitionDuration * expiration *- * PICS Selection: none + * PICS Selection: PICS_DENM_REPETITION * Initial conditions: * with { * the IUT being in the "initial state" @@ -993,7 +993,7 @@ module ItsDenm_TestCases { * @desc Check that DEN Basic Service does not repeat transmission of DENM if repetitionInterval is * not provided by application *- * PICS Selection: none + * PICS Selection: PICS_DENM_REPETITION * Initial conditions: * with { * the IUT being in the "initial state" @@ -1028,7 +1028,7 @@ module ItsDenm_TestCases { * @desc Check that DEN Basic Service does not repeat transmission of DENM if repetitionDuration is * not provided by application *- * PICS Selection: none + * PICS Selection: PICS_DENM_REPETITION * Initial conditions: * with { * the IUT being in the "initial state" @@ -1063,7 +1063,7 @@ module ItsDenm_TestCases { * @desc Check that existing actionID in originating ITS-S are updated when stationID is modified * *- * PICS Selection: none + * PICS Selection: PICS_DENM_REPETITION * Initial conditions: * with { * the IUT being in the "initial state" @@ -1111,7 +1111,7 @@ module ItsDenm_TestCases { * @desc Check that actionID is not modified in repetitions of DENM if stationID is not modified * *- * PICS Selection: none + * PICS Selection: PICS_DENM_REPETITION * Initial conditions: * with { * the IUT being in the "initial state" @@ -1157,7 +1157,7 @@ module ItsDenm_TestCases { * @desc Check that actionID is not modified in repetitions of DENM if stationID is not modified * *- * PICS Selection: none + * PICS Selection: PICS_DENM_REPETITION * Initial conditions: * with { * the IUT being in the "initial state" @@ -1207,7 +1207,7 @@ module ItsDenm_TestCases { * when validityDuration was not provided * *- * PICS Selection: none + * PICS Selection: PICS_DENM_REPETITION * Initial conditions: * with { * the IUT being in the "initial state" @@ -1313,7 +1313,7 @@ module ItsDenm_TestCases { * @desc Check that IUT does not send a DENM if it is not permitted by signing certificate * *- * PICS Selection: PICS_DENM_GENERATION AND PICS_SECURITY + * PICS Selection: PICS_DENM_GENERATION AND PICS_IS_IUT_SECURED * Initial conditions: * with { * the IUT being in the "initial state" @@ -1339,17 +1339,17 @@ module ItsDenm_TestCases { * @see ETSI 102 869-2 v1.5.1 TP/DEN/SSP/BV-01 * @reference ETSI EN 302 637-3, clause 8.4.2 */ - testcase TC_DEN_SSP_BV_01() runs on ItsDenm system ItsDenmSystem { + testcase TC_DEN_SSP_BV_01_01() runs on ItsDenm system ItsDenmSystem { - f_DEN_SSP_BV_01(); + f_DEN_SSP_BV_01_01(); - } // end TC_DEN_SSP_BV_01 + } // end TC_DEN_SSP_BV_01_01 /** * @desc Check that IUT does not send a DENM if it is not permitted by signing certificate * *- * PICS Selection: PICS_DENM_GENERATION AND PICS_SECURITY + * PICS Selection: PICS_DENM_GENERATION AND PICS_IS_IUT_SECURED * Initial conditions: * with { * the IUT being in the "initial state" @@ -1375,11 +1375,11 @@ module ItsDenm_TestCases { * @see ETSI 102 869-2 v1.5.1 TP/DEN/SSP/BV-01 * @reference ETSI EN 302 637-3, clause 8.4.2 */ - testcase TC_DEN_SSP_BV_02() runs on ItsDenm system ItsDenmSystem { + testcase TC_DEN_SSP_BV_01_02() runs on ItsDenm system ItsDenmSystem { - f_DEN_SSP_BV_02(); + f_DEN_SSP_BV_01_02(); - } // end TC_DEN_SSP_BV_02 + } // end TC_DEN_SSP_BV_01_02 } } // end denMessageTransmission @@ -1390,7 +1390,7 @@ module ItsDenm_TestCases { * @desc Check that receiving ITS-S transmits DENM to application if it concerns an unknown ActionID and if it is not a termination DENM * *- * PICS Selection: none + * PICS Selection: PICS_DENM_RECEPTION * Initial conditions: * with { * the IUT being in the "initial state" @@ -1426,7 +1426,7 @@ module ItsDenm_TestCases { * @desc Check that receiving ITS-S transmits DENM to application if it concerns a known ActionID * and referenceTime is greater than highest value received for this ActionID *- * PICS Selection: none + * PICS Selection: PICS_DENM_RECEPTION * Initial conditions: * with { * the IUT being in the "initial state" @@ -1466,7 +1466,7 @@ module ItsDenm_TestCases { /** * @desc Check that receiving ITS-S discards termination DENM if it concerns an unknown ActionID (own actionID) *- * PICS Selection: none + * PICS Selection: PICS_DENM_RECEPTION * Initial conditions: * with { * the IUT being in the "initial state" @@ -1501,7 +1501,7 @@ module ItsDenm_TestCases { /** * @desc Check that receiving ITS-S discards termination DENM if it concerns an unknown ActionID (other actionID) *- * PICS Selection: none + * PICS Selection: PICS_DENM_RECEPTION * Initial conditions: * with { * and the IUT having received several events @@ -1535,7 +1535,7 @@ module ItsDenm_TestCases { /** * @desc Check that receiving ITS-S discards DENM if referenceTime is lower than highest value received for this ActionID *- * PICS Selection: none + * PICS Selection: PICS_DENM_RECEPTION * Initial conditions: * with { * the IUT being in the "initial state" @@ -1576,7 +1576,7 @@ module ItsDenm_TestCases { * @desc Check that receiving ITS-S discards DENM if detectionTime is smaller than highest value received for this ActionID * *- * PICS Selection: none + * PICS Selection: PICS_DENM_RECEPTION * Initial conditions: * with { * the IUT being in the "initial state" @@ -1621,7 +1621,7 @@ module ItsDenm_TestCases { * @desc Check that receiving ITS-S transmits DENM to application if it concerns a known ActionID and referenceTime * is equal to highest received value and detectionTime is more recent *- * PICS Selection: none + * PICS Selection: PICS_DENM_RECEPTION * Initial conditions: * with { * the IUT being in the "initial state" @@ -1668,7 +1668,7 @@ module ItsDenm_TestCases { * if SSP value of the signing certificate is not consistent with the causeCode * *- * PICS Selection: none + * PICS Selection: PICS_DENM_RECEPTION AND PICS_IS_IUT_SECURED * Initial conditions: * with { * the IUT being in the "initial state" @@ -1708,7 +1708,7 @@ module ItsDenm_TestCases { * if SSP value of the signing certificate is not consistent with the causeCode * *- * PICS Selection: none + * PICS Selection: PICS_DENM_RECEPTION AND PICS_IS_IUT_SECURED * Initial conditions: * with { * the IUT being in the "initial state" @@ -1747,7 +1747,7 @@ module ItsDenm_TestCases { * if SSP value of the signing certificate is not consistent with the causeCode * *- * PICS Selection: none + * PICS Selection: PICS_DENM_RECEPTION AND PICS_IS_IUT_SECURED * Initial conditions: * with { * the IUT being in the "initial state" @@ -1803,7 +1803,7 @@ module ItsDenm_TestCases { * if SSP value of the signing certificate is not consistent with the causeCode * *- * PICS Selection: none + * PICS Selection: PICS_DENM_RECEPTION AND PICS_IS_IUT_SECURED * Initial conditions: * with { * the IUT being in the "initial state" @@ -1861,7 +1861,7 @@ module ItsDenm_TestCases { * @desc Check that receiving ITS-S replies to requestResponseIndication * *- * PICS Selection: none + * PICS Selection: PICS_DENM_RECEPTION * Initial conditions: * with { * the IUT being in the "initial state" @@ -1909,7 +1909,7 @@ module ItsDenm_TestCases { /** * @desc Check that forwarding ITS-S forwards DENM if no DENM with same ActionId has been received during forwarding delay *- * PICS Selection: PICS_KAF + * PICS Selection: PICS_DENM_KAF * Initial conditions: * with { * the IUT being in the "initial state" @@ -1949,7 +1949,7 @@ module ItsDenm_TestCases { * @desc Check that forwarding ITS-S forwards DENM if no DENM with same ActionId and referenceTime greater * or equal to the last received DENM has been received during forwarding delay *- * PICS Selection: PICS_KAF + * PICS Selection: PICS_DENM_KAF * Initial conditions: * with { * the IUT being in the "initial state" @@ -1997,7 +1997,7 @@ module ItsDenm_TestCases { /** * @desc Check that forwarding delay is set to min(2*transmissionInterval + rnd(0, 150ms), validityDuration) *- * PICS Selection: PICS_KAF + * PICS Selection: PICS_DENM_KAF * Initial conditions: * with { * the IUT being in the "initial state" @@ -2033,7 +2033,7 @@ module ItsDenm_TestCases { /** * @desc Check that Forwarding ITS-S replaces the ITS PDU header of forwarded DENMs *- * PICS Selection: PICS_KAF + * PICS Selection: PICS_DENM_KAF * Initial conditions: * with { * the IUT being in the "initial state" @@ -2075,7 +2075,7 @@ module ItsDenm_TestCases { /** * @desc Check that forwarding ITS-S does not change actionID *- * PICS Selection: PICS_KAF + * PICS Selection: PICS_DENM_KAF * Initial conditions: * with { * the IUT being in the "initial state" @@ -2116,7 +2116,7 @@ module ItsDenm_TestCases { /** * @desc Check that forwarding ITS-S does not change referenceTime *- * PICS Selection: PICS_KAF + * PICS Selection: PICS_DENM_KAF * Initial conditions: * with { * the IUT being in the "initial state" @@ -2160,7 +2160,7 @@ module ItsDenm_TestCases { /** * @desc Check that forwarding ITS-S does not change termination *- * PICS Selection: PICS_KAF + * PICS Selection: PICS_DENM_KAF * Initial conditions: * with { * the IUT being in the "initial state" @@ -2205,7 +2205,7 @@ module ItsDenm_TestCases { * @desc Check that Forwarding ITS-S does not modify management, situation, location and alacarte containers * when forwarding a DENM *- * PICS Selection: PICS_KAF + * PICS Selection: PICS_DENM_KAF * Initial conditions: * with { * the IUT being in the "initial state" @@ -2256,7 +2256,7 @@ module ItsDenm_TestCases { /** * @desc Check that forwarding ITS-S stops forwarding DENM after validity expiration *- * PICS Selection: PICS_KAF + * PICS Selection: PICS_DENM_KAF * Initial conditions: * with { * the IUT being in the "initial state" @@ -2296,7 +2296,7 @@ module ItsDenm_TestCases { /** * @desc Check that forwarding ITS-S stops forwarding DENM if it is outside relevance area *- * PICS Selection: PICS_KAF + * PICS Selection: PICS_DENM_KAF * Initial conditions: * with { * the IUT being in the "initial state" @@ -2334,7 +2334,7 @@ module ItsDenm_TestCases { /** * @desc Check that forwarding ITS-S does not forward DENM is transmissionInterval is not present *- * PICS Selection: PICS_KAF + * PICS Selection: PICS_DENM_KAF * Initial conditions: * with { * the IUT being in the "initial state" diff --git a/ttcn/AtsDENM/ItsDenm_TestControl.ttcn b/ttcn/AtsDENM/ItsDenm_TestControl.ttcn index deab5e264182be016f62470c45a40c414ef87d73..f441c5eb1cd590be53c339642a367a1279cffd8f 100644 --- a/ttcn/AtsDENM/ItsDenm_TestControl.ttcn +++ b/ttcn/AtsDENM/ItsDenm_TestControl.ttcn @@ -73,11 +73,10 @@ module ItsDenm_TestControl { if(PICS_DENM_GENERATION) { execute(TC_DEN_PAR_BV_01()); execute(TC_DEN_PAR_BV_02()); - } - - if(PICS_IS_IUT_SECURED) { - execute(TC_DEN_SSP_BV_01()); - execute(TC_DEN_SSP_BV_02()); + if(PICS_IS_IUT_SECURED) { + execute(TC_DEN_SSP_BV_01_01()); + execute(TC_DEN_SSP_BV_01_02()); + } } if(PICS_DENM_RECEPTION) { diff --git a/ttcn/AtsDENM/ItsDenm_TpFunctions.ttcn b/ttcn/AtsDENM/ItsDenm_TpFunctions.ttcn index c1a546c1638dcb85f51efd4c37605e998609ddb4..95949e37d63c1010dbcfa531b57c20a3f6a7d2bb 100644 --- a/ttcn/AtsDENM/ItsDenm_TpFunctions.ttcn +++ b/ttcn/AtsDENM/ItsDenm_TpFunctions.ttcn @@ -2388,7 +2388,7 @@ module ItsDenm_TpFunctions { } // end TC_DEN_SSP_BV_XX - function f_DEN_SSP_BV_01( ) runs on ItsDenm { + function f_DEN_SSP_BV_01_01( ) runs on ItsDenm { f_DEN_SSP_BV_XX ( PX_CERT_IUT_DENM_01, m_situation(CauseCodeType_trafficCondition_, TrafficConditionSubCauseCode_unavailable_), @@ -2396,7 +2396,7 @@ module ItsDenm_TpFunctions { ); } - function f_DEN_SSP_BV_02( ) runs on ItsDenm { + function f_DEN_SSP_BV_01_02( ) runs on ItsDenm { f_DEN_SSP_BV_XX ( PX_CERT_IUT_DENM_02, m_situation(CauseCodeType_accident_, AccidentSubCauseCode_unavailable_),