Bug fixed validating Security with Commsignia

ttcn/AtsDENM/ItsDenm_TpFunctions.ttcn

@@ -802,9 +802,12 @@ module ItsDenm_TpFunctions {
               f_utTriggerEvent(m_utTriggerEvent(v_situation));
               f_awaitDenMessage(mw_denmInd(mw_anyDenmPdu), v_denmInd);
               v_timestampIts := f_getCurrentTime();
+              //log("v_timestampIts: ", v_timestampIts);
               v_actionId := v_denmInd.msgIn.denm.management.actionID;
               v_referenceTime1 := v_denmInd.msgIn.denm.management.referenceTime;
+              //log("v_referenceTime1: ", v_referenceTime1);
               v_diff := v_timestampIts - v_referenceTime1;
+              //log("v_diff: ", v_diff);
               f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
               
               // Test Body
@@ -827,7 +830,9 @@ module ItsDenm_TpFunctions {
                   ) -> value v_denmInd {
                       tc_ac.stop;
                       v_timestampIts := f_getCurrentTime();
+                      //log("v_timestampIts: ", v_timestampIts);
                       v_msgtimestamp := v_denmInd.msgIn.denm.management.referenceTime;
+                      //log("v_msgtimestamp: ", v_msgtimestamp);
                       if ( ( ( v_timestampIts + v_diff ) > v_msgtimestamp ) and ( v_msgtimestamp > v_referenceTime1 ) ) {
                           log("*** " & testcasename() & ": PASS: Successfully received expected DENM. ***");
                           f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
@@ -1535,8 +1540,7 @@ module ItsDenm_TpFunctions {
               const float c_upperRepetitionInterval := int2float(c_repetitionInterval)*1.05;
               // Local variables
               var template (value) SituationContainer v_situation := m_situation(CauseCodeType_vehicleBreakdown_, VehicleBreakdownSubCauseCode_unavailable_);
-              var template (present) DenmInd v_expectedDenmInd :=
-                                                  mw_denmInd(mw_denmPdu(mw_denm( mw_denmMgmtCon( mw_actionId, -, -, c_validityDuration)))); 
+              var template (present) DenmInd v_expectedDenmInd := mw_denmInd(mw_denmPdu(mw_denm( mw_denmMgmtCon( mw_actionId, -, -, c_validityDuration)))); 
               var ActionID v_actionId;
               var DenmInd v_denmInd;
               // Local timers
@@ -2924,7 +2928,7 @@ module ItsDenm_TpFunctions {
             function f_DEN_MSRV_BO_08_01 () runs on ItsDenm {
                 
                 f_DEN_MSRV_BO_08_XX(
-                    "CERT_TS_DENM_01",
+                    "CERT_TS_DENM_BO_01_AT",
                     m_situation(CauseCodeType_trafficCondition_, TrafficConditionSubCauseCode_unavailable_)
                 );
             }
@@ -2932,7 +2936,7 @@ module ItsDenm_TpFunctions {
             function f_DEN_MSRV_BO_08_02 () runs on ItsDenm {
                 
                 f_DEN_MSRV_BO_08_XX(
-                    "CERT_TS_DENM_02",
+                    "CERT_TS_DENM_BO_02_AT",
                     m_situation(CauseCodeType_accident_, AccidentSubCauseCode_unavailable_)
                 );
             }
@@ -2980,6 +2984,7 @@ module ItsDenm_TpFunctions {
                 );
                 
                 f_sleep(1.0);
+                vc_utEvents := {};
                 
                 // instruct adapter to use p_certName to sign message
                 if(e_success != f_acTriggerSecEvent(m_acEnableSecurity(p_certName))) { 
@@ -3025,7 +3030,7 @@ module ItsDenm_TpFunctions {
             function f_DEN_MSRV_BO_09_01 () runs on ItsDenm {
                 
                 f_DEN_MSRV_BO_09_XX(
-                    "CERT_TS_DENM_01",
+                    "CERT_TS_DENM_BO_01_AT",
                     m_situation(CauseCodeType_trafficCondition_, TrafficConditionSubCauseCode_unavailable_),
                     m_situation(CauseCodeType_trafficCondition_, TrafficConditionSubCauseCode_trafficJamIncreasing_)
                 );
@@ -3034,7 +3039,7 @@ module ItsDenm_TpFunctions {
             function f_DEN_MSRV_BO_09_02 () runs on ItsDenm {
                 
                 f_DEN_MSRV_BO_09_XX(
-                    "CERT_TS_DENM_02",
+                    "CERT_TS_DENM_BO_02_AT",
                     m_situation(CauseCodeType_accident_, AccidentSubCauseCode_unavailable_),
                     m_situation(CauseCodeType_accident_, AccidentSubCauseCode_multiVehicleAccident_)
                 );