armodel 1.4.3__py3-none-any.whl → 1.6.0__py3-none-any.whl

armodel/tests/test_armodel/models/test_ar_package.py

@@ -5,7 +5,7 @@ from ....models.ar_package import AUTOSAR
 from ....models.datatype import ApplicationPrimitiveDataType, ApplicationRecordDataType, DataTypeMappingSet, ImplementationDataType, SwBaseType
 from ....models.general_structure import ARElement, ARObject, CollectableElement, Identifiable, MultilanguageReferrable, PackageableElement, Referrable
 from ....models.m2_msr import CompuMethod
-from ....models.port_interface import ClientServerInterface, DataInterface, PortInterface, SenderReceiverInterface
+from ....models.m2.autosar_templates.sw_component_template.port_interface import ClientServerInterface, DataInterface, PortInterface, SenderReceiverInterface
 from ....models.sw_component import ApplicationSwComponentType, AtomicSwComponentType, CompositionSwComponentType, EcuAbstractionSwComponentType, ServiceSwComponentType, SwComponentType
 
 class TestAUTOSAR:

armodel/tests/test_armodel/models/test_ar_ref.py

@@ -21,9 +21,9 @@ class TestARRef:
     def test_AutosarVariableRef(self):
         ref_type = AutosarVariableRef()
         assert(ref_type != None)
-        assert(ref_type.autosar_variable_iref == None)
-        assert(ref_type.autosar_variable_in_impl_datatype == None)
-        assert(ref_type.local_variable_ref == None)
+        assert(ref_type.autosarVariableIRef == None)
+        assert(ref_type.autosarVariableInImplDatatype == None)
+        assert(ref_type.localVariableRef == None)
 
     def test_AtpInstanceRef(self):
         with pytest.raises(NotImplementedError) as err:

armodel/tests/test_armodel/models/test_bsw_module_template.py

@@ -15,12 +15,12 @@ class TestBswModuleDescription:
         document = AUTOSAR.getInstance()
         ar_root = document.createARPackage("AUTOSAR")
         bsw_module_description = BswModuleDescription(ar_root, "bsw_module")
-        with pytest.raises(ValueError) as err:
-            bsw_module_description.category = "invalid"
-        assert(str(err.value) == "Invalid category <invalid> of BswModuleDescription <bsw_module>")
+        #with pytest.raises(ValueError) as err:
+        #    bsw_module_description.category = "invalid"
+        #assert(str(err.value) == "Invalid category <invalid> of BswModuleDescription <bsw_module>")
 
-        bsw_module_description.category = "BSW_MODULE"
-        assert(bsw_module_description.category == "BSW_MODULE")
+        bsw_module_description.setCategory("BSW_MODULE")
+        assert(bsw_module_description.getCategory() == "BSW_MODULE")
 
 class Test_M2_AUTOSARTemplates_BswModuleTemplate_BswInterfaces:
     def test_BswModuleEntry(self):

armodel/tests/test_armodel/models/test_common_structure.py

@@ -1,8 +1,8 @@
 import pytest
 
 from .... import AUTOSAR
-from ....models.common_structure import AbstractImplementationDataTypeElement, ConstantReference, ImplementationDataTypeElement, ValueSpecification, ConstantSpecification, ExecutableEntity
-from ....models.datatype import AbstractImplementationDataType
+from ....models.m2.autosar_templates.common_structure import ConstantReference, ConstantSpecification, ValueSpecification
+from ....models.common_structure import AbstractImplementationDataTypeElement, ImplementationDataTypeElement, ExecutableEntity
 from ....models.general_structure import ARElement, ARObject, CollectableElement, Identifiable
 from ....models.general_structure import MultilanguageReferrable, PackageableElement, Referrable
 
@@ -30,7 +30,7 @@ class Test_M2_AUTOSARTemplates_CommonStructure_Constants:
     def test_ConstantReference(self):
         ref = ConstantReference()
 
-        assert(ref.constant_ref == None)
+        assert(ref.getConstantRef() == None)
 
         assert(isinstance(ref, ARObject))
         assert(isinstance(ref, ValueSpecification))

armodel/tests/test_armodel/models/test_data_dictionary.py

@@ -1,6 +1,6 @@
 import pytest
 
-from ....models.data_dictionary import SwDataDefProps, SwPointerTargetProps
+from ....models.m2.msr.data_dictionary.data_def_properties import SwDataDefProps, SwPointerTargetProps
 from ....models.general_structure import ARObject
 
 class Test_M2_MSR_DataDictionary_DataDefProperties:
@@ -16,7 +16,7 @@ class Test_M2_MSR_DataDictionary_DataDefProperties:
         assert(props.implementationDataTypeRef == None)
         assert(props.swImplPolicy == None)
         assert(props.swCalibrationAccess == None)
-        assert(props.sw_pointer_target_props == None)
+        assert(props.swPointerTargetProps == None)
 
     def test_SwPointerTargetProps(self):
         props = SwPointerTargetProps()
@@ -24,6 +24,6 @@ class Test_M2_MSR_DataDictionary_DataDefProperties:
         assert(isinstance(props, ARObject))
         assert(isinstance(props, SwPointerTargetProps))
 
-        assert(props.function_pointer_signature == None)
-        assert(props.sw_data_def_props == None)
-        assert(props.target_category == None)
+        assert(props.getFunctionPointerSignatureRef() == None)
+        assert(props.getSwDataDefProps() == None)
+        assert(props.getTargetCategory() == None)

armodel/tests/test_armodel/models/test_data_prototype.py

@@ -42,9 +42,9 @@ 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.type_tref is None)
+        assert(prototype.typeTRef is None)
 
     def test_ApplicationCompositeElementDataPrototype(self):
         with pytest.raises(NotImplementedError) as err:

armodel/tests/test_armodel/models/test_datatype.py

@@ -26,7 +26,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 == "")
 
@@ -52,7 +52,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))
 
@@ -97,9 +97,9 @@ 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.sw_data_def_props == None)
+        assert(data_type.swDataDefProps == None)
 
     def test_ApplicationCompositeDataType(self):
         with pytest.raises(NotImplementedError) as err:
@@ -128,7 +128,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)
@@ -153,7 +153,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")
@@ -185,7 +185,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)
 
@@ -224,7 +224,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.sub_elements == [])
         assert(data_type.symbol_props == None)

armodel/tests/test_armodel/models/test_port_interface.py

@@ -5,7 +5,7 @@ from ....models.ar_ref import RefType
 from ....models.data_prototype import AtpPrototype, AutosarDataPrototype, DataPrototype, VariableDataPrototype
 from ....models.datatype import AtpType
 from ....models.general_structure import ARElement, ARObject, AtpFeature, CollectableElement, Identifiable, MultilanguageReferrable, PackageableElement, Referrable
-from ....models.port_interface import ApplicationError, ArgumentDataPrototype, ClientServerInterface, ClientServerOperation, DataInterface, NvDataInterface, ParameterInterface, PortInterface, SenderReceiverInterface
+from ....models.m2.autosar_templates.sw_component_template.port_interface import ApplicationError, ArgumentDataPrototype, ClientServerInterface, ClientServerOperation, DataInterface, NvDataInterface, ParameterInterface, PortInterface, SenderReceiverInterface
 
 
 class Test_M2_AUTOSARTemplates_SWComponentTemplate_PortInterface:
@@ -40,7 +40,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):
@@ -63,7 +63,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):
@@ -87,7 +87,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")
@@ -117,7 +117,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 == "")
@@ -133,7 +133,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

@@ -72,13 +72,13 @@ class TestBswMD:
         assert(len(behavior.getBswSchedulableEntities()) == 1)
         entity = behavior.getBswSchedulableEntities()[0]
         assert(entity.short_name == "BswM_MainFunction")
-        assert(entity.minimum_start_interval is not None)
-        assert(entity.minimum_start_interval_ms is not None)
+        assert(entity.minimumStartInterval is not None)
+        assert(entity.minimumStartIntervalMs is not None)
         assert(len(entity.getCanEnterExclusiveAreaRefs()) == 1) 
         assert(entity.getCanEnterExclusiveAreaRefs()[0].dest == "EXCLUSIVE-AREA")
         assert(entity.getCanEnterExclusiveAreaRefs()[0].value == "/AUTOSAR_BswM/BswModuleDescriptions/BswM/InternalBehavior_0/SCHM_BSWM_EXCLUSIVE_AREA")
-        assert(entity.implemented_entry_ref.dest == "BSW-MODULE-ENTRY")
-        assert(entity.implemented_entry_ref.value == "/AUTOSAR_BswM/BswModuleEntrys/BswM_MainFunction")
+        assert(entity.implementedEntryRef.dest == "BSW-MODULE-ENTRY")
+        assert(entity.implementedEntryRef.value == "/AUTOSAR_BswM/BswModuleEntrys/BswM_MainFunction")
 
         assert(len(behavior.getBswTimingEvents()) == 1)
         event = behavior.getBswTimingEvents()[0]
@@ -153,16 +153,16 @@ class TestBswMD:
 
         assert(impl.programming_language.getValue() == "C")
 
-        assert(impl._resource_consumption.short_name == "ResourceConsumption")
-        assert(len(impl._resource_consumption.getMemorySections()) == 8)
+        assert(impl.resource_consumption.short_name == "ResourceConsumption")
+        assert(len(impl.resource_consumption.getMemorySections()) == 8)
 
-        section = impl._resource_consumption.getMemorySection("CODE")
+        section = impl.resource_consumption.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.resource_consumption.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")
@@ -188,5 +188,13 @@ class TestBswMD:
 
         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

@@ -13,10 +13,10 @@ class TestSWComponents:
 
     def test_ar_packages(self):
         document = AUTOSAR.getInstance()
-        root_pkgs = sorted(document.getARPackages(), key = lambda pkg: pkg.short_name)
+        root_pkgs = sorted(document.getARPackages(), key = lambda pkg: pkg.getShortName())
 
         assert(len(root_pkgs) == 1)
-        assert("DemoApplication" == root_pkgs[0].short_name)
+        assert("DemoApplication" == root_pkgs[0].getShortName())
 
     def test_composition_sw_component_types(self):
         document = AUTOSAR.getInstance()
@@ -75,16 +75,16 @@ class TestSWComponents:
 
         assert(filecmp.cmp("src/armodel/tests/test_files/AUTOSAR_Datatypes.arxml", "data/generated_AUTOSAR_Datatypes.arxml", shallow = False) == True)
 
-    def test_bswm_bswmd_arxml_loading_and_saving(self):
+    def test_bswm_mode_arxml_loading_and_saving(self):
         document = AUTOSAR.getInstance()
         document.clear()
         parser = ARXMLParser()
-        parser.load("src/armodel/tests/test_files/BswM_Bswmd.arxml", document)
+        parser.load("src/armodel/tests/test_files/BswMMode.arxml", document)
 
         writer = ARXMLWriter()
-        writer.save("data/generated_BswM_Bswmd.arxml", document)
+        writer.save("data/generated_AUTOSAR_Datatypes.arxml", document)
 
-        assert(filecmp.cmp("src/armodel/tests/test_files/BswM_Bswmd.arxml", "data/generated_BswM_Bswmd.arxml", shallow = False) == True)
+        assert(filecmp.cmp("src/armodel/tests/test_files/BswMMode.arxml", "data/generated_AUTOSAR_Datatypes.arxml", shallow = False) == True)