armodel 1.8.2__py3-none-any.whl → 1.8.3__py3-none-any.whl

armodel/tests/test_armodel/parser/test_arxml_parser.py

@@ -1,5 +1,8 @@
 
+from ....writer.arxml_writer import ARXMLWriter
+from ....models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSARDoc
 from ....parser.arxml_parser import ARXMLParser
+import xml.etree.ElementTree as ET
 
 
 class TestARXMLParser:
@@ -13,3 +16,38 @@ class TestARXMLParser:
         assert (parser.convert_find_key("A/B/*") == "xmlns:A/xmlns:B/*")
         assert (parser.convert_find_key("./A/B") == "./xmlns:A/xmlns:B")
         assert (parser.convert_find_key("./A/B/*") == "./xmlns:A/xmlns:B/*")
+
+    def test_read_ar_packages(self):
+        parser = ARXMLParser()
+        parser.nsmap = {"xmlns": "http://autosar.org/schema/r4.0"}
+        xml_content = """
+            <AUTOSAR xmlns="http://autosar.org/schema/r4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://autosar.org/schema/r4.0 AUTOSAR_4-3-0.xsd">
+                <AR-PACKAGES T="2023-03-08T00:27:29+08:00" UUID="cb03ce49-8b4b-4565-abce-0a7a054d24af">
+                    <AR-PACKAGE>
+                        <SHORT-NAME>ApplicationTypes</SHORT-NAME>s
+                        <ELEMENTS>
+                            <IMPLEMENTATION-DATA-TYPE>
+                                <SHORT-NAME>MyDataType</SHORT-NAME>
+                            </IMPLEMENTATION-DATA-TYPE>
+                        </ELEMENTS>
+                    </AR-PACKAGE>
+                    <AR-PACKAGE>
+                        <SHORT-NAME>MyPackage</SHORT-NAME>
+                        <ELEMENTS>
+                            <IMPLEMENTATION-DATA-TYPE>
+                                <SHORT-NAME>MyDataType2</SHORT-NAME>
+                            </IMPLEMENTATION-DATA-TYPE>
+                        </ELEMENTS>
+                    </AR-PACKAGE>
+                </AR-PACKAGES>
+            </AUTOSAR>
+        """ # noqa E501
+
+        # prepare the XML content
+        element = ET.fromstring(xml_content)
+
+        document = AUTOSARDoc()
+        parser.readARPackages(element, document)
+        assert len(document.getARPackages()) == 2
+        assert document.getARPackages()[0].getShortName() == "ApplicationTypes"
+        assert document.getARPackages()[1].getShortName() == "MyPackage"

armodel/tests/test_armodel/parser/test_implementation_data_type.py

@@ -0,0 +1,247 @@
+from ....writer.arxml_writer import ARXMLWriter
+from ....models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSARDoc
+from ....parser.arxml_parser import ARXMLParser
+import xml.etree.ElementTree as ET
+
+
+class TestImplementationDataTypeParser:
+
+    def test_read_value_implementation_data_type(self):
+        parser = ARXMLParser()
+        parser.nsmap = {"xmlns": "http://autosar.org/schema/r4.0"}
+        xml_content = """
+            <AUTOSAR xmlns="http://autosar.org/schema/r4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://autosar.org/schema/r4.0 AUTOSAR_4-3-0.xsd">
+                <AR-PACKAGES T="2023-03-08T00:27:29+08:00" UUID="cb03ce49-8b4b-4565-abce-0a7a054d24af">
+                    <AR-PACKAGE>
+                        <SHORT-NAME>ImplementationDataType</SHORT-NAME>s
+                        <ELEMENTS>
+                            <IMPLEMENTATION-DATA-TYPE>
+                                <SHORT-NAME>MyDataType</SHORT-NAME>
+                                <CATEGORY>VALUE</CATEGORY>
+                                <SW-DATA-DEF-PROPS T="2020-08-24T10:22:17+02:00">
+                                    <SW-DATA-DEF-PROPS-VARIANTS>
+                                    <SW-DATA-DEF-PROPS-CONDITIONAL T="2020-08-31T10:28:32+02:00">
+                                        <BASE-TYPE-REF DEST="SW-BASE-TYPE">/AUTOSAR_Platform/BaseTypes/uint8</BASE-TYPE-REF>
+                                        <COMPU-METHOD-REF DEST="COMPU-METHOD">/Application/ApplicationTypes/compu_Application_E_MyDataType</COMPU-METHOD-REF>
+                                    </SW-DATA-DEF-PROPS-CONDITIONAL>
+                                    </SW-DATA-DEF-PROPS-VARIANTS>
+                                </SW-DATA-DEF-PROPS>
+                            </IMPLEMENTATION-DATA-TYPE>
+                        </ELEMENTS>
+                    </AR-PACKAGE>
+                </AR-PACKAGES>
+            </AUTOSAR>
+        """  # noqa E501
+
+        # prepare the XML content
+        element = ET.fromstring(xml_content)
+
+        # read the XML content using the parser
+        document = AUTOSARDoc()
+        parser.readARPackages(element, document)
+
+        # assert the ARPackages
+        assert len(document.getARPackages()) == 1
+        ar_package = document.getARPackages()[0]
+        assert ar_package.getShortName() == "ImplementationDataType"
+
+        # assert the ImplementationDataType
+        assert len(ar_package.getImplementationDataTypes()) == 1
+        data_type = ar_package.getImplementationDataTypes()[0]
+        assert data_type.getShortName() == "MyDataType"
+        assert str(data_type.getCategory()) == "VALUE"
+        assert data_type.getCategory().getValue() == "VALUE"
+        assert data_type.getSwDataDefProps() is not None
+        assert data_type.getSwDataDefProps().getBaseTypeRef().getDest() == "SW-BASE-TYPE"
+        assert data_type.getSwDataDefProps().getBaseTypeRef().getValue() == "/AUTOSAR_Platform/BaseTypes/uint8"
+        assert data_type.getSwDataDefProps().getCompuMethodRef().getDest() == "COMPU-METHOD"
+        assert data_type.getSwDataDefProps().getCompuMethodRef().getValue() == "/Application/ApplicationTypes/compu_Application_E_MyDataType"
+
+    def test_read_array_implementation_data_type(self):
+        parser = ARXMLParser()
+        parser.nsmap = {"xmlns": "http://autosar.org/schema/r4.0"}
+        xml_content = """
+            <AUTOSAR xmlns="http://autosar.org/schema/r4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://autosar.org/schema/r4.0 AUTOSAR_4-3-0.xsd">
+                <AR-PACKAGES T="2023-03-08T00:27:29+08:00" UUID="cb03ce49-8b4b-4565-abce-0a7a054d24af">
+                    <AR-PACKAGE>
+                        <SHORT-NAME>ImplementationDataType</SHORT-NAME>s
+                        <ELEMENTS>
+                            <IMPLEMENTATION-DATA-TYPE>
+                                <SHORT-NAME>MyArrayDataType</SHORT-NAME>
+                                <CATEGORY>ARRAY</CATEGORY>
+                                <SW-DATA-DEF-PROPS>
+                                    <SW-DATA-DEF-PROPS-VARIANTS>
+                                    <SW-DATA-DEF-PROPS-CONDITIONAL></SW-DATA-DEF-PROPS-CONDITIONAL>
+                                    </SW-DATA-DEF-PROPS-VARIANTS>
+                                </SW-DATA-DEF-PROPS>
+                                <SUB-ELEMENTS>
+                                    <IMPLEMENTATION-DATA-TYPE-ELEMENT UUID="2264d081-8375-489d-bd02-b71b9d495a18">
+                                    <SHORT-NAME>Byte</SHORT-NAME>
+                                    <CATEGORY>VALUE</CATEGORY>
+                                    <ARRAY-SIZE T="2021-03-26T19:19:25+01:00">8</ARRAY-SIZE>
+                                    <ARRAY-SIZE-SEMANTICS>FIXED-SIZE</ARRAY-SIZE-SEMANTICS>
+                                    <SW-DATA-DEF-PROPS>
+                                        <SW-DATA-DEF-PROPS-VARIANTS>
+                                            <SW-DATA-DEF-PROPS-CONDITIONAL T="2021-03-26T20:19:25+01:00">
+                                                <BASE-TYPE-REF DEST="SW-BASE-TYPE">/AUTOSAR_Platform/BaseTypes/uint8</BASE-TYPE-REF>
+                                            </SW-DATA-DEF-PROPS-CONDITIONAL>
+                                        </SW-DATA-DEF-PROPS-VARIANTS>
+                                    </SW-DATA-DEF-PROPS>
+                                    </IMPLEMENTATION-DATA-TYPE-ELEMENT>
+                                </SUB-ELEMENTS>
+                            </IMPLEMENTATION-DATA-TYPE>
+                        </ELEMENTS>
+                    </AR-PACKAGE>
+                </AR-PACKAGES>
+            </AUTOSAR>
+        """ # noqa E501
+
+        # prepare the XML content
+        element = ET.fromstring(xml_content)
+
+        # read the XML content using the parser
+        document = AUTOSARDoc()
+        parser.readARPackages(element, document)
+
+        # assert the ARPackages
+        assert len(document.getARPackages()) == 1
+        ar_package = document.getARPackages()[0]
+        assert ar_package.getShortName() == "ImplementationDataType"
+
+        # assert the ImplementationDataType
+        assert len(ar_package.getImplementationDataTypes()) == 1
+        data_type = ar_package.getImplementationDataTypes()[0]
+        assert data_type.getShortName() == "MyArrayDataType"
+        assert str(data_type.getCategory()) == "ARRAY"
+        assert data_type.getCategory().getValue() == "ARRAY"
+        assert data_type.getSwDataDefProps() is not None
+        assert data_type.getSwDataDefProps().getBaseTypeRef() is None
+        assert data_type.getSwDataDefProps().getCompuMethodRef() is None
+
+        # assert the SubElements of ImplementationDataType
+        assert len(data_type.getSubElements()) == 1
+        sub_element = data_type.getSubElements()[0]
+        assert sub_element.getShortName() == "Byte"
+        assert str(sub_element.getCategory()) == "VALUE"
+        assert sub_element.getCategory().getValue() == "VALUE"
+        assert sub_element.getArraySize().getValue() == 8
+        assert str(sub_element.getArraySizeSemantics()) == "FIXED-SIZE"
+        assert sub_element.getArraySizeSemantics().getValue() == "FIXED-SIZE"
+        assert sub_element.getSwDataDefProps() is not None
+        assert sub_element.getSwDataDefProps().getBaseTypeRef() is not None
+        assert sub_element.getSwDataDefProps().getBaseTypeRef().getDest() == "SW-BASE-TYPE"
+        assert sub_element.getSwDataDefProps().getBaseTypeRef().getValue() == "/AUTOSAR_Platform/BaseTypes/uint8"
+        assert sub_element.getSwDataDefProps().getCompuMethodRef() is None
+
+        # root = ET.Element("AUTOSAR", parser.nsmap)
+        # writer = ARXMLWriter()
+        # writer.writeARPackage(root, document)
+        # xml_str = ET.tostring(root, encoding='utf-8')
+        # assert xml_str == xml_content
+
+    def test_structure_implementation_data_type(self):
+        parser = ARXMLParser()
+        parser.nsmap = {"xmlns": "http://autosar.org/schema/r4.0"}
+        xml_content = """
+            <AUTOSAR xmlns="http://autosar.org/schema/r4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://autosar.org/schema/r4.0 AUTOSAR_4-3-0.xsd">
+                <AR-PACKAGES T="2023-03-08T00:27:29+08:00" UUID="cb03ce49-8b4b-4565-abce-0a7a054d24af">
+                    <AR-PACKAGE>
+                        <SHORT-NAME>ImplementationDataType</SHORT-NAME>s
+                        <ELEMENTS>
+                            <IMPLEMENTATION-DATA-TYPE>
+                                <SHORT-NAME>MyStructDataType</SHORT-NAME>
+                                <CATEGORY>STRUCTURE</CATEGORY>
+                                <SW-DATA-DEF-PROPS>
+                                    <SW-DATA-DEF-PROPS-VARIANTS>
+                                    <SW-DATA-DEF-PROPS-CONDITIONAL></SW-DATA-DEF-PROPS-CONDITIONAL>
+                                    </SW-DATA-DEF-PROPS-VARIANTS>
+                                </SW-DATA-DEF-PROPS>
+                                <SUB-ELEMENTS>
+                                    <IMPLEMENTATION-DATA-TYPE-ELEMENT T="2021-03-26T20:42:24+01:00" UUID="DCE:7700371a-cddc-4346-8b1e-749bddae5ed0">
+                                        <SHORT-NAME>PayloadSize</SHORT-NAME>
+                                        <CATEGORY>VALUE</CATEGORY>
+                                        <SW-DATA-DEF-PROPS>
+                                            <SW-DATA-DEF-PROPS-VARIANTS>
+                                            <SW-DATA-DEF-PROPS-CONDITIONAL T="2021-03-26T19:16:35+01:00">
+                                                <BASE-TYPE-REF DEST="SW-BASE-TYPE">/AUTOSAR_Platform/BaseTypes/uint8</BASE-TYPE-REF>
+                                            </SW-DATA-DEF-PROPS-CONDITIONAL>
+                                            </SW-DATA-DEF-PROPS-VARIANTS>
+                                        </SW-DATA-DEF-PROPS>
+                                    </IMPLEMENTATION-DATA-TYPE-ELEMENT>
+                                    <IMPLEMENTATION-DATA-TYPE-ELEMENT T="2021-03-26T20:42:45+01:00">
+                                        <SHORT-NAME>Payload</SHORT-NAME>
+                                        <CATEGORY>TYPE_REFERENCE</CATEGORY>
+                                        <SW-DATA-DEF-PROPS>
+                                            <SW-DATA-DEF-PROPS-VARIANTS>
+                                            <SW-DATA-DEF-PROPS-CONDITIONAL T="2021-03-26T19:25:45+01:00">
+                                                <IMPLEMENTATION-DATA-TYPE-REF DEST="IMPLEMENTATION-DATA-TYPE">/Application/ApplicationTypes/ArrayData</IMPLEMENTATION-DATA-TYPE-REF>
+                                            </SW-DATA-DEF-PROPS-CONDITIONAL>
+                                            </SW-DATA-DEF-PROPS-VARIANTS>
+                                        </SW-DATA-DEF-PROPS>
+                                    </IMPLEMENTATION-DATA-TYPE-ELEMENT>
+                                </SUB-ELEMENTS>
+                            </IMPLEMENTATION-DATA-TYPE>
+                        </ELEMENTS>
+                    </AR-PACKAGE>
+                </AR-PACKAGES>
+            </AUTOSAR>
+        """ # noqa E501
+
+        # prepare the XML content
+        element = ET.fromstring(xml_content)
+
+        # read the XML content using the parser
+        document = AUTOSARDoc()
+        parser.readARPackages(element, document)
+
+        # assert the ARPackages
+        assert len(document.getARPackages()) == 1
+        ar_package = document.getARPackages()[0]
+        assert ar_package.getShortName() == "ImplementationDataType"
+
+        # assert the ImplementationDataType
+        assert len(ar_package.getImplementationDataTypes()) == 1
+        data_type = ar_package.getImplementationDataTypes()[0]
+        assert data_type.getShortName() == "MyStructDataType"
+        assert str(data_type.getCategory()) == "STRUCTURE"
+        assert data_type.getCategory().getValue() == "STRUCTURE"
+        assert data_type.getSwDataDefProps() is not None
+        assert data_type.getSwDataDefProps().getBaseTypeRef() is None
+        assert data_type.getSwDataDefProps().getCompuMethodRef() is None
+
+        # assert the SubElements of ImplementationDataType
+        assert len(data_type.getSubElements()) == 2
+
+        # assert the first sub element
+        sub_element1 = data_type.getSubElements()[0]
+        assert sub_element1.getShortName() == "PayloadSize"
+        assert str(sub_element1.getCategory()) == "VALUE"
+        assert sub_element1.getCategory().getValue() == "VALUE"
+        assert sub_element1.getSwDataDefProps() is not None
+        assert sub_element1.getSwDataDefProps().getBaseTypeRef() is not None
+        assert sub_element1.getSwDataDefProps().getBaseTypeRef().getDest() == "SW-BASE-TYPE"
+        assert sub_element1.getSwDataDefProps().getBaseTypeRef().getValue() == "/AUTOSAR_Platform/BaseTypes/uint8"
+        assert sub_element1.getSwDataDefProps().getCompuMethodRef() is None
+        assert sub_element1.getArraySize() is None
+        assert sub_element1.getArraySizeSemantics() is None
+        assert sub_element1.getArraySizeHandling() is None
+        assert sub_element1.getIsOptional() is None
+        assert sub_element1.getSwDataDefProps().getCompuMethodRef() is None
+        
+        # assert the second sub element
+        sub_element2 = data_type.getSubElements()[1]
+        assert sub_element2.getShortName() == "Payload"
+        assert str(sub_element2.getCategory()) == "TYPE_REFERENCE"
+        assert sub_element2.getCategory().getValue() == "TYPE_REFERENCE"
+        assert sub_element2.getSwDataDefProps() is not None
+        assert sub_element2.getSwDataDefProps().getBaseTypeRef() is None
+        assert sub_element2.getSwDataDefProps().getImplementationDataTypeRef() is not None
+        assert sub_element2.getSwDataDefProps().getImplementationDataTypeRef().getDest() == "IMPLEMENTATION-DATA-TYPE"
+        assert sub_element2.getSwDataDefProps().getImplementationDataTypeRef().getValue() == "/Application/ApplicationTypes/ArrayData"
+        assert sub_element2.getSwDataDefProps().getCompuMethodRef() is None
+        assert sub_element2.getArraySize() is None
+        assert sub_element2.getArraySizeSemantics() is None
+        assert sub_element2.getArraySizeHandling() is None
+        assert sub_element2.getIsOptional() is None
+        assert sub_element2.getSwDataDefProps().getCompuMethodRef() is None
+        

armodel/tests/test_armodel/parser/test_rte_event.py

@@ -0,0 +1,142 @@
+import xml.etree.ElementTree as ET
+
+from armodel.models.M2.AUTOSARTemplates.SWComponentTemplate.Components import AtomicSwComponentType
+
+from ....models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSARDoc
+from ....models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior import SwcInternalBehavior
+from ....writer.arxml_writer import ARXMLWriter
+from ....parser.arxml_parser import ARXMLParser
+
+
+class TestRteEVent:
+
+    def test_data_send_completed_events(self):
+        xml_content = """
+            <APPLICATION-SW-COMPONENT-TYPE>
+              <SHORT-NAME>MyComponents</SHORT-NAME>
+              <INTERNAL-BEHAVIORS>
+                <SWC-INTERNAL-BEHAVIOR T="2024-11-01T09:39:52+02:00" UUID="0c573b8e-57a1-4bc5-b815-07b6e0094060">
+                  <SHORT-NAME>MyInternalBehavior</SHORT-NAME>
+                  <DATA-TYPE-MAPPING-REFS>
+                    <DATA-TYPE-MAPPING-REF DEST="DATA-TYPE-MAPPING-SET">/DataType/MappingSet/Array_mapping_set</DATA-TYPE-MAPPING-REF>
+                    <DATA-TYPE-MAPPING-REF DEST="DATA-TYPE-MAPPING-SET">/DataType/MappingSet/uint8_mapping_set</DATA-TYPE-MAPPING-REF>
+                  </DATA-TYPE-MAPPING-REFS>
+                  <EVENTS>
+                    <DATA-SEND-COMPLETED-EVENT >
+                      <SHORT-NAME>data_send_event1</SHORT-NAME>
+                      <START-ON-EVENT-REF DEST="RUNNABLE-ENTITY">/MyComponents/MySwc_IB/re_data_send_completed_1</START-ON-EVENT-REF>
+                      <EVENT-SOURCE-REF DEST="VARIABLE-ACCESS">/MyComponents/MySwc_IB/re_CyclicJob_20ms/dsp_data_send_completed_1</EVENT-SOURCE-REF>
+                    </DATA-SEND-COMPLETED-EVENT>
+                    <DATA-SEND-COMPLETED-EVENT>
+                      <SHORT-NAME>data_send_event2</SHORT-NAME>
+                      <START-ON-EVENT-REF DEST="RUNNABLE-ENTITY">/MyComponents/MySwc_IB/re_data_send_completed_2</START-ON-EVENT-REF>
+                      <EVENT-SOURCE-REF DEST="VARIABLE-ACCESS">/MyComponents/MySwc_IB/re_CyclicJob_20ms/dsp_data_send_completed_2</EVENT-SOURCE-REF>
+                    </DATA-SEND-COMPLETED-EVENT>
+                  </EVENTS>
+                </SWC-INTERNAL-BEHAVIOR>
+              </INTERNAL-BEHAVIORS>
+            </APPLICATION-SW-COMPONENT-TYPE>
+        """ # noqa E501
+        
+        # prepare the XML content
+        element = ET.fromstring(xml_content)
+        document = AUTOSARDoc()
+
+        parser = ARXMLParser()
+        parser.nsmap = {"xmlns": ""}
+
+        sw_component = AtomicSwComponentType(document, "MyComponents")
+        parser.readAtomicSwComponentType(element, sw_component)
+
+        internal_behavior = sw_component.getInternalBehavior()
+        assert internal_behavior is not None
+        assert isinstance(internal_behavior, SwcInternalBehavior) is True
+        assert internal_behavior.getShortName() == "MyInternalBehavior"
+        assert len(internal_behavior.getDataSendCompletedEvents()) == 2
+
+        event1 = internal_behavior.getDataSendCompletedEvents()[0]
+        assert event1.getShortName() == "data_send_event1"
+        assert event1.getStartOnEventRef().getDest() == "RUNNABLE-ENTITY"
+        assert event1.getStartOnEventRef().getValue() == "/MyComponents/MySwc_IB/re_data_send_completed_1"
+        assert event1.getEventSourceRef().getDest() == "VARIABLE-ACCESS"
+        assert event1.getEventSourceRef().getValue() == "/MyComponents/MySwc_IB/re_CyclicJob_20ms/dsp_data_send_completed_1"
+
+        event2 = internal_behavior.getDataSendCompletedEvents()[1]
+        assert event2.getShortName() == "data_send_event2"
+        assert event2.getStartOnEventRef().getDest() == "RUNNABLE-ENTITY"
+        assert event2.getStartOnEventRef().getValue() == "/MyComponents/MySwc_IB/re_data_send_completed_2"
+        assert event2.getEventSourceRef().getDest() == "VARIABLE-ACCESS"
+        assert event2.getEventSourceRef().getValue() == "/MyComponents/MySwc_IB/re_CyclicJob_20ms/dsp_data_send_completed_2"
+
+    def test_operation_invoked_events(self):
+        xml_content = """
+            <APPLICATION-SW-COMPONENT-TYPE>
+              <SHORT-NAME>MyComponents</SHORT-NAME>
+              <INTERNAL-BEHAVIORS>
+                <SWC-INTERNAL-BEHAVIOR T="2024-11-01T09:39:52+02:00" UUID="0c573b8e-57a1-4bc5-b815-07b6e0094060">
+                  <SHORT-NAME>MyInternalBehavior</SHORT-NAME>
+                  <DATA-TYPE-MAPPING-REFS>
+                    <DATA-TYPE-MAPPING-REF DEST="DATA-TYPE-MAPPING-SET">/DataType/MappingSet/Array_mapping_set</DATA-TYPE-MAPPING-REF>
+                    <DATA-TYPE-MAPPING-REF DEST="DATA-TYPE-MAPPING-SET">/DataType/MappingSet/uint8_mapping_set</DATA-TYPE-MAPPING-REF>
+                  </DATA-TYPE-MAPPING-REFS>
+                  <EVENTS>
+                    <DATA-SEND-COMPLETED-EVENT >
+                      <SHORT-NAME>data_send_event1</SHORT-NAME>
+                      <START-ON-EVENT-REF DEST="RUNNABLE-ENTITY">/MyComponents/MySwc_IB/re_data_send_completed_1</START-ON-EVENT-REF>
+                      <EVENT-SOURCE-REF DEST="VARIABLE-ACCESS">/MyComponents/MySwc_IB/re_CyclicJob_20ms/dsp_data_send_completed_1</EVENT-SOURCE-REF>
+                    </DATA-SEND-COMPLETED-EVENT>
+                    <OPERATION-INVOKED-EVENT>
+                      <SHORT-NAME>oie_event1</SHORT-NAME>
+                      <START-ON-EVENT-REF DEST="RUNNABLE-ENTITY">/MyComponents/MySwc_IB/re_event1</START-ON-EVENT-REF>
+                      <OPERATION-IREF>
+                        <CONTEXT-P-PORT-REF DEST="P-PORT-PROTOTYPE">/MyComponents/pp_oie_port</CONTEXT-P-PORT-REF>
+                        <TARGET-PROVIDED-OPERATION-REF DEST="CLIENT-SERVER-OPERATION">/MyComponents/Interfaces/ClientServerInterfaces/IfCs_event/operation1</TARGET-PROVIDED-OPERATION-REF>
+                      </OPERATION-IREF>
+                    </OPERATION-INVOKED-EVENT>
+                    <OPERATION-INVOKED-EVENT >
+                      <SHORT-NAME>oie_event2</SHORT-NAME>
+                      <START-ON-EVENT-REF DEST="RUNNABLE-ENTITY">/MyComponents/MySwc_IB/re_event2</START-ON-EVENT-REF>
+                      <OPERATION-IREF T="2021-07-21T17:39:44+03:00">
+                        <CONTEXT-P-PORT-REF DEST="P-PORT-PROTOTYPE">/MyComponents//pp_oie_port</CONTEXT-P-PORT-REF>
+                        <TARGET-PROVIDED-OPERATION-REF DEST="CLIENT-SERVER-OPERATION">/MyComponents/Interfaces/ClientServerInterfaces/IfCs_event/operation2</TARGET-PROVIDED-OPERATION-REF>
+                      </OPERATION-IREF>
+                    </OPERATION-INVOKED-EVENT>
+                  </EVENTS>
+                </SWC-INTERNAL-BEHAVIOR>
+              </INTERNAL-BEHAVIORS>
+            </APPLICATION-SW-COMPONENT-TYPE>
+        """ # noqa E501
+        
+        # prepare the XML content
+        element = ET.fromstring(xml_content)
+        document = AUTOSARDoc()
+
+        parser = ARXMLParser()
+        parser.nsmap = {"xmlns": ""}
+
+        sw_component = AtomicSwComponentType(document, "MyComponents")
+        parser.readAtomicSwComponentType(element, sw_component)
+
+        internal_behavior = sw_component.getInternalBehavior()
+        assert internal_behavior is not None
+        assert isinstance(internal_behavior, SwcInternalBehavior) is True
+        assert internal_behavior.getShortName() == "MyInternalBehavior"
+        assert len(internal_behavior.getOperationInvokedEvents()) == 2
+
+        event1 = internal_behavior.getOperationInvokedEvents()[0]
+        assert event1.getShortName() == "oie_event1"
+        assert event1.getStartOnEventRef().getDest() == "RUNNABLE-ENTITY"
+        assert event1.getStartOnEventRef().getValue() == "/MyComponents/MySwc_IB/re_event1"
+        assert event1.getOperationIRef().getContextPPortRef().getDest() == "P-PORT-PROTOTYPE"
+        assert event1.getOperationIRef().getContextPPortRef().getValue() == "/MyComponents/pp_oie_port"
+        assert event1.getOperationIRef().getTargetProvidedOperationRef().getDest() == "CLIENT-SERVER-OPERATION"
+        assert event1.getOperationIRef().getTargetProvidedOperationRef().getValue() == "/MyComponents/Interfaces/ClientServerInterfaces/IfCs_event/operation1"
+
+        event2 = internal_behavior.getOperationInvokedEvents()[1]
+        assert event2.getShortName() == "oie_event2"
+        assert event2.getStartOnEventRef().getDest() == "RUNNABLE-ENTITY"
+        assert event2.getStartOnEventRef().getValue() == "/MyComponents/MySwc_IB/re_event2"
+        assert event2.getOperationIRef().getContextPPortRef().getDest() == "P-PORT-PROTOTYPE"
+        assert event2.getOperationIRef().getContextPPortRef().getValue() == "/MyComponents//pp_oie_port"
+        assert event2.getOperationIRef().getTargetProvidedOperationRef().getDest() == "CLIENT-SERVER-OPERATION"
+        assert event2.getOperationIRef().getTargetProvidedOperationRef().getValue() == "/MyComponents/Interfaces/ClientServerInterfaces/IfCs_event/operation2"

armodel/tests/test_armodel/parser/test_runnable_entity.py

@@ -0,0 +1,135 @@
+import xml.etree.ElementTree as ET
+
+from ....models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior import RunnableEntity, SwcInternalBehavior
+from ....models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSARDoc
+from ....parser.arxml_parser import ARXMLParser
+
+
+class TestRunnableEntity:
+    def setup_method(self):
+        self.xml_content = """
+            <SWC-INTERNAL-BEHAVIOR>
+                <RUNNABLES>
+                    <RUNNABLE-ENTITY>
+                      <SHORT-NAME>Cyclic</SHORT-NAME>
+                      <MINIMUM-START-INTERVAL>0.0</MINIMUM-START-INTERVAL>
+                      <CAN-BE-INVOKED-CONCURRENTLY>false</CAN-BE-INVOKED-CONCURRENTLY>
+                      <DATA-RECEIVE-POINT-BY-ARGUMENTS>
+                        <VARIABLE-ACCESS>
+                          <SHORT-NAME>DRP_P_Special_EventMessage</SHORT-NAME>
+                          <ACCESSED-VARIABLE>
+                            <AUTOSAR-VARIABLE-IREF>
+                              <PORT-PROTOTYPE-REF DEST="R-PORT-PROTOTYPE">/DemoApplication/SwComponentTypes/SWC_CyclicCounter/R_SpecialHandling</PORT-PROTOTYPE-REF>
+                              <TARGET-DATA-PROTOTYPE-REF DEST="VARIABLE-DATA-PROTOTYPE">/DemoApplication/PortInterfaces/If_Internal/EventMessage</TARGET-DATA-PROTOTYPE-REF>
+                            </AUTOSAR-VARIABLE-IREF>
+                          </ACCESSED-VARIABLE>
+                        </VARIABLE-ACCESS>
+                      </DATA-RECEIVE-POINT-BY-ARGUMENTS>
+                      <DATA-SEND-POINTS>
+                        <VARIABLE-ACCESS>
+                          <SHORT-NAME>DWA_P_CounterOut_CounterValue</SHORT-NAME>
+                          <ACCESSED-VARIABLE>
+                            <AUTOSAR-VARIABLE-IREF>
+                              <PORT-PROTOTYPE-REF DEST="P-PORT-PROTOTYPE">/DemoApplication/SwComponentTypes/SWC_CyclicCounter/P_CounterOut</PORT-PROTOTYPE-REF>
+                              <TARGET-DATA-PROTOTYPE-REF DEST="VARIABLE-DATA-PROTOTYPE">/DemoApplication/PortInterfaces/If_Counter/CounterValue</TARGET-DATA-PROTOTYPE-REF>
+                            </AUTOSAR-VARIABLE-IREF>
+                          </ACCESSED-VARIABLE>
+                        </VARIABLE-ACCESS>
+                      </DATA-SEND-POINTS>
+                      <READ-LOCAL-VARIABLES>
+                        <VARIABLE-ACCESS>
+                          <SHORT-NAME>CurrentCounterValue3</SHORT-NAME>
+                          <ACCESSED-VARIABLE>
+                            <LOCAL-VARIABLE-REF DEST="VARIABLE-DATA-PROTOTYPE">/DemoApplication/SwComponentTypes/SWC_CyclicCounter/IB_SWC_CyclicCounter/CurrentCounterValue</LOCAL-VARIABLE-REF>
+                          </ACCESSED-VARIABLE>
+                        </VARIABLE-ACCESS>
+                      </READ-LOCAL-VARIABLES>
+                      <SERVER-CALL-POINTS>
+                        <SYNCHRONOUS-SERVER-CALL-POINT>
+                          <SHORT-NAME>CS_DETService_ReportError</SHORT-NAME>
+                          <OPERATION-IREF>
+                            <CONTEXT-R-PORT-REF DEST="R-PORT-PROTOTYPE">/DemoApplication/SwComponentTypes/SWC_CyclicCounter/R_CyclicCounterDet</CONTEXT-R-PORT-REF>
+                            <TARGET-REQUIRED-OPERATION-REF DEST="CLIENT-SERVER-OPERATION">/DemoApplication/PortInterfaces/DETService/ReportError</TARGET-REQUIRED-OPERATION-REF>
+                          </OPERATION-IREF>
+                          <TIMEOUT>0.0</TIMEOUT>
+                        </SYNCHRONOUS-SERVER-CALL-POINT>
+                        <SYNCHRONOUS-SERVER-CALL-POINT>
+                          <SHORT-NAME>CS_EchoResult_SetCounterAndAdd</SHORT-NAME>
+                          <OPERATION-IREF>
+                            <CONTEXT-R-PORT-REF DEST="R-PORT-PROTOTYPE">/DemoApplication/SwComponentTypes/SWC_CyclicCounter/R_MyLED</CONTEXT-R-PORT-REF>
+                            <TARGET-REQUIRED-OPERATION-REF DEST="CLIENT-SERVER-OPERATION">/DemoApplication/PortInterfaces/If_DiscreteValueOutput/SetDiscreteValue</TARGET-REQUIRED-OPERATION-REF>
+                          </OPERATION-IREF>
+                          <TIMEOUT>0.0</TIMEOUT>
+                        </SYNCHRONOUS-SERVER-CALL-POINT>
+                        <SYNCHRONOUS-SERVER-CALL-POINT>
+                          <SHORT-NAME>CS_UR_ComMUser_0_ComM_UserRequest</SHORT-NAME>
+                          <OPERATION-IREF>
+                            <CONTEXT-R-PORT-REF DEST="R-PORT-PROTOTYPE">/DemoApplication/SwComponentTypes/SWC_CyclicCounter/UR_ComMUser_0</CONTEXT-R-PORT-REF>
+                            <TARGET-REQUIRED-OPERATION-REF DEST="CLIENT-SERVER-OPERATION">/DemoApplication/PortInterfaces/ComM_UserRequest/RequestComMode</TARGET-REQUIRED-OPERATION-REF>
+                          </OPERATION-IREF>
+                          <TIMEOUT>0.0</TIMEOUT>
+                        </SYNCHRONOUS-SERVER-CALL-POINT>
+                      </SERVER-CALL-POINTS>
+                      <SYMBOL>SWC_CyclicCounter_Cyclic</SYMBOL>
+                      <WRITTEN-LOCAL-VARIABLES>
+                        <VARIABLE-ACCESS>
+                          <SHORT-NAME>CurrentCounterValue4</SHORT-NAME>
+                          <ACCESSED-VARIABLE T="2020-08-03T07:59:25+02:00">
+                            <LOCAL-VARIABLE-REF DEST="VARIABLE-DATA-PROTOTYPE">/DemoApplication/SwComponentTypes/SWC_CyclicCounter/IB_SWC_CyclicCounter/CurrentCounterValue</LOCAL-VARIABLE-REF>
+                          </ACCESSED-VARIABLE>
+                        </VARIABLE-ACCESS>
+                      </WRITTEN-LOCAL-VARIABLES>
+                    </RUNNABLE-ENTITY>
+                </RUNNABLES>
+            </SWC-INTERNAL-BEHAVIOR>
+        """
+
+    def test_data_receive_point_by_argument(self):
+        # prepare the XML content
+        element = ET.fromstring(self.xml_content)
+        document = AUTOSARDoc()
+
+        parser = ARXMLParser()
+        parser.nsmap = {"xmlns": ""}
+
+        behavior = SwcInternalBehavior(document, "Behavior")
+        parser.readSwcInternalBehaviorRunnables(element, behavior)
+
+        assert len(behavior.getRunnableEntities()) == 1
+        assert isinstance(behavior.getRunnableEntities()[0], RunnableEntity) is True
+
+        runnable_entity = behavior.getRunnableEntities()[0]
+        assert runnable_entity.getShortName() == "Cyclic"
+        assert runnable_entity.getMinimumStartInterval().getValue() == 0.0
+        assert runnable_entity.getCanBeInvokedConcurrently().getValue() is False
+        assert len(runnable_entity.getDataReceivePointByArguments()) == 1
+
+        drp_arg = runnable_entity.getDataReceivePointByArguments()[0]
+        assert drp_arg.getShortName() == "DRP_P_Special_EventMessage"
+        assert drp_arg.getAccessedVariableRef().getAutosarVariableIRef().getPortPrototypeRef().getDest() == "R-PORT-PROTOTYPE"
+        assert drp_arg.getAccessedVariableRef().getAutosarVariableIRef().getPortPrototypeRef().getValue() == "/DemoApplication/SwComponentTypes/SWC_CyclicCounter/R_SpecialHandling"
+        assert drp_arg.getAccessedVariableRef().getAutosarVariableIRef().getTargetDataPrototypeRef().getDest() == "VARIABLE-DATA-PROTOTYPE"
+        assert drp_arg.getAccessedVariableRef().getAutosarVariableIRef().getTargetDataPrototypeRef().getValue() == "/DemoApplication/PortInterfaces/If_Internal/EventMessage"
+
+    def test_written_local_variables(self):
+        # prepare the XML content
+        element = ET.fromstring(self.xml_content)
+        document = AUTOSARDoc()
+
+        parser = ARXMLParser()
+        parser.nsmap = {"xmlns": ""}
+
+        behavior = SwcInternalBehavior(document, "Behavior")
+        parser.readSwcInternalBehaviorRunnables(element, behavior)
+
+        assert len(behavior.getRunnableEntities()) == 1
+        assert isinstance(behavior.getRunnableEntities()[0], RunnableEntity) is True
+
+        runnable_entity = behavior.getRunnableEntities()[0]
+        assert len(runnable_entity.getWrittenLocalVariables()) == 1
+
+        written_var = runnable_entity.getWrittenLocalVariables()[0]
+        assert written_var.getShortName() == "CurrentCounterValue4"
+        assert written_var.getAccessedVariableRef().timestamp == "2020-08-03T07:59:25+02:00"
+        assert written_var.getAccessedVariableRef().getLocalVariableRef().getDest() == "VARIABLE-DATA-PROTOTYPE"
+        assert written_var.getAccessedVariableRef().getLocalVariableRef().getValue() == "/DemoApplication/SwComponentTypes/SWC_CyclicCounter/IB_SWC_CyclicCounter/CurrentCounterValue"

armodel/writer/abstract_arxml_writer.py

@@ -74,6 +74,8 @@ class AbstractARXMLWriter:
         if numerical is not None:
             child_element = ET.SubElement(element, key)
             self.writeARObjectAttributes(child_element, numerical)
+            if numerical.getShortLabel() is not None:
+                child_element.attrib["SHORT-LABEL"] = numerical.getShortLabel()
             child_element.text = numerical._text
 
     def setChildElementOptionalIntegerValue(self, element: ET.Element, key: str, value: Integer):