armodel 1.6.4__py3-none-any.whl → 1.7.1__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/parser/test_sw_components.py

@@ -53,40 +53,27 @@ 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):
+    def test_bswm_mode_arxml_loading_and_saving(self):
         document = AUTOSAR.getInstance()
         document.clear()
         parser = ARXMLParser()
-        parser.load("src/armodel/tests/test_files/AUTOSAR_Datatypes.arxml", document)
+        parser.load("src/armodel/tests/test_files/BswMMode.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)
+        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("src/armodel/tests/test_files/BswMMode.arxml", document)
+        parser.load("test_files/AUTOSAR_MOD_AISpecification_ApplicationDataType_Blueprint.arxml", document)
 
         writer = ARXMLWriter()
-        writer.save("data/generated_AUTOSAR_Datatypes.arxml", document)
-
-        assert(filecmp.cmp("src/armodel/tests/test_files/BswMMode.arxml", "data/generated_AUTOSAR_Datatypes.arxml", shallow = False) == True)
+        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

@@ -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

@@ -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
-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
@@ -71,6 +67,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,11 +77,18 @@ class AbstractARXMLWriter:
             if literal._value is not None:
                 child_element.text = str(literal._value)
 
-    def setChildElementOptionalRefType(self, parent: ET.Element, child_tag_name: str, ref: TRefType):
+    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: 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
 
@@ -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: