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

armodel/parser/file_parser.py

@@ -3,6 +3,8 @@ import os
 import re
 from typing import List
 
+from colorama import Fore
+
 
 class FileListParser:
     '''
@@ -22,8 +24,8 @@ class FileListParser:
                 for line in f_in:
                     if not line.startswith('#'):
                         self.file_list.append(line.strip())
-        except:
-            self.logger.error("No such file or directory: %s" % os.path.realpath(file))
+        except IOError:
+            self.logger.error(Fore.RED + "No such file or directory: %s" % os.path.realpath(file) + Fore.WHITE)
 
     def parse_dir_files(self, dir_name):
         for (root, _, files) in os.walk(dir_name, topdown=False):
@@ -41,4 +43,4 @@ class FileListParser:
                     logging.debug("Parse ARXML list file %s " % input_file)
                     self.parse_text_file(input_file[1:])
                 else:
-                    self.file_list.append(input_file)
+                    self.file_list.append(input_file)

armodel/tests/test_armodel/models/test_ar_package.py

@@ -2,17 +2,11 @@
 import pytest
 
 from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.Datatypes import ApplicationPrimitiveDataType, ApplicationRecordDataType
-
 from ....models.M2.MSR.AsamHdo.BaseTypes import SwBaseType
-
 from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import PackageableElement
-
 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.CommonStructure.ImplementationDataTypes import ImplementationDataType
 from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Components import ApplicationSwComponentType, AtomicSwComponentType, EcuAbstractionSwComponentType, SwComponentType
 from ....models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
@@ -23,28 +17,29 @@ from ....models.M2.AUTOSARTemplates.SWComponentTemplate.PortInterface import Cli
 from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Components import ServiceSwComponentType
 from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Components import CompositionSwComponentType
 
+
 class TestAUTOSAR:
 
     def test_autosar_singleton_exception(self):
         AUTOSAR.getInstance()
         with pytest.raises(Exception) as err:
             AUTOSAR()
-        assert(str(err.value) == "The AUTOSAR is singleton!")
+        assert (str(err.value) == "The AUTOSAR is singleton!")
 
     def test_cannot_find_element(self):
         document = AUTOSAR.getInstance()
-        #with pytest.raises(Exception) as err:
+        # with pytest.raises(Exception) as err:
         #    document.find("/sw_package/not_found")
-        #assert(str(err.value) ==
+        # assert(str(err.value) ==
         #       "The sw_package of reference </sw_package/not_found> does not exist.")
-        assert(document.find("/sw_package/not_found") == None)
+        assert (document.find("/sw_package/not_found") is None)
 
     def test_autosar(self):
         document = AUTOSAR.getInstance()
         assert (isinstance(document, CollectableElement))
         assert (isinstance(document, AUTOSAR))
         assert (len(document.getARPackages()) == 0)
-        assert (document.schema_location == "")
+        assert (document.schema_location is None)
         assert (document.full_name == "")
 
     def test_create_autosar_package(self):

armodel/tests/test_armodel/models/test_port_interface.py

@@ -23,186 +23,185 @@ class Test_M2_AUTOSARTemplates_SWComponentTemplate_PortInterface:
     def test_PortInterface(self):
         with pytest.raises(NotImplementedError) as err:
             PortInterface(AUTOSAR.getInstance(), "PortInterface")
-        assert(str(err.value) == "PortInterface is an abstract class.")
+        assert (str(err.value) == "PortInterface is an abstract class.")
 
     def test_DataInterface(self):
         with pytest.raises(NotImplementedError) as err:
             DataInterface(AUTOSAR.getInstance(), "DataInterface")
-        assert(str(err.value) == "DataInterface is an abstract class.")
+        assert (str(err.value) == "DataInterface is an abstract class.")
 
     def test_NvDataInterface(self):
         document = AUTOSAR.getInstance()
         ar_root = document.createARPackage("AUTOSAR")
         data_if = NvDataInterface(ar_root, "NvDataInterface")
 
-        assert(isinstance(data_if, ARElement))
-        assert(isinstance(data_if, ARObject))
-        # assert(isinstance(sr, AtpBlueprint))
-        # assert(isinstance(sr, AtpBlueprintable))
-        # assert(isinstance(sr, AtpClassifier))
-        assert(isinstance(data_if, AtpType))
-        assert(isinstance(data_if, CollectableElement))
-        assert(isinstance(data_if, DataInterface))
-        assert(isinstance(data_if, Identifiable))
-        assert(isinstance(data_if, MultilanguageReferrable))
-        assert(isinstance(data_if, PackageableElement))
-        assert(isinstance(data_if, PortInterface))
-        assert(isinstance(data_if, Referrable))
-        assert(isinstance(data_if, NvDataInterface))
-
-        assert(data_if.parent == ar_root)
-        assert(data_if.short_name == "NvDataInterface")
+        assert (isinstance(data_if, ARElement))
+        assert (isinstance(data_if, ARObject))
+        # assert (isinstance(sr, AtpBlueprint))
+        # assert (isinstance(sr, AtpBlueprintable))
+        # assert (isinstance(sr, AtpClassifier))
+        assert (isinstance(data_if, AtpType))
+        assert (isinstance(data_if, CollectableElement))
+        assert (isinstance(data_if, DataInterface))
+        assert (isinstance(data_if, Identifiable))
+        assert (isinstance(data_if, MultilanguageReferrable))
+        assert (isinstance(data_if, PackageableElement))
+        assert (isinstance(data_if, PortInterface))
+        assert (isinstance(data_if, Referrable))
+        assert (isinstance(data_if, NvDataInterface))
+
+        assert (data_if.parent == ar_root)
+        assert (data_if.short_name == "NvDataInterface")
 
     def test_ParameterInterface(self):
         document = AUTOSAR.getInstance()
         ar_root = document.createARPackage("AUTOSAR")
         data_if = ParameterInterface(ar_root, "ParameterInterface")
 
-        assert(isinstance(data_if, ARElement))
-        assert(isinstance(data_if, ARObject))
-        # assert(isinstance(sr, AtpBlueprint))
-        # assert(isinstance(sr, AtpBlueprintable))
-        # assert(isinstance(sr, AtpClassifier))
-        assert(isinstance(data_if, AtpType))
-        assert(isinstance(data_if, CollectableElement))
-        assert(isinstance(data_if, DataInterface))
-        assert(isinstance(data_if, Identifiable))
-        assert(isinstance(data_if, MultilanguageReferrable))
-        assert(isinstance(data_if, PackageableElement))
-        assert(isinstance(data_if, PortInterface))
-        assert(isinstance(data_if, Referrable))
-        assert(isinstance(data_if, ParameterInterface))
-
-        assert(data_if.parent == ar_root)
-        assert(data_if.short_name == "ParameterInterface")
+        assert (isinstance(data_if, ARElement))
+        assert (isinstance(data_if, ARObject))
+        # assert (isinstance(sr, AtpBlueprint))
+        # assert (isinstance(sr, AtpBlueprintable))
+        # assert (isinstance(sr, AtpClassifier))
+        assert (isinstance(data_if, AtpType))
+        assert (isinstance(data_if, CollectableElement))
+        assert (isinstance(data_if, DataInterface))
+        assert (isinstance(data_if, Identifiable))
+        assert (isinstance(data_if, MultilanguageReferrable))
+        assert (isinstance(data_if, PackageableElement))
+        assert (isinstance(data_if, PortInterface))
+        assert (isinstance(data_if, Referrable))
+        assert (isinstance(data_if, ParameterInterface))
+
+        assert (data_if.parent == ar_root)
+        assert (data_if.short_name == "ParameterInterface")
 
     def test_SenderReceiverInterface(self):
         document = AUTOSAR.getInstance()
         ar_root = document.createARPackage("AUTOSAR")
         sr_if = SenderReceiverInterface(ar_root, "sr_if")
 
-        assert(isinstance(sr_if, ARElement))
-        assert(isinstance(sr_if, ARObject))
-        # assert(isinstance(sr, AtpBlueprint))
-        # assert(isinstance(sr, AtpBlueprintable))
-        # assert(isinstance(sr, AtpClassifier))
-        assert(isinstance(sr_if, AtpType))
-        assert(isinstance(sr_if, CollectableElement))
-        assert(isinstance(sr_if, DataInterface))
-        assert(isinstance(sr_if, Identifiable))
-        assert(isinstance(sr_if, MultilanguageReferrable))
-        assert(isinstance(sr_if, PackageableElement))
-        assert(isinstance(sr_if, PortInterface))
-        assert(isinstance(sr_if, Referrable))
-        assert(isinstance(sr_if, SenderReceiverInterface))
-
-        assert(sr_if.short_name == "sr_if")
-        assert(sr_if.parent == ar_root)
-        assert(len(sr_if.getDataElements()) == 0)
+        assert (isinstance(sr_if, ARElement))
+        assert (isinstance(sr_if, ARObject))
+        # assert (isinstance(sr, AtpBlueprint))
+        # assert (isinstance(sr, AtpBlueprintable))
+        # assert (isinstance(sr, AtpClassifier))
+        assert (isinstance(sr_if, AtpType))
+        assert (isinstance(sr_if, CollectableElement))
+        assert (isinstance(sr_if, DataInterface))
+        assert (isinstance(sr_if, Identifiable))
+        assert (isinstance(sr_if, MultilanguageReferrable))
+        assert (isinstance(sr_if, PackageableElement))
+        assert (isinstance(sr_if, PortInterface))
+        assert (isinstance(sr_if, Referrable))
+        assert (isinstance(sr_if, SenderReceiverInterface))
+
+        assert (sr_if.short_name == "sr_if")
+        assert (sr_if.parent == ar_root)
+        assert (len(sr_if.getDataElements()) == 0)
 
         element = sr_if.createDataElement("element")
-        assert(isinstance(element, VariableDataPrototype))
-        assert(element.short_name == "element")
-        assert(len(sr_if.getDataElements()) == 1)
+        assert (isinstance(element, VariableDataPrototype))
+        assert (element.short_name == "element")
+        assert (len(sr_if.getDataElements()) == 1)
 
         element2 = sr_if.getDataElement("element")
-        assert(element == element2)
+        assert (element == element2)
 
         with pytest.raises(IndexError) as err:
             sr_if.getDataElement("non_exist_element")
-        assert(str(err.value) == "data element <non_exist_element> can not be found.")
+        assert (str(err.value) == "data element <non_exist_element> can not be found.")
 
     def test_ArgumentDataPrototype(self):
         document = AUTOSAR.getInstance()
         ar_root = document.createARPackage("AUTOSAR")
         prototype = ArgumentDataPrototype(ar_root, "ArgumentDataPrototype")
 
-        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, ArgumentDataPrototype))
-
-        assert(prototype.getParent() == ar_root)
-        assert(prototype.getShortName() == "ArgumentDataPrototype")
-        assert(prototype.getDirection() == None)
-        assert(prototype.getServerArgumentImplPolicy() == None)
+        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, ArgumentDataPrototype))
+
+        assert (prototype.getParent() == ar_root)
+        assert (prototype.getShortName() == "ArgumentDataPrototype")
+        assert (prototype.getDirection() == None)
+        assert (prototype.getServerArgumentImplPolicy() == None)
 
     def test_ApplicationError(self):
         document = AUTOSAR.getInstance()
         ar_root = document.createARPackage("AUTOSAR")
         app_error = ApplicationError(ar_root, "ApplicationError")
 
-        assert(isinstance(app_error, ARObject))
-        assert(isinstance(app_error, Identifiable))
-        assert(isinstance(app_error, MultilanguageReferrable))
-        assert(isinstance(app_error, Referrable))
-        assert(isinstance(app_error, ApplicationError))
+        assert (isinstance(app_error, ARObject))
+        assert (isinstance(app_error, Identifiable))
+        assert (isinstance(app_error, MultilanguageReferrable))
+        assert (isinstance(app_error, Referrable))
+        assert (isinstance(app_error, ApplicationError))
 
-        assert(app_error.parent == ar_root)
-        assert(app_error.short_name == "ApplicationError")
+        assert (app_error.parent == ar_root)
+        assert (app_error.short_name == "ApplicationError")
 
     def test_ClientServerOperation(self):
         document = AUTOSAR.getInstance()
         ar_root = document.createARPackage("AUTOSAR")
         operation = ClientServerOperation(ar_root, "client_server_operation")
-        assert(isinstance(operation, ARObject))
-        # assert(isinstance(operation, AtpClassifier))
-        assert(isinstance(operation, AtpFeature))
-        assert(isinstance(operation, Identifiable))
-        assert(isinstance(operation, MultilanguageReferrable))
-        assert(isinstance(operation, Referrable))
-        assert(isinstance(operation, ClientServerOperation))
-        assert(operation.short_name == "client_server_operation")
-
-        prototype = ArgumentDataPrototype(ar_root, "argument_data_prototype1")
-        operation.addArgumentDataPrototype(prototype)
-        assert(prototype.short_name == "argument_data_prototype1")
-
-        assert(len(operation.getArgumentDataPrototypes()) == 1)
-        assert(operation.getArgumentDataPrototypes()[0] == prototype)
+        assert (isinstance(operation, ARObject))
+        # assert (isinstance(operation, AtpClassifier))
+        assert (isinstance(operation, AtpFeature))
+        assert (isinstance(operation, Identifiable))
+        assert (isinstance(operation, MultilanguageReferrable))
+        assert (isinstance(operation, Referrable))
+        assert (isinstance(operation, ClientServerOperation))
+        assert (operation.short_name == "client_server_operation")
+
+        prototype = operation.createArgumentDataPrototype("argument_data_prototype1")
+        assert (prototype.short_name == "argument_data_prototype1")
+
+        assert (len(operation.getArguments()) == 1)
+        assert (operation.getArguments()[0] == prototype)
 
         refType = RefType()
         refType.dest = "APPLICATION-ERROR"
         refType.value = "/AUTOSAR_NvM/PortInterfaces/NvMService/E_NOT_OK"
         operation.addPossibleErrorRef(refType)
 
-        assert(len(operation.getPossbileErrorRefs()) == 1)
-        assert(operation.getPossbileErrorRefs()[0] == refType)
+        assert (len(operation.getPossibleErrorRefs()) == 1)
+        assert (operation.getPossibleErrorRefs()[0] == refType)
 
     def test_ClientServerInterface(self):
         document = AUTOSAR.getInstance()
         ar_root = document.createARPackage("AUTOSAR")
         cs_if = ClientServerInterface(ar_root, "client_server_interface")
-        assert(isinstance(cs_if, ARObject))
-        assert(isinstance(cs_if, ARElement))
-        # assert(isinstance(operation, AtpBlueprint))
-        # assert(isinstance(operation, AtpBlueprintable))
-        # assert(isinstance(operation, AtpClassifier))
-        assert(isinstance(cs_if, AtpType))
-        assert(isinstance(cs_if, CollectableElement))
-        assert(isinstance(cs_if, Identifiable))
-        assert(isinstance(cs_if, MultilanguageReferrable))
-        assert(isinstance(cs_if, PackageableElement))
-        assert(isinstance(cs_if, PortInterface))
-        assert(isinstance(cs_if, Referrable))
+        assert (isinstance(cs_if, ARObject))
+        assert (isinstance(cs_if, ARElement))
+        # assert (isinstance(operation, AtpBlueprint))
+        # assert (isinstance(operation, AtpBlueprintable))
+        # assert (isinstance(operation, AtpClassifier))
+        assert (isinstance(cs_if, AtpType))
+        assert (isinstance(cs_if, CollectableElement))
+        assert (isinstance(cs_if, Identifiable))
+        assert (isinstance(cs_if, MultilanguageReferrable))
+        assert (isinstance(cs_if, PackageableElement))
+        assert (isinstance(cs_if, PortInterface))
+        assert (isinstance(cs_if, Referrable))
 
         element = cs_if.createOperation("operation")
-        assert(isinstance(element, ClientServerOperation))
-        assert(element.short_name == "operation")
-        assert(len(cs_if.getOperations()) == 1)
+        assert (isinstance(element, ClientServerOperation))
+        assert (element.short_name == "operation")
+        assert (len(cs_if.getOperations()) == 1)
 
         element2 = cs_if.getOperations()[0]
-        assert(element == element2)
+        assert (element == element2)
 
         element = cs_if.createApplicationError("error")
-        assert(isinstance(element, ApplicationError))
-        assert(element.short_name == "error")
-        assert(len(cs_if.getPossibleErrors()) == 1)
+        assert (isinstance(element, ApplicationError))
+        assert (element.short_name == "error")
+        assert (len(cs_if.getPossibleErrors()) == 1)
 
         element2 = cs_if.getPossibleErrors()[0]
-        assert(element == element2)
+        assert (element == element2)