diff --git a/src/core/bugcheck_error.py b/src/core/bugcheck_error.py index 14af6e2..f18bd20 100644 --- a/src/core/bugcheck_error.py +++ b/src/core/bugcheck_error.py @@ -7,6 +7,7 @@ class BugCheckError: + @staticmethod def UnkObjectDataType(objectType: type): assert objectType is not None assert type(objectType) is type @@ -15,6 +16,7 @@ def UnkObjectDataType(objectType: type): raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def MultipleDefOfOptionIsFound(optName: str, count: int): assert type(optName) is str assert type(count) is int @@ -27,6 +29,7 @@ def MultipleDefOfOptionIsFound(optName: str, count: int): raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def UnkOptObjectDataType(optName: str, optDataType: type): assert type(optName) is str assert type(optDataType) is type @@ -39,6 +42,7 @@ def UnkOptObjectDataType(optName: str, optDataType: type): raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def MultipleDefOfFileIsFound(fileName: str, count: int): assert type(fileName) is str assert type(count) is int @@ -51,6 +55,7 @@ def MultipleDefOfFileIsFound(fileName: str, count: int): raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def UnkFileObjectDataType(fileName: str, fileDataType: type): assert type(fileName) is str assert type(fileDataType) is type @@ -61,6 +66,7 @@ def UnkFileObjectDataType(fileName: str, fileDataType: type): raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def UnkFileDataStatus(filePath: str, fileStatus: any): assert type(filePath) is str assert fileStatus is not None @@ -71,6 +77,7 @@ def UnkFileDataStatus(filePath: str, fileStatus: any): raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def FileIsNotFoundInIndex(fileKey: str, filePath: str): assert type(fileKey) is str assert type(filePath) is str @@ -81,6 +88,7 @@ def FileIsNotFoundInIndex(fileKey: str, filePath: str): raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def OptionIsNotFoundInIndex(optName: str): assert type(optName) is str @@ -88,6 +96,7 @@ def OptionIsNotFoundInIndex(optName: str): raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def OptionIsNotFoundInFileLine(optName: str): assert type(optName) is str @@ -95,21 +104,25 @@ def OptionIsNotFoundInFileLine(optName: str): raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def CommentIsNotFoundInFileLine(): errMsg = "[BUG CHECK] Comment is not found in file line." raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def IncludeIsNotFoundInFileLine(): errMsg = "[BUG CHECK] Include is not found in file line." raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def FileLineIsNotFoundInFile(): errMsg = "[BUG CHECK] FileLine is not found in file." raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def OptionHandlerToPrepareSetValueIsNotDefined(name: str): assert type(name) is str @@ -119,6 +132,7 @@ def OptionHandlerToPrepareSetValueIsNotDefined(name: str): raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def OptionHandlerToPrepareGetValueIsNotDefined(name: str): assert type(name) is str @@ -128,6 +142,7 @@ def OptionHandlerToPrepareGetValueIsNotDefined(name: str): raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def OptionHandlerToPrepareSetValueItemIsNotDefined(name: str): assert type(name) is str @@ -137,6 +152,7 @@ def OptionHandlerToPrepareSetValueItemIsNotDefined(name: str): raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def OptionHandlerToSetValueIsNotDefined(name: str): assert type(name) is str @@ -146,6 +162,7 @@ def OptionHandlerToSetValueIsNotDefined(name: str): raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def OptionHandlerToGetValueIsNotDefined(name: str): assert type(name) is str @@ -155,6 +172,7 @@ def OptionHandlerToGetValueIsNotDefined(name: str): raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def OptionHandlerToAddOptionIsNotDefined(name: str): assert type(name) is str @@ -166,6 +184,7 @@ def OptionHandlerToAddOptionIsNotDefined(name: str): raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def OptionHandlerToSetValueItemIsNotDefined(name: str): assert type(name) is str @@ -177,6 +196,7 @@ def OptionHandlerToSetValueItemIsNotDefined(name: str): raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def OptionHandlerToWriteIsNotDefined(name: str): assert type(name) is str @@ -186,6 +206,7 @@ def OptionHandlerToWriteIsNotDefined(name: str): raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def UnexpectedSituation(bugcheckSrc: str, bugcheckPoint: str, explain: str): assert type(bugcheckSrc) is str assert type(bugcheckPoint) is str @@ -204,6 +225,7 @@ def UnexpectedSituation(bugcheckSrc: str, bugcheckPoint: str, explain: str): raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def UnknownOptionValueType(optionName: str, typeOfOptionValue: type): assert type(optionName) is str assert optionName != "" diff --git a/src/core/controller_utils.py b/src/core/controller_utils.py index 52be385..9c16687 100644 --- a/src/core/controller_utils.py +++ b/src/core/controller_utils.py @@ -27,6 +27,7 @@ class DataControllerUtils: + @staticmethod def Option__set_Value(optionData: PgCfgModel__OptionData, value: any): assert type(optionData) is PgCfgModel__OptionData assert value is not None @@ -34,6 +35,7 @@ def Option__set_Value(optionData: PgCfgModel__OptionData, value: any): optionData.m_Value = value # -------------------------------------------------------------------- + @staticmethod def Option__add_ValueItem(optionData: PgCfgModel__OptionData, valueItem: any): assert type(optionData) is PgCfgModel__OptionData assert type(optionData.m_Value) is list @@ -42,6 +44,7 @@ def Option__add_ValueItem(optionData: PgCfgModel__OptionData, valueItem: any): optionData.m_Value.append(valueItem) # -------------------------------------------------------------------- + @staticmethod def Option__delete( cfgData: PgCfgModel__ConfigurationData, optionData: PgCfgModel__OptionData, @@ -65,6 +68,7 @@ def Option__delete( __class__.Helper__DeleteFileLine(cfgData, fileLineData) # -------------------------------------------------------------------- + @staticmethod def Include__delete( cfgData: PgCfgModel__ConfigurationData, includeData: PgCfgModel__IncludeData, @@ -88,6 +92,7 @@ def Include__delete( __class__.Helper__DeleteFileLine(cfgData, fileLineData) # -------------------------------------------------------------------- + @staticmethod def Comment__delete( cfgData: PgCfgModel__ConfigurationData, commentData: PgCfgModel__CommentData, @@ -116,6 +121,7 @@ def Comment__delete( __class__.Helper__DeleteFileLine(cfgData, fileLineData) # -------------------------------------------------------------------- + @staticmethod def FileLine__add_Comment( fileLineData: PgCfgModel__FileLineData, offset: typing.Optional[int], text: str ) -> PgCfgModel__CommentData: @@ -134,6 +140,7 @@ def FileLine__add_Comment( return commentData # -------------------------------------------------------------------- + @staticmethod def Helper__CheckThatWeCanAddCommentToFileLine( fileLineData: PgCfgModel__FileLineData, ): @@ -166,6 +173,7 @@ def Helper__CheckThatWeCanAddCommentToFileLine( BugCheckError.UnkObjectDataType(typeOfLastElement) # -------------------------------------------------------------------- + @staticmethod def FileLine__add_Include( fileLineData: PgCfgModel__FileLineData, filePath: str, @@ -192,6 +200,7 @@ def FileLine__add_Include( return includeData # -------------------------------------------------------------------- + @staticmethod def FileLine__add_Option( cfgData: PgCfgModel__ConfigurationData, fileLineData: PgCfgModel__FileLineData, @@ -244,6 +253,7 @@ def FileLine__add_Option( return optionData # -------------------------------------------------------------------- + @staticmethod def Helper__CheckThatWeCanAddWorkDataToFileLine( fileLineData: PgCfgModel__FileLineData, ): @@ -276,6 +286,7 @@ def Helper__CheckThatWeCanAddWorkDataToFileLine( BugCheckError.UnkObjectDataType(typeOfLastElement) # -------------------------------------------------------------------- + @staticmethod def FileLine__delete( cfgData: PgCfgModel__ConfigurationData, fileLineData: PgCfgModel__FileLineData ): @@ -290,6 +301,7 @@ def FileLine__delete( assert not fileLineData.IsAlive() # -------------------------------------------------------------------- + @staticmethod def FileLine__clear( cfgData: PgCfgModel__ConfigurationData, fileLineData: PgCfgModel__FileLineData ): @@ -304,6 +316,7 @@ def FileLine__clear( return __class__.Helper__ClearFileLine(cfgData, fileLineData) # -------------------------------------------------------------------- + @staticmethod def File__add_Option( cfgData: PgCfgModel__ConfigurationData, fileData: PgCfgModel__FileData, @@ -336,6 +349,7 @@ def File__add_Option( return optionData # -------------------------------------------------------------------- + @staticmethod def File__add_Line(fileData: PgCfgModel__FileData) -> PgCfgModel__FileLineData: assert type(fileData) is PgCfgModel__FileData assert type(fileData.m_Lines) is list @@ -345,6 +359,7 @@ def File__add_Line(fileData: PgCfgModel__FileData) -> PgCfgModel__FileLineData: return lineData # -------------------------------------------------------------------- + @staticmethod def Cfg__CreateAndAddTopLevelFile__AUTO( cfgData: PgCfgModel__ConfigurationData, file_name: str ) -> PgCfgModel__FileData: @@ -365,6 +380,7 @@ def Cfg__CreateAndAddTopLevelFile__AUTO( return __class__.Helper__FinishCreateTopLevelFile(cfgData, newFilePath) # -------------------------------------------------------------------- + @staticmethod def Cfg__CreateAndAddTopLevelFile__USER( cfgData: PgCfgModel__ConfigurationData, path: str ) -> PgCfgModel__FileData: @@ -392,6 +408,7 @@ def Cfg__CreateAndAddTopLevelFile__USER( return __class__.Helper__FinishCreateTopLevelFile(cfgData, newFilePath) # -------------------------------------------------------------------- + @staticmethod def Cfg__GetOrCreateFile__USER( cfgData: PgCfgModel__ConfigurationData, baseFolder: str, path: str ) -> PgCfgModel__FileData: @@ -424,6 +441,7 @@ def Cfg__GetOrCreateFile__USER( return newFileData # Helper methods ----------------------------------------------------- + @staticmethod def Helper__FinishCreateTopLevelFile( cfgData: PgCfgModel__ConfigurationData, newFilePath: str ) -> PgCfgModel__FileData: @@ -441,6 +459,7 @@ def Helper__FinishCreateTopLevelFile( return newFileData # -------------------------------------------------------------------- + @staticmethod def Helper__FindIndexOfFileLine( fileData: PgCfgModel__FileData, fileLineData: PgCfgModel__FileLineData ) -> int: @@ -465,6 +484,7 @@ def Helper__FindIndexOfFileLine( return iFileLine # -------------------------------------------------------------------- + @staticmethod def Helper__FindIndexOfFileLineElement( fileLineData: PgCfgModel__FileLineData, elementData: PgCfgModel__FileLineElementData, @@ -490,6 +510,7 @@ def Helper__FindIndexOfFileLineElement( return iItem # -------------------------------------------------------------------- + @staticmethod def Helper__RegFileInCfgData( cfgData: PgCfgModel__ConfigurationData, fileData: PgCfgModel__FileData ): @@ -512,6 +533,7 @@ def Helper__RegFileInCfgData( ) # -------------------------------------------------------------------- + @staticmethod def Helper__UnRegFileFromCfgData( cfgData: PgCfgModel__ConfigurationData, fileData: PgCfgModel__FileData ): @@ -533,6 +555,7 @@ def Helper__UnRegFileFromCfgData( ) # -------------------------------------------------------------------- + @staticmethod def Helper__InsertFileIntoIndex( filesByStrKeyDictionary: dict[str, PgCfgModel__FileData], fileKey: str, @@ -562,6 +585,7 @@ def Helper__InsertFileIntoIndex( assert filesByStrKeyDictionary[fileKey][-1] is fileData # -------------------------------------------------------------------- + @staticmethod def Helper__DeleteFileIntoIndex( filesByStrKeyDictionary: dict[str, PgCfgModel__FileData], fileKey: str, @@ -626,6 +650,7 @@ def Helper__DeleteFileIntoIndex( BugCheckError.UnkFileObjectDataType(fileKey, typeOfIndexItemData) # -------------------------------------------------------------------- + @staticmethod def Helper__InsertOptionIntoIndex( optionsByNameDictionary: dict[str, PgCfgModel__OptionData], optionData: PgCfgModel__OptionData, @@ -657,6 +682,7 @@ def Helper__InsertOptionIntoIndex( BugCheckError.UnkOptObjectDataType(optionData.m_Name, typeOfData) # -------------------------------------------------------------------- + @staticmethod def Helper__DeleteOptionFromIndex( optionsByNameDictionary: dict[str, PgCfgModel__OptionData], optionData: PgCfgModel__OptionData, @@ -719,6 +745,7 @@ def Helper__DeleteOptionFromIndex( BugCheckError.UnkOptObjectDataType(optionData.m_Name, typeOfData) # -------------------------------------------------------------------- + @staticmethod def Helper__ClearFileLine( cfgData: PgCfgModel__ConfigurationData, fileLineData: PgCfgModel__FileLineData ): @@ -752,6 +779,7 @@ def Helper__ClearFileLine( cItems = cItems__new # -------------------------------------------------------------------- + @staticmethod def Helper__FileLineHasWorkData(fileLineData: PgCfgModel__FileLineData): assert fileLineData is not None assert type(fileLineData) is PgCfgModel__FileLineData @@ -781,6 +809,7 @@ def Helper__FileLineHasWorkData(fileLineData: PgCfgModel__FileLineData): return False # -------------------------------------------------------------------- + @staticmethod def Helper__DeleteElement( cfgData: PgCfgModel__ConfigurationData, objectData: PgCfgModel__ObjectData ): @@ -803,6 +832,7 @@ def Helper__DeleteElement( BugCheckError.UnkObjectDataType(typeOfObjectData) # -------------------------------------------------------------------- + @staticmethod def Helper__DeleteComment(commentData: PgCfgModel__CommentData): assert type(commentData) is PgCfgModel__CommentData assert commentData.IsAlive() @@ -839,6 +869,7 @@ def Helper__DeleteComment(commentData: PgCfgModel__CommentData): fileLineData.m_Items.pop(iFileLineItem) # -------------------------------------------------------------------- + @staticmethod def Helper__DeleteOption( cfgData: PgCfgModel__ConfigurationData, optionData: PgCfgModel__OptionData ): @@ -900,6 +931,7 @@ def Helper__DeleteOption( fileLineData.m_Items.pop(iFileLineItem) # -------------------------------------------------------------------- + @staticmethod def Helper__DeleteInclude(includeData: PgCfgModel__IncludeData): assert type(includeData) is PgCfgModel__IncludeData assert includeData.IsAlive() @@ -936,6 +968,7 @@ def Helper__DeleteInclude(includeData: PgCfgModel__IncludeData): fileLineData.m_Items.pop(iFileLineItem) # -------------------------------------------------------------------- + @staticmethod def Helper__DeleteFileLine( cfgData: PgCfgModel__ConfigurationData, fileLineData: PgCfgModel__FileLineData ): diff --git a/src/core/raise_error.py b/src/core/raise_error.py index f3a0ef6..e9a5b9d 100644 --- a/src/core/raise_error.py +++ b/src/core/raise_error.py @@ -8,6 +8,7 @@ class RaiseError: + @staticmethod def MethodIsNotImplemented(classType: type, methodName: str): assert type(classType) is type assert type(methodName) is str @@ -19,6 +20,7 @@ def MethodIsNotImplemented(classType: type, methodName: str): raise NotImplementedError(errMsg) # -------------------------------------------------------------------- + @staticmethod def GetPropertyIsNotImplemented(classType: type, methodName: str): assert type(classType) is type assert type(methodName) is str @@ -30,11 +32,13 @@ def GetPropertyIsNotImplemented(classType: type, methodName: str): raise NotImplementedError(errMsg) # -------------------------------------------------------------------- + @staticmethod def OptionNameIsNone(): errMsg = "Option name is None." raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def OptionNameHasBadType(nameType: type): assert nameType is not None assert type(nameType) is type @@ -43,16 +47,19 @@ def OptionNameHasBadType(nameType: type): raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def OptionNameIsEmpty(): errMsg = "Option name is empty." raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def NoneValueIsNotSupported(): errMsg = "None value is not supported." raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def NoneOptionValueItemIsNotSupported(optionName: str): assert type(optionName) is str assert optionName != "" @@ -61,31 +68,37 @@ def NoneOptionValueItemIsNotSupported(optionName: str): raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def CommentObjectWasDeleted(): errMsg = "Comment object was deleted." raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def OptionObjectWasDeleted(): errMsg = "Option object was deleted." raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def IncludeObjectWasDeleted(): errMsg = "Include object was deleted." raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def FileLineObjectWasDeleted(): errMsg = "FileLine object was deleted." raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def FileObjectWasDeleted(): errMsg = "File object was deleted." raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def BadOptionValueType(optionName: str, optionValueType: type, expectedType: type): assert type(optionName) is str assert type(optionValueType) is type @@ -97,6 +110,7 @@ def BadOptionValueType(optionName: str, optionValueType: type, expectedType: typ raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def CantConvertOptionValue(optionName: str, sourceType: type, targetType: type): assert type(optionName) is str assert type(sourceType) is type @@ -110,6 +124,7 @@ def CantConvertOptionValue(optionName: str, sourceType: type, targetType: type): raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def BadOptionValueItemType( optionName: str, optionValueItemType: type, expectedType: type ): @@ -125,16 +140,19 @@ def BadOptionValueItemType( raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def CommentTextContainsInvalidSymbols(): errMsg = "Comment text contains invalid symbols." raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def FileIsAlreadyRegistered(file_path: str): errMsg = "File [{0}] is already registered.".format(file_path) raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def OptionIsAlreadyExistInThisFile(filePath: str, optionName: str): assert type(filePath) is str assert type(optionName) is str @@ -147,6 +165,7 @@ def OptionIsAlreadyExistInThisFile(filePath: str, optionName: str): raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def OptionIsAlreadyExistInAnotherFile(filePath: str, optionName: str): assert type(filePath) is str assert type(optionName) is str @@ -159,6 +178,7 @@ def OptionIsAlreadyExistInAnotherFile(filePath: str, optionName: str): raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def OptionIsAlreadyExistInFile(filePath: str, optionName: str): assert type(filePath) is str assert type(optionName) is str @@ -171,6 +191,7 @@ def OptionIsAlreadyExistInFile(filePath: str, optionName: str): raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def OptionValueItemIsAlreadyDefined(filePath: str, optName: str, valueItem: any): assert type(filePath) is str assert type(optName) is str @@ -181,6 +202,7 @@ def OptionValueItemIsAlreadyDefined(filePath: str, optName: str, valueItem: any) raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def OptionValueItemIsAlreadyDefinedInAnotherFile( filePath: str, optName: str, valueItem: any ): @@ -193,6 +215,7 @@ def OptionValueItemIsAlreadyDefinedInAnotherFile( raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def UnknownFileName(fileName: str): assert type(fileName) is str @@ -200,6 +223,7 @@ def UnknownFileName(fileName: str): raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def MultipleDefOfFileIsFound(fileName: str, count: int): assert type(fileName) is str assert type(count) is int @@ -210,11 +234,13 @@ def MultipleDefOfFileIsFound(fileName: str, count: int): raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def FilePathIsEmpty(): errMsg = "File path is empty." raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def FileWasModifiedExternally( filePath: str, ourLastMDate: datetime.datetime, @@ -230,11 +256,13 @@ def FileWasModifiedExternally( raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def FileLineAlreadyHasComment(): errMsg = "File line already has a comment." raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def FileLineAlreadyHasOption(optionName: str): assert type(optionName) is str @@ -242,12 +270,14 @@ def FileLineAlreadyHasOption(optionName: str): raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def FileLineAlreadyHasIncludeDirective(): errMsg = "File line already has an include directive." raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def CfgReader__UnexpectedSymbol(lineNum: int, colNum: int, ch: str): assert type(lineNum) is int assert type(colNum) is int @@ -259,6 +289,7 @@ def CfgReader__UnexpectedSymbol(lineNum: int, colNum: int, ch: str): raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def CfgReader__IncludeWithoutPath(lineNum: int): assert type(lineNum) is int assert lineNum >= 0 @@ -267,6 +298,7 @@ def CfgReader__IncludeWithoutPath(lineNum: int): raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def CfgReader__EndOfIncludePathIsNotFound(lineNum: int): assert type(lineNum) is int assert lineNum >= 0 @@ -275,6 +307,7 @@ def CfgReader__EndOfIncludePathIsNotFound(lineNum: int): raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def CfgReader__IncompletedEscapeInInclude(lineNum: int): assert type(lineNum) is int assert lineNum >= 0 @@ -283,6 +316,7 @@ def CfgReader__IncompletedEscapeInInclude(lineNum: int): raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def CfgReader__UnknownEscapedSymbolInInclude(lineNum: int, colNum: int, ch: str): assert type(lineNum) is int assert type(colNum) is int @@ -297,6 +331,7 @@ def CfgReader__UnknownEscapedSymbolInInclude(lineNum: int, colNum: int, ch: str) raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def CfgReader__IncludeHasEmptyPath(lineNum: int): assert type(lineNum) is int assert lineNum >= 0 @@ -305,6 +340,7 @@ def CfgReader__IncludeHasEmptyPath(lineNum: int): raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def CfgReader__OptionWithoutValue(optionName: str, lineNum: int): assert type(lineNum) is int assert type(optionName) is str @@ -317,6 +353,7 @@ def CfgReader__OptionWithoutValue(optionName: str, lineNum: int): raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def CfgReader__EndQuotedOptionValueIsNotFound(optionName: str, lineNum: int): assert type(lineNum) is int assert type(optionName) is str @@ -329,6 +366,7 @@ def CfgReader__EndQuotedOptionValueIsNotFound(optionName: str, lineNum: int): raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def CfgReader__IncompletedEscapeInQuotedOptionValue(optionName: str, lineNum: int): assert type(lineNum) is int assert type(optionName) is str @@ -341,6 +379,7 @@ def CfgReader__IncompletedEscapeInQuotedOptionValue(optionName: str, lineNum: in raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def CfgReader__UnknownEscapedSymbolInQuotedOptionValue( optionName: str, lineNum: int, colNum: int, ch: str ): @@ -357,6 +396,7 @@ def CfgReader__UnknownEscapedSymbolInQuotedOptionValue( raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def BadFormatOfCommaSeparatedList(): errMsg = "Bad format of comma separated list." raise Exception(errMsg) diff --git a/src/core/read_utils.py b/src/core/read_utils.py index 52636cf..b809801 100644 --- a/src/core/read_utils.py +++ b/src/core/read_utils.py @@ -123,6 +123,7 @@ def Helper__GetStepSize(self, ch: str) -> int: class ReadUtils: + @staticmethod def IsSpace(ch: str) -> bool: assert type(ch) is str @@ -135,6 +136,7 @@ def IsSpace(ch: str) -> bool: return False # -------------------------------------------------------------------- + @staticmethod def IsEOL(ch: str) -> bool: assert type(ch) is str @@ -144,6 +146,7 @@ def IsEOL(ch: str) -> bool: return False # -------------------------------------------------------------------- + @staticmethod def IsValidSeqCh1(ch: str) -> bool: assert type(ch) is str @@ -156,6 +159,7 @@ def IsValidSeqCh1(ch: str) -> bool: return False # -------------------------------------------------------------------- + @staticmethod def IsValidSeqCh2(ch: str) -> bool: assert type(ch) is str @@ -165,6 +169,7 @@ def IsValidSeqCh2(ch: str) -> bool: return __class__.IsValidSeqCh1(ch) # -------------------------------------------------------------------- + @staticmethod def Unpack_StrList2(source: str) -> typing.List[str]: assert source is not None assert type(source) is str diff --git a/src/core/write_utils.py b/src/core/write_utils.py index 6e14ced..9929b7f 100644 --- a/src/core/write_utils.py +++ b/src/core/write_utils.py @@ -8,6 +8,7 @@ class WriteUtils: + @staticmethod def Pack_StrList2(strList: list) -> str: assert strList is not None assert type(strList) is list @@ -36,6 +37,7 @@ def Pack_StrList2(strList: list) -> str: return result # -------------------------------------------------------------------- + @staticmethod def Pack_Str(text: str) -> str: assert text is not None assert type(text) is str @@ -67,6 +69,7 @@ def Pack_Str(text: str) -> str: return result # Helper Methods ----------------------------------------------------- + @staticmethod def Helper__PackStrListItem2(itemText: str) -> str: assert itemText is not None assert type(itemText) is str @@ -91,6 +94,7 @@ def Helper__PackStrListItem2(itemText: str) -> str: return result # -------------------------------------------------------------------- + @staticmethod def Helper__StrList__DoesItemNeedToQuote(itemText: str) -> bool: assert itemText is not None assert type(itemText) is str diff --git a/src/implementation/v00/configuration_base.py b/src/implementation/v00/configuration_base.py index a2f25f0..770de8f 100644 --- a/src/implementation/v00/configuration_base.py +++ b/src/implementation/v00/configuration_base.py @@ -3288,6 +3288,7 @@ def LoadConfigurationFile( return rootFile # -------------------------------------------------------------------- + @staticmethod def LoadFileContent( file: PostgresConfigurationFile_Base, fileContent: ConfigurationFileReader ) -> None: @@ -3297,6 +3298,7 @@ def LoadFileContent( return __class__.Helper__LoadFileContent(file, fileContent) # Helper methods ----------------------------------------------------- + @staticmethod def Helper__LoadFileContent( file: PostgresConfigurationFile_Base, fileContent: ConfigurationFileReader ) -> None: @@ -3811,6 +3813,7 @@ def Init(self): class PostgresConfigurationWriter_Base: + @staticmethod def MakeFileDataContent( ctx: PostgresConfigurationWriterCtx_Base, fileData: PgCfgModel__FileData ) -> str: @@ -3820,6 +3823,7 @@ def MakeFileDataContent( return __class__.Helper__MakeFileDataContent(ctx, fileData) # -------------------------------------------------------------------- + @staticmethod def DoWork(ctx: PostgresConfigurationWriterCtx_Base): assert type(ctx) is PostgresConfigurationWriterCtx_Base assert isinstance(ctx.Cfg, PostgresConfiguration_Base) @@ -3828,6 +3832,7 @@ def DoWork(ctx: PostgresConfigurationWriterCtx_Base): return __class__.Helper__DoWork(ctx) # Helper Methods ----------------------------------------------------- + @staticmethod def Helper__DoWork(ctx: PostgresConfigurationWriterCtx_Base): assert type(ctx) is PostgresConfigurationWriterCtx_Base assert isinstance(ctx.Cfg, PostgresConfiguration_Base) @@ -3855,6 +3860,7 @@ def Helper__DoWork(ctx: PostgresConfigurationWriterCtx_Base): return # -------------------------------------------------------------------- + @staticmethod def Helper__DoWork__Stage01__CreateFileContexts( ctx: PostgresConfigurationWriterCtx_Base, ): @@ -3886,6 +3892,7 @@ def Helper__DoWork__Stage01__CreateFileContexts( BugCheckError.UnkFileDataStatus(fileData.m_Path, fileData.m_Status) # -------------------------------------------------------------------- + @staticmethod def Helper__DoWork__Stage02__MakeFileDataContents( ctx: PostgresConfigurationWriterCtx_Base, ): @@ -3904,6 +3911,7 @@ def Helper__DoWork__Stage02__MakeFileDataContents( ) # -------------------------------------------------------------------- + @staticmethod def Helper__DoWork__Stage03__OpenUpdFilesToWrite( ctx: PostgresConfigurationWriterCtx_Base, ): @@ -3946,6 +3954,7 @@ def Helper__DoWork__Stage03__OpenUpdFilesToWrite( return # -------------------------------------------------------------------- + @staticmethod def Helper__DoWork__Stage04__OpenNewFilesToWrite( ctx: PostgresConfigurationWriterCtx_Base, ): @@ -4011,6 +4020,7 @@ def Helper__DoWork__Stage04__OpenNewFilesToWrite( return # -------------------------------------------------------------------- + @staticmethod def Helper__DoWork__Stage05__WriteContents( ctx: PostgresConfigurationWriterCtx_Base, ): @@ -4040,6 +4050,7 @@ def Helper__DoWork__Stage05__WriteContents( fileCtx.FileData.m_Status = PgCfgModel__FileStatus.EXISTS # -------------------------------------------------------------------- + @staticmethod def Helper__MakeFileDataContent( ctx: PostgresConfigurationWriterCtx_Base, fileData: PgCfgModel__FileData ) -> str: @@ -4058,6 +4069,7 @@ def Helper__MakeFileDataContent( return fileContent # -------------------------------------------------------------------- + @staticmethod def Helper__FileLineToString( ctx: PostgresConfigurationWriterCtx_Base, fileLineData: PgCfgModel__FileLineData, @@ -4096,6 +4108,7 @@ def Helper__FileLineToString( return lineContent # -------------------------------------------------------------------- + @staticmethod def Helper__AppendItemToLine(lineContent: str, offset: int, text: str) -> str: assert type(lineContent) is str assert offset is None or type(offset) is int @@ -4119,6 +4132,7 @@ def Helper__AppendItemToLine(lineContent: str, offset: int, text: str) -> str: return lineContent # -------------------------------------------------------------------- + @staticmethod def Helper__ElementToString( ctx: PostgresConfigurationWriterCtx_Base, elementData: PgCfgModel__FileLineElementData, @@ -4141,6 +4155,7 @@ def Helper__ElementToString( BugCheckError.UnkObjectDataType(typeOfElementData) # -------------------------------------------------------------------- + @staticmethod def Helper__OptionToString( ctx: PostgresConfigurationWriterCtx_Base, optionData: PgCfgModel__OptionData ) -> str: @@ -4170,6 +4185,7 @@ def Helper__OptionToString( return result # -------------------------------------------------------------------- + @staticmethod def Helper__CommentToString( ctx: PostgresConfigurationWriterCtx_Base, commentData: PgCfgModel__CommentData ) -> str: @@ -4186,6 +4202,7 @@ def Helper__CommentToString( return result # -------------------------------------------------------------------- + @staticmethod def Helper__IncludeToString( ctx: PostgresConfigurationWriterCtx_Base, includeData: PgCfgModel__IncludeData ) -> str: diff --git a/tests/ErrorMessageBuilder.py b/tests/ErrorMessageBuilder.py index 1f6eba0..3f2580e 100644 --- a/tests/ErrorMessageBuilder.py +++ b/tests/ErrorMessageBuilder.py @@ -9,6 +9,7 @@ class ErrorMessageBuilder: + @staticmethod def MethodIsNotImplemented(classType: type, methodName: str): assert type(classType) is type assert type(methodName) is str @@ -20,6 +21,7 @@ def MethodIsNotImplemented(classType: type, methodName: str): return errMsg # -------------------------------------------------------------------- + @staticmethod def GetPropertyIsNotImplemented(classType: type, methodName: str): assert type(classType) is type assert type(methodName) is str @@ -31,11 +33,13 @@ def GetPropertyIsNotImplemented(classType: type, methodName: str): return errMsg # -------------------------------------------------------------------- + @staticmethod def OptionNameIsNone(): errMsg = "Option name is None." raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def OptionNameHasBadType(nameType: type): assert nameType is not None assert type(nameType) is type @@ -44,16 +48,19 @@ def OptionNameHasBadType(nameType: type): return errMsg # -------------------------------------------------------------------- + @staticmethod def OptionNameIsEmpty(): errMsg = "Option name is empty." return errMsg # -------------------------------------------------------------------- + @staticmethod def NoneValueIsNotSupported(): errMsg = "None value is not supported." return errMsg # -------------------------------------------------------------------- + @staticmethod def NoneOptionValueItemIsNotSupported(optionName: str): assert type(optionName) is str assert optionName != "" @@ -62,31 +69,37 @@ def NoneOptionValueItemIsNotSupported(optionName: str): return errMsg # -------------------------------------------------------------------- + @staticmethod def CommentObjectWasDeleted(): errMsg = "Comment object was deleted." return errMsg # -------------------------------------------------------------------- + @staticmethod def OptionObjectWasDeleted(): errMsg = "Option object was deleted." return errMsg # -------------------------------------------------------------------- + @staticmethod def IncludeObjectWasDeleted(): errMsg = "Include object was deleted." return errMsg # -------------------------------------------------------------------- + @staticmethod def FileLineObjectWasDeleted(): errMsg = "FileLine object was deleted." return errMsg # -------------------------------------------------------------------- + @staticmethod def FileObjectWasDeleted(): errMsg = "File object was deleted." return errMsg # -------------------------------------------------------------------- + @staticmethod def BadOptionValueType(optionName: str, optionValueType: type, expectedType: type): assert type(optionName) is str assert type(optionValueType) is type @@ -98,6 +111,7 @@ def BadOptionValueType(optionName: str, optionValueType: type, expectedType: typ return errMsg # -------------------------------------------------------------------- + @staticmethod def CantConvertOptionValue(optionName: str, sourceType: type, targetType: type): assert type(optionName) is str assert type(sourceType) is type @@ -111,6 +125,7 @@ def CantConvertOptionValue(optionName: str, sourceType: type, targetType: type): return errMsg # -------------------------------------------------------------------- + @staticmethod def BadOptionValueItemType( optionName: str, optionValueItemType: type, expectedType: type ): @@ -126,16 +141,19 @@ def BadOptionValueItemType( return errMsg # -------------------------------------------------------------------- + @staticmethod def CommentTextContainsInvalidSymbols(): errMsg = "Comment text contains invalid symbols." raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def FileIsAlreadyRegistered(file_path: str): errMsg = "File [{0}] is already registered.".format(file_path) raise Exception(errMsg) # -------------------------------------------------------------------- + @staticmethod def OptionIsAlreadyExistInThisFile(filePath: str, optionName: str): assert type(filePath) is str assert type(optionName) is str @@ -148,6 +166,7 @@ def OptionIsAlreadyExistInThisFile(filePath: str, optionName: str): return errMsg # -------------------------------------------------------------------- + @staticmethod def OptionIsAlreadyExistInAnotherFile(filePath: str, optionName: str): assert type(filePath) is str assert type(optionName) is str @@ -160,6 +179,7 @@ def OptionIsAlreadyExistInAnotherFile(filePath: str, optionName: str): return errMsg # -------------------------------------------------------------------- + @staticmethod def OptionIsAlreadyExistInFile(filePath: str, optionName: str): assert type(filePath) is str assert type(optionName) is str @@ -172,6 +192,7 @@ def OptionIsAlreadyExistInFile(filePath: str, optionName: str): return errMsg # -------------------------------------------------------------------- + @staticmethod def OptionValueItemIsAlreadyDefined(filePath: str, optName: str, valueItem: any): assert type(filePath) is str assert type(optName) is str @@ -182,6 +203,7 @@ def OptionValueItemIsAlreadyDefined(filePath: str, optName: str, valueItem: any) return errMsg # -------------------------------------------------------------------- + @staticmethod def OptionValueItemIsAlreadyDefinedInAnotherFile( filePath: str, optName: str, valueItem: any ): @@ -194,6 +216,7 @@ def OptionValueItemIsAlreadyDefinedInAnotherFile( return errMsg # -------------------------------------------------------------------- + @staticmethod def UnknownFileName(fileName: str): assert type(fileName) is str @@ -201,6 +224,7 @@ def UnknownFileName(fileName: str): return errMsg # -------------------------------------------------------------------- + @staticmethod def MultipleDefOfFileIsFound(fileName: str, count: int): assert type(fileName) is str assert type(count) is int @@ -211,11 +235,13 @@ def MultipleDefOfFileIsFound(fileName: str, count: int): return errMsg # -------------------------------------------------------------------- + @staticmethod def FilePathIsEmpty(): errMsg = "File path is empty." return errMsg # -------------------------------------------------------------------- + @staticmethod def FileWasModifiedExternally( filePath: str, ourLastMDate: datetime.datetime, @@ -231,11 +257,13 @@ def FileWasModifiedExternally( return errMsg # -------------------------------------------------------------------- + @staticmethod def FileLineAlreadyHasComment(): errMsg = "File line already has a comment." return errMsg # -------------------------------------------------------------------- + @staticmethod def FileLineAlreadyHasOption(optionName: str): assert type(optionName) is str @@ -243,11 +271,13 @@ def FileLineAlreadyHasOption(optionName: str): return errMsg # -------------------------------------------------------------------- + @staticmethod def FileLineAlreadyHasIncludeDirective(): errMsg = "File line already has an include directive." return errMsg # -------------------------------------------------------------------- + @staticmethod def CfgReader__UnexpectedSymbol(lineNum: int, colNum: int, ch: str): assert type(lineNum) is int assert type(colNum) is int @@ -259,6 +289,7 @@ def CfgReader__UnexpectedSymbol(lineNum: int, colNum: int, ch: str): return errMsg # -------------------------------------------------------------------- + @staticmethod def CfgReader__IncludeWithoutPath(lineNum: int): assert type(lineNum) is int assert lineNum >= 0 @@ -267,6 +298,7 @@ def CfgReader__IncludeWithoutPath(lineNum: int): return errMsg # -------------------------------------------------------------------- + @staticmethod def CfgReader__EndOfIncludePathIsNotFound(lineNum: int): assert type(lineNum) is int assert lineNum >= 0 @@ -275,6 +307,7 @@ def CfgReader__EndOfIncludePathIsNotFound(lineNum: int): return errMsg # -------------------------------------------------------------------- + @staticmethod def CfgReader__IncompletedEscapeInInclude(lineNum: int): assert type(lineNum) is int assert lineNum >= 0 @@ -283,6 +316,7 @@ def CfgReader__IncompletedEscapeInInclude(lineNum: int): return errMsg # -------------------------------------------------------------------- + @staticmethod def CfgReader__UnknownEscapedSymbolInInclude(lineNum: int, colNum: int, ch: str): assert type(lineNum) is int assert type(colNum) is int @@ -297,6 +331,7 @@ def CfgReader__UnknownEscapedSymbolInInclude(lineNum: int, colNum: int, ch: str) return errMsg # -------------------------------------------------------------------- + @staticmethod def CfgReader__IncludeHasEmptyPath(lineNum: int): assert type(lineNum) is int assert lineNum >= 0 @@ -305,6 +340,7 @@ def CfgReader__IncludeHasEmptyPath(lineNum: int): return errMsg # -------------------------------------------------------------------- + @staticmethod def CfgReader__OptionWithoutValue(optionName: str, lineNum: int): assert type(lineNum) is int assert type(optionName) is str @@ -317,6 +353,7 @@ def CfgReader__OptionWithoutValue(optionName: str, lineNum: int): return errMsg # -------------------------------------------------------------------- + @staticmethod def CfgReader__EndQuotedOptionValueIsNotFound(optionName: str, lineNum: int): assert type(lineNum) is int assert type(optionName) is str @@ -329,6 +366,7 @@ def CfgReader__EndQuotedOptionValueIsNotFound(optionName: str, lineNum: int): return errMsg # -------------------------------------------------------------------- + @staticmethod def CfgReader__IncompletedEscapeInQuotedOptionValue(optionName: str, lineNum: int): assert type(lineNum) is int assert type(optionName) is str @@ -341,6 +379,7 @@ def CfgReader__IncompletedEscapeInQuotedOptionValue(optionName: str, lineNum: in return errMsg # -------------------------------------------------------------------- + @staticmethod def CfgReader__UnknownEscapedSymbolInQuotedOptionValue( optionName: str, lineNum: int, colNum: int, ch: str ): @@ -357,6 +396,7 @@ def CfgReader__UnknownEscapedSymbolInQuotedOptionValue( return errMsg # -------------------------------------------------------------------- + @staticmethod def BadFormatOfCommaSeparatedList(): errMsg = "Bad format of comma separated list." return errMsg diff --git a/tests/TestConfigHelper.py b/tests/TestConfigHelper.py index e5a99a3..79a76c3 100644 --- a/tests/TestConfigHelper.py +++ b/tests/TestConfigHelper.py @@ -12,6 +12,7 @@ class TestConfigHelper: + @staticmethod def NoCleanup() -> bool: if TestConfigPropNames.TEST_CFG__NO_CLEANUP not in os.environ.keys(): return False @@ -26,6 +27,7 @@ def NoCleanup() -> bool: sm_NO: typing.List[str] = ["0", "FALSE", "NO"] # -------------------------------------------------------------------- + @staticmethod def Helper__ToBoolean(v, envVarName: str) -> bool: assert type(envVarName) is str diff --git a/tests/TestGlobalCache.py b/tests/TestGlobalCache.py index 6cbec8f..ac521c1 100644 --- a/tests/TestGlobalCache.py +++ b/tests/TestGlobalCache.py @@ -20,6 +20,7 @@ def __init__(self): pass # -------------------------------------------------------------------- + @staticmethod def GetOrCreateResource(globalResourceID: str, resourceFactory) -> any: assert resourceFactory is not None assert isinstance(globalResourceID, str) @@ -39,6 +40,7 @@ def GetOrCreateResource(globalResourceID: str, resourceFactory) -> any: return r # -------------------------------------------------------------------- + @staticmethod def ReleaseAllResources(): assert __class__.sm_Guard is not None assert __class__.sm_Dict is not None diff --git a/tests/TestServices.py b/tests/TestServices.py index a655b35..330aaf7 100644 --- a/tests/TestServices.py +++ b/tests/TestServices.py @@ -17,24 +17,29 @@ class TestServices: + @staticmethod def GetRootDir() -> str: return TestStartupData.GetRootDir() # -------------------------------------------------------------------- + @staticmethod def GetRootTmpDir() -> str: return TestStartupData.GetRootTmpDataDirForCurrentTestWorker() # -------------------------------------------------------------------- + @staticmethod def MakeRootTmpDirForGlobalResources(globalResourceID: str) -> str: assert isinstance(globalResourceID, str) return os.path.join(__class__.GetRootTmpDir(), ".global", globalResourceID) # -------------------------------------------------------------------- + @staticmethod def GetCurTestTmpDir(request: pytest.FixtureRequest) -> str: assert isinstance(request, pytest.FixtureRequest) return __class__.Helper__GetCurTestTmpDir(request.node) # -------------------------------------------------------------------- + @staticmethod def Helper__GetCurTestTmpDir(function: pytest.Function) -> str: assert isinstance(function, pytest.Function) @@ -64,6 +69,7 @@ def Helper__GetCurTestTmpDir(function: pytest.Function) -> str: return result # -------------------------------------------------------------------- + @staticmethod def CleanTestTmpDirBeforeExit(function: pytest.Function): assert isinstance(function, pytest.Function) @@ -83,6 +89,7 @@ def CleanTestTmpDirBeforeExit(function: pytest.Function): return # -------------------------------------------------------------------- + @staticmethod def PrintExceptionOK(e: Exception): assert isinstance(e, Exception) @@ -91,10 +98,12 @@ def PrintExceptionOK(e: Exception): ) # -------------------------------------------------------------------- + @staticmethod def ThrowWeWaitAnException(): raise Exception("We wait an exception!") # -------------------------------------------------------------------- + @staticmethod def SleepWithPrint(sleepTimeInSec: float): logging.info("Sleep {0} second(s).".format(sleepTimeInSec)) time.sleep(sleepTimeInSec) diff --git a/tests/TestStartupData.py b/tests/TestStartupData.py index ed5a096..c943eee 100755 --- a/tests/TestStartupData.py +++ b/tests/TestStartupData.py @@ -20,11 +20,13 @@ class TestStartupData__Helper: sm_StartTS = datetime.datetime.now() # -------------------------------------------------------------------- + @staticmethod def GetStartTS() -> datetime.datetime: assert type(__class__.sm_StartTS) is datetime.datetime return __class__.sm_StartTS # -------------------------------------------------------------------- + @staticmethod def CalcRootDir() -> str: r = os.path.abspath(__file__) r = os.path.dirname(r) @@ -33,6 +35,7 @@ def CalcRootDir() -> str: return r # -------------------------------------------------------------------- + @staticmethod def CalcRootTmpDir() -> str: if TestConfigPropNames.TEST_CFG__TEMP_DIR in os.environ: resultPath = os.environ[TestConfigPropNames.TEST_CFG__TEMP_DIR] @@ -44,6 +47,7 @@ def CalcRootTmpDir() -> str: return resultPath # -------------------------------------------------------------------- + @staticmethod def CalcRootLogDir() -> str: if TestConfigPropNames.TEST_CFG__LOG_DIR in os.environ: resultPath = os.environ[TestConfigPropNames.TEST_CFG__LOG_DIR] @@ -55,6 +59,7 @@ def CalcRootLogDir() -> str: return resultPath # -------------------------------------------------------------------- + @staticmethod def CalcCurrentTestWorkerSignature() -> str: currentPID = os.getpid() assert type(currentPID) @@ -98,21 +103,25 @@ class TestStartupData: sm_RootLogDir: str = TestStartupData__Helper.CalcRootLogDir() # -------------------------------------------------------------------- + @staticmethod def GetRootDir() -> str: assert type(__class__.sm_RootDir) is str return __class__.sm_RootDir # -------------------------------------------------------------------- + @staticmethod def GetRootLogDir() -> str: assert type(__class__.sm_RootLogDir) is str return __class__.sm_RootLogDir # -------------------------------------------------------------------- + @staticmethod def GetCurrentTestWorkerSignature() -> str: assert type(__class__.sm_CurrentTestWorkerSignature) is str return __class__.sm_CurrentTestWorkerSignature # -------------------------------------------------------------------- + @staticmethod def GetRootTmpDataDirForCurrentTestWorker() -> str: assert type(__class__.sm_RootTmpDataDirForCurrentTestWorker) is str return __class__.sm_RootTmpDataDirForCurrentTestWorker diff --git a/tests/ThrowError.py b/tests/ThrowError.py index 1f2fae1..3c6b39a 100644 --- a/tests/ThrowError.py +++ b/tests/ThrowError.py @@ -6,11 +6,13 @@ class ThrowError: + @staticmethod def EnvVarIsNotDefined(envVarName: str): assert type(envVarName) is str raise Exception("System env variable [{0}] is not defined.".format(envVarName)) # -------------------------------------------------------------------- + @staticmethod def EnvVarHasBadValue(envVarName: str): assert type(envVarName) is str raise Exception("System env variable [{0}] has bad value.".format(envVarName))