Commit db871991 authored by Yann Garcia's avatar Yann Garcia
Browse files

Merge branch 'TTF0002' of https://forge.etsi.org/gitlab/ITS/ITS into TTF0002

parents c66ee9ec 2691afb7
...@@ -220,7 +220,7 @@ module ItsSpatem_TestCases { ...@@ -220,7 +220,7 @@ module ItsSpatem_TestCases {
* @see ETSI TS 103 191-2 v1.2.5 TP_IS_TLM_GEN_MSGF_BV_05 * @see ETSI TS 103 191-2 v1.2.5 TP_IS_TLM_GEN_MSGF_BV_05
* @reference CEN ISO/TS 19091 [4], clause 6.7.6 * @reference CEN ISO/TS 19091 [4], clause 6.7.6
*/ */
testcase TC_IS_TLM_GEN_MSGF_BV_05 () runs on ItsMapemSpatem system ItsMapemSpatemSystem { testcase TC_IS_TLM_GEN_MSGF_BV_05 () runs on ItsMtc {
f_IS_TLM_GEN_MSGF_BV_05(); f_IS_TLM_GEN_MSGF_BV_05();
...@@ -278,7 +278,7 @@ module ItsSpatem_TestCases { ...@@ -278,7 +278,7 @@ module ItsSpatem_TestCases {
* @see ETSI TS 103 191-2 v1.2.5 TP_IS_TLM_GEN_MSGF_BV_06 * @see ETSI TS 103 191-2 v1.2.5 TP_IS_TLM_GEN_MSGF_BV_06
* @reference CEN ISO/TS 19091 [4], clauses 6.7.8 * @reference CEN ISO/TS 19091 [4], clauses 6.7.8
*/ */
testcase TC_IS_TLM_GEN_MSGF_BV_06 () runs on ItsMapemSpatem system ItsMapemSpatemSystem { testcase TC_IS_TLM_GEN_MSGF_BV_06 () runs on ItsMtc {
f_IS_TLM_GEN_MSGF_BV_06(); f_IS_TLM_GEN_MSGF_BV_06();
...@@ -337,7 +337,7 @@ module ItsSpatem_TestCases { ...@@ -337,7 +337,7 @@ module ItsSpatem_TestCases {
* @see ETSI TS 103 191-2 v1.2.5 TP_IS_TLM_GEN_MSGF_BV_07 * @see ETSI TS 103 191-2 v1.2.5 TP_IS_TLM_GEN_MSGF_BV_07
* @reference CEN ISO/TS 19091 [4], clauses 6.7.9 * @reference CEN ISO/TS 19091 [4], clauses 6.7.9
*/ */
testcase TC_IS_TLM_GEN_MSGF_BV_07 () runs on ItsMapemSpatem system ItsMapemSpatemSystem { testcase TC_IS_TLM_GEN_MSGF_BV_07 () runs on ItsMtc {
f_IS_TLM_GEN_MSGF_BV_07(); f_IS_TLM_GEN_MSGF_BV_07();
......
...@@ -256,9 +256,10 @@ module ItsSpatem_TpFunctions { ...@@ -256,9 +256,10 @@ module ItsSpatem_TpFunctions {
/** /**
* @desc TP Function for TC_IS_TLM_GEN_MSGF_BV_05 * @desc TP Function for TC_IS_TLM_GEN_MSGF_BV_05
*/ */
function f_IS_TLM_GEN_MSGF_BV_05 () runs on ItsMapemSpatem { function f_IS_TLM_GEN_MSGF_BV_05 () runs on ItsMtc {
// Local variables // Local variables
var ItsMapemSpatem v_mapem;
var ItsMapemSpatem v_spatem;
// Test control // Test control
if (not PICS_SPATEM_GENERATION) { if (not PICS_SPATEM_GENERATION) {
...@@ -266,16 +267,74 @@ module ItsSpatem_TpFunctions { ...@@ -266,16 +267,74 @@ module ItsSpatem_TpFunctions {
setverdict(inconc); setverdict(inconc);
stop; stop;
} }
// Test component configuration
f_cfUp();
// Test component configuration
f_cf02Up();
// Preamble
// Start components
v_mapem := f_getComponent(c_compMap);
v_spatem := f_getComponent(c_compSpat);
v_mapem.start(f_IS_TLM_GEN_MSGF_BV_05_MAPEM());
v_spatem.start(f_IS_TLM_GEN_MSGF_BV_05_SPATEM());
// Synchronization
f_serverSync2ClientsAndStop({c_prDone, c_tbDone});
// Cleanup
f_cf02Down();
} // End of function f_IS_TLM_GEN_MSGF_BV_05
/**
* @desc TP Function for TC_IS_TLM_GEN_MSGF_BV_05_SPATEM
*/
function f_IS_TLM_GEN_MSGF_BV_05_MAPEM () runs on ItsMapemSpatem {
// Local variables
var MapemInd v_mapem;
// Preamble // Preamble
f_prInitialState();
f_awaitMapeMessage(
mw_mapemInd(
mw_mapemPdu(
mw_mapem(
{mw_intersectionGeometry(
-,
-,
-,
{mw_roadLane(
-,//laneID
-,//laneAttributes
-,//p_ingressApproach
-,//egressApproach
? //connectsTo
)}
)}
)
)),
v_mapem
);
f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
} // End of function f_IS_TLM_GEN_MSGF_BV_05_MAPEM
/**
* @desc TP Function for TC_IS_TLM_GEN_MSGF_BV_05_SPATEM
*/
function f_IS_TLM_GEN_MSGF_BV_05_SPATEM () runs on ItsMapemSpatem {
// Local variables
// Preamble
f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
f_prInitialState(); f_prInitialState();
f_utTriggerEvent(m_utTriggerEvent(startTLMService)); f_utTriggerEvent(m_utTriggerEvent(startTLMService));
// Wait for SPATEM sent // Wait for SPATEM sent
tc_ac.start(2.0); tc_ac.start(2.0);
f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
// Test Body // Test Body
tc_ac.start; tc_ac.start;
...@@ -288,7 +347,7 @@ module ItsSpatem_TpFunctions { ...@@ -288,7 +347,7 @@ module ItsSpatem_TpFunctions {
-, //IntersectionReferenceID p_id -, //IntersectionReferenceID p_id
-, //MsgCount p_revision -, //MsgCount p_revision
-, //IntersectionStatusObject p_status -, //IntersectionStatusObject p_status
{mw_movementState} //MovementList p_states {mw_movementState(?)} //MovementList p_states with signalGroup
)} )}
) )
) )
...@@ -306,16 +365,16 @@ module ItsSpatem_TpFunctions { ...@@ -306,16 +365,16 @@ module ItsSpatem_TpFunctions {
// Postamble // Postamble
f_utTriggerEvent(m_utTriggerEvent(stopTLMService)); f_utTriggerEvent(m_utTriggerEvent(stopTLMService));
f_poDefault(); f_poDefault();
f_cfDown();
} // End of function f_IS_TLM_GEN_MSGF_BV_05 } // End of function f_IS_TLM_GEN_MSGF_BV_05_SPATEM
/** /**
* @desc TP Function for TC_IS_TLM_GEN_MSGF_BV_06 * @desc TP Function for TC_IS_TLM_GEN_MSGF_BV_06
*/ */
function f_IS_TLM_GEN_MSGF_BV_06 () runs on ItsMapemSpatem { function f_IS_TLM_GEN_MSGF_BV_06 () runs on ItsMtc {
// Local variables // Local variables
var ItsMapemSpatem v_mapem;
var ItsMapemSpatem v_spatem;
// Test control // Test control
if (not PICS_SPATEM_GENERATION) { if (not PICS_SPATEM_GENERATION) {
...@@ -323,16 +382,74 @@ module ItsSpatem_TpFunctions { ...@@ -323,16 +382,74 @@ module ItsSpatem_TpFunctions {
setverdict(inconc); setverdict(inconc);
stop; stop;
} }
// Test component configuration
f_cfUp();
// Test component configuration
f_cf02Up();
// Preamble
// Start components
v_mapem := f_getComponent(c_compMap);
v_spatem := f_getComponent(c_compSpat);
v_mapem.start(f_IS_TLM_GEN_MSGF_BV_06_MAPEM());
v_spatem.start(f_IS_TLM_GEN_MSGF_BV_06_SPATEM());
// Synchronization
f_serverSync2ClientsAndStop({c_prDone, c_tbDone});
// Cleanup
f_cf02Down();
} // End of function f_IS_TLM_GEN_MSGF_BV_06
/**
* @desc TP Function for TC_IS_TLM_GEN_MSGF_BV_06_SPATEM
*/
function f_IS_TLM_GEN_MSGF_BV_06_MAPEM () runs on ItsMapemSpatem {
// Local variables
var MapemInd v_mapem;
// Preamble // Preamble
f_prInitialState();
f_awaitMapeMessage(
mw_mapemInd(
mw_mapemPdu(
mw_mapem(
{mw_intersectionGeometry(
-,
-,
-,
{mw_roadLane(
-,//laneID
?,//laneAttributes
-,//p_ingressApproach
-,//egressApproach
? //connectsTo
)}
)}
)
)),
v_mapem
);
f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
} // End of function f_IS_TLM_GEN_MSGF_BV_06_MAPEM
/**
* @desc TP Function for TC_IS_TLM_GEN_MSGF_BV_06
*/
function f_IS_TLM_GEN_MSGF_BV_06_SPATEM () runs on ItsMapemSpatem {
// Local variables
// Preamble
f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
f_prInitialState(); f_prInitialState();
f_utTriggerEvent(m_utTriggerEvent(startTLMService)); f_utTriggerEvent(m_utTriggerEvent(startTLMService));
// Wait for SPATEM sent // Wait for SPATEM sent
tc_ac.start(2.0); tc_ac.start(2.0);
f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
// Test Body // Test Body
tc_ac.start; tc_ac.start;
...@@ -366,19 +483,127 @@ module ItsSpatem_TpFunctions { ...@@ -366,19 +483,127 @@ module ItsSpatem_TpFunctions {
// Postamble // Postamble
f_utTriggerEvent(m_utTriggerEvent(stopTLMService)); f_utTriggerEvent(m_utTriggerEvent(stopTLMService));
f_poDefault(); f_poDefault();
f_cfDown();
} // End of function f_IS_TLM_GEN_MSGF_BV_06 } // End of function f_IS_TLM_GEN_MSGF_BV_06_SPATEM
/** /**
* @desc TP Function for TC_IS_TLM_GEN_MSGF_BV_07 * @desc TP Function for TC_IS_TLM_GEN_MSGF_BV_07
*/ */
function f_IS_TLM_GEN_MSGF_BV_07 () runs on ItsMapemSpatem { function f_IS_TLM_GEN_MSGF_BV_07 () runs on ItsMtc {
// Local variables
var ItsMapemSpatem v_mapem;
var ItsMapemSpatem v_spatem;
// TODO // Test control
if (not (PICS_SPATEM_GENERATION and PICS_SPATEM_PEDESTRIAN_MANOEUVRES)) {
log("*** " & testcasename() & ": PICS_SPATEM_GENERATION AND PICS_SPATEM_PEDESTRIAN_MANOEUVRES required for executing the TC ***");
setverdict(inconc);
stop;
}
// Test component configuration
f_cf02Up();
// Preamble
// Start components
v_mapem := f_getComponent(c_compMap);
v_spatem := f_getComponent(c_compSpat);
v_mapem.start(f_IS_TLM_GEN_MSGF_BV_07_MAPEM());
v_spatem.start(f_IS_TLM_GEN_MSGF_BV_07_SPATEM());
// Synchronization
f_serverSync2ClientsAndStop({c_prDone, c_tbDone});
// Cleanup
f_cf02Down();
} // End of function f_IS_TLM_GEN_MSGF_BV_07 } // End of function f_IS_TLM_GEN_MSGF_BV_07
/**
* @desc TP Function for TC_IS_TLM_GEN_MSGF_BV_07_SPATEM
*/
function f_IS_TLM_GEN_MSGF_BV_07_MAPEM () runs on ItsMapemSpatem {
// Local variables
var MapemInd v_mapem;
// Preamble
f_prInitialState();
f_awaitMapeMessage(
mw_mapemInd(
mw_mapemPdu(
mw_mapem(
{mw_intersectionGeometry(
-,
-,
-,
{mw_roadLane(
-,//laneID
?,//laneAttributes
-,//p_ingressApproach
-,//egressApproach
? //connectsTo
)}
)}
)
)),
v_mapem
);
f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
} // End of function f_IS_TLM_GEN_MSGF_BV_07_MAPEM
/**
* @desc TP Function for TC_IS_TLM_GEN_MSGF_BV_07_SPATEM
*/
function f_IS_TLM_GEN_MSGF_BV_07_SPATEM () runs on ItsMapemSpatem {
// Local variables
// Preamble
f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
f_prInitialState();
f_utTriggerEvent(m_utTriggerEvent(startTLMService));
// Wait for SPATEM sent
tc_ac.start(2.0);
// Test Body
tc_ac.start;
alt {
[] mapemSpatemPort.receive(
mw_spatemInd(
mw_spatemPdu(
mw_spatem_intersections(
{mw_IntersectionState(
?, //IntersectionReferenceID p_id
-, //MsgCount p_revision
-, //IntersectionStatusObject p_status
{mw_movementState(
?,//SignalGroupID,
? //MovementEventList,
)} //MovementList p_states
)}
)
)
)) {
tc_ac.stop;
log("*** " & testcasename() & ": PASS: Successfully received SAPTEM PDU header. ***");
f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
}
[] tc_ac.timeout {
log("*** " & testcasename() & ": INCONC: Timeout while awaiting the reception of a message. ***");
f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);
}
}
// Postamble
f_utTriggerEvent(m_utTriggerEvent(stopTLMService));
f_poDefault();
} // End of function f_IS_TLM_GEN_MSGF_BV_07_SPATEM
/** /**
* @desc TP Function for TC_IS_TLM_GEN_MSGF_BV_08 * @desc TP Function for TC_IS_TLM_GEN_MSGF_BV_08
*/ */
......
Subproject commit 2edfaf564426d4636ca954e157de3bdce0923fe8 Subproject commit 6fcc4da30157b23bf2777185a66261958a39ac59
Markdown is supported
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