UpperTester changes

ttcn/CAM/LibItsCam_Functions.ttcn

@@ -110,10 +110,10 @@ module LibItsCam_Functions {
                 [] utPort.receive(UtCamResults: { utCamChangePositionResult := true}) {
                     tc_wait.stop;
                 }
-		[] utPort.receive(UtCamResults: { utCamChangePositionResult := false }) {
-		  tc_wait.stop;
-		  log("*** f_utChangePosition: INFO: IUT position change was not successful ***");
-		  f_selfOrClientSyncAndVerdict("error", e_error);
+                [] utPort.receive(UtCamResults: { utCamChangePositionResult := false }) {
+                    tc_wait.stop;
+                    log("*** f_utChangePosition: INFO: IUT position change was not successful ***");
+                    f_selfOrClientSyncAndVerdict("error", e_error);
                 }
                 [] a_utDefault() {
                 }

ttcn/DENM/LibItsDenm_EncdecDeclarations.ttcn

@@ -22,4 +22,10 @@ module LibItsDenm_EncdecDeclarations {
     external function fx_enc_UtDenmInitialize (UtDenmInitialize p) return bitstring
         with {extension "prototype(convert) encode(UpperTester)"}
     
+    external function fx_enc_UtDenmChangePosition (UtDenmChangePosition p) return bitstring
+        with {extension "prototype(convert) encode(UpperTester)"}
+    
+    external function fx_enc_UtDenmChangePseudonym (UtDenmChangePseudonym p) return bitstring
+        with {extension "prototype(convert) encode(UpperTester)"}
+    
 } // End of module LibItsDenm_EncdecDeclarations 

ttcn/DENM/LibItsDenm_Functions.ttcn

@@ -58,7 +58,7 @@ module LibItsDenm_Functions {
                     log("*** " & testcasename() & ": INFO: Could not receive expected UT message from IUT in time ***");
                     f_selfOrClientSyncAndVerdict("error", e_timeout);
                 }
-            }            
+            }
             
             //activate denmPort default alts
             vc_denmDefaultActive := true;
@@ -69,7 +69,7 @@ module LibItsDenm_Functions {
          * @desc    Requests to change the IUT with a new pseudonym
          * @param   p_change The change to trigger.
          */
-        function f_utChangePseudonym ( template (value) UtChangePseudonym p_change ) runs on ItsDenm {
+        function f_utChangePseudonym ( template (value) UtDenmChangePseudonym p_change ) runs on ItsDenm {
             
             //deactivate denmPort default alts
             vc_denmDefaultActive := false;
@@ -77,11 +77,11 @@ module LibItsDenm_Functions {
             utPort.send(p_change);
             tc_wait.start;
             alt {
-                [] utPort.receive(UtDenmResults: { utChangePseudonymResult := true}) {
+                [] utPort.receive(UtDenmResults: { utDenmChangePseudonymResult := true}) {
                     tc_wait.stop;
                     log("*** " & testcasename() & ": INFO: IUT pseudonym changed ***");
                 }
-                [] utPort.receive(UtDenmResults: { utChangePseudonymResult := false}) {
+                [] utPort.receive(UtDenmResults: { utDenmChangePseudonymResult := false}) {
                     tc_wait.stop;
                     log("*** " & testcasename() & ": INFO: IUT pseudonym changed ***");
                     f_selfOrClientSyncAndVerdict("error", e_error);

ttcn/DENM/LibItsDenm_Templates.ttcn

@@ -146,7 +146,7 @@ module LibItsDenm_Templates {
             /**
              * @desc    Send template for Upper Tester event changePseudonym
              */
-            template (value) UtChangePseudonym m_utChangePseudonym := {
+            template (value) UtDenmChangePseudonym m_utDenmChangePseudonym := {
             }
             
             /**
@@ -231,7 +231,7 @@ module LibItsDenm_Templates {
              * @param p_longitude   The new longitude
              * @param p_elevation   The new elevation (Default: 0)
              */
-            template (value) UtDenmChangePosition m_utChangePosition(
+            template (value) UtDenmChangePosition m_utDenmChangePosition(
                 template (value) integer p_latitude,
                 template (value) integer p_longitude,
                 template (value) integer p_elevation := 0

ttcn/DENM/LibItsDenm_TestSystem.ttcn

@@ -47,7 +47,7 @@ module LibItsDenm_TestSystem {
          */
         type port UpperTesterPort message {
             out 
-                UtDenmInitialize, UtDenmTrigger, UtDenmUpdate, UtDenmTermination, UtDenmChangePosition, UtChangePseudonym;
+                UtDenmInitialize, UtDenmTrigger, UtDenmUpdate, UtDenmTermination, UtDenmChangePosition, UtDenmChangePseudonym;
             in 
                 UtDenmResults, UtDenmEventInd;
         } // end UpperTesterPort

ttcn/DENM/LibItsDenm_TypesAndValues.ttcn

@@ -80,7 +80,7 @@ module LibItsDenm_TypesAndValues {
      * @member utDenmTriggerResult          -
      * @member utDenmUpdateResult,          -
      * @member utDenmChangePositionResult   -
-     * @member utChangePseudonymResult      -
+     * @member utDenmChangePseudonymResult      -
      */
     type union UtDenmResults {
       boolean utDenmInitializeResult,
@@ -88,7 +88,7 @@ module LibItsDenm_TypesAndValues {
         UtDenmUpdateResult utDenmUpdateResult,
         boolean utDenmTerminationResult,
         boolean utDenmChangePositionResult,
-        boolean utChangePseudonymResult
+        boolean utDenmChangePseudonymResult
       } with {
       variant ""
       } // End of type UtDenmResults
@@ -171,7 +171,7 @@ module LibItsDenm_TypesAndValues {
     /**
      * @desc Upper Tester message to change the pseudonym of the DENM IUT 
      */
-    type record UtChangePseudonym {
+    type record UtDenmChangePseudonym {
       // empty on purpose
     } with {
       variant "FIELDORDER(msb)"

ttcn/GeoNetworking/LibItsGeoNetworking_TestSystem.ttcn

@@ -50,9 +50,9 @@ module LibItsGeoNetworking_TestSystem {
          */
         type port UpperTesterPort message {
             out
-                UtGnInitialize, UtGnChangePosition, UtAutoInteropTrigger, UtGnTrigger;
+                UtGnInitialize, UtGnChangePosition, UtAutoInteropTrigger, UtGnTrigger; // FIXME Remove UtAutoInteropTrigger from GN component, create an AutoInterop component
             in
-	        UtGnResults, UtGnEventInd;
+                UtGnResults, UtGnEventInd;
         } // end UpperTesterPort
         
     } // end portDefinitions

ttcn/GeoNetworking/LibItsGeoNetworking_TypesAndValues.ttcn

@@ -949,7 +949,7 @@ module LibItsGeoNetworking_TypesAndValues {
     type union UtGnResults {
       boolean utGnInitializeResult,
         boolean utGnTriggerResult,
-        boolean utGnAutoInteropTriggerResult,
+        boolean utAutoInteropTriggerResult, // FIXME Remove UtAutoInteropTrigger from GN component, create an AutoInterop component
         boolean utGnChangePositionResult
       } with {
       variant ""