titanization.patch 518 KB
Newer Older
garciay's avatar
garciay committed
Index: AtsCAM/ItsCam_TpFunctions.ttcn
===================================================================
garciay's avatar
garciay committed
--- AtsCAM/ItsCam_TpFunctions.ttcn	(revision 2630)
garciay's avatar
garciay committed
+++ AtsCAM/ItsCam_TpFunctions.ttcn	(working copy)
@@ -26,6 +26,7 @@
     import from LibItsCommon_Templates all;
     import from LibItsCommon_Functions all;
     import from LibItsCommon_Pixits all;
+    import from LibItsCommon_ASN1_NamedNumbers all;
     
     // LibItsCam
     import from LibItsCam_TestSystem all;
garciay's avatar
garciay committed
@@ -401,7 +402,7 @@
                     }
                     
                     for (v_cnt:=0; v_cnt<lengthof(p_utTriggers); v_cnt:=v_cnt+1) {
-                        f_utTriggerEvent(p_utTriggers[v_cnt]);
+                        f_utTriggerEvent(valueof(p_utTriggers[v_cnt]));
                         
                         tc_ac.start;
                         alt {
@@ -557,7 +558,9 @@
                     f_CAM_MSD_INA_BV_01(
                         "Brake pedal being deactivated", 
                         { m_setAccelerationControlStatus(AccelerationControl_brakePedalEngaged_), m_setAccelerationControlStatus(c_accCtrlIdle) },
-                        { mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_brakePedalActive_On)), mw_camMsg_HF_BV(mw_HF_BV_accCtrl((omit, mw_brakePedalActive_Off))) }
+//FIXME RGY omit has been disallowed in value lists (see $B.1.2.1 of the standad), ifpresent shall be used instead
+//                        { mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_brakePedalActive_On)), mw_camMsg_HF_BV(mw_HF_BV_accCtrl((omit, mw_brakePedalActive_Off))) }
+                        { mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_brakePedalActive_On)), mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_brakePedalActive_Off ifpresent)) }
                     );
                     
                     // Postamble
@@ -629,7 +632,9 @@
                     f_CAM_MSD_INA_BV_01(
                         "Gas pedal being deactivated", 
                         { m_setAccelerationControlStatus(AccelerationControl_gasPedalEngaged_), m_setAccelerationControlStatus(c_accCtrlIdle) },
-                        { mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_gasPedalActive_On)), mw_camMsg_HF_BV(mw_HF_BV_accCtrl((omit, mw_gasPedalActive_Off))) }
+//FIXME RGY omit has been disallowed in value lists (see $B.1.2.1 of the standad), ifpresent shall be used instead
+//                        { mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_gasPedalActive_On)), mw_camMsg_HF_BV(mw_HF_BV_accCtrl((omit, mw_gasPedalActive_Off))) }
+                        { mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_gasPedalActive_On)), mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_gasPedalActive_Off ifpresent)) }
                     );
                     
                     // Postamble
@@ -701,7 +706,9 @@
                     f_CAM_MSD_INA_BV_01(
                         "Emergency brake being deactivated", 
                         { m_setAccelerationControlStatus(AccelerationControl_emergencyBrakeEngaged_), m_setAccelerationControlStatus(c_accCtrlIdle) },
-                        { mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_emergencyBrakeActive_On)), mw_camMsg_HF_BV(mw_HF_BV_accCtrl((omit, mw_emergencyBrakeActive_Off))) }
+//FIXME RGY omit has been disallowed in value lists (see $B.1.2.1 of the standad), ifpresent shall be used instead
+//                        { mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_emergencyBrakeActive_On)), mw_camMsg_HF_BV(mw_HF_BV_accCtrl((omit, mw_emergencyBrakeActive_Off))) }
+                        { mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_emergencyBrakeActive_On)), mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_emergencyBrakeActive_Off ifpresent)) }
                     );
                     
                     // Postamble
@@ -773,7 +780,9 @@
                     f_CAM_MSD_INA_BV_01(
                         "Collision warning being deactivated",
                         { m_setAccelerationControlStatus(AccelerationControl_collisionWarningEngaged_), m_setAccelerationControlStatus(c_accCtrlIdle) },
-                        { mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_collisionWarningActive_On)), mw_camMsg_HF_BV(mw_HF_BV_accCtrl((omit, mw_collisionWarningActive_Off))) }
+//FIXME RGY omit has been disallowed in value lists (see $B.1.2.1 of the standad), ifpresent shall be used instead
+//                        { mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_collisionWarningActive_On)), mw_camMsg_HF_BV(mw_HF_BV_accCtrl((omit, mw_collisionWarningActive_Off))) }
+                        { mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_collisionWarningActive_On)), mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_collisionWarningActive_Off ifpresent)) }
                     );
                     
                     // Postamble
@@ -845,7 +854,9 @@
                     f_CAM_MSD_INA_BV_01(
                         "ACC being deactivated",
                         { m_setAccelerationControlStatus(AccelerationControl_accEngaged_), m_setAccelerationControlStatus(c_accCtrlIdle) },
-                        { mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_accActive_On)), mw_camMsg_HF_BV(mw_HF_BV_accCtrl((omit, mw_accActive_Off))) }
+//FIXME RGY omit has been disallowed in value lists (see $B.1.2.1 of the standad), ifpresent shall be used instead
+//                        { mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_accActive_On)), mw_camMsg_HF_BV(mw_HF_BV_accCtrl((omit, mw_accActive_Off))) }
+                        { mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_accActive_On)), mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_accActive_Off ifpresent)) }
                     );
                     
                     // Postamble
@@ -917,7 +928,9 @@
                     f_CAM_MSD_INA_BV_01(
                         "Cruise control being deactivated",
                         { m_setAccelerationControlStatus(AccelerationControl_cruiseControlEngaged_), m_setAccelerationControlStatus(c_accCtrlIdle) },
-                        { mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_cruiseControl_On)), mw_camMsg_HF_BV(mw_HF_BV_accCtrl((omit, mw_cruiseControl_Off))) }
+//FIXME RGY omit has been disallowed in value lists (see $B.1.2.1 of the standad), ifpresent shall be used instead
+//                        { mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_cruiseControl_On)), mw_camMsg_HF_BV(mw_HF_BV_accCtrl((omit, mw_cruiseControl_Off))) }
+                        { mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_cruiseControl_On)), mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_cruiseControl_Off ifpresent)) }
                     );
                     
                     // Postamble
@@ -989,7 +1002,9 @@
                     f_CAM_MSD_INA_BV_01( 
                         "Speed limiter control being deactivated", 
                         { m_setAccelerationControlStatus(AccelerationControl_speedLimiterEngaged_), m_setAccelerationControlStatus(c_accCtrlIdle) },
-                        { mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_speedLimiterActive_On)), mw_camMsg_HF_BV(mw_HF_BV_accCtrl((omit, mw_speedLimiterActive_Off))) }
+//FIXME RGY omit has been disallowed in value lists (see $B.1.2.1 of the standad), ifpresent shall be used instead
+//                        { mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_speedLimiterActive_On)), mw_camMsg_HF_BV(mw_HF_BV_accCtrl((omit, mw_speedLimiterActive_Off))) }
+                        { mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_speedLimiterActive_On)), mw_camMsg_HF_BV(mw_HF_BV_accCtrl(mw_speedLimiterActive_Off ifpresent)) }
                     );
                     
                     // Postamble
@@ -1061,7 +1076,9 @@
                     f_CAM_MSD_INA_BV_01(
                         "Low beam headlights being deactivated", 
                         { m_setExteriorLightsStatus(ExteriorLights_lowBeamHeadlightsOn_), m_setExteriorLightsStatus(c_elAllLightsOff) },
-                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_lowBeamLightsOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_lowBeamLightsOff))) }
+//FIXME RGY omit has been disallowed in value lists (see $B.1.2.1 of the standad), ifpresent shall be used instead
+//                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_lowBeamLightsOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_lowBeamLightsOff))) }
+                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_lowBeamLightsOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_lowBeamLightsOff ifpresent)) }
                     );
                     
                     // Postamble
@@ -1133,7 +1150,9 @@
                     f_CAM_MSD_INA_BV_01(
                         "High beam headlights being deactivated", 
                         { m_setExteriorLightsStatus(ExteriorLights_highBeamHeadlightsOn_), m_setExteriorLightsStatus(c_elAllLightsOff) },
-                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_highBeamLightsOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_highBeamLightsOff))) }
+//FIXME RGY omit has been disallowed in value lists (see $B.1.2.1 of the standad), ifpresent shall be used instead
+//                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_highBeamLightsOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_highBeamLightsOff))) }
+                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_highBeamLightsOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_highBeamLightsOff ifpresent)) }
                     );
                     
                     // Postamble
@@ -1205,7 +1224,9 @@
                     f_CAM_MSD_INA_BV_01( 
                         "Left turn signal being deactivated", 
                         { m_setExteriorLightsStatus(ExteriorLights_leftTurnSignalOn_), m_setExteriorLightsStatus(c_elAllLightsOff) },
-                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_leftTurnSignalOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_leftTurnSignalOff))) }
+//FIXME RGY omit has been disallowed in value lists (see $B.1.2.1 of the standad), ifpresent shall be used instead
+//                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_leftTurnSignalOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_leftTurnSignalOff))) }
+                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_leftTurnSignalOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_leftTurnSignalOff ifpresent)) }
                     );
                     
                     // Postamble
@@ -1277,7 +1298,9 @@
                     f_CAM_MSD_INA_BV_01(
                         "Right turn signal being deactivated", 
                         { m_setExteriorLightsStatus(ExteriorLights_rightTurnSignalOn_), m_setExteriorLightsStatus(c_elAllLightsOff) },
-                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_rightTurnSignalOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_rightTurnSignalOff))) }
+//FIXME RGY omit has been disallowed in value lists (see $B.1.2.1 of the standad), ifpresent shall be used instead
+//                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_rightTurnSignalOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_rightTurnSignalOff))) }
+                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_rightTurnSignalOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_rightTurnSignalOff ifpresent)) }
                     );
                     
                     // Postamble
@@ -1349,7 +1372,9 @@
                     f_CAM_MSD_INA_BV_01(
                         "Daytime running lights being deactivated", 
                         { m_setExteriorLightsStatus(ExteriorLights_daytimeRunningLightsOn_), m_setExteriorLightsStatus(c_elAllLightsOff) },
-                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_daytimeRunningLightsOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_daytimeRunningLightsOff))) }
+//FIXME RGY omit has been disallowed in value lists (see $B.1.2.1 of the standad), ifpresent shall be used instead
+//                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_daytimeRunningLightsOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_daytimeRunningLightsOff))) }
+                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_daytimeRunningLightsOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_daytimeRunningLightsOff ifpresent)) }
                     );
                     
                     // Postamble
@@ -1421,7 +1446,9 @@
                     f_CAM_MSD_INA_BV_01(
                         "Reverese light being deactivated", 
                         { m_setExteriorLightsStatus(ExteriorLights_reverseLightOn_), m_setExteriorLightsStatus(c_elAllLightsOff) },
-                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_reverseLightOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_reverseLightOff))) }
+//FIXME RGY omit has been disallowed in value lists (see $B.1.2.1 of the standad), ifpresent shall be used instead
+//                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_reverseLightOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_reverseLightOff))) }
+                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_reverseLightOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_reverseLightOff ifpresent)) }
                     );
                     
                     // Postamble
@@ -1493,7 +1520,9 @@
                     f_CAM_MSD_INA_BV_01(
                         "Fog lights being deactivated", 
                         { m_setExteriorLightsStatus(ExteriorLights_fogLightOn_), m_setExteriorLightsStatus(c_elAllLightsOff) },
-                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_fogLightOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_fogLightOff))) }
+//FIXME RGY omit has been disallowed in value lists (see $B.1.2.1 of the standad), ifpresent shall be used instead
+//                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_fogLightOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_fogLightOff))) }
+                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_fogLightOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_fogLightOff ifpresent)) }
                     );
                     
                     // Postamble
@@ -1565,7 +1594,9 @@
                     f_CAM_MSD_INA_BV_01(
                         "Parking lights being deactivated", 
                         { m_setExteriorLightsStatus(ExteriorLights_parkingLightsOn_), m_setExteriorLightsStatus(c_elAllLightsOff) },
-                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_parkingLightsOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_parkingLightsOff))) }
+//FIXME RGY omit has been disallowed in value lists (see $B.1.2.1 of the standad), ifpresent shall be used instead
+//                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_parkingLightsOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights((omit, mw_parkingLightsOff))) }
+                        { mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_parkingLightsOn)), mw_camMsg_LF_BV(mw_LF_BV_extLights(mw_parkingLightsOff ifpresent)) }
                     );
                     
                     // Postamble
garciay's avatar
garciay committed
Index: AtsDENM/ItsDenm_TpFunctions.ttcn
===================================================================
garciay's avatar
garciay committed
--- AtsDENM/ItsDenm_TpFunctions.ttcn	(revision 2630)
garciay's avatar
garciay committed
+++ AtsDENM/ItsDenm_TpFunctions.ttcn	(working copy)
@@ -18,6 +18,7 @@
     import from LibItsCommon_TypesAndValues all;
     import from LibItsCommon_Templates all;
     import from LibItsCommon_Functions all;
+    import from LibItsCommon_ASN1_NamedNumbers all;
     
     // LibIts
     import from DENM_PDU_Descriptions language "ASN.1:1997" all;
garciay's avatar
garciay committed
@@ -256,7 +257,7 @@
               // Preamble
               f_prInitialState();
               for (i := 0; i < lengthof(v_situations) - 1; i := i + 1) {
-                  f_utTriggerEvent(m_utTriggerEvent(v_situations[i]));
+                  f_utTriggerEvent(m_utTriggerEvent(valueof(v_situations[i])));
                   f_awaitDenMessage(mw_denmInd(mw_anyDenmPdu), v_denmInd);
                   v_actionIds[i] := v_denmInd.msgIn.denm.management.actionID;
               }
@@ -263,7 +264,7 @@
               f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
               
               // Test Body
-              f_utTriggerEvent(m_utTriggerEvent(v_situations[lengthof(v_situations) - 1]));
+              f_utTriggerEvent(m_utTriggerEvent(valueof(v_situations[lengthof(v_situations) - 1])));
               f_awaitDenMessage(mw_denmInd(mw_anyDenmPdu), v_denmInd);
               v_actionIds[lengthof(v_actionIds) - 1] := v_denmInd.msgIn.denm.management.actionID;
               
@@ -447,7 +448,7 @@
               // Preamble
               f_prInitialState();
               for (i := 0; i < lengthof(v_situations) - 1; i := i + 1) {
-                  f_utTriggerEvent(m_utTriggerEvent(v_situations[i]));
+                  f_utTriggerEvent(m_utTriggerEvent(valueof(v_situations[i])));
                   f_awaitDenMessage(mw_denmInd(mw_anyDenmPdu), v_denmInd);
                   v_actionIds[i] := v_denmInd.msgIn.denm.management.actionID;
                   v_timestampIts := v_denmInd.msgIn.denm.management.referenceTime;
@@ -455,7 +456,7 @@
               f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
               
               // Test Body
-              f_utTriggerEvent(m_utTriggerEvent(v_situations[lengthof(v_situations) - 1]));
+              f_utTriggerEvent(m_utTriggerEvent(valueof(v_situations[lengthof(v_situations) - 1])));
               
               tc_ac.start;
               alt {
@@ -530,7 +531,7 @@
               // Preamble
               f_prInitialState();
               for (i := 0; i < lengthof(v_situations) - 1; i := i + 1) {
-                  f_utTriggerEvent(m_utTriggerEvent(v_situations[i]));
+                  f_utTriggerEvent(m_utTriggerEvent(valueof(v_situations[i])));
                   f_awaitDenMessage(mw_denmInd(mw_anyDenmPdu), v_denmInd);
                   f_poCancelEvent(e_iut, v_denmInd.msgIn.denm.management.actionID);
               }
@@ -539,7 +540,7 @@
               f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
               
               // Test Body
-              f_utTriggerEvent(m_utTriggerEvent(v_situations[lengthof(v_situations) - 1]));
+              f_utTriggerEvent(m_utTriggerEvent(valueof(v_situations[lengthof(v_situations) - 1])));
               
               tc_ac.start;
               alt {
@@ -1254,7 +1255,7 @@
               // Preamble
               f_prInitialState();
               for (i := 0; i < lengthof(v_situations); i := i + 1) {
-                  f_utTriggerEvent(m_utTriggerEvent(v_situations[i]));
+                  f_utTriggerEvent(m_utTriggerEvent(valueof(v_situations[i])));
                   f_awaitDenMessage(mw_denmInd(mw_anyDenmPdu), v_denmInd);
                   v_actionIds[i] := v_denmInd.msgIn.denm.management.actionID;
               }
garciay's avatar
garciay committed
Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn
===================================================================
garciay's avatar
garciay committed
--- AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn	(revision 2630)
garciay's avatar
garciay committed
+++ AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn	(working copy)
garciay's avatar
garciay committed
@@ -23,7 +23,8 @@
     import from LibItsGeoNetworking_Templates all;
     import from LibItsGeoNetworking_TypesAndValues all;
     import from LibItsGeoNetworking_Pics all;
garciay's avatar
garciay committed
-	import from LibItsGeoNetworking_Pixits all;
+    import from LibItsGeoNetworking_Pixits all;
+    import from LibItsGeoNetworking_EncdecDeclarations all;
 
     // 6.2.1
     group geoFormatingAndDataValidity {
garciay's avatar
garciay committed
@@ -107,7 +108,7 @@
                 f_prNeighbour();
                 v_gnPacket := m_geoNwPdu(m_geoNwShbPacket(v_longPosVectorNodeB));
                 
-                f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(v_gnPacket));
+                f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_gnPacket)));
                 
                 f_sleep(PX_TAC);
                 
@@ -125,7 +126,7 @@
                 // Test Body
                 v_gnPacket.basicHeader.version := valueof(v_gnPacket.basicHeader.version) + 1;
                 
-                f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(v_gnPacket));
+                f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(v_gnPacket)));
                 
                 f_sleep(PX_TAC);
                 
@@ -221,8 +222,8 @@
                 // Preamble
                 f_prNeighbour();
                 if ( not f_utTriggerEvent(m_generateShbMessageWithPayload(v_payload)) ) {
-                	log("*** " & testcasename() & ": INCONC: Trigger failed ***");
-                	f_selfOrClientSyncAndVerdict(c_prDone, e_timeout);
+                    log("*** " & testcasename() & ": INCONC: Trigger failed ***");
+                    f_selfOrClientSyncAndVerdict(c_prDone, e_timeout);
                 }
                 f_selfOrClientSyncAndVerdict(c_prDone, e_success);
                 
@@ -380,7 +381,7 @@
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwTsbPacket(
                                     vc_localSeqNumber,
@@ -391,7 +392,7 @@
                                 v_hopLimit
                             )
                         )
-                    );
+                    ));
                     
                     tc_noac.start;
                     alt {
@@ -1379,7 +1380,7 @@
                         f_prNeighbour();
                     }
                     else {
-						f_prNonNeighbour();
+                        f_prNonNeighbour();
                     }
                     
                     return v_longPosVectorNode;
@@ -1392,7 +1393,7 @@
                     
                     //preamble part II
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(p_packet, -, c_hopLimit1))
+                        valueof(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(p_packet, -, c_hopLimit1)))
                     );
                     f_selfOrClientSyncAndVerdict(c_prDone, e_success);
                 } // end f_TP_GEONW_PON_LOT_BV_03_pre_2
@@ -1456,7 +1457,7 @@
                 
                 // Preamble
                 f_prDefault(); // NodeB will send Beacon only once
-                f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(m_geoNwBeaconPacket(f_getPosition(c_compNodeB)), -, c_hopLimit1)));
+                f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(m_geoNwBeaconPacket(f_getPosition(c_compNodeB)), -, c_hopLimit1))));
                 f_selfOrClientSyncAndVerdict(c_prDone, e_success);
                 
                 // Test Body
@@ -1717,7 +1718,7 @@
                     f_prDefault();
                     
                     // Act as a neighbor and send one beacon
-                    f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(m_geoNwBeaconPacket(f_getPosition(c_compNodeB)), -, c_hopLimit1)));
+                    f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(m_geoNwBeaconPacket(f_getPosition(c_compNodeB)), -, c_hopLimit1))));
                 } // end f_TP_GEONW_PON_LOT_BV_05_pre_1
                 
                 /**
@@ -1727,7 +1728,7 @@
                     
                     //preamble part II
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(p_packet))
+                        valueof(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(p_packet)))
                     );
                     f_selfOrClientSyncAndVerdict(c_prDone, e_success);
                 } // end f_TP_GEONW_PON_LOT_BV_05_pre_2
@@ -1992,10 +1993,10 @@
                         }
                         else {
                             v_expectedSequenceNumber := v_expectedSequenceNumber + 1;
-				            if ( not  f_utTriggerEvent(m_generateGeoBroadcastMessage(f_getArea(c_area1))) ) {
-				                log("*** " & testcasename() & ": INCONC: Trigger failed ***");
-				                f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);
-				            }
+                            if ( not  f_utTriggerEvent(m_generateGeoBroadcastMessage(f_getArea(c_area1))) ) {
+                                log("*** " & testcasename() & ": INCONC: Trigger failed ***");
+                                f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);
+                            }
                             tc_ac.start;
                             repeat;
                         }
@@ -2185,7 +2186,7 @@
                 
                 // Test Body
                 f_sendGeoNetMessage(
-                    m_geoNwReq_linkLayerBroadcast(
+                    valueof(m_geoNwReq_linkLayerBroadcast(
                         m_geoNwPdu(
                             m_geoNwLsReplyPacket(
                                 v_longPosVectorNodeA,
@@ -2194,7 +2195,7 @@
                             )
                         )
                     )
-                );
+                ));
                 
                 tc_ac.start;
                 alt {
@@ -2275,12 +2276,12 @@
                         if ( v_firstLsRequestReceived == true ) {
                             log("*** " & testcasename() & ": Second LsRequest received ***");
                             tc_ac.stop;
-                            f_sendGeoNetMessage ( m_geoNwReq_linkLayerBroadcast(
+                            f_sendGeoNetMessage ( valueof( m_geoNwReq_linkLayerBroadcast(
                                                     m_geoNwPdu (
                                                         m_geoNwLsReplyPacket(
                                                             v_longPosVectorNodeA,
                                                             f_longPosVector2ShortPosVector(v_longPosVectorIut),
-                                                            vc_localSeqNumber ) ) ) );
+                                                            vc_localSeqNumber ) ) ) ) );
                             f_selfOrClientSyncAndVerdict(c_prDone, e_success);
                         }
                         else {
@@ -2424,7 +2425,7 @@
                 }
                 
                 f_sendGeoNetMessage(
-                    m_geoNwReq_linkLayerBroadcast(
+                    valueof(m_geoNwReq_linkLayerBroadcast(
                         m_geoNwPdu(
                             m_geoNwLsReplyPacket(
                                 v_longPosVectorNodeA,
@@ -2433,7 +2434,7 @@
                             )
                         )
                     )
-                );
+                ));
                 
                 // Check for messages send to Tester
                 tc_noac.start;
@@ -2562,7 +2563,7 @@
                 f_prNeighbour();
                  if ( not f_utTriggerEvent(m_generateGeoUnicastMessageWithLifetime(
                     v_longPosVectorNodeA.gnAddr,
-			                    float2int(int2float(v_maxNbrRetrans + 2) * f_getLsRetransmitTimer() * 1000.0))) ) {
+                                float2int(int2float(v_maxNbrRetrans + 2) * f_getLsRetransmitTimer() * 1000.0))) ) {
                     log("*** " & testcasename() & ": INCONC: Trigger failed ***");
                     f_selfOrClientSyncAndVerdict(c_prDone, e_timeout);
                 }
@@ -2767,7 +2768,7 @@
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwLsRequestPacket(
                                     v_longPosVectorNodeB,
@@ -2776,7 +2777,7 @@
                                 )
                             )
                         )
-                    );
+                    ));
                     
                     tc_noac.start;
                     alt {
@@ -2899,7 +2900,7 @@
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwLsRequestPacket(
                                     f_getPosition(c_compNodeA),
@@ -2910,7 +2911,7 @@
                                 c_defaultHopLimit
                             )
                         )
-                    );
+                    ));
                     f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
                     
                     // Postamble
@@ -3013,7 +3014,7 @@
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwLsReplyPacket(
                                     f_getPosition(c_compNodeA),
@@ -3024,7 +3025,7 @@
                                 c_defaultHopLimit
                             )
                         )
-                    );
+                    ));
                     f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
                     
                     // Postamble
@@ -3077,7 +3078,7 @@
                 
                 // Test Body
                 f_sendGeoNetMessage(
-                    m_geoNwReq_linkLayerBroadcast(
+                    valueof(m_geoNwReq_linkLayerBroadcast(
                         m_geoNwPdu(
                             m_geoNwUnicastPacket(
                                 v_longPosVectorNodeA,
@@ -3086,7 +3087,7 @@
                             )
                         )
                     )
-                );
+                ));
                 
                 tc_ac.start;
                 alt {
@@ -3165,7 +3166,7 @@
                 f_sleepIgnoreDef(int2float(v_lt2));
                 
                 f_sendGeoNetMessage(
-                    m_geoNwReq_linkLayerBroadcast(
+                    valueof(m_geoNwReq_linkLayerBroadcast(
                         m_geoNwPdu(
                             m_geoNwLsReplyPacket(
                                 v_longPosVectorNodeA,
@@ -3174,7 +3175,7 @@
                             )
                         )
                     )
-                );
+                ));
                 
                 tc_ac.start;
                 alt {
@@ -3310,7 +3311,7 @@
                 // Test Body
                 if (tc_wait.running) {
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwUnicastPacket(
                                     v_longPosVectorNodeA,
@@ -3319,7 +3320,7 @@
                                 )
                             )
                         )
-                    );
+                    ));
                     tc_wait.stop;
                     
                     tc_noac.start;
@@ -3392,7 +3393,7 @@
                 
                 // Test Body
                 f_sendGeoNetMessage(
-                    m_geoNwReq_linkLayerBroadcast(
+                    valueof(m_geoNwReq_linkLayerBroadcast(
                         m_geoNwPdu(
                             m_geoNwUnicastPacket(
                                 v_longPosVectorNodeA,
@@ -3401,7 +3402,7 @@
                             )
                         )
                     )
-                );
+                ));
                 
                 tc_ac.start;
                 alt {
@@ -3467,7 +3468,7 @@
                 
                 // Test Body
                 f_sendGeoNetMessage(
-                    m_geoNwReq_linkLayerBroadcast(
+                    valueof(m_geoNwReq_linkLayerBroadcast(
                         m_geoNwPdu(
                             m_geoNwUnicastPacket(
                                 v_longPosVectorNodeA,
@@ -3476,7 +3477,7 @@
                             )
                         )
                     )
-                );
+                ));
                 
                 tc_noac.start;
                 alt {
@@ -3546,7 +3547,7 @@
                 
                 // Test Body
                 f_sendGeoNetMessage(
-                    m_geoNwReq_linkLayerBroadcast(
+                    valueof(m_geoNwReq_linkLayerBroadcast(
                         m_geoNwPdu(
                             m_geoNwUnicastPacket(
                                 v_longPosVectorNodeA,
@@ -3555,7 +3556,7 @@
                             )
                         )
                     )
-                );
+                ));
                 
                 tc_noac.start;
                 alt {
@@ -3677,22 +3678,22 @@
                     f_prNeighbour();
                     
                     // Make sure IUT has LocE for NodeA by sending unsolicited LS_REPLY
-                    f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(
+                    f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(
                         m_geoNwLsReplyPacket(
                             v_longPosVectorNodeA,
                             f_longPosVector2ShortPosVector(v_longPosVectorIut),
                             vc_localSeqNumber
                         )
-                    )));
+                    ))));
                     
                     f_selfOrClientSyncAndVerdict(c_prDone, e_success);
                     
                     // Test Body
                     // /!\ This pre-condition has impact on test body
-	                if ( not f_utTriggerEvent(m_generateGeoUnicastMessage(v_longPosVectorNodeA.gnAddr)) ) {
-	                    log("*** " & testcasename() & ": INCONC: Trigger failed ***");
-	                    f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);
-	                }
+                    if ( not f_utTriggerEvent(m_generateGeoUnicastMessage(v_longPosVectorNodeA.gnAddr)) ) {
+                        log("*** " & testcasename() & ": INCONC: Trigger failed ***");
+                        f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);
+                    }
                     tc_noac.start;
                     alt {
                         [] geoNetworkingPort.receive(mw_geoNwInd(mw_geoNwPdu(?))) {
@@ -3723,7 +3724,9 @@
                     // Local variables
                     var ItsGeoNetworking v_nodeB;
                     var ItsGeoNetworking v_nodeC;
-                    const UInt16 c_sequenceNumberC := f_getInitialSequenceNumber();
+//FIXME RGY c_sequenceNumberC shall not be constant as calls a function returning a variable
+//                    const UInt16 c_sequenceNumberC := f_getInitialSequenceNumber();
+                    var UInt16 c_sequenceNumberC := f_getInitialSequenceNumber();
                     
                     // Test control
                     if (not PICS_GN_GUC_SRC) {
garciay's avatar
garciay committed
@@ -3812,7 +3815,7 @@
                     vc_localSeqNumber := p_sequenceNumberC;
                     
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwUnicastPacket(
                                     v_longPosVectorNodeC,
@@ -3823,7 +3826,7 @@
                                 c_defaultHopLimit
                             )
                         )
-                    );
+                    ));
                     
                     f_selfOrClientSyncAndVerdict(c_prDone, e_success);
                     
@@ -3847,7 +3850,9 @@
                     // Local variables
                     var ItsGeoNetworking v_nodeB;
                     var ItsGeoNetworking v_nodeC;
-                    const UInt16 c_sequenceNumberC := f_getInitialSequenceNumber();
+//FIXME RGY c_sequenceNumberC shall not be constant as calls a function returning a variable
+//                    const UInt16 c_sequenceNumberC := f_getInitialSequenceNumber();
+                    var UInt16 c_sequenceNumberC := f_getInitialSequenceNumber();
                     const integer c_messageCount := 2;
                     
                     // Test control
garciay's avatar
garciay committed
@@ -3949,7 +3954,7 @@
                     
                     for(i:=0; i < vc_multipleMessagesCount; i:=i+1) {
                         f_sendGeoNetMessage(
-                            m_geoNwReq_linkLayerBroadcast(
+                            valueof(m_geoNwReq_linkLayerBroadcast(
                                 m_geoNwPdu(
                                     m_geoNwUnicastPacket(
                                         v_longPosVectorNodeC,
@@ -3958,7 +3963,7 @@
                                     )
                                 )
                             )
-                        );
+                        ));
                     }
                     
                     f_selfOrClientSyncAndVerdict(c_prDone, e_success);
@@ -4063,7 +4068,7 @@
                     f_prNeighbour();
                     
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwUnicastPacket(
                                     v_longPosVectorNodeC,
@@ -4074,7 +4079,7 @@
                                 c_defaultHopLimit
                             )
                         )
-                    );
+                    ));
                     
                     f_selfOrClientSyncAndVerdict(c_prDone, e_success);
                     
@@ -4245,10 +4250,10 @@
                     f_prDefault();
                     vc_multipleMessagesCount := p_messageCount;
                     for(i:=0; i < vc_multipleMessagesCount; i:=i+1) {
-	                    if(not f_utTriggerEvent(m_generateGeoBroadcastMessage(f_getArea(c_area1))) ) {
-	                        log("*** " & testcasename() & ": INCONC: Trigger failed ***");
-	                        f_selfOrClientSyncAndVerdict(c_prDone, e_timeout);
-	                    }
+                        if(not f_utTriggerEvent(m_generateGeoBroadcastMessage(f_getArea(c_area1))) ) {
+                            log("*** " & testcasename() & ": INCONC: Trigger failed ***");
+                            f_selfOrClientSyncAndVerdict(c_prDone, e_timeout);
+                        }
                     }
 
                     tc_ac.start(1.0);
@@ -4573,13 +4578,13 @@
                     f_prNeighbour();
                     
                     // Make sure IUT has LocE for NodeA by sending unsolicited LS_REPLY
-                    f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(
+                    f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(
                         m_geoNwLsReplyPacket(
                             v_longPosVectorNodeA,
                             f_longPosVector2ShortPosVector(v_longPosVectorIut),
                             vc_localSeqNumber
                         )
-                    )));
+                    ))));
                     
                     if ( not f_utTriggerEvent(m_generateGeoUnicastMessage(v_longPosVectorNodeA.gnAddr)) ) {
                         log("*** " & testcasename() & ": INCONC: Trigger failed ***");
@@ -4803,13 +4808,13 @@
                     // Preamble
                     f_prNonNeighbour();
                     // Make sure IUT has LocE for NodeA by sending unsolicited LS_REPLY
-                    f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(
+                    f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(
                         m_geoNwLsReplyPacket(
                             v_longPosVectorNodeA,
                             f_longPosVector2ShortPosVector(v_longPosVectorIut),
                             vc_localSeqNumber
                         )
-                    )));
+                    ))));
                     f_selfOrClientSyncAndVerdict(c_prDone, e_success);
                     
                     // Test Body
@@ -5418,7 +5423,7 @@
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_withLinkLayerDestination(
+                        valueof(m_geoNwReq_withLinkLayerDestination(
                             m_geoNwPdu(
                                 m_geoNwUnicastPacket(
                                     f_getPosition(c_compNodeC),
@@ -5433,7 +5438,7 @@
                             -,
                             f_getIutMacAddress()
                         )
-                    );
+                    ));
 
                     tc_ac.start;
                     alt {
@@ -5551,7 +5556,7 @@
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwAnycastPacket(
                                     v_longPosVectorNodeC,
@@ -5562,7 +5567,7 @@
                                 )
                             )
                         )
-                    );
+                    ));
                     
                     tc_ac.start;
                     alt {
@@ -5680,7 +5685,7 @@
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwBroadcastPacket(
                                     v_longPosVectorNodeC,
@@ -5691,7 +5696,7 @@
                                 )
                             )
                         )
-                    );
+                    ));
                     
                     tc_ac.start;
                     alt {
@@ -5809,7 +5814,7 @@
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_linkLayerBroadcast(
+                        valueof(m_geoNwReq_linkLayerBroadcast(
                             m_geoNwPdu(
                                 m_geoNwTsbPacket(
                                     vc_localSeqNumber,
@@ -5821,7 +5826,7 @@
                                 c_defaultHopLimit
                             )
                         )
-                    );
+                    ));
                     
                     tc_ac.start;
                     alt {
@@ -5970,7 +5975,7 @@
                 
                 // Test Body
                 v_longPosVectorNodeB.gnAddr := v_iutGnAddress;
-                f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(m_geoNwShbPacket(v_longPosVectorNodeB), -, c_hopLimit1)));
+                f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(m_geoNwShbPacket(v_longPosVectorNodeB), -, c_hopLimit1))));
                 
                 f_sleep(0.5);
                 
@@ -6340,7 +6345,7 @@
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_withLinkLayerDestination(
+                        valueof(m_geoNwReq_withLinkLayerDestination(
                             m_geoNwPdu(
                                 m_geoNwUnicastPacket(
                                     f_getPosition(c_compNodeC),
@@ -6353,7 +6358,7 @@
                             -,
                             f_getIutMacAddress()
                         )
-                    );
+                    ));
                     
                     f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
                     
@@ -6432,7 +6437,7 @@
                     f_prNeighbour();
                     
                     f_sendGeoNetMessage(
-                        m_geoNwReq_withLinkLayerDestination(
+                        valueof(m_geoNwReq_withLinkLayerDestination(
                             m_geoNwPdu(
                                 m_geoNwUnicastPacket(
                                     v_longPosVectorNodeA,
@@ -6443,7 +6448,7 @@
                             -,
                             f_getIutMacAddress()
                         )
-                    );
+                    ));
                     f_selfOrClientSyncAndVerdict(c_prDone, e_success);
                     
                     // Test Body
@@ -6507,7 +6512,7 @@
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_withLinkLayerDestination(
+                        valueof(m_geoNwReq_withLinkLayerDestination(
                             m_geoNwPdu(
                                 m_geoNwUnicastPacket(
                                     f_getPosition(c_compNodeC),
@@ -6521,7 +6526,7 @@
                             -,
                             f_getIutMacAddress()
                         )
-                    );
+                    ));
                     
                     f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
                     
@@ -6625,7 +6630,7 @@
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_withLinkLayerDestination(
+                        valueof(m_geoNwReq_withLinkLayerDestination(
                             m_geoNwPdu(
                                 m_geoNwUnicastPacket(
                                     f_getPosition(c_compNodeC),
@@ -6638,7 +6643,7 @@
                             -,
                             f_getIutMacAddress()
                         )
-                    );
+                    ));
                     
                     f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
                     
@@ -6683,7 +6688,7 @@
                                       vc_localSeqNumber
                                   )
                               );
-                f_sendGeoNetMessage(m_geoNwReq_withLinkLayerDestination(v_gnPacket, -, f_getIutMacAddress()));
+                f_sendGeoNetMessage(valueof(m_geoNwReq_withLinkLayerDestination(v_gnPacket, -, f_getIutMacAddress())));
                 
                 f_sleep(PX_TAC);
                 
@@ -6829,7 +6834,7 @@
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_withLinkLayerDestination(
+                        valueof(m_geoNwReq_withLinkLayerDestination(
                             m_geoNwPdu(
                                 m_geoNwUnicastPacket(
                                     f_getPosition(c_compNodeC),
@@ -6842,7 +6847,7 @@
                             -,
                             f_getIutMacAddress()
                         )
-                    );
+                    ));
                     log("*** " & testcasename() & ": INFO: Message sent ***");
                     f_selfOrClientSyncAndVerdict(c_msgSent, e_success);
                     
@@ -6955,7 +6960,7 @@
                         ) {
                             tc_ac.stop;
                             if(t_toCbf.running) {
-                            	t_toCbf.stop;
+                                t_toCbf.stop;
                                 log("*** " & testcasename() & ": FAIL: IUT re-broadcasted the packet too early ***");
                                 f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
                             }
@@ -6994,7 +6999,7 @@
                     
                     // Test Body
                     f_sendGeoNetMessage(
-                        m_geoNwReq_withLinkLayerDestination(
+                        valueof(m_geoNwReq_withLinkLayerDestination(
                             m_geoNwPdu(
                                 m_geoNwUnicastPacket(
                                     f_getPosition(c_compNodeC),
@@ -7007,7 +7012,7 @@
                             -,
                             f_getIutMacAddress()
                         )
-                    );
+                    ));
                     log("*** " & testcasename() & ": INFO: Message sent ***");
                     f_selfOrClientSyncAndVerdict(c_msgSent, e_success);
                     
@@ -7104,7 +7109,7 @@
                     f_sleepIgnoreDef(int2float(f_getGeoUnicastCbfMaxTime())/2000.0);
                     
                     f_sendGeoNetMessage(
-                        m_geoNwReq_withLinkLayerDestination(
+                        valueof(m_geoNwReq_withLinkLayerDestination(
                             m_geoNwPdu(
                                 m_geoNwUnicastPacket(
                                     f_getPosition(c_compNodeC),
@@ -7117,7 +7122,7 @@
                             -,
                             f_getIutMacAddress()
                         )
-                    );
+                    ));
                     
                     tc_noac.start;
                     alt {
@@ -7162,7 +7167,7 @@
                     // Test Body
                     //Note: Sending of the GUC packet move to test body in contrast to the test purpose due to time critical behaviour
                     f_sendGeoNetMessage(
-                        m_geoNwReq_withLinkLayerDestination(
+                        valueof(m_geoNwReq_withLinkLayerDestination(
                             m_geoNwPdu(
                                 m_geoNwUnicastPacket(
                                     f_getPosition(c_compNodeC),
@@ -7175,7 +7180,7 @@
                             -,
                             f_getIutMacAddress()
                         )
-                    );
+                    ));
                     
                     tc_noac.start;
                     alt {
@@ -7311,7 +7316,7 @@