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

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
@@ -15,43 +18,61 @@ class TestSWComponents:
         document = AUTOSAR.getInstance()
         root_pkgs = sorted(document.getARPackages(), key = lambda pkg: pkg.getShortName())
 
-        assert(len(root_pkgs) == 1)
-        assert("DemoApplication" == root_pkgs[0].getShortName())
+        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")  
-        assert(sw_component.short_name == "TopLevelComposition")
-        assert(isinstance(sw_component, CompositionSwComponentType))
-        prototypes = sw_component.getPortPrototypes()
-        assert(len(prototypes) == 2)
+        sw_component = document.find("/DemoApplication/SwComponentTypes/TopLevelComposition")
+        assert (sw_component.short_name == "TopLevelComposition")
+        assert (isinstance(sw_component, CompositionSwComponentType))
+        ports = sw_component.getPorts()
+        assert (len(ports) == 2)
 
     def test_composition_sw_component_types_sw_connectors(self):
         document = AUTOSAR.getInstance()
-        sw_component = document.find("/DemoApplication/SwComponentTypes/TopLevelComposition")  
-        assert(isinstance(sw_component, CompositionSwComponentType))
-        assert(len(sw_component.getSwConnectors()) == 6)
-        assert(len(sw_component.getAssemblySwConnectors()) == 3)
-        assert(len(sw_component.getDelegationSwConnectors()) == 3)
+        sw_component = document.find("/DemoApplication/SwComponentTypes/TopLevelComposition")
+        assert (isinstance(sw_component, CompositionSwComponentType))
+        assert (len(sw_component.getSwConnectors()) == 6)
+        assert (len(sw_component.getAssemblySwConnectors()) == 3)
+        assert (len(sw_component.getDelegationSwConnectors()) == 3)
 
         connector_name_list = set()
         for sw_connector in sw_component.getAssemblySwConnectors():
             connector_name_list.add(sw_connector.short_name)
 
-        assert(connector_name_list == set(['a6a18805580c94537a4c82f6c289a4d', 'ac681652833fb4b12b920adab33a73b', 'ac681652833fb4b12b920adab33a73c']))
+        assert (connector_name_list == set(['a6a18805580c94537a4c82f6c289a4d', 'ac681652833fb4b12b920adab33a73b', 'ac681652833fb4b12b920adab33a73c']))
 
         sw_component.removeElement("a6a18805580c94537a4c82f6c289a4d")
-        assert(len(sw_component.getAssemblySwConnectors()) == 2)
+        assert (len(sw_component.getAssemblySwConnectors()) == 2)
 
         # remove all the AssemblySwConnector
         sw_component.removeAllAssemblySwConnector()
-        assert(len(sw_component.getAssemblySwConnectors()) == 0)
-        assert(len(sw_component.getDelegationSwConnectors()) == 3)
+        assert (len(sw_component.getAssemblySwConnectors()) == 0)
+        assert (len(sw_component.getDelegationSwConnectors()) == 3)
         
         # remove all the DelegationSwConnector
         sw_component.removeAllDelegationSwConnector()
-        assert(len(sw_component.getAssemblySwConnectors()) == 0)
-        assert(len(sw_component.getDelegationSwConnectors()) == 0)
+        assert (len(sw_component.getAssemblySwConnectors()) == 0)
+        assert (len(sw_component.getDelegationSwConnectors()) == 0)
         
     def test_bswm_mode_arxml_loading_and_saving(self):
         document = AUTOSAR.getInstance()
@@ -62,9 +83,20 @@ class TestSWComponents:
         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)
+        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):
+    def test_sw_record_demo_arxml_loading_and_saving(self):
+        document = AUTOSAR.getInstance()
+        document.clear()
+        parser = ARXMLParser()
+        parser.load("src/armodel/tests/test_files/SwRecordDemo.arxml", document)
+
+        writer = ARXMLWriter()
+        writer.save("data/generated_SwRecordDemo.arxml", document)
+
+        assert (filecmp.cmp("src/armodel/tests/test_files/SwRecordDemo.arxml", "data/generated_SwRecordDemo.arxml", shallow = False) == True)
+
+    def test_application_data_type_blueprint_arxml_loading_and_saving(self):
         document = AUTOSAR.getInstance()
         document.clear()
         parser = ARXMLParser()
@@ -73,7 +105,7 @@ class TestSWComponents:
         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)
+        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

@@ -3,13 +3,13 @@ from ....writer.arxml_writer import ARXMLWriter
 from ....parser.arxml_parser import ARXMLParser
 from ....models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
 
+
 class TestSystemTemplate:
     def setup_method(self):
         document = AUTOSAR.getInstance()
         document.clear()
         parser = ARXMLParser()
         parser.load("src/armodel/tests/test_files/CanSystem.arxml", document)
-
     
     def test_can_system_arxml_loading_and_saving(self):
         document = AUTOSAR.getInstance()
@@ -20,10 +20,4 @@ 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) is True)

armodel/transformer/abstract.py

@@ -0,0 +1,6 @@
+class AbstractTransformer():
+    def __init__(self):
+        pass
+
+    def remove(self):
+        pass

armodel/transformer/admin_data.py

@@ -0,0 +1,31 @@
+import logging
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ARPackage import ARPackage
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Describable, Identifiable
+from ..models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
+from ..transformer.abstract import AbstractTransformer
+
+
+class AdminDataTransformer(AbstractTransformer):
+    def __init__(self):
+        super().__init__()
+        self.logger = logging.getLogger()
+
+    def process_pkg(self, pkg: ARPackage):
+        for sub_package in pkg.getARPackages():
+            self.process_pkg(sub_package)
+
+        self.logger.debug("Remove AdminData of <%s>", pkg.getShortName())
+        pkg.removeAdminData()
+
+        for element in pkg.getElements():
+            if isinstance(element, Describable):
+                self.logger.debug("Remove AdminData of <%s>", element.getShortName())
+                element.removeAdminData()
+            elif isinstance(element, Identifiable):
+                self.logger.debug("Remove AdminData of <%s>", element.getShortName())
+                element.removeAdminData()
+
+    def remove(self, root: AUTOSAR):
+        root.removeAdminData()
+        for pkg in root.getARPackages():
+            self.process_pkg(pkg)

armodel/writer/abstract_arxml_writer.py

@@ -8,13 +8,15 @@ 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, RefType, ARBoolean
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, ARLiteral, ARNumerical, Integer, TimeValue
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType, ARBoolean
+
 
 class AbstractARXMLWriter:
     __metaclass__ = ABCMeta
      
-    def __init__(self, options = None) -> None:
-        if type(self) == AbstractARXMLWriter:
+    def __init__(self, options=None) -> None:
+        if type(self) is AbstractARXMLWriter:
             raise NotImplementedError("AbstractARXMLWriter is an abstract class.")
         
         self.options = {}
@@ -25,7 +27,7 @@ class AbstractARXMLWriter:
         self._processOptions(options=options)
 
         self.nsmap = {
-            "xmlns": "http://autosar.org/schema/r4.0", 
+            "xmlns": "http://autosar.org/schema/r4.0",
         }
 
     def _processOptions(self, options):
@@ -34,23 +36,23 @@ class AbstractARXMLWriter:
                 self.options['warning'] = options['warning']
 
     def _raiseError(self, error_msg):
-        if (self.options['warning'] == True):
+        if (self.options['warning'] is True):
             self.logger.error(Fore.RED + error_msg + Fore.WHITE)
         else:
             raise ValueError(error_msg)
         
     def notImplemented(self, error_msg):
-        if (self.options['warning'] == True):
+        if (self.options['warning'] is True):
             self.logger.error(Fore.RED + error_msg + Fore.WHITE)
         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)
+            # self.logger.debug("Timestamp: %s" % ar_obj.timestamp)
             element.attrib['T'] = ar_obj.timestamp
         if ar_obj.uuid is not None:
-            self.logger.debug("UUID: %s" % ar_obj.uuid)
+            # self.logger.debug("UUID: %s" % ar_obj.uuid)
             element.attrib['UUID'] = ar_obj.uuid
 
     '''
@@ -70,7 +72,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):
@@ -78,14 +80,7 @@ class AbstractARXMLWriter:
 
     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)
-            self.setARObjectAttributes(child_element, literal)
-            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)
 
@@ -104,44 +99,43 @@ 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):
         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:
             child_element = ET.SubElement(element, key)
-            self.setARObjectAttributes(child_element, value)
+            self.writeARObjectAttributes(child_element, value)
             child_element.text = value.getText()
         return element
 
     def setChildElementOptionalLiteral(self, element: ET.Element, key: str, value: ARLiteral) -> ET.Element:
-        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      
-        
+        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"\<([\w-]+)\/\>", r"<\1></\1>", xml)
+        # xml = re.sub(r"<([\w-]+)\s+(\w+)=(\"[\w-]+\")\/>", r"<\1 \2=\3></\1>", xml)
+        # xml = re.sub(r"&quot;", '"', xml)
         return xml
 
     def saveToFile(self, filename, root: ET.Element):
-        if sys.version_info <= (3,9):
-            xml = ET.tostring(root, encoding = "UTF-8", short_empty_elements = False)
+        if sys.version_info <= (3, 9):
+            xml = ET.tostring(root, encoding="UTF-8", short_empty_elements=False)
         else:
-            xml = ET.tostring(root, encoding = "UTF-8", xml_declaration = True, short_empty_elements = False)
+            xml = ET.tostring(root, encoding="UTF-8", xml_declaration=True, short_empty_elements=False)
         
         dom = minidom.parseString(xml.decode())
-        xml = dom.toprettyxml(indent = "  ", encoding = "UTF-8")
+        xml = dom.toprettyxml(indent="  ", encoding="UTF-8")
 
         text = self.patch_xml(xml.decode())
     
         with open(filename, "w", encoding="utf-8") as f_out:
-            #f_out.write(xml.decode())
-            f_out.write(text)
+            # f_out.write(xml.decode())
+            f_out.write(text)