Skip to content
GitLab
Commit f8385566 authored by berge's avatar berge
Browse files

Merged revision(s) 1636-1833 from branches/STF484_VALIDATION

parent b725cbfe
Expand all Hide whitespace changes
Inline Side-by-side
javasrc/codec/org/etsi/ttcn/codec/its/uppertester/UtPduId.java
View file @ f8385566
......@@ -15,6 +15,8 @@ public enum UtPduId {
UtInitializeResult(0x01),
UtChangePosition(0x02),
UtChangePositionResult(0x03),
UtChangePseudonym(0x04),
UtChangePseudonymResult(0x05),
UtResult(0x24), // FIXME: obsolete
/* From LibItsDenm_TypesAndValues */
......@@ -39,8 +41,6 @@ public enum UtPduId {
UtCamTrigger_changeHeading(0x34),
UtCamTrigger_setDriveDirection(0x35),
UtCamTrigger_changeYawRate(0x36),
UtCamTrigger_changePosition(0x37),// FIXME: obsolete
UtCamTrigger_checkLdm(0x38),// FIXME: obsolete
UtCamTrigger_setStationType(0x39),
UtCamTrigger_setVehicleRole(0x3a),
UtCamTrigger_setEmbarkationStatus(0x3b),
......@@ -83,6 +83,10 @@ public enum UtPduId {
UtSec_setCertificate(0x93),
UtSec_setPrivateKey(0x94),
UtSec_setTrustPoint(0x95),
/* From LibItsMapSpat_TypesAndValues */
UtMapSpatTrigger(0xA0),
UtMapSpatTriggerResult(0xA1),
/* Reserved */
reserved(0xFF);
......
ttcn/AtsCAM/ItsCam_TestCases.ttcn
View file @ f8385566
This diff is collapsed.
ttcn/AtsDENM/ItsDenm_TestCases.ttcn
View file @ f8385566
This diff is collapsed.
ttcn/AtsDENM/ItsDenm_TestControl.ttcn
View file @ f8385566
......@@ -21,10 +21,8 @@ module ItsDenm_TestControl {
execute(TC_DEN_EVGN_BV_03());
execute(TC_DEN_EVGN_BV_04());
execute(TC_DEN_EVGN_BV_05());
execute(TC_DEN_EVGN_BV_06());
execute(TC_DEN_EVGN_BV_07());
execute(TC_DEN_EVGN_BV_08());
execute(TC_DEN_EVGN_BV_09());
execute(TC_DEN_EVUP_BV_01());
execute(TC_DEN_EVUP_BV_02());
......
ttcn/AtsGeoNetworking/ItsGeoNetworking_TestControl.ttcn
View file @ f8385566
......@@ -78,6 +78,9 @@ module ItsGeoNetworking_TestControl {
execute(TC_GEONW_PON_LOS_BV_12());
execute(TC_GEONW_PON_LOS_BV_13());
execute(TC_GEONW_PON_LOS_BV_14());
execute(TC_GEONW_PON_LOS_BV_15());
execute(TC_GEONW_PON_LOS_BV_16());
execute(TC_GEONW_PON_LOS_BV_17());
execute(TC_GEONW_PON_FPB_BV_01());
execute(TC_GEONW_PON_FPB_BV_02());
......@@ -105,9 +108,10 @@ module ItsGeoNetworking_TestControl {
execute(TC_GEONW_PON_BEA_BV_01());
execute(TC_GEONW_PON_BEA_BV_02());
execute(TC_GEONW_PON_BEA_BV_03());
execute(TC_GEONW_PON_GUC_BV_01());
if ((PICS_GN_GEOUNICAST_FORWARDING_ALGORITHM == e_greedy) or (PICS_GN_GEOUNICAST_FORWARDING_ALGORITHM == e_unspecified)) {
execute(TC_GEONW_PON_GUC_BV_01());
execute(TC_GEONW_PON_GUC_BV_02());
}
execute(TC_GEONW_PON_GUC_BV_03());
......@@ -118,24 +122,34 @@ module ItsGeoNetworking_TestControl {
execute(TC_GEONW_PON_GUC_BV_07());
execute(TC_GEONW_PON_GUC_BV_08());
execute(TC_GEONW_PON_GUC_BV_10());
execute(TC_GEONW_PON_GUC_BV_11());
}
if ((PICS_GN_GEOUNICAST_FORWARDING_ALGORITHM == e_greedy) or (PICS_GN_GEOUNICAST_FORWARDING_ALGORITHM == e_unspecified)) {
execute(TC_GEONW_PON_GUC_BV_12());
execute(TC_GEONW_PON_GUC_BV_13());
}
execute(TC_GEONW_PON_GBC_BV_01());
execute(TC_GEONW_PON_GBC_BV_02());
if ((PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_simple) or (PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_unspecified) or (PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_advanced)) {
execute(TC_GEONW_PON_GBC_BV_02());
}
if ((PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_simple) or (PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_unspecified)) {
execute(TC_GEONW_PON_GBC_BV_03());
execute(TC_GEONW_PON_GBC_BV_04());
}
execute(TC_GEONW_PON_GBC_BV_05());
execute(TC_GEONW_PON_GBC_BV_06());
if ((PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_simple) or (PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_unspecified)) {
execute(TC_GEONW_PON_GBC_BV_07());
execute(TC_GEONW_PON_GBC_BV_08());
execute(TC_GEONW_PON_GBC_BV_06());
}
execute(TC_GEONW_PON_GBC_BV_07());
execute(TC_GEONW_PON_GBC_BV_08());
execute(TC_GEONW_PON_GBC_BV_09());
execute(TC_GEONW_PON_GBC_BV_10());
execute(TC_GEONW_PON_GBC_BV_11());
if ((PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_simple) or (PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_unspecified)) {
execute(TC_GEONW_PON_GBC_BV_10());
}
execute(TC_GEONW_PON_GBC_BV_11());
if (PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_cbf) {
execute(TC_GEONW_PON_GBC_BV_12());
}
execute(TC_GEONW_PON_GBC_BV_19());
......@@ -154,7 +168,9 @@ module ItsGeoNetworking_TestControl {
execute(TC_GEONW_PON_SHB_BV_02());
execute(TC_GEONW_PON_GAC_BV_01());
execute(TC_GEONW_PON_GAC_BV_02());
if ((PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_simple) or (PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_unspecified)) {
execute(TC_GEONW_PON_GAC_BV_02());
}
execute(TC_GEONW_PON_GAC_BV_03());
execute(TC_GEONW_PON_GAC_BV_04());
execute(TC_GEONW_PON_GAC_BV_05());
......@@ -164,9 +180,11 @@ module ItsGeoNetworking_TestControl {
execute(TC_GEONW_PON_GAC_BV_09());
execute(TC_GEONW_PON_GAC_BV_10());
execute(TC_GEONW_PON_GAC_BV_11());
execute(TC_GEONW_PON_GAC_BV_12());
if (PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_cbf) {
execute(TC_GEONW_PON_GAC_BV_13());
}
if (PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM != e_cbf) {
if (PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_cbf) {
execute(TC_GEONW_PON_BCA_BV_01());
execute(TC_GEONW_PON_BCA_BV_02());
execute(TC_GEONW_PON_BCA_BV_03());
......@@ -176,11 +194,12 @@ module ItsGeoNetworking_TestControl {
execute(TC_GEONW_PON_BCA_BV_07());
}
if (PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM != e_advanced) {
if (PICS_GN_GEOBROADCAST_FORWARDING_ALGORITHM == e_advanced) {
execute(TC_GEONW_PON_BAA_BV_01());
execute(TC_GEONW_PON_BAA_BV_02());
execute(TC_GEONW_PON_BAA_BV_03());
execute(TC_GEONW_PON_BAA_BV_04());
execute(TC_GEONW_PON_BAA_BV_05());
execute(TC_GEONW_PON_BAA_BV_06());
execute(TC_GEONW_PON_BAA_BV_07());
execute(TC_GEONW_PON_BAA_BV_08());
......
ttcn/AtsMapSpat/ItsMapSpat_TestCases.ttcn 0 → 100644
View file @ f8385566
This diff is collapsed.
ttcn/AtsMapSpat/ItsMapSpat_TestControl.ttcn 0 → 100644
View file @ f8385566
/**
* @author ETSI / STF484
* @version $URL$
* $Id$
* @desc Test Control file for MAP SPAT
*
*/
module ItsMapSpat_TestControl {
// ATS MAPSpat
import from ItsMapSpat_TestCases {testcase all};
// LibIts
import from LibItsMapSpat_Pics all;
// Test Execution
control {
if ( PICS_RSU ) {
execute(TC_MAP_SPAT_MSD_BV_01());
execute(TC_MAP_SPAT_MSD_BV_02());
execute(TC_MAP_SPAT_MSD_BV_03());
execute(TC_MAP_SPAT_MSD_BV_04());
execute(TC_MAP_SPAT_MSD_BV_05());
execute(TC_MAP_SPAT_MSD_BV_06());
execute(TC_MAP_SPAT_MSD_BV_07());
execute(TC_MAP_SPAT_MSD_BV_08());
execute(TC_MAP_SPAT_MSD_BV_09());
execute(TC_MAP_SPAT_MSD_BV_10());
execute(TC_MAP_SPAT_MSD_BV_11());
execute(TC_MAP_SPAT_MSD_BV_12());
execute(TC_MAP_SPAT_MSD_BV_13());
execute(TC_MAP_SPAT_MSD_BV_14());
execute(TC_MAP_SPAT_MSD_BV_15());
execute(TC_MAP_SPAT_MSD_BV_16());
}
else {
execute(TC_MAP_SPAT_MSP_BV_01());
execute(TC_MAP_SPAT_MSP_BV_02());
}
}
} // end ItsMapSpat_TestControl
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment