armodel 1.7.6__py3-none-any.whl → 1.7.7__py3-none-any.whl

armodel/tests/test_armodel/models/test_bsw_module_template.py

@@ -1,10 +1,9 @@
 import pytest
 
 from ....models.M2.AUTOSARTemplates.BswModuleTemplate.BswOverview import BswModuleDescription
-
 from ....models.M2.AUTOSARTemplates.BswModuleTemplate.BswBehavior import BswCalledEntity, BswModuleEntity
-
 from ....models.M2.AUTOSARTemplates.BswModuleTemplate.BswInterfaces import BswModuleEntry
+from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import CategoryString
 from .... import AUTOSAR
 
 class TestBswModuleDescription:
@@ -24,7 +23,10 @@ class TestBswModuleDescription:
         #assert(str(err.value) == "Invalid category <invalid> of BswModuleDescription <bsw_module>")
 
         bsw_module_description.setCategory("BSW_MODULE")
-        assert(bsw_module_description.getCategory() == "BSW_MODULE")
+        assert(bsw_module_description.getCategory().getValue() == "BSW_MODULE")
+
+        bsw_module_description.setCategory(CategoryString().setValue("BSW_MODULE"))
+        assert(bsw_module_description.getCategory().getValue() == "BSW_MODULE")
 
 class Test_M2_AUTOSARTemplates_BswModuleTemplate_BswInterfaces:
     def test_BswModuleEntry(self):

armodel/tests/test_armodel/models/test_datatype.py

@@ -144,7 +144,7 @@ class Test_M2_AUTOSARTemplates_SWComponentTemplate_Datatype_Datatypes:
 
         assert(data_type.parent == ar_root)
         assert(data_type.short_name == "ApplicationArrayDataType")
-        assert(data_type.dynamic_array_size_profile == None)
+        assert(data_type.dynamicArraySizeProfile == None)
         assert(data_type.element == None)
 
     def test_ApplicationRecordDataType(self):

armodel/tests/test_armodel/parser/test_bsw_module_descriiption.py

@@ -0,0 +1,218 @@
+import filecmp
+from typing import List
+
+from ....models.M2.AUTOSARTemplates.BswModuleTemplate.BswBehavior import BswInternalBehavior
+from ....models.M2.AUTOSARTemplates.BswModuleTemplate.BswImplementation import BswImplementation
+from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.EngineeringObject import AutosarEngineeringObject
+from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ARPackage import ARPackage
+
+from .... import AUTOSAR
+from .... import ARXMLParser, ARXMLWriter
+
+import logging
+
+class TestBswMD:
+    def setup_method(self):
+        logger = logging.getLogger()
+        formatter = logging.Formatter('[%(levelname)s] : %(message)s')
+        logging.basicConfig(format='[%(levelname)s] : %(message)s', level = logging.DEBUG)
+        log_file = 'pytest_armodel.log'
+
+        file_handler = logging.FileHandler(log_file)
+        file_handler.setFormatter(formatter)
+        file_handler.setLevel(logging.DEBUG)
+        logger.addHandler(file_handler)
+
+        document = AUTOSAR.getInstance()
+        document.clear()
+        parser = ARXMLParser()
+        parser.load("src/armodel/tests/test_files/BswM_Bswmd.arxml", document)
+
+    def test_ar_packages(self):
+        document = AUTOSAR.getInstance()
+        root_pkgs = sorted(document.getARPackages(), key = lambda pkg: pkg.short_name)
+        assert(len(root_pkgs) == 2)
+        assert(root_pkgs[0].getShortName() == "AUTOSAR_BswM")
+        assert(root_pkgs[1].getShortName() == "EB_BswM_TxDxM1I14R0")
+
+        root_pkg_0_pkgs = sorted(root_pkgs[0].getARPackages(), key = lambda pkg: pkg.short_name)
+        assert(len(root_pkg_0_pkgs) == 3)
+
+        bsw_module_desc_pkg = root_pkg_0_pkgs[0]   # type：ARPackage  
+        assert(bsw_module_desc_pkg.getShortName() == "BswModuleDescriptions")
+
+        root_pkg_1_pkgs = root_pkgs[1].getARPackages()
+        assert(len(root_pkg_1_pkgs) == 1)
+
+    def test_bsw_module_description(self):
+        document = AUTOSAR.getInstance()
+
+        pkg = document.find("/AUTOSAR_BswM/BswModuleDescriptions")     # type: ARPackage
+        bsw_module_descs = pkg.getBswModuleDescriptions()
+        assert(len(bsw_module_descs) == 1)
+
+        bsw_module_desc = bsw_module_descs[0]
+        assert(bsw_module_desc.getShortName() == "BswM")
+        assert(bsw_module_desc.moduleId.getText() == "34")
+        assert(bsw_module_desc.moduleId.getValue() == 34)
+
+        # verify the provided entries
+        assert(len(bsw_module_desc.implementedEntryRefs) == 2)
+        assert(bsw_module_desc.implementedEntryRefs[0].getDest() == "BSW-MODULE-ENTRY")
+        assert(bsw_module_desc.implementedEntryRefs[0].getValue() == "/AUTOSAR_BswM/BswModuleEntrys/BswM_Init")
+        assert(bsw_module_desc.implementedEntryRefs[1].getDest() == "BSW-MODULE-ENTRY")
+        assert(bsw_module_desc.implementedEntryRefs[1].getValue() == "/AUTOSAR_BswM/BswModuleEntrys/BswM_MainFunction")
+
+        assert(len(bsw_module_desc.getBswInternalBehaviors()) == 1)
+        behavior = bsw_module_desc.getBswInternalBehaviors()[0]
+        assert(behavior.short_name == "InternalBehavior_0")
+
+        assert(len(behavior.getDataTypeMappingRefs()) == 1)
+        data_type_mapping_ref = behavior.getDataTypeMappingRefs()[0]
+        assert(data_type_mapping_ref.getDest() == "DATA-TYPE-MAPPING-SET")
+        assert(data_type_mapping_ref.getValue() == "/BswMMode/DataTypeMappingSets/BswMModeMapping")
+
+        assert(len(behavior.getExclusiveAreas()) == 1)
+        assert(behavior.getExclusiveAreas()[0].short_name == "SCHM_BSWM_EXCLUSIVE_AREA")
+
+        assert(len(behavior.getBswSchedulableEntities()) == 1)
+        entity = behavior.getBswSchedulableEntities()[0]
+        assert(entity.short_name == "BswM_MainFunction")
+        assert(entity.minimumStartInterval is not None)
+        assert(entity.minimumStartIntervalMs is not None)
+        assert(len(entity.getCanEnterExclusiveAreaRefs()) == 1) 
+        assert(entity.getCanEnterExclusiveAreaRefs()[0].getDest() == "EXCLUSIVE-AREA")
+        assert(entity.getCanEnterExclusiveAreaRefs()[0].getValue() == "/AUTOSAR_BswM/BswModuleDescriptions/BswM/InternalBehavior_0/SCHM_BSWM_EXCLUSIVE_AREA")
+        assert(entity.implementedEntryRef.getDest() == "BSW-MODULE-ENTRY")
+        assert(entity.implementedEntryRef.getValue() == "/AUTOSAR_BswM/BswModuleEntrys/BswM_MainFunction")
+
+        assert(len(behavior.getBswTimingEvents()) == 1)
+        event = behavior.getBswTimingEvents()[0]
+        assert(event.short_name == "TimingEvent_MainFunction")
+        assert(event.startsOnEventRef.getDest() == "BSW-SCHEDULABLE-ENTITY")
+        assert(event.startsOnEventRef.getValue() == "/AUTOSAR_BswM/BswModuleDescriptions/BswM/InternalBehavior_0/BswM_MainFunction")
+        assert(event.period.getValue() == 0.02)
+        assert(event.period.getText() == "0.02")
+        assert(event.periodMs == 20)
+
+    def test_bsw_module_entries(self):
+        document = AUTOSAR.getInstance()
+
+        pkg = document.find("/AUTOSAR_BswM/BswModuleEntrys")     # type: ARPackage
+        entries = sorted(pkg.getBswModuleEntries(), key= lambda entry: entry.short_name)
+        assert(len(entries) == 2)
+
+        assert(entries[0].getShortName() == "BswM_Init")
+        assert(entries[0].getServiceId().getValue() == 0)
+        assert(entries[0].getIsReentrant().getValue() == False)
+        assert(entries[0].getIsSynchronous().getValue() == True)
+        assert(entries[0].getCallType().getText() == "REGULAR")
+        assert(entries[0].getExecutionContext().getText() == "UNSPECIFIED")
+        assert(entries[0].getSwServiceImplPolicy().getText() == "STANDARD")
+
+        assert(entries[1].getShortName() == "BswM_MainFunction")
+        assert(entries[1].getServiceId().getValue() == 3)
+        assert(entries[1].getIsReentrant().getValue() == False)
+        assert(entries[1].getIsSynchronous().getValue() == True)
+        assert(entries[1].getCallType().getText() == "SCHEDULED")
+        assert(entries[1].getExecutionContext().getText() == "TASK")
+        assert(entries[1].getSwServiceImplPolicy().getText() == "STANDARD")
+
+    def test_bsw_module_swc_bsw_mapping(self):
+        document = AUTOSAR.getInstance()
+
+        pkg = document.find("/AUTOSAR_BswM/SwcBswMappings")     # type: ARPackage
+        mappings = pkg.getSwcBswMappings()
+        assert(len(mappings) == 1)
+
+        assert(mappings[0].bswBehaviorRef.getDest() == "BSW-INTERNAL-BEHAVIOR")
+        assert(mappings[0].bswBehaviorRef.getValue() == "/AUTOSAR_BswM/BswModuleDescriptions/BswM/InternalBehavior_0")
+        
+        assert(len(mappings[0].getRunnableMappings()) == 1)
+        runnable_mapping = mappings[0].getRunnableMappings()[0]
+        assert(runnable_mapping.getBswEntityRef().getDest() == "BSW-SCHEDULABLE-ENTITY")
+        assert(runnable_mapping.getBswEntityRef().getValue() == "/AUTOSAR_BswM/BswModuleDescriptions/BswM/InternalBehavior_0/BswM_MainFunction")
+        assert(runnable_mapping.getSwcRunnableRef().getDest() == "RUNNABLE-ENTITY")
+        assert(runnable_mapping.getSwcRunnableRef().getValue() == "/AUTOSAR_BswM/SwComponentTypes/BswM/BswMInternalBehavior/RES_MainFunction")
+
+    def test_bsw_module_implementation(self):
+        document = AUTOSAR.getInstance()
+
+        pkg = document.find("/EB_BswM_TxDxM1I14R0/Implementations")     # type: ARPackage
+        assert(len(pkg.getBswImplementations()) == 1)
+        impl = pkg.getBswImplementations()[0]
+        assert(impl.short_name == "BswImplementation_0")
+        assert(len(impl.getCodeDescriptors()) == 1)
+        
+        code_desc = impl.getCodeDescriptors()[0]
+        assert(code_desc.short_name == "Files")
+        assert(len(code_desc.getArtifactDescriptors()) == 21)
+        assert(len(code_desc.getArtifactDescriptors("SWSRC")) == 4)
+        assert(len(code_desc.getArtifactDescriptors("SWHDR")) == 15)
+        assert(len(code_desc.getArtifactDescriptors("SWMAKE")) == 2)
+
+        artifact_descs = sorted(code_desc.getArtifactDescriptors("SWMAKE"), key = lambda o: o.getShortLabel().getValue())       # type: List[AutosarEngineeringObject]
+        assert(artifact_descs[0].getShortLabel().getValue() == "make::BswM_defs.mak")
+        assert(artifact_descs[0].getCategory().getValue() == "SWMAKE")
+        assert(artifact_descs[1].getShortLabel().getValue() == "make::BswM_rules.mak")
+        assert(artifact_descs[1].getCategory().getValue() == "SWMAKE")
+
+        assert(impl.programmingLanguage.getValue() == "C")
+
+        assert(impl.resourceConsumption.short_name == "ResourceConsumption")
+        assert(len(impl.resourceConsumption.getMemorySections()) == 8)
+
+        section = impl.resourceConsumption.getMemorySection("CODE")
+        assert(section.short_name == "CODE")
+        assert(section.alignment == None)
+        assert(section.swAddrMethodRef.getDest() == "SW-ADDR-METHOD")
+        assert(section.swAddrMethodRef.getValue() == "/AUTOSAR_MemMap/SwAddrMethods/CODE")
+
+        section = impl.resourceConsumption.getMemorySection("VAR_NO_INIT_UNSPECIFIED")
+        assert(section.short_name == "VAR_NO_INIT_UNSPECIFIED")
+        assert(section.alignment.getText() == "UNSPECIFIED")
+        assert(section.swAddrMethodRef.getDest() == "SW-ADDR-METHOD")
+        assert(section.swAddrMethodRef.getValue() == "/AUTOSAR_MemMap/SwAddrMethods/VAR_NOINIT")
+
+        assert(impl.vendorId.getValue() == 1)
+        assert(impl.swVersion.getValue() == "1.14.1")
+        assert(impl.swcBswMappingRef.getDest() == "SWC-BSW-MAPPING")
+        assert(impl.swcBswMappingRef.getValue() == "/AUTOSAR_BswM/SwcBswMappings/SwcBswMapping_0")
+        assert(impl.arReleaseVersion.getValue() == "4.0.3")
+        assert(impl.behaviorRef.getDest() == "BSW-INTERNAL-BEHAVIOR")
+        assert(impl.behaviorRef.getValue() == "/AUTOSAR_BswM/BswModuleDescriptions/BswM/InternalBehavior_0")
+
+    def test_get_implementation(self):
+        document = AUTOSAR.getInstance()
+        impl = document.getImplementation("/AUTOSAR_BswM/BswModuleDescriptions/BswM/InternalBehavior_0")
+        assert(impl.getFullName() == "/EB_BswM_TxDxM1I14R0/Implementations/BswImplementation_0")
+        assert(isinstance(impl, BswImplementation))
+
+    def test_get_behavior(self):
+        document = AUTOSAR.getInstance()
+        behavior = document.getBehavior("/EB_BswM_TxDxM1I14R0/Implementations/BswImplementation_0")
+        assert(behavior.getFullName() == "/AUTOSAR_BswM/BswModuleDescriptions/BswM/InternalBehavior_0")
+        assert(isinstance(behavior, BswInternalBehavior))
+
+
+    def test_load_save(self):
+        document = AUTOSAR.getInstance()
+        document.clear()
+        parser = ARXMLParser()
+        parser.load("src/armodel/tests/test_files/SoftwareComponents.arxml", document)
+
+        writer = ARXMLWriter()
+        writer.save("data/generated.arxml", document)
+
+        assert(filecmp.cmp("src/armodel/tests/test_files/SoftwareComponents.arxml", "data/generated.arxml", shallow = False) == True)
+    
+    def test_bswm_bswmd_arxml_loading_and_saving(self):
+        document = AUTOSAR.getInstance()
+        document.clear()
+        parser = ARXMLParser()
+        parser.load("src/armodel/tests/test_files/BswM_Bswmd.arxml", document)
+
+        writer = ARXMLWriter()
+        writer.save("data/generated_BswM_Bswmd.arxml", document)
+
+        assert(filecmp.cmp("src/armodel/tests/test_files/BswM_Bswmd.arxml", "data/generated_BswM_Bswmd.arxml", shallow = False) == True)

armodel/tests/test_armodel/parser/test_sw_components.py

@@ -1,5 +1,8 @@
 import filecmp
-from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Components import CompositionSwComponentType
+
+from ....models.M2.AUTOSARTemplates.CommonStructure.InternalBehavior import InternalBehavior
+from ....models.M2.AUTOSARTemplates.SWComponentTemplate.SwcImplementation import SwcImplementation
+from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Components import AtomicSwComponentType, CompositionSwComponentType
 from ....writer.arxml_writer import ARXMLWriter
 from ....parser.arxml_parser import ARXMLParser
 from ....models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
@@ -18,6 +21,24 @@ class TestSWComponents:
         assert(len(root_pkgs) == 1)
         assert("DemoApplication" == root_pkgs[0].getShortName())
 
+    def test_sw_component(self):
+        document = AUTOSAR.getInstance()
+        sw_component = document.find("/DemoApplication/SwComponentTypes/SWC_CyclicCounter")
+        assert(sw_component.getShortName() == 'SWC_CyclicCounter')
+        assert(isinstance(sw_component, AtomicSwComponentType))
+
+    def test_get_implementation(self):
+        document = AUTOSAR.getInstance()
+        impl = document.getImplementation("/DemoApplication/SwComponentTypes/SWC_CyclicCounter/IB_SWC_CyclicCounter")
+        assert(impl.getFullName() == "/DemoApplication/SwcImplementations/Impl_SWC_CyclicCounter")
+        assert(isinstance(impl, SwcImplementation))
+
+    def test_get_behavior(self):
+        document = AUTOSAR.getInstance()
+        behavior = document.getBehavior("/DemoApplication/SwcImplementations/Impl_SWC_CyclicCounter")
+        assert(behavior.getFullName() == "/DemoApplication/SwComponentTypes/SWC_CyclicCounter/IB_SWC_CyclicCounter")
+        assert(isinstance(behavior, InternalBehavior))
+
     def test_composition_sw_component_types(self):
         document = AUTOSAR.getInstance()
         sw_component = document.find("/DemoApplication/SwComponentTypes/TopLevelComposition")  

armodel/writer/abstract_arxml_writer.py

@@ -45,7 +45,7 @@ class AbstractARXMLWriter:
         else:
             raise NotImplementedError(error_msg)
         
-    def setARObjectAttributes(self, element: ET.Element, ar_obj: ARObject):
+    def writeARObjectAttributes(self, element: ET.Element, ar_obj: ARObject):
         if ar_obj.timestamp is not None:
             self.logger.debug("Timestamp: %s" % ar_obj.timestamp)
             element.attrib['T'] = ar_obj.timestamp
@@ -70,7 +70,7 @@ class AbstractARXMLWriter:
     def setChildElementOptionalNumericalValue(self, element: ET.Element, key: str, numerical: ARNumerical):
         if numerical is not None:
             child_element = ET.SubElement(element, key)
-            self.setARObjectAttributes(child_element, numerical)
+            self.writeARObjectAttributes(child_element, numerical)
             child_element.text = numerical._text
 
     def setChildElementOptionalIntegerValue(self, element: ET.Element, key: str, value: Integer):
@@ -82,7 +82,7 @@ class AbstractARXMLWriter:
     def setChildElementOptionalLiteral(self, element: ET.Element, key: str, literal: ARLiteral):
         if literal is not None:
             child_element = ET.SubElement(element, key)
-            self.setARObjectAttributes(child_element, literal)
+            self.writeARObjectAttributes(child_element, literal)
             if literal._value is not None:
                 child_element.text = str(literal._value)
 
@@ -104,7 +104,7 @@ class AbstractARXMLWriter:
     def setChildElementOptionalFloatValue(self, element: ET.Element, key: str, value: ARFloat):
         if value is not None:
             child_element = ET.SubElement(element, key)
-            self.setARObjectAttributes(child_element, value)
+            self.writeARObjectAttributes(child_element, value)
             child_element.text = value.getText()
 
     def setChildElementOptionalTimeValue(self, element: ET.Element, key: str, value: TimeValue):
@@ -114,7 +114,7 @@ class AbstractARXMLWriter:
         child_element = None
         if value is not None:
             child_element = ET.SubElement(element, key)
-            self.setARObjectAttributes(child_element, value)
+            self.writeARObjectAttributes(child_element, value)
             child_element.text = value.getText()
         return element
 
@@ -122,13 +122,14 @@ class AbstractARXMLWriter:
         child_element = None
         if value is not None:
             child_element = ET.SubElement(element, key)
-            self.setARObjectAttributes(child_element, value)
+            self.writeARObjectAttributes(child_element, value)
             child_element.text = value.getText()
         return element      
         
     def patch_xml(self, xml: str) -> str:
         xml = re.sub(r"\<([\w-]+)\/\>",r"<\1></\1>", xml)
         xml = re.sub(r"<(([\w-]+)\s+\w+=\"[\w-]+\")\/>", r"<\1></\2>", xml)
+        xml = re.sub(r"&quot;", '"', xml)
         return xml
 
     def saveToFile(self, filename, root: ET.Element):