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

armodel/tests/test_armodel/models/test_ar_ref.py

@@ -14,13 +14,16 @@ from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArOb
 class TestARRef:
     def test_RefType(self):
         ref_type = RefType()
-        assert(ref_type.value == "")
-        assert(ref_type.dest == "")
+        assert(ref_type.getBase() == None)
+        assert(ref_type.getValue() == None)
+        assert(ref_type.getDest() == None)
 
     def test_TRefType(self):
         ref_type = TRefType()
-        assert(ref_type.value == "")
-        assert(ref_type.dest == "")
+        assert(ref_type.getBase() == None)
+        assert(ref_type.getValue() == None)
+        assert(ref_type.getDest() == None)
+
 
     def test_AutosarVariableRef(self):
         ref_type = AutosarVariableRef()

armodel/tests/test_armodel/models/test_datatype.py

@@ -180,8 +180,8 @@ class Test_M2_AUTOSARTemplates_SWComponentTemplate_Datatype_Datatypes:
         assert(isinstance(data_type_map, ARObject))
         assert(isinstance(data_type_map, DataTypeMap))
 
-        assert(data_type_map.application_data_type_ref == None)
-        assert(data_type_map.implementation_data_type_ref == None)
+        assert(data_type_map.applicationDataTypeRef == None)
+        assert(data_type_map.implementationDataTypeRef == None)
 
     def test_DataTypeMappingSet(self):
         document = AUTOSAR.getInstance()
@@ -201,7 +201,7 @@ class Test_M2_AUTOSARTemplates_SWComponentTemplate_Datatype_Datatypes:
 
         assert(data_type_mapping_set.parent == ar_root)
         assert(data_type_mapping_set.short_name == "DataTypeMappingSet")
-        assert(len(data_type_mapping_set._dataTypeMaps) == 0)
+        assert(len(data_type_mapping_set.dataTypeMaps) == 0)
 
         data_type_map = DataTypeMap()
         data_type_mapping_set.addDataTypeMap(data_type_map)
@@ -242,7 +242,7 @@ class Test_M2_AUTOSARTemplates_CommonStructure_ImplementationDataTypes:
         assert(data_type.short_name == "ImplementationDataType")
         assert(data_type.subElements == [])
         assert(data_type.symbolProps == None)
-        assert(data_type._type_emitter == None)
+        assert(data_type.typeEmitter == None)
 
         element = data_type.createImplementationDataTypeElement("ImplementationDataTypeElement")
         assert(isinstance(element, ImplementationDataTypeElement))

armodel/tests/test_armodel/models/test_m2_msr.py

@@ -18,8 +18,8 @@ class Test_M2_MSR_AsamHdo_ComputationMethod:
         assert(isinstance(compu, ARObject))
         assert(isinstance(compu, Compu))
 
-        assert(compu.compu_content == None)
-        assert(compu.compu_default_value == None)
+        assert(compu.compuContent == None)
+        assert(compu.compuDefaultValue == None)
 
     def test_CompuConstContent(self):
         with pytest.raises(NotImplementedError) as err:
@@ -50,7 +50,7 @@ class Test_M2_MSR_AsamHdo_ComputationMethod:
         assert(isinstance(compu_const, ARObject))
         assert(isinstance(compu_const, CompuConst))
 
-        assert(compu_const.compu_const_content_type == None)
+        assert(compu_const.compuConstContentType == None)
 
     def test_CompuScale(self):
         compu_scale = CompuScale()
@@ -58,7 +58,7 @@ class Test_M2_MSR_AsamHdo_ComputationMethod:
         assert(isinstance(compu_scale, ARObject))
         assert(isinstance(compu_scale, CompuScale))
 
-        assert(compu_scale.compu_content == None)
+        assert(compu_scale.compuContent == None)
         assert(compu_scale.lowerLimit == None)
         assert(compu_scale.upperLimit == None)
         assert(compu_scale.compuInverseValue == None)
@@ -70,7 +70,7 @@ class Test_M2_MSR_AsamHdo_ComputationMethod:
         assert(isinstance(compu_scales, ARObject))
         assert(isinstance(compu_scales, CompuScales))
 
-        assert(len(compu_scales.compu_scales) == 0)
+        assert(len(compu_scales.compuScales) == 0)
 
         compu_scale = CompuScale()
         compu_scales.addCompuScale(compu_scale)

armodel/tests/test_armodel/parser/test_sw_components.py

@@ -64,7 +64,16 @@ class TestSWComponents:
 
         assert(filecmp.cmp("src/armodel/tests/test_files/BswMMode.arxml", "data/generated_AUTOSAR_Datatypes.arxml", shallow = False) == True)
 
-        
+    def test_bswm_mode_arxml_loading_and_saving(self):
+        document = AUTOSAR.getInstance()
+        document.clear()
+        parser = ARXMLParser()
+        parser.load("test_files/AUTOSAR_MOD_AISpecification_ApplicationDataType_Blueprint.arxml", document)
+
+        writer = ARXMLWriter()
+        writer.save("data/generated_AUTOSAR_MOD_AISpecification_ApplicationDataType_Blueprint.arxml", document)
+
+        #assert(filecmp.cmp("test_files/AUTOSAR_MOD_AISpecification_ApplicationDataType_Blueprint.arxml", "data/generated_AUTOSAR_MOD_AISpecification_ApplicationDataType_Blueprint.arxml", shallow = False) == True)
 
     
         

armodel/tests/test_armodel/parser/test_system.py

@@ -1,5 +1,4 @@
 import filecmp
-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

armodel/writer/abstract_arxml_writer.py

@@ -8,11 +8,7 @@ import logging
 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, Integer, TimeValue
-from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import TRefType
-
-from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARBoolean
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, ARLiteral, ARNumerical, Integer, TimeValue, RefType, ARBoolean
 
 class AbstractARXMLWriter:
     __metaclass__ = ABCMeta
@@ -43,6 +39,12 @@ class AbstractARXMLWriter:
         else:
             raise ValueError(error_msg)
         
+    def notImplemented(self, error_msg):
+        if (self.options['warning'] == True):
+            self.logger.error(Fore.RED + error_msg + Fore.WHITE)
+        else:
+            raise NotImplementedError(error_msg)
+        
     def setARObjectAttributes(self, element: ET.Element, ar_obj: ARObject):
         if ar_obj.timestamp is not None:
             self.logger.debug("Timestamp: %s" % ar_obj.timestamp)
@@ -74,6 +76,9 @@ class AbstractARXMLWriter:
     def setChildElementOptionalIntegerValue(self, element: ET.Element, key: str, value: Integer):
         self.setChildElementOptionalNumericalValue(element, key, value)
 
+    def setChildElementOptionalPositiveInteger(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)
@@ -84,11 +89,15 @@ class AbstractARXMLWriter:
     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):
+    def setChildElementOptionalRefType(self, parent: ET.Element, child_tag_name: str, ref: RefType):
         if ref is not None:
             child_tag = ET.SubElement(parent, child_tag_name)
-            if ref.dest is not None:
-                child_tag.attrib['DEST'] = ref.dest
+            base = ref.getBase()
+            if base is not None:
+                child_tag.attrib['BASE'] = base
+            dest = ref.getDest()
+            if dest is not None:
+                child_tag.attrib['DEST'] = dest
             if ref.value is not None:
                 child_tag.text = ref.value