armodel 1.6.3__py3-none-any.whl → 1.7.0__py3-none-any.whl

armodel/tests/test_armodel/models/test_data_prototype.py

@@ -46,7 +46,7 @@ class Test_M2_AUTOSARTemplates_SWComponentTemplate_Datatype_DataPrototypes:
         assert(isinstance(prototype, MultilanguageReferrable))
         assert(isinstance(prototype, Referrable))
 
-        assert(prototype._parent == ar_root)
+        assert(prototype.parent == ar_root)
         assert(prototype.short_name == "prototype")
         assert(prototype.typeTRef is None)
 

armodel/tests/test_armodel/models/test_datatype.py

@@ -40,7 +40,7 @@ class Test_M2_AUTOSARTemplates_CommonStructure_Implementation:
         assert(isinstance(prototype, Referrable))
         assert(isinstance(prototype, SymbolProps))
 
-        assert(prototype._parent == ar_root)
+        assert(prototype.parent == ar_root)
         assert(prototype.short_name == "SymbolProps")
         assert(prototype.symbol == None)
 
@@ -66,7 +66,7 @@ class Test_M2_MSR_AsamHdo_BaseTypes:
         assert(isinstance(base_type, Referrable))
         assert(isinstance(base_type, SwBaseType))
 
-        assert(base_type._parent == ar_root)
+        assert(base_type.parent == ar_root)
         assert(base_type.short_name == "SwBaseType")
         assert(isinstance(base_type.baseTypeDefinition, BaseTypeDirectDefinition))
 
@@ -111,7 +111,7 @@ class Test_M2_AUTOSARTemplates_SWComponentTemplate_Datatype_Datatypes:
         assert(isinstance(data_type, Referrable))
         assert(isinstance(data_type, ApplicationPrimitiveDataType))
 
-        assert(data_type._parent == ar_root)
+        assert(data_type.parent == ar_root)
         assert(data_type.short_name == "ApplicationPrimitiveDataType")
         assert(data_type.swDataDefProps == None)
 
@@ -142,7 +142,7 @@ class Test_M2_AUTOSARTemplates_SWComponentTemplate_Datatype_Datatypes:
         assert(isinstance(data_type, Referrable))
         assert(isinstance(data_type, ApplicationArrayDataType))
 
-        assert(data_type._parent == ar_root)
+        assert(data_type.parent == ar_root)
         assert(data_type.short_name == "ApplicationArrayDataType")
         assert(data_type.dynamic_array_size_profile == None)
         assert(data_type.element == None)
@@ -167,7 +167,7 @@ class Test_M2_AUTOSARTemplates_SWComponentTemplate_Datatype_Datatypes:
         assert(isinstance(data_type, Referrable))
         assert(isinstance(data_type, ApplicationRecordDataType))
 
-        assert(data_type._parent == ar_root)
+        assert(data_type.parent == ar_root)
         assert(data_type.short_name == "ApplicationRecordDataType")
 
         element = data_type.createApplicationRecordElement("element")
@@ -199,7 +199,7 @@ class Test_M2_AUTOSARTemplates_SWComponentTemplate_Datatype_Datatypes:
         assert(isinstance(data_type_mapping_set, Referrable))
         assert(isinstance(data_type_mapping_set, DataTypeMappingSet))
 
-        assert(data_type_mapping_set._parent == ar_root)
+        assert(data_type_mapping_set.parent == ar_root)
         assert(data_type_mapping_set.short_name == "DataTypeMappingSet")
         assert(len(data_type_mapping_set._dataTypeMaps) == 0)
 
@@ -238,7 +238,7 @@ class Test_M2_AUTOSARTemplates_CommonStructure_ImplementationDataTypes:
         assert(isinstance(data_type, Referrable))
         assert(isinstance(data_type, ImplementationDataType))
 
-        assert(data_type._parent == ar_root)
+        assert(data_type.parent == ar_root)
         assert(data_type.short_name == "ImplementationDataType")
         assert(data_type.subElements == [])
         assert(data_type.symbolProps == None)

armodel/tests/test_armodel/models/test_port_interface.py

@@ -15,7 +15,7 @@ from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Prim
 from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.DataPrototypes import AtpPrototype, AutosarDataPrototype, DataPrototype, VariableDataPrototype
 from ....models.M2.AUTOSARTemplates.GenericStructure.AbstractStructure import AtpType
 from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement
-from ....models.M2.AUTOSARTemplates.SWComponentTemplate.port_interface import ApplicationError, ArgumentDataPrototype, ClientServerInterface, ClientServerOperation, DataInterface, NvDataInterface, ParameterInterface, PortInterface, SenderReceiverInterface
+from ....models.M2.AUTOSARTemplates.SWComponentTemplate.PortInterface import ApplicationError, ArgumentDataPrototype, ClientServerInterface, ClientServerOperation, DataInterface, NvDataInterface, ParameterInterface, PortInterface, SenderReceiverInterface
 
 
 class Test_M2_AUTOSARTemplates_SWComponentTemplate_PortInterface:
@@ -50,7 +50,7 @@ class Test_M2_AUTOSARTemplates_SWComponentTemplate_PortInterface:
         assert(isinstance(data_if, Referrable))
         assert(isinstance(data_if, NvDataInterface))
 
-        assert(data_if._parent == ar_root)
+        assert(data_if.parent == ar_root)
         assert(data_if.short_name == "NvDataInterface")
 
     def test_ParameterInterface(self):
@@ -73,7 +73,7 @@ class Test_M2_AUTOSARTemplates_SWComponentTemplate_PortInterface:
         assert(isinstance(data_if, Referrable))
         assert(isinstance(data_if, ParameterInterface))
 
-        assert(data_if._parent == ar_root)
+        assert(data_if.parent == ar_root)
         assert(data_if.short_name == "ParameterInterface")
 
     def test_SenderReceiverInterface(self):
@@ -97,7 +97,7 @@ class Test_M2_AUTOSARTemplates_SWComponentTemplate_PortInterface:
         assert(isinstance(sr_if, SenderReceiverInterface))
 
         assert(sr_if.short_name == "sr_if")
-        assert(sr_if._parent == ar_root)
+        assert(sr_if.parent == ar_root)
         assert(len(sr_if.getDataElements()) == 0)
 
         element = sr_if.createDataElement("element")
@@ -127,7 +127,7 @@ class Test_M2_AUTOSARTemplates_SWComponentTemplate_PortInterface:
         assert(isinstance(prototype, Referrable))
         assert(isinstance(prototype, ArgumentDataPrototype))
 
-        assert(prototype._parent == ar_root)
+        assert(prototype.parent == ar_root)
         assert(prototype.short_name == "ArgumentDataPrototype")
         assert(prototype.direction == "")
         assert(prototype.server_argument_impl_policy == "")
@@ -143,7 +143,7 @@ class Test_M2_AUTOSARTemplates_SWComponentTemplate_PortInterface:
         assert(isinstance(app_error, Referrable))
         assert(isinstance(app_error, ApplicationError))
 
-        assert(app_error._parent == ar_root)
+        assert(app_error.parent == ar_root)
         assert(app_error.short_name == "ApplicationError")
 
     def test_ClientServerOperation(self):

armodel/tests/test_armodel/parser/test_parse_bswmd.py

@@ -153,30 +153,30 @@ class TestBswMD:
         assert(artifact_descs[1].getShortLabel().getValue() == "make::BswM_rules.mak")
         assert(artifact_descs[1].getCategory().getValue() == "SWMAKE")
 
-        assert(impl.programming_language.getValue() == "C")
+        assert(impl.programmingLanguage.getValue() == "C")
 
-        assert(impl.resource_consumption.short_name == "ResourceConsumption")
-        assert(len(impl.resource_consumption.getMemorySections()) == 8)
+        assert(impl.resourceConsumption.short_name == "ResourceConsumption")
+        assert(len(impl.resourceConsumption.getMemorySections()) == 8)
 
-        section = impl.resource_consumption.getMemorySection("CODE")
+        section = impl.resourceConsumption.getMemorySection("CODE")
         assert(section.short_name == "CODE")
         assert(section.alignment == None)
         assert(section.swAddrMethodRef.dest == "SW-ADDR-METHOD")
         assert(section.swAddrMethodRef.value == "/AUTOSAR_MemMap/SwAddrMethods/CODE")
 
-        section = impl.resource_consumption.getMemorySection("VAR_NO_INIT_UNSPECIFIED")
+        section = impl.resourceConsumption.getMemorySection("VAR_NO_INIT_UNSPECIFIED")
         assert(section.short_name == "VAR_NO_INIT_UNSPECIFIED")
         assert(section.alignment.getText() == "UNSPECIFIED")
         assert(section.swAddrMethodRef.dest == "SW-ADDR-METHOD")
         assert(section.swAddrMethodRef.value == "/AUTOSAR_MemMap/SwAddrMethods/VAR_NOINIT")
 
-        assert(impl.vendor_id.getValue() == 1)
-        assert(impl.sw_version.getValue() == "1.14.1")
-        assert(impl.swc_bsw_mapping_ref.dest == "SWC-BSW-MAPPING")
-        assert(impl.swc_bsw_mapping_ref.value == "/AUTOSAR_BswM/SwcBswMappings/SwcBswMapping_0")
-        assert(impl.ar_release_version.getValue() == "4.0.3")
-        assert(impl.behavior_ref.dest == "BSW-INTERNAL-BEHAVIOR")
-        assert(impl.behavior_ref.value == "/AUTOSAR_BswM/BswModuleDescriptions/BswM/InternalBehavior_0")
+        assert(impl.vendorId.getValue() == 1)
+        assert(impl.swVersion.getValue() == "1.14.1")
+        assert(impl.swcBswMappingRef.dest == "SWC-BSW-MAPPING")
+        assert(impl.swcBswMappingRef.value == "/AUTOSAR_BswM/SwcBswMappings/SwcBswMapping_0")
+        assert(impl.arReleaseVersion.getValue() == "4.0.3")
+        assert(impl.behaviorRef.dest == "BSW-INTERNAL-BEHAVIOR")
+        assert(impl.behaviorRef.value == "/AUTOSAR_BswM/BswModuleDescriptions/BswM/InternalBehavior_0")
 
     
     def test_load_save(self):

armodel/tests/test_armodel/parser/test_sw_components.py

@@ -1,5 +1,5 @@
 import filecmp
-from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Composition import CompositionSwComponentType
+from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Components import CompositionSwComponentType
 from ....writer.arxml_writer import ARXMLWriter
 from ....parser.arxml_parser import ARXMLParser
 from ....models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
@@ -53,28 +53,6 @@ class TestSWComponents:
         assert(len(sw_component.getAssemblySwConnectors()) == 0)
         assert(len(sw_component.getDelegationSwConnectors()) == 0)
         
-    def test_software_components_arxml_loading_and_saving(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_software_components_arxml_loading_and_saving(self):
-        document = AUTOSAR.getInstance()
-        document.clear()
-        parser = ARXMLParser()
-        parser.load("src/armodel/tests/test_files/AUTOSAR_Datatypes.arxml", document)
-
-        writer = ARXMLWriter()
-        writer.save("data/generated_AUTOSAR_Datatypes.arxml", document)
-
-        assert(filecmp.cmp("src/armodel/tests/test_files/AUTOSAR_Datatypes.arxml", "data/generated_AUTOSAR_Datatypes.arxml", shallow = False) == True)
-
     def test_bswm_mode_arxml_loading_and_saving(self):
         document = AUTOSAR.getInstance()
         document.clear()

armodel/tests/test_armodel/parser/test_system.py

@@ -1,5 +1,5 @@
 import filecmp
-from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Composition import CompositionSwComponentType
+from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Components import CompositionSwComponentType
 from ....writer.arxml_writer import ARXMLWriter
 from ....parser.arxml_parser import ARXMLParser
 from ....models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
@@ -12,7 +12,7 @@ class TestSystemTemplate:
         parser.load("src/armodel/tests/test_files/CanSystem.arxml", document)
 
     
-    def test_bswm_mode_arxml_loading_and_saving(self):
+    def test_can_system_arxml_loading_and_saving(self):
         document = AUTOSAR.getInstance()
         document.clear()
         parser = ARXMLParser()
@@ -21,7 +21,7 @@ class TestSystemTemplate:
         writer = ARXMLWriter()
         writer.save("data/generated_CanSystem.arxml", document)
 
-        #assert(filecmp.cmp("src/armodel/tests/test_files/CanSystem.arxml", "data/generated_CanSystem.arxml", shallow = False) == True)
+        assert(filecmp.cmp("src/armodel/tests/test_files/CanSystem.arxml", "data/generated_CanSystem.arxml", shallow = False) == True)
 
         
 

armodel/writer/abstract_arxml_writer.py

@@ -9,7 +9,7 @@ import xml.etree.cElementTree as ET
 
 from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 
-from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, ARLiteral, ARNumerical
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, ARLiteral, ARNumerical, Integer, TimeValue
 from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import TRefType
 
 from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARBoolean
@@ -71,6 +71,9 @@ class AbstractARXMLWriter:
             self.setARObjectAttributes(child_element, numerical)
             child_element.text = numerical._text
 
+    def setChildElementOptionalIntegerValue(self, element: ET.Element, key: str, value: Integer):
+        self.setChildElementOptionalNumericalValue(element, key, value)
+
     def setChildElementOptionalLiteral(self, element: ET.Element, key: str, literal: ARLiteral):
         if literal is not None:
             child_element = ET.SubElement(element, key)
@@ -78,6 +81,9 @@ class AbstractARXMLWriter:
             if literal._value is not None:
                 child_element.text = str(literal._value)
 
+    def setChildElementOptionalRevisionLabelString(self, element: ET.Element, key: str, literal: ARLiteral):
+        self.setChildElementOptionalLiteral(element, key, literal)
+
     def setChildElementOptionalRefType(self, parent: ET.Element, child_tag_name: str, ref: TRefType):
         if ref is not None:
             child_tag = ET.SubElement(parent, child_tag_name)
@@ -91,6 +97,9 @@ class AbstractARXMLWriter:
             child_element = ET.SubElement(element, key)
             child_element.text = value.getText()
 
+    def setChildElementOptionalTimeValue(self, element: ET.Element, key: str, value: TimeValue):
+        self.setChildElementOptionalFloatValue(element, key, value)
+
     def setChildElementOptionalBooleanValue(self, element: ET.Element, key: str, value: ARBoolean) -> ET.Element:
         child_element = None
         if value is not None: