Validate IVIM & MAPEM ATS

ttcn/Common/LibItsCommon_ASN1_NamedNumbers.ttcn

@@ -48,8 +48,8 @@ module LibItsCommon_ASN1_NamedNumbers {
             const ItsPduHeader.messageID ItsPduHeader_messageID_denm_ := 1;
             const ItsPduHeader.messageID ItsPduHeader_messageID_cam_ := 2;
             const ItsPduHeader.messageID ItsPduHeader_messageID_poi_ := 3;
-            const ItsPduHeader.messageID ItsPduHeader_messageID_spatem_ := 4;
-            const ItsPduHeader.messageID ItsPduHeader_messageID_mapem_ := 5;
+            const ItsPduHeader.messageID ItsPduHeader_messageID_mapem_ := 4;
+            const ItsPduHeader.messageID ItsPduHeader_messageID_spatem_ := 5;
             const ItsPduHeader.messageID ItsPduHeader_messageID_ivim_ := 6;
             const ItsPduHeader.messageID ItsPduHeader_messageID_ev_rsr_ := 7;
             const ItsPduHeader.messageID ItsPduHeader_messageID_tistpgtransaction_ := 8;

ttcn/MapemSpatem/LibItsMapemSpatem_EncdecDeclarations.ttcn

@@ -4,16 +4,16 @@ module LibItsMapemSpatem_EncdecDeclarations {
     import from MAPEM_PDU_Descriptions language "ASN.1:1997" all;
     import from SPATEM_PDU_Descriptions language "ASN.1:1997" all;
     
-    external function fx_enc_MAPEM (MAPEM pdu) return octetstring
-        with {extension "prototype(convert) encode(BER:BER_ENCODE_CER)"}
+    external function fx_enc_MAPEM (MAPEM pdu) return bitstring
+        with {extension "prototype(convert) encode(PER)"}
     
-    external function fx_dec_MAPEM (octetstring stream) return MAPEM
-        with {extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)"}
+    external function fx_dec_MAPEM (inout bitstring b, out MAPEM p) return integer
+        with {extension "prototype(sliding) decode(PER)"}
     
-    external function fx_enc_SPATEM (SPATEM pdu) return octetstring
-        with {extension "prototype(convert) encode(BER:BER_ENCODE_CER)"}
+    external function fx_enc_SPATEM (SPATEM pdu) return bitstring
+        with {extension "prototype(convert) encode(PER)"}
     
-    external function fx_dec_SPATEM (octetstring stream) return SPATEM
-        with {extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)"}
+    external function fx_dec_SPATEM (inout bitstring b, out SPATEM p) return integer
+        with {extension "prototype(sliding) decode(PER)"}
     
 } // End of module LibItsMapemSpatem_EncdecDeclarations

ttcn/MapemSpatem/LibItsMapemSpatem_Functions.ttcn

@@ -208,11 +208,13 @@ module LibItsMapemSpatem_Functions {
             var UtSpatemEventInd v_spatemevent;
             [] utPort.receive(UtMapemEventInd:?) -> value v_mapemevent {
                 //store every upper tester indication received
+                log("*** " & testcasename() & ": INFO: Store UtMapemEventInd messge ***");
                 vc_utMapemEvents[lengthof(vc_utMapemEvents)] := v_mapemevent;
                 repeat;
             }
             [] utPort.receive(UtSpatemEventInd:?) -> value v_spatemevent {
                 //store every upper tester indication received
+                log("*** " & testcasename() & ": INFO: Store UtSpatemEventInd messge ***");
                 vc_utSpatemEvents[lengthof(vc_utSpatemEvents)] := v_spatemevent;
                 repeat;
             }

ttcn/MapemSpatem/LibItsMapemSpatem_Templates.ttcn

@@ -400,9 +400,9 @@ module LibItsMapemSpatem_Templates {
                  * @desc    Receive template for MAPEM Message
                  */
                 template (omit) MapData m_mapem(
-                                                 in template (value) MsgCount p_msgIssueRevision,
-                                                 in template (omit) IntersectionGeometryList p_intersectionGeometryList := omit,
-                                                 in template (omit) RoadSegmentList p_roadSegments := omit
+                                                in template (value) MsgCount p_msgIssueRevision,
+                                                in template (omit) IntersectionGeometryList p_intersectionGeometryList := omit,
+                                                in template (omit) RoadSegmentList p_roadSegments := omit
                 ) modifies m_defaultMapem := {
                     msgIssueRevision  := p_msgIssueRevision,
                     intersections     := p_intersectionGeometryList,