Commit 32853fcb authored by Yann Garcia's avatar Yann Garcia
Browse files

Validate AtsRtcmem against TTwb 1.1.30

parent 12e18a7c
......@@ -347,7 +347,7 @@ module LibItsIvim_Functions {
//
// return v_ret;
// }
function f_prInitialState(Scenario p_scenario := e_staticPosition,
function f_prInitialState(Scenario p_scenario := e_staticPosition, // TODO: To be removed, not used in IVIM (RSU)
in charstring p_certificate_id := ""
) runs on ItsIvim return FncRetCode {
var FncRetCode v_ret := e_success;
......
......@@ -39,49 +39,49 @@ module LibItsIvim_Pixits {
* ZoneId 1 used in IVIM messages sent by the tester
* @see ETSI TS 103 191-3 Table B.8
*/
modulepar Zid PX_ZONEID_1 := 1
modulepar Zid PX_ZONEID_1 := 1;
/**
* @desc IUT ZoneId 2 identifier
* ZoneId 2 used in IVIM messages sent by the tester
* @see ETSI TS 103 191-3 Table B.8
*/
modulepar Zid PX_ZONEID_2 := 2
modulepar Zid PX_ZONEID_2 := 2;
/**
* @desc IUT LaneId identifier
* LaneId used in IVIM messages sent by the tester
* @see ETSI TS 103 191-3 Table B.8
*/
modulepar LanePosition PX_LANE := 1 //innermostDrivingLane(1)
modulepar LanePosition PX_LANE := 1; //innermostDrivingLane(1)
/**
* @desc IUT RelavanceZoneId identifier
* RelavanceZoneId used in IVIM messages sent by the tester
* @see ETSI TS 103 191-3 Table B.8
*/
modulepar Zid PX_RELAVANCE_ZONEID := 1
modulepar Zid PX_RELAVANCE_ZONEID := 1;
/**
* @desc IUT DetectionZoneId identifier
* DetectionZoneId used in IVIM messages sent by the tester
* @see ETSI TS 103 191-3 Table B.8
*/
modulepar Zid PX_DETECTION_ZONEID := 1
modulepar Zid PX_DETECTION_ZONEID := 1;
/**
* @desc IUT DriverAwarenesZoneId identifier
* DriverAwarenesZoneId used in IVIM messages sent by the tester
* @see ETSI TS 103 191-3 Table B.8
*/
modulepar Zid PX_DRIVER_AWARENES_ZONEID := 1
modulepar Zid PX_DRIVER_AWARENES_ZONEID := 1;
/**
* @desc IUT LayoutId identifier
* LayoutId used in IVIM messages sent by the tester
* @see ETSI TS 103 191-3 Table B.8
*/
modulepar integer PX_LAYOUTID := 1
modulepar integer PX_LAYOUTID := 1;
/**
* @desc IUT RScode integer variant
......@@ -90,6 +90,6 @@ module LibItsIvim_Pixits {
* //add others if needed
* @see ETSI TS 103 191-3 Table B.8
*/
modulepar integer PX_RSCODE_VA := 1
modulepar integer PX_RSCODE_VA := 1;
} // End of module LibItsIvim_Pixits
\ No newline at end of file
} // End of module LibItsIvim_Pixits
......@@ -73,7 +73,7 @@ module LibItsRtcmem_Functions {
}
[] utPort.receive ( UtRtcmemResults: { utRtcmemTriggerResult := false }) {
tc_wait.stop;
f_selfOrClientSyncAndVerdict("SREM Trigger failed", e_error);
f_selfOrClientSyncAndVerdict("RTCMEM Trigger failed", e_error);
}
[] tc_wait.timeout {
log("*** " & testcasename() & ": INFO: Could not receive expected UT message from IUT in time ***");
......@@ -104,7 +104,7 @@ module LibItsRtcmem_Functions {
}
[] utPort.receive ( UtRtcmemResults: { utRtcmemUpdateResult := false }) {
tc_wait.stop;
f_selfOrClientSyncAndVerdict("SREM Update failed", e_error);
f_selfOrClientSyncAndVerdict("RTCMEM Update failed", e_error);
}
[] tc_wait.timeout {
log("*** " & testcasename() & ": INFO: Could not receive expected UT message from IUT in time ***");
......@@ -225,7 +225,7 @@ module LibItsRtcmem_Functions {
*/
altstep a_default() runs on ItsRtcmem {
[vc_rtcmemDefaultActive] rtcmemPort.receive(mw_rtcmemInd(mw_rtcmemPdu(mw_defaultRtcmem))) {
log("*** " & testcasename() & ": INFO: SREMM received in default ***");
log("*** " & testcasename() & ": INFO: RTCMEMM received in default ***");
vc_rtcmemReceived := true;
repeat;
}
......@@ -364,7 +364,7 @@ module LibItsRtcmem_Functions {
group receiveFunctions {
/**
* @desc Awaits a SREM and returns it
* @desc Awaits a RTCMEM and returns it
* @param p_rcvMsg The expected message to be received.
* @param p_rcvdMsg The received message - OUT.
*/
......
......@@ -28,8 +28,8 @@ module LibItsRtcmem_TypesAndValues {
* @desc Upper Tester results message of the Rtcmem/Ssem IUT
* @member utRtcmemInitialize -
* @member utRtcmemTriggerResult -
* @member utAutoInteropTriggerResult -
* @member utRtcmemChangePositionResult -
* @member utRtcmemUpdateResult -
* @member utRtcmemTerminationResult -
*/
type union UtRtcmemResults {
boolean utRtcmemInitializeResult,
......
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