armodel 1.8.4__py3-none-any.whl → 1.8.6__py3-none-any.whl

armodel/parser/arxml_parser.py

@@ -2,6 +2,9 @@ from typing import List
 import xml.etree.ElementTree as ET
 import os
 
+
+
+
 from ..models.M2.MSR.AsamHdo.AdminData import AdminData, DocRevision, Modification
 from ..models.M2.MSR.AsamHdo.BaseTypes import BaseTypeDirectDefinition, SwBaseType
 from ..models.M2.MSR.AsamHdo.Constraints.GlobalConstraints import DataConstrRule, InternalConstrs, PhysConstrs, DataConstr
@@ -29,6 +32,7 @@ from ..models.M2.MSR.Documentation.TextModel.MultilanguageData import MultiLangu
 from ..models.M2.MSR.Documentation.TextModel.MultilanguageData import MultilanguageLongName
 from ..models.M2.MSR.Documentation.TextModel.BlockElements.PaginationAndView import DocumentViewSelectable, Paginateable
 
+
 from ..models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
 from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswBehavior import BswApiOptions, BswAsynchronousServerCallPoint, BswBackgroundEvent
 from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswBehavior import BswSynchronousServerCallPoint
@@ -101,7 +105,8 @@ from ..models.M2.AUTOSARTemplates.SWComponentTemplate.EndToEndProtection import
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Composition.InstanceRefs import POperationInAtomicSwcInstanceRef, PPortInCompositionInstanceRef
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Composition.InstanceRefs import ROperationInAtomicSwcInstanceRef, RPortInCompositionInstanceRef
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.PortInterface.InstanceRefs import ApplicationCompositeElementInPortInterfaceInstanceRef
-from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Communication import CompositeNetworkRepresentation, ModeSwitchedAckRequest
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Communication import CompositeNetworkRepresentation, ModeSwitchedAckRequest, NvProvideComSpec
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Communication import NvRequireComSpec, PPortComSpec, RPortComSpec
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Communication import TransformationComSpecProps, UserDefinedTransformationComSpecProps
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Communication import TransmissionAcknowledgementRequest
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Communication import ClientComSpec, ModeSwitchReceiverComSpec, ModeSwitchSenderComSpec
@@ -135,8 +140,9 @@ from ..models.M2.AUTOSARTemplates.SWComponentTemplate.PortInterface import Varia
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcImplementation import SwcImplementation
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior import RunnableEntity, RunnableEntityArgument, SwcInternalBehavior
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.AutosarVariableRef import AutosarVariableRef
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.DataElements import ParameterAccess
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.IncludedDataTypes import IncludedDataTypeSet
-from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.InstanceRefsUsage import AutosarParameterRef
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.InstanceRefsUsage import AutosarParameterRef, ParameterInAtomicSWCTypeInstanceRef
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.InstanceRefsUsage import VariableInAtomicSWCTypeInstanceRef
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.ModeDeclarationGroup import IncludedModeDeclarationGroupSet
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.ModeDeclarationGroup import ModeAccessPoint, ModeSwitchPoint
@@ -1247,21 +1253,38 @@ class ARXMLParser(AbstractARXMLParser):
         argument = RunnableEntityArgument()
         argument.setSymbol(self.getChildElementOptionalLiteral(element, "SYMBOL"))
         return argument
+
+    def getParameterInAtomicSWCTypeInstanceRef(self, element: ET.Element, key: str) -> ParameterInAtomicSWCTypeInstanceRef:
+        parameter_iref = None
+        child_element = self.find(element, key)
+        if child_element is not None:
+            parameter_iref = ParameterInAtomicSWCTypeInstanceRef()
+            parameter_iref.setBaseRef(self.getChildElementOptionalRefType(child_element, "BASE-REF"))
+            parameter_iref.setContextDataPrototypeRef(self.getChildElementOptionalRefType(child_element, "CONTEXT-DATA-PROTOTYPE-REF"))
+            parameter_iref.setPortPrototypeRef(self.getChildElementOptionalRefType(child_element, "PORT-PROTOTYPE-REF"))
+            parameter_iref.setRootParameterDataPrototypeRef(self.getChildElementOptionalRefType(child_element, "ROOT-PARAMETER-DATA-PROTOTYPE-REF"))
+            parameter_iref.setTargetDataPrototypeRef(self.getChildElementOptionalRefType(child_element, "TARGET-DATA-PROTOTYPE-REF"))
+        return parameter_iref
     
     def getAutosarParameterRef(self, element: ET.Element, key: str) -> AutosarParameterRef:
         parameter = None
         child_element = self.find(element, key)
         if child_element is not None:
             parameter = AutosarParameterRef()
+            parameter.setAutosarParameterIRef(self.getParameterInAtomicSWCTypeInstanceRef(child_element, "AUTOSAR-PARAMETER-IREF"))
             parameter.setLocalParameterRef(self.getChildElementOptionalRefType(child_element, "LOCAL-PARAMETER-REF"))
         return parameter
 
+    def readParameterAccess(self, element: ET.Element, access: ParameterAccess):
+        self.readIdentifiable(element, access)
+        access.setAccessedParameter(self.getAutosarParameterRef(element, "ACCESSED-PARAMETER"))
+
     def readRunnableEntityParameterAccesses(self, element: ET.Element, parent: RunnableEntity):
         for child_element in self.findall(element, "PARAMETER-ACCESSS/PARAMETER-ACCESS"):
             short_name = self.getShortName(child_element)
             self.logger.debug("readParameterAccesses %s" % short_name)
             parameter_access = parent.createParameterAccess(short_name)
-            parameter_access.setAccessedParameter(self.getAutosarParameterRef(child_element, "ACCESSED-PARAMETER"))
+            self.readParameterAccess(child_element, parameter_access)
 
     def readRunnableEntityWrittenLocalVariables(self, element: ET.Element, parent: RunnableEntity):
         self._readVariableAccesses(element, parent, "WRITTEN-LOCAL-VARIABLES")
@@ -1886,8 +1909,8 @@ class ARXMLParser(AbstractARXMLParser):
         iref = None
         if child_element is not None:
             iref = ApplicationCompositeElementInPortInterfaceInstanceRef()
-            iref.setRootDataPrototypeRef(self.getChildElementOptionalRefType(child_element, "ROOT-DATA-PROTOTYPE-REF"))\
-                .setTargetDataPrototypeRef(self.getChildElementOptionalRefType(child_element, "TARGET-DATA-PROTOTYPE-REF"))
+            iref.setRootDataPrototypeRef(self.getChildElementOptionalRefType(child_element, "ROOT-DATA-PROTOTYPE-REF"))
+            iref.setTargetDataPrototypeRef(self.getChildElementOptionalRefType(child_element, "TARGET-DATA-PROTOTYPE-REF"))
         return iref
 
     def getCompositeNetworkRepresentation(self, element: ET.Element) -> CompositeNetworkRepresentation:
@@ -1898,7 +1921,7 @@ class ARXMLParser(AbstractARXMLParser):
         return representation
 
     def readReceiverComSpec(self, element: ET.Element, com_spec: ReceiverComSpec):
-        self.readARObjectAttributes(element, com_spec)
+        self.readRPortComSpec(element, com_spec)
         for child_element in self.findall(element, "COMPOSITE-NETWORK-REPRESENTATIONS/COMPOSITE-NETWORK-REPRESENTATION"):
             com_spec.addCompositeNetworkRepresentation(self.getCompositeNetworkRepresentation(child_element))
         com_spec.setDataElementRef(self.getChildElementOptionalRefType(element, "DATA-ELEMENT-REF"))
@@ -1949,26 +1972,39 @@ class ARXMLParser(AbstractARXMLParser):
 
         self.logger.debug("readApplicationValueSpecification Category %s" % value_spec.category)
 
-    def getInitValue(self, element: ET.Element) -> ValueSpecification:
+    def getChildValueSpecification(self, element: ET.Element, key: str) -> ValueSpecification:
         value_spec = None
-        child_element = self.find(element, "INIT-VALUE/*")
+        child_element = self.find(element, key + "/*")
         if child_element is not None:
             value_spec = self.getValueSpecification(child_element, self.getTagName(child_element))
         return value_spec
-    
+
+    def getInitValue(self, element: ET.Element) -> ValueSpecification:
+        return self.getChildValueSpecification(element, "INIT-VALUE")
+
+    def readRPortComSpec(self, element: ET.Element, com_spec: RPortComSpec):
+        self.readARObjectAttributes(element, com_spec)
+
     def getClientComSpec(self, element: ET.Element) -> ClientComSpec:
         com_spec = ClientComSpec()
-        self.readARObjectAttributes(element, com_spec)
+        self.readRPortComSpec(element, com_spec)
         com_spec.operationRef = self.getChildElementOptionalRefType(element, "OPERATION-REF")
         return com_spec
     
     def getParameterRequireComSpec(self, element: ET.Element) -> ParameterRequireComSpec:
         com_spec = ParameterRequireComSpec()
-        self.readARObjectAttributes(element, com_spec)
-        com_spec.setInitValue(self.getInitValue(element)) \
-                .setParameterRef(self.getChildElementOptionalRefType(element, "PARAMETER-REF"))
+        self.readRPortComSpec(element, com_spec)
+        com_spec.setInitValue(self.getChildValueSpecification(element, "INIT-VALUE"))
+        com_spec.setParameterRef(self.getChildElementOptionalRefType(element, "PARAMETER-REF"))
         return com_spec
-    
+
+    def getNvRequireComSpec(self, element: ET.Element) -> NvRequireComSpec:
+        com_spec = NvRequireComSpec()
+        self.readRPortComSpec(element, com_spec)
+        com_spec.setInitValue(self.getChildValueSpecification(element, "INIT-VALUE"))
+        com_spec.setVariableRef(self.getChildElementOptionalRefType(element, "VARIABLE-REF"))
+        return com_spec
+
     def getQueuedReceiverComSpec(self, element: ET.Element) -> QueuedReceiverComSpec:
         com_spec = QueuedReceiverComSpec()
         self.readARObjectAttributes(element, com_spec)
@@ -1978,7 +2014,7 @@ class ARXMLParser(AbstractARXMLParser):
     
     def getModeSwitchReceiverComSpec(self, element: ET.Element) -> ModeSwitchReceiverComSpec:
         com_spec = ModeSwitchReceiverComSpec()
-        self.readARObjectAttributes(element, com_spec)
+        self.readRPortComSpec(element, com_spec)
         com_spec.setEnhancedModeApi(self.getChildElementOptionalBooleanValue(element, "ENHANCED-MODE-API"))
         com_spec.setModeGroupRef(self.getChildElementOptionalRefType(element, "MODE-GROUP-REF"))
         com_spec.setSupportsAsynchronousModeSwitch(self.getChildElementOptionalBooleanValue(element, "SUPPORTS-ASYNCHRONOUS-MODE-SWITCH"))
@@ -2009,6 +2045,8 @@ class ARXMLParser(AbstractARXMLParser):
                 parent.addRequiredComSpec(self.getModeSwitchReceiverComSpec(child_element))
             elif tag_name == "PARAMETER-REQUIRE-COM-SPEC":
                 parent.addRequiredComSpec(self.getParameterRequireComSpec(child_element))
+            elif tag_name == "NV-REQUIRE-COM-SPEC":
+                parent.addRequiredComSpec(self.getNvRequireComSpec(child_element))
             else:
                 self.raiseError("Unsupported RequiredComSpec <%s>" % tag_name)
 
@@ -2093,9 +2131,12 @@ class ARXMLParser(AbstractARXMLParser):
             else:
                 self.notImplemented("Unsupported TransformationComSpecProps <%s>" % tag_name)
     
+    def readPPortComSpec(self, element: ET.Element, com_spec: PPortComSpec):
+        self.readARObjectAttributes(element, com_spec)
+
     def getServerComSpec(self, element: ET.Element) -> ServerComSpec:
         com_spec = ServerComSpec()
-        self.readARObjectAttributes(element, com_spec)
+        self.readPPortComSpec(element, com_spec)
         com_spec.setOperationRef(self.getChildElementOptionalRefType(element, "OPERATION-REF"))
         com_spec.setQueueLength(self.getChildElementOptionalNumericalValue(element, "QUEUE-LENGTH"))
         self.readServerComSpecTransformationComSpecProps(element, com_spec)
@@ -2121,6 +2162,14 @@ class ARXMLParser(AbstractARXMLParser):
         com_spec.setQueueLength(self.getChildElementOptionalNumericalValue(element, "QUEUE-LENGTH"))
         return com_spec
 
+    def getNvProvideComSpec(self, element: ET.Element) -> NvProvideComSpec:
+        com_spec = NvProvideComSpec()
+        self.readPPortComSpec(element, com_spec)
+        com_spec.setRamBlockInitValue(self.getChildValueSpecification(element, "RAM-BLOCK-INIT-VALUE"))
+        com_spec.setRomBlockInitValue(self.getChildValueSpecification(element, "ROM-BLOCK-INIT-VALUE"))
+        com_spec.setVariableRef(self.getChildElementOptionalRefType(element, "VARIABLE-REF"))
+        return com_spec
+
     def readProvidedComSpec(self, element: ET.Element, parent: PPortPrototype):
         for child_element in self.findall(element, "PROVIDED-COM-SPECS/*"):
             tag_name = self.getTagName(child_element)
@@ -2132,6 +2181,8 @@ class ARXMLParser(AbstractARXMLParser):
                 parent.addProvidedComSpec(self.getQueuedSenderComSpec(child_element))
             elif tag_name == "MODE-SWITCH-SENDER-COM-SPEC":
                 parent.addProvidedComSpec(self.getModeSwitchSenderComSpec(child_element))
+            elif tag_name == "NV-PROVIDE-COM-SPEC":
+                parent.addProvidedComSpec(self.getNvProvideComSpec(child_element))
             else:
                 self.raiseError("Unsupported RequiredComSpec <%s>" % tag_name)
 
@@ -5214,18 +5265,19 @@ class ARXMLParser(AbstractARXMLParser):
             group.addISignalIPduRef(ref_type)
 
     def readSenderReceiverToSignalMapping(self, element: ET.Element, mapping: SenderReceiverToSignalMapping):
-        mapping.setCommunicationDirection(self.getChildElementOptionalLiteral(element, "COMMUNICATION-DIRECTION")) \
-               .setDataElementIRef(self.getVariableDataPrototypeInSystemInstanceRef(self.find(element, "DATA-ELEMENT-IREF"))) \
-               .setSystemSignalRef(self.getChildElementOptionalRefType(element, "SYSTEM-SIGNAL-REF"))
+        mapping.setCommunicationDirection(self.getChildElementOptionalLiteral(element, "COMMUNICATION-DIRECTION"))
+        mapping.setDataElementIRef(self.getVariableDataPrototypeInSystemInstanceRef(self.find(element, "DATA-ELEMENT-IREF")))
+        mapping.setSystemSignalRef(self.getChildElementOptionalRefType(element, "SYSTEM-SIGNAL-REF"))
+        self.logger.debug("Read SenderReceiverToSignalMapping <%s>" % mapping.getSystemSignalRef().getValue())
     
     def readSenderRecCompositeTypeMapping(self, element: ET.Element, mapping: SenderRecCompositeTypeMapping):
         self.readARObjectAttributes(element, mapping)
 
     def readSenderRecRecordElementMapping(self, element: ET.Element, mapping: SenderRecRecordElementMapping):
         self.readARObjectAttributes(element, mapping)
-        mapping.setApplicationRecordElementRef(self.getChildElementOptionalRefType(element, "APPLICATION-RECORD-ELEMENT-REF")) \
-               .setImplementationRecordElementRef(self.getChildElementOptionalRefType(element, "IMPLEMENTATION-RECORD-ELEMENT-REF")) \
-               .setSystemSignalRef(self.getChildElementOptionalRefType(element, "SYSTEM-SIGNAL-REF"))
+        mapping.setApplicationRecordElementRef(self.getChildElementOptionalRefType(element, "APPLICATION-RECORD-ELEMENT-REF"))
+        mapping.setImplementationRecordElementRef(self.getChildElementOptionalRefType(element, "IMPLEMENTATION-RECORD-ELEMENT-REF"))
+        mapping.setSystemSignalRef(self.getChildElementOptionalRefType(element, "SYSTEM-SIGNAL-REF"))
 
     def readSenderRecArrayTypeMappingRecordElementMapping(self, element: ET.Element, mapping: SenderRecRecordTypeMapping):
         for child_element in self.findall(element, "RECORD-ELEMENT-MAPPINGS/*"):
@@ -5342,7 +5394,10 @@ class ARXMLParser(AbstractARXMLParser):
             self.readIdentifiable(child_element, prototype)
             prototype.setFlatMapRef(self.getChildElementOptionalRefType(child_element, "FLAT-MAP-REF")) \
                      .setSoftwareCompositionTRef(self.getChildElementOptionalRefType(child_element, "SOFTWARE-COMPOSITION-TREF"))
-            AUTOSAR.getInstance().setRootSwCompositionPrototype(prototype)
+            try:
+                AUTOSAR.getInstance().setRootSwCompositionPrototype(prototype)
+            except ValueError as e:
+                self.raiseWarning("%s" % e)
 
     def readSystemFibexElementRefs(self, element: ET.Element, system: System):
         for ref in self.getChildElementRefTypeList(element, "FIBEX-ELEMENTS/FIBEX-ELEMENT-REF-CONDITIONAL/FIBEX-ELEMENT-REF"):

armodel/tests/test_armodel/models/test_data_dictionary.py

@@ -3,27 +3,28 @@ import pytest
 from ....models.M2.MSR.DataDictionary.DataDefProperties import SwDataDefProps, SwPointerTargetProps
 from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 
+
 class Test_M2_MSR_DataDictionary_DataDefProperties:
     def test_SwDataDefProps(self):
         props = SwDataDefProps()
 
-        assert(isinstance(props, ARObject))
-        assert(isinstance(props, SwDataDefProps))
+        assert (isinstance(props, ARObject))
+        assert (isinstance(props, SwDataDefProps))
 
-        assert(props.baseTypeRef == None)
-        assert(props.compuMethodRef == None)
-        assert(props.dataConstrRef == None)                 
-        assert(props.implementationDataTypeRef == None)
-        assert(props.swImplPolicy == None)
-        assert(props.swCalibrationAccess == None)
-        assert(props.swPointerTargetProps == None)
+        assert (props.baseTypeRef is None)
+        assert (props.compuMethodRef is None)
+        assert (props.dataConstrRef is None)
+        assert (props.implementationDataTypeRef is None)
+        assert (props.swImplPolicy is None)
+        assert (props.swCalibrationAccess is None)
+        assert (props.swPointerTargetProps is None)
 
     def test_SwPointerTargetProps(self):
         props = SwPointerTargetProps()
 
-        assert(isinstance(props, ARObject))
-        assert(isinstance(props, SwPointerTargetProps))
+        assert (isinstance(props, ARObject))
+        assert (isinstance(props, SwPointerTargetProps))
 
-        assert(props.getFunctionPointerSignatureRef() == None)
-        assert(props.getSwDataDefProps() == None)
-        assert(props.getTargetCategory() == None)
+        assert (props.getFunctionPointerSignatureRef() is None)
+        assert (props.getSwDataDefProps() is None)
+        assert (props.getTargetCategory() is None)

armodel/tests/test_armodel/models/test_data_prototype.py

@@ -1,14 +1,16 @@
 import pytest
 
+from .... import AUTOSAR
 from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable, MultilanguageReferrable, Referrable
-
 from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-
-from .... import AUTOSAR
-from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
-from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.DataPrototypes import ApplicationArrayElement, ApplicationCompositeElementDataPrototype, ApplicationRecordElement, AtpPrototype, AutosarDataPrototype, DataPrototype, VariableDataPrototype
+from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.DataPrototypes import ApplicationArrayElement
+from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.DataPrototypes import ApplicationCompositeElementDataPrototype
+from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.DataPrototypes import ApplicationRecordElement
+from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.DataPrototypes import AtpPrototype, AutosarDataPrototype
+from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.DataPrototypes import DataPrototype, VariableDataPrototype
 from ....models.M2.AUTOSARTemplates.GenericStructure.AbstractStructure import AtpFeature
 
+
 class Test_M2_AUTOSARTemplates_SWComponentTemplate_Datatype_DataPrototypes:
 
     def test_AtpPrototype(self):
@@ -16,75 +18,76 @@ class Test_M2_AUTOSARTemplates_SWComponentTemplate_Datatype_DataPrototypes:
             document = AUTOSAR.getInstance()
             ar_root = document.createARPackage("AUTOSAR")
             AtpPrototype(ar_root, "prototype")
-        assert(str(err.value) == "AtpPrototype is an abstract class.")
+        assert (str(err.value) == "AtpPrototype is an abstract class.")
 
     def test_DataPrototype(self):
         with pytest.raises(NotImplementedError) as err:
             document = AUTOSAR.getInstance()
             ar_root = document.createARPackage("AUTOSAR")
             DataPrototype(ar_root, "prototype")
-        assert(str(err.value) == "DataPrototype is an abstract class.")
+        assert (str(err.value) == "DataPrototype is an abstract class.")
 
     def test_AutosarDataPrototype(self):
         with pytest.raises(NotImplementedError) as err:
             document = AUTOSAR.getInstance()
             ar_root = document.createARPackage("AUTOSAR")
             AutosarDataPrototype(ar_root, "prototype")
-        assert(str(err.value) == "AutosarDataPrototype is an abstract class.")
+        assert (str(err.value) == "AutosarDataPrototype is an abstract class.")
 
     def test_VariableDataPrototype(self):
         document = AUTOSAR.getInstance()
         ar_root = document.createARPackage("AUTOSAR")
         prototype = VariableDataPrototype(ar_root, "prototype")
 
-        assert(isinstance(prototype, ARObject))
-        assert(isinstance(prototype, AtpFeature))
-        assert(isinstance(prototype, AtpPrototype))
-        assert(isinstance(prototype, AutosarDataPrototype))
-        assert(isinstance(prototype, DataPrototype))
-        assert(isinstance(prototype, Identifiable))
-        assert(isinstance(prototype, MultilanguageReferrable))
-        assert(isinstance(prototype, Referrable))
+        assert (isinstance(prototype, ARObject))
+        assert (isinstance(prototype, AtpFeature))
+        assert (isinstance(prototype, AtpPrototype))
+        assert (isinstance(prototype, AutosarDataPrototype))
+        assert (isinstance(prototype, DataPrototype))
+        assert (isinstance(prototype, Identifiable))
+        assert (isinstance(prototype, MultilanguageReferrable))
+        assert (isinstance(prototype, Referrable))
 
-        assert(prototype.parent == ar_root)
-        assert(prototype.short_name == "prototype")
-        assert(prototype.typeTRef is None)
+        assert (prototype.parent == ar_root)
+        assert (prototype.short_name == "prototype")
+        assert (prototype.typeTRef is None)
 
     def test_ApplicationCompositeElementDataPrototype(self):
         with pytest.raises(NotImplementedError) as err:
             document = AUTOSAR.getInstance()
             ar_root = document.createARPackage("AUTOSAR")
-            ApplicationCompositeElementDataPrototype(ar_root, "application_composition_element_data_prototype")
-        assert(str(err.value) == "ApplicationCompositeElementDataPrototype is an abstract class.")
+            ApplicationCompositeElementDataPrototype(
+                ar_root, "application_composition_element_data_prototype")
+        assert (str(err.value) == "ApplicationCompositeElementDataPrototype is an abstract class.")
 
     def test_ApplicationArrayElement(self):
         document = AUTOSAR.getInstance()
         ar_root = document.createARPackage("AUTOSAR")
         prototype = ApplicationArrayElement(ar_root, "prototype")
 
-        assert(isinstance(prototype, ARObject))
-        assert(isinstance(prototype, ApplicationCompositeElementDataPrototype))
-        assert(isinstance(prototype, AtpFeature))
-        assert(isinstance(prototype, AtpPrototype))
-        assert(isinstance(prototype, DataPrototype))
-        assert(isinstance(prototype, Identifiable))
-        assert(isinstance(prototype, MultilanguageReferrable))
-        assert(isinstance(prototype, Referrable))
-        assert(isinstance(prototype, ApplicationArrayElement))
+        assert (isinstance(prototype, ARObject))
+        assert (isinstance(prototype, ApplicationCompositeElementDataPrototype))
+        assert (isinstance(prototype, AtpFeature))
+        assert (isinstance(prototype, AtpPrototype))
+        assert (isinstance(prototype, DataPrototype))
+        assert (isinstance(prototype, Identifiable))
+        assert (isinstance(prototype, MultilanguageReferrable))
+        assert (isinstance(prototype, Referrable))
+        assert (isinstance(prototype, ApplicationArrayElement))
 
     def test_ApplicationRecordElement(self):
         document = AUTOSAR.getInstance()
         ar_root = document.createARPackage("AUTOSAR")
         prototype = ApplicationRecordElement(ar_root, "prototype")
 
-        assert(isinstance(prototype, ARObject))
-        assert(isinstance(prototype, ApplicationCompositeElementDataPrototype))
-        assert(isinstance(prototype, AtpFeature))
-        assert(isinstance(prototype, AtpPrototype))
-        assert(isinstance(prototype, DataPrototype))
-        assert(isinstance(prototype, Identifiable))
-        assert(isinstance(prototype, MultilanguageReferrable))
-        assert(isinstance(prototype, Referrable))
-        assert(isinstance(prototype, ApplicationRecordElement))
-
-        assert(prototype.isOptional == None)
+        assert (isinstance(prototype, ARObject))
+        assert (isinstance(prototype, ApplicationCompositeElementDataPrototype))
+        assert (isinstance(prototype, AtpFeature))
+        assert (isinstance(prototype, AtpPrototype))
+        assert (isinstance(prototype, DataPrototype))
+        assert (isinstance(prototype, Identifiable))
+        assert (isinstance(prototype, MultilanguageReferrable))
+        assert (isinstance(prototype, Referrable))
+        assert (isinstance(prototype, ApplicationRecordElement))
+
+        assert (prototype.isOptional is None)

armodel/tests/test_armodel/models/test_general_structure.py

@@ -1,15 +1,10 @@
 import pytest
 
 from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement, PackageableElement
-
 from ....models.M2.AUTOSARTemplates.GenericStructure.AbstractStructure import AtpFeature
-
 from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import CollectableElement
-
 from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable, MultilanguageReferrable, Referrable
-
 from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-
 from ....models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
 from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Limit
 

armodel/tests/test_armodel/models/test_implementation.py

@@ -9,7 +9,7 @@ class TestImplementation:
         document = AUTOSAR.getInstance()
         ar_root = document.createARPackage("AUTOSAR")
         code = Code(ar_root, "code")
-        assert(code.short_name == "code")
+        assert (code.short_name == "code")
 
         data = [
             ["Autosar::include::BswM.h", "SWHDR"],
@@ -22,6 +22,6 @@ class TestImplementation:
                            .setCategory(item[1])
             code.addArtifactDescriptor(engineering_obj)
 
-        assert(len(code.getArtifactDescriptors()) == 2)
-        assert(len(code.getArtifactDescriptors("SWHDR")) == 1)
-        assert(len(code.getArtifactDescriptors("SWSRC")) == 1)
+        assert (len(code.getArtifactDescriptors()) == 2)
+        assert (len(code.getArtifactDescriptors("SWHDR")) == 1)
+        assert (len(code.getArtifactDescriptors("SWSRC")) == 1)

armodel/tests/test_armodel/models/test_m2_msr.py

@@ -1,79 +1,79 @@
 import pytest
 
-from ....models.M2.MSR.AsamHdo.ComputationMethod import Compu, CompuConst, CompuConstContent, CompuConstNumericContent, CompuConstTextContent, CompuContent, CompuScale
-
 from .... import AUTOSAR
+from ....models.M2.MSR.AsamHdo.ComputationMethod import Compu, CompuConst, CompuConstContent, CompuConstNumericContent, CompuConstTextContent
+from ....models.M2.MSR.AsamHdo.ComputationMethod import CompuContent, CompuScale, CompuScales
 from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from ....models.M2.MSR.AsamHdo.ComputationMethod import CompuScales
+
 
 class Test_M2_MSR_AsamHdo_ComputationMethod:
     def test_CompuContent(self):
         with pytest.raises(NotImplementedError) as err:
             CompuContent()
-        assert(str(err.value) == "CompuContent is an abstract class.")
+        assert (str(err.value) == "CompuContent is an abstract class.")
 
     def test_Compu(self):
         compu = Compu()
 
-        assert(isinstance(compu, ARObject))
-        assert(isinstance(compu, Compu))
+        assert (isinstance(compu, ARObject))
+        assert (isinstance(compu, Compu))
 
-        assert(compu.compuContent == None)
-        assert(compu.compuDefaultValue == None)
+        assert (compu.compuContent is None)
+        assert (compu.compuDefaultValue is None)
 
     def test_CompuConstContent(self):
         with pytest.raises(NotImplementedError) as err:
             CompuConstContent()
-        assert(str(err.value) == "CompuConstContent is an abstract class.")
+        assert (str(err.value) == "CompuConstContent is an abstract class.")
 
     def test_CompuConstTextContent(self):
         content = CompuConstTextContent()
 
-        assert(isinstance(content, ARObject))
-        assert(isinstance(content, CompuConstContent))
-        assert(isinstance(content, CompuConstTextContent))
+        assert (isinstance(content, ARObject))
+        assert (isinstance(content, CompuConstContent))
+        assert (isinstance(content, CompuConstTextContent))
 
-        assert(content.vt == None)
+        assert (content.vt is None)
 
     def test_CompuConstNumericContent(self):
         content = CompuConstNumericContent()
 
-        assert(isinstance(content, ARObject))
-        assert(isinstance(content, CompuConstContent))
-        assert(isinstance(content, CompuConstNumericContent))
+        assert (isinstance(content, ARObject))
+        assert (isinstance(content, CompuConstContent))
+        assert (isinstance(content, CompuConstNumericContent))
 
-        assert(content.v == None)
+        assert (content.v is None)
 
     def test_CompuConst(self):
         compu_const = CompuConst()
 
-        assert(isinstance(compu_const, ARObject))
-        assert(isinstance(compu_const, CompuConst))
+        assert (isinstance(compu_const, ARObject))
+        assert (isinstance(compu_const, CompuConst))
 
-        assert(compu_const.compuConstContentType == None)
+        assert (compu_const.compuConstContentType is None)
 
     def test_CompuScale(self):
         compu_scale = CompuScale()
 
-        assert(isinstance(compu_scale, ARObject))
-        assert(isinstance(compu_scale, CompuScale))
+        assert (isinstance(compu_scale, ARObject))
+        assert (isinstance(compu_scale, CompuScale))
 
-        assert(compu_scale.compuContent == None)
-        assert(compu_scale.lowerLimit == None)
-        assert(compu_scale.upperLimit == None)
-        assert(compu_scale.compuInverseValue == None)
-        assert(compu_scale.compuScaleContents == None)
+        assert (compu_scale.compuContent is None)
+        assert (compu_scale.lowerLimit is None)
+        assert (compu_scale.upperLimit is None)
+        assert (compu_scale.compuInverseValue is None)
+        assert (compu_scale.compuScaleContents is None)
 
     def test_CompuScales(self):
         compu_scales = CompuScales()
 
-        assert(isinstance(compu_scales, ARObject))
-        assert(isinstance(compu_scales, CompuScales))
+        assert (isinstance(compu_scales, ARObject))
+        assert (isinstance(compu_scales, CompuScales))
 
-        assert(len(compu_scales.compuScales) == 0)
+        assert (len(compu_scales.compuScales) == 0)
 
         compu_scale = CompuScale()
         compu_scales.addCompuScale(compu_scale)
 
-        assert(len(compu_scales.getCompuScales()) == 1)
-        assert(compu_scales.getCompuScales()[0] == compu_scale)
+        assert (len(compu_scales.getCompuScales()) == 1)
+        assert (compu_scales.getCompuScales()[0] == compu_scale)