Fix issue in PModeGroupInAtomicSwcInstanceRef

PModeGroupInAtomicSwcInstanceRef used the wrong
XML tag for the property target_mode_group.

Author: cogu

examples/xml/port/data/ModeSwitchComponent.arxml

@@ -57,7 +57,7 @@
                       <SHORT-NAME>SWITCH_VehicleMode_mode</SHORT-NAME>
                       <MODE-GROUP-IREF>
                         <CONTEXT-P-PORT-REF DEST="P-PORT-PROTOTYPE">/ComponentTypes/ModeSwitchComponent/VehicleMode</CONTEXT-P-PORT-REF>
-                        <CONTEXT-MODE-DECLARATION-GROUP-PROTOTYPE-REF DEST="MODE-DECLARATION-GROUP-PROTOTYPE">/PortInterfaces/VehicleMode_I/mode</CONTEXT-MODE-DECLARATION-GROUP-PROTOTYPE-REF>
+                        <TARGET-MODE-GROUP-REF DEST="MODE-DECLARATION-GROUP-PROTOTYPE">/PortInterfaces/VehicleMode_I/mode</TARGET-MODE-GROUP-REF>
                       </MODE-GROUP-IREF>
                     </MODE-SWITCH-POINT>
                   </MODE-SWITCH-POINTS>

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "autosar"
-version = "0.5.5b2"
+version = "0.5.5b3"
 description = "A set of Python modules for working with AUTOSAR XML files"
 readme = "README.md"
 requires-python = ">=3.10"

src/autosar/xml/element.py

@@ -5587,7 +5587,7 @@ def __init__(self,
                  ) -> None:
         # .CONTEXT-P-PORT-REF
         self.context_port: AbstractProvidedPortPrototypeRef | None = None
-        # .CONTEXT-MODE-DECLARATION-GROUP-PROTOTYPE-REF (keep name consistent in similar classes)
+        # .TARGET-MODE-GROUP-REF
         self.target_mode_group: ModeDeclarationGroupPrototypeRef | None = None
 
         self._assign_optional("context_port", context_port, AbstractProvidedPortPrototypeRef)

src/autosar/xml/reader.py

@@ -4488,7 +4488,7 @@ def _read_p_mode_group_in_atomic_swc_instance_ref(self,
         xml_child = child_elements.get("CONTEXT-P-PORT-REF")
         if xml_child is not None:
             data["context_port"] = self._read_abstract_provided_port_prototype_ref(xml_child)
-        xml_child = child_elements.get("CONTEXT-MODE-DECLARATION-GROUP-PROTOTYPE-REF")
+        xml_child = child_elements.get("TARGET-MODE-GROUP-REF")
         if xml_child is not None:
             child_element = self._read_mode_declaration_group_prototype_ref(xml_child)
             data["target_mode_group"] = child_element

src/autosar/xml/writer.py

@@ -3887,7 +3887,7 @@ def _write_p_mode_group_in_atomic_swc_instance_ref(self,
                 self._write_abstract_provided_port_prototype_ref(elem.context_port, "CONTEXT-P-PORT-REF")
             if elem.target_mode_group is not None:
                 self._write_mode_declaration_group_prototype_ref(elem.target_mode_group,
-                                                                 "CONTEXT-MODE-DECLARATION-GROUP-PROTOTYPE-REF")
+                                                                 "TARGET-MODE-GROUP-REF")
             self._leave_child()
 
     def _write_p_operation_in_atomic_swc_instance_ref(self,

tests/xml/test_swc_internal_behavior.py

@@ -486,13 +486,12 @@ def test_mode_group_with_p_port(self):
             context_port=context_port,
             target_mode_group=context_mode_decl_group_ref_str)
         element = ar_element.ModeAccessPoint(mode_group=mode_group_iref)
-
-        inner_tag = "CONTEXT-MODE-DECLARATION-GROUP-PROTOTYPE-REF"
+        long_tag = "TARGET-MODE-GROUP-REF"
         xml = f'''<MODE-ACCESS-POINT>
   <MODE-GROUP-IREF>
     <P-MODE-GROUP-IN-ATOMIC-SWC-INSTANCE-REF>
       <CONTEXT-P-PORT-REF DEST="P-PORT-PROTOTYPE">{context_port_ref_str}</CONTEXT-P-PORT-REF>
-      <{inner_tag} DEST="MODE-DECLARATION-GROUP-PROTOTYPE">{context_mode_decl_group_ref_str}</{inner_tag}>
+      <{long_tag} DEST="MODE-DECLARATION-GROUP-PROTOTYPE">{context_mode_decl_group_ref_str}</{long_tag}>
     </P-MODE-GROUP-IN-ATOMIC-SWC-INSTANCE-REF>
   </MODE-GROUP-IREF>
 </MODE-ACCESS-POINT>'''
@@ -516,12 +515,11 @@ def test_mode_group_with_r_port(self):
             target_mode_group=target_mode_group_ref)
         element = ar_element.ModeAccessPoint(mode_group=mode_group_iref)
 
-        inner_tag = "TARGET-MODE-GROUP-REF"
         xml = f'''<MODE-ACCESS-POINT>
   <MODE-GROUP-IREF>
     <R-MODE-GROUP-IN-ATOMIC-SWC-INSTANCE-REF>
       <CONTEXT-R-PORT-REF DEST="R-PORT-PROTOTYPE">{context_port_ref_str}</CONTEXT-R-PORT-REF>
-      <{inner_tag} DEST="MODE-DECLARATION-GROUP-PROTOTYPE">{target_mode_group_ref_str}</{inner_tag}>
+      <TARGET-MODE-GROUP-REF DEST="MODE-DECLARATION-GROUP-PROTOTYPE">{target_mode_group_ref_str}</TARGET-MODE-GROUP-REF>
     </R-MODE-GROUP-IN-ATOMIC-SWC-INSTANCE-REF>
   </MODE-GROUP-IREF>
 </MODE-ACCESS-POINT>'''
@@ -558,13 +556,12 @@ def test_mode_group(self):
             context_port=context_port,
             target_mode_group=context_mode_decl_group_ref_str)
         element = ar_element.ModeSwitchPoint("MyName", mode_group=mode_group_iref)
-
-        inner_tag = "CONTEXT-MODE-DECLARATION-GROUP-PROTOTYPE-REF"
+        long_tag = "TARGET-MODE-GROUP-REF"
         xml = f'''<MODE-SWITCH-POINT>
   <SHORT-NAME>MyName</SHORT-NAME>
   <MODE-GROUP-IREF>
     <CONTEXT-P-PORT-REF DEST="P-PORT-PROTOTYPE">{context_port_ref_str}</CONTEXT-P-PORT-REF>
-    <{inner_tag} DEST="MODE-DECLARATION-GROUP-PROTOTYPE">{context_mode_decl_group_ref_str}</{inner_tag}>
+    <{long_tag} DEST="MODE-DECLARATION-GROUP-PROTOTYPE">{context_mode_decl_group_ref_str}</{long_tag}>
   </MODE-GROUP-IREF>
 </MODE-SWITCH-POINT>'''
         writer = autosar.xml.Writer()
@@ -2064,7 +2061,7 @@ def test_mode_access_point_from_list(self):
         mode_access1 = ar_element.ModeAccessPoint(ar_element.ModeAccessPointIdent("MyAccessPoint1"), mode_group_iref1)
         mode_access2 = ar_element.ModeAccessPoint(ar_element.ModeAccessPointIdent("MyAccessPoint2"), mode_group_iref2)
         element = ar_element.RunnableEntity("MyName", mode_access_point=[mode_access1, mode_access2])
-        long_tag = "CONTEXT-MODE-DECLARATION-GROUP-PROTOTYPE-REF"
+        long_tag = "TARGET-MODE-GROUP-REF"
         writer = autosar.xml.Writer()
         xml = f'''<RUNNABLE-ENTITY>
   <SHORT-NAME>MyName</SHORT-NAME>
@@ -2117,7 +2114,6 @@ def test_mode_switch_point_from_single_element(self):
         mode_group_iref = ar_element.PModeGroupInAtomicSwcInstanceRef(port_prototype_ref, mode_group_ref_str)
         mode_switch = ar_element.ModeSwitchPoint("MyModeSwitchPoint", mode_group_iref)
         element = ar_element.RunnableEntity("MyName", mode_switch_point=mode_switch)
-        long_tag = "CONTEXT-MODE-DECLARATION-GROUP-PROTOTYPE-REF"
         writer = autosar.xml.Writer()
         xml = f'''<RUNNABLE-ENTITY>
   <SHORT-NAME>MyName</SHORT-NAME>
@@ -2126,7 +2122,7 @@ def test_mode_switch_point_from_single_element(self):
       <SHORT-NAME>MyModeSwitchPoint</SHORT-NAME>
       <MODE-GROUP-IREF>
         <CONTEXT-P-PORT-REF DEST="{port_dest_str}">{port_ref_str}</CONTEXT-P-PORT-REF>
-        <{long_tag} DEST="{mode_dest_str}">{mode_group_ref_str}</{long_tag}>
+        <TARGET-MODE-GROUP-REF DEST="{mode_dest_str}">{mode_group_ref_str}</TARGET-MODE-GROUP-REF>
       </MODE-GROUP-IREF>
     </MODE-SWITCH-POINT>
   </MODE-SWITCH-POINTS>
@@ -2154,7 +2150,6 @@ def test_mode_switch_point_from_list(self):
         mode_switch1 = ar_element.ModeSwitchPoint("MyModeSwitchPoint1", mode_group_iref1)
         mode_switch2 = ar_element.ModeSwitchPoint("MyModeSwitchPoint2", mode_group_iref2)
         element = ar_element.RunnableEntity("MyName", mode_switch_point=[mode_switch1, mode_switch2])
-        long_tag = "CONTEXT-MODE-DECLARATION-GROUP-PROTOTYPE-REF"
         writer = autosar.xml.Writer()
         xml = f'''<RUNNABLE-ENTITY>
   <SHORT-NAME>MyName</SHORT-NAME>
@@ -2163,14 +2158,14 @@ def test_mode_switch_point_from_list(self):
       <SHORT-NAME>MyModeSwitchPoint1</SHORT-NAME>
       <MODE-GROUP-IREF>
         <CONTEXT-P-PORT-REF DEST="{port_dest_str}">{port_ref_str1}</CONTEXT-P-PORT-REF>
-        <{long_tag} DEST="{mode_dest_str}">{mode_group_ref_str1}</{long_tag}>
+        <TARGET-MODE-GROUP-REF DEST="{mode_dest_str}">{mode_group_ref_str1}</TARGET-MODE-GROUP-REF>
       </MODE-GROUP-IREF>
     </MODE-SWITCH-POINT>
     <MODE-SWITCH-POINT>
       <SHORT-NAME>MyModeSwitchPoint2</SHORT-NAME>
       <MODE-GROUP-IREF>
         <CONTEXT-P-PORT-REF DEST="{port_dest_str}">{port_ref_str2}</CONTEXT-P-PORT-REF>
-        <{long_tag} DEST="{mode_dest_str}">{mode_group_ref_str2}</{long_tag}>
+        <TARGET-MODE-GROUP-REF DEST="{mode_dest_str}">{mode_group_ref_str2}</TARGET-MODE-GROUP-REF>
       </MODE-GROUP-IREF>
     </MODE-SWITCH-POINT>
   </MODE-SWITCH-POINTS>
@@ -3423,12 +3418,12 @@ def test_mode_group_from_element(self):
             target_mode_group=context_mode_decl_group_ref_str)
         element = ar_element.SwcModeManagerErrorEvent('MyName',
                                                       mode_group=mode_instance)
-        tag = "CONTEXT-MODE-DECLARATION-GROUP-PROTOTYPE-REF"
+        long_tag = "TARGET-MODE-GROUP-REF"
         xml = f'''<SWC-MODE-MANAGER-ERROR-EVENT>
   <SHORT-NAME>MyName</SHORT-NAME>
   <MODE-GROUP-IREF>
     <CONTEXT-P-PORT-REF DEST="P-PORT-PROTOTYPE">{context_port_ref_str}</CONTEXT-P-PORT-REF>
-    <{tag} DEST="MODE-DECLARATION-GROUP-PROTOTYPE">{context_mode_decl_group_ref_str}</{tag}>
+    <{long_tag} DEST="MODE-DECLARATION-GROUP-PROTOTYPE">{context_mode_decl_group_ref_str}</{long_tag}>
   </MODE-GROUP-IREF>
 </SWC-MODE-MANAGER-ERROR-EVENT>'''
         writer = autosar.xml.Writer()
@@ -3449,13 +3444,13 @@ def test_mode_group_using_convenience_method(self):
                                                            start_on_event_ref_str,
                                                            context_port,
                                                            context_mode_decl_group_ref_str)
-        tag = "CONTEXT-MODE-DECLARATION-GROUP-PROTOTYPE-REF"
+        long_tag = "TARGET-MODE-GROUP-REF"
         xml = f'''<SWC-MODE-MANAGER-ERROR-EVENT>
   <SHORT-NAME>MyName</SHORT-NAME>
   <START-ON-EVENT-REF DEST="RUNNABLE-ENTITY">{start_on_event_ref_str}</START-ON-EVENT-REF>
   <MODE-GROUP-IREF>
     <CONTEXT-P-PORT-REF DEST="P-PORT-PROTOTYPE">{context_port_ref_str}</CONTEXT-P-PORT-REF>
-    <{tag} DEST="MODE-DECLARATION-GROUP-PROTOTYPE">{context_mode_decl_group_ref_str}</{tag}>
+    <{long_tag} DEST="MODE-DECLARATION-GROUP-PROTOTYPE">{context_mode_decl_group_ref_str}</{long_tag}>
   </MODE-GROUP-IREF>
 </SWC-MODE-MANAGER-ERROR-EVENT>'''
         writer = autosar.xml.Writer()