diff --git a/CHANGELOG.md b/CHANGELOG.md index c4a7fbe..9e4b1b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 Go to [legend](#legend---types-of-changes) for further information about the types of changes. +## [1.5.0] - 2022-02-14 + +### Changed + +- All function names renamed to start with capital letter. +- Version bump. + ## [1.4.0] - 2022-02-10 ### Added @@ -57,6 +64,7 @@ Go to [legend](#legend---types-of-changes) for further information about the typ - AutoIt Code formatting to the common notation without additional spaces after opened brackets and before closed brackets. +[1.5.0]: https://github.com/Sven-Seyfert/Au3LogFramework/compare/v1.4.0...v1.5.0 [1.4.0]: https://github.com/Sven-Seyfert/Au3LogFramework/compare/v1.3.0...v1.4.0 [1.3.0]: https://github.com/Sven-Seyfert/Au3LogFramework/compare/v1.2.0...v1.3.0 [1.2.0]: https://github.com/Sven-Seyfert/Au3LogFramework/compare/v1.1.0...v1.2.0 diff --git a/build/Au3LogFramework.exe b/build/Au3LogFramework.exe index 684b714..463ab69 100644 Binary files a/build/Au3LogFramework.exe and b/build/Au3LogFramework.exe differ diff --git a/examples/AutoIt/Example.au3 b/examples/AutoIt/Example.au3 index fc2faef..381d07e 100644 --- a/examples/AutoIt/Example.au3 +++ b/examples/AutoIt/Example.au3 @@ -1,12 +1,12 @@ ; compiler information for AutoIt #pragma compile(CompanyName, © SOLVE SMART) -#pragma compile(FileVersion, 1.4.0) +#pragma compile(FileVersion, 1.5.0) #pragma compile(LegalCopyright, © Sven Seyfert) #pragma compile(ProductName, Example) -#pragma compile(ProductVersion, 1.4.0 - 2022-02-10) +#pragma compile(ProductVersion, 1.5.0 - 2022-02-14) #AutoIt3Wrapper_AU3Check_Stop_OnWarning=y -#AutoIt3Wrapper_Icon=..\media\favicon.ico +#AutoIt3Wrapper_Icon=..\..\media\favicon.ico #AutoIt3Wrapper_Outfile_x64=Example.exe #AutoIt3Wrapper_UseUpx=n #AutoIt3Wrapper_UseX64=y @@ -47,7 +47,7 @@ Global $sFileCurrentReport ; functions -------------------------------------------------------------------- -Func _callAu3LogFramework($iAu3LogFrameworkAction, $sTestObject = '', $sTestScenario = '', $sTestScenarioState = '', $sTestScenarioStepType = '', $sTestScenarioStepDescription = '', $sTestScenarioAdditionalInfo = '', $sSystemUnderTestTitle = '') +Func _CallAu3LogFramework($iAu3LogFrameworkAction, $sTestObject = '', $sTestScenario = '', $sTestScenarioState = '', $sTestScenarioStepType = '', $sTestScenarioStepDescription = '', $sTestScenarioAdditionalInfo = '', $sSystemUnderTestTitle = '') Local $sArguments = _ '"' & $iAu3LogFrameworkAction & '" ' & _ '"' & $sTestObject & '" ' & _ @@ -63,39 +63,39 @@ Func _callAu3LogFramework($iAu3LogFrameworkAction, $sTestObject = '', $sTestScen ShellExecuteWait(@ComSpec, ' /C cd "' & $sAu3LogFrameworkPath & '" && ' & $sAu3LogFrameworkExe & ' ' & $sArguments, '', '', @SW_HIDE) - _randomSleep() + _RandomSleep() EndFunc -Func _getCurrentCreatedReport() +Func _GetCurrentCreatedReport() Local $aFileList = _FileListToArray($sAu3LogFrameworkReportPath, '*.html', 1, True) Local $iFileCount = $aFileList[0] Return $aFileList[$iFileCount] EndFunc -Func _writeFile($sFolderReport, $sText) +Func _WriteFile($sFolderReport, $sText) Local $hFile = FileOpen($sFolderReport, $iFileOpenMode) FileWrite($hFile, $sText) FileClose($hFile) EndFunc -Func _getJustFileName($sFilePath) +Func _GetJustFileName($sFilePath) Return StringRegExpReplace($sFilePath, '(.+?)\\', '', 0) EndFunc -Func _createAdditionalInfosFile($sFile, $sText) - Local $sFolderReport = StringReplace(_getJustFileName($sFile), '.html', '\') +Func _CreateAdditionalInfosFile($sFile, $sText) + Local $sFolderReport = StringReplace(_GetJustFileName($sFile), '.html', '\') Local $sTimestamp = @YEAR & '-' & @MON & '-' & @MDAY & ' ' & @HOUR & '''' & @MIN & '''' & @SEC & '''' & @MSEC Local $sFileAdditionalInfos = $sAu3LogFrameworkOutputPath & $sFolderReport & $sTimestamp & '.txt' ConsoleWrite($sFileAdditionalInfos & @CRLF) - _writeFile($sFileAdditionalInfos, $sText) + _WriteFile($sFileAdditionalInfos, $sText) Return $sFileAdditionalInfos EndFunc -Func _getHtmlATagWithAdditionalInfosFileLink($sFile) +Func _GetHtmlATagWithAdditionalInfosFileLink($sFile) Local $sHtmlHref = StringReplace($sFile, '\', '/') $sHtmlHref = StringReplace($sHtmlHref, '../../', '../') Local $sHtmlATag = '"' @@ -103,12 +103,12 @@ Func _getHtmlATagWithAdditionalInfosFileLink($sFile) Return StringReplace($sHtmlATag, '"', '""') EndFunc -Func _getAdditionalInfoHtmlATag() - Local $sFileAdditionalInfos = _createAdditionalInfosFile($sFileCurrentReport, 'FailureMessage:' & @CRLF & _randomWords() & @CRLF & @CRLF & 'StackTrace:' & @CRLF & _randomWords()) - Return _getHtmlATagWithAdditionalInfosFileLink($sFileAdditionalInfos) +Func _GetAdditionalInfoHtmlATag() + Local $sFileAdditionalInfos = _CreateAdditionalInfosFile($sFileCurrentReport, 'FailureMessage:' & @CRLF & _RandomWords() & @CRLF & @CRLF & 'StackTrace:' & @CRLF & _RandomWords()) + Return _GetHtmlATagWithAdditionalInfosFileLink($sFileAdditionalInfos) EndFunc -Func _randomWords($iWords = 30) +Func _RandomWords($iWords = 30) Local $sText = '' For $i = 1 To $iWords Step 1 @@ -128,46 +128,46 @@ Func _randomWords($iWords = 30) Return $sText EndFunc -Func _randomSleep() +Func _RandomSleep() Sleep(Random(500, 1250, 1)) EndFunc ; processing ------------------------------------------------------------------- -_callAu3LogFramework('start', $sTestObjectName) +_CallAu3LogFramework('start', $sTestObjectName) -Global $sFileCurrentReport = _getCurrentCreatedReport() +Global $sFileCurrentReport = _GetCurrentCreatedReport() -_callAu3LogFramework('test', $sTestObjectName, 'First test name', 'Ok', 'Given', 'Test with status Ok') -_callAu3LogFramework('test', $sTestObjectName, 'First test name', 'Screenshot', 'When', 'Test with status Screenshot', '', $sScreenshotWindow) -_callAu3LogFramework('test', $sTestObjectName, 'First test name', 'Ok', 'Then', 'Test with status Ok') +_CallAu3LogFramework('test', $sTestObjectName, 'First test name', 'Ok', 'Given', 'Test with status Ok') +_CallAu3LogFramework('test', $sTestObjectName, 'First test name', 'Screenshot', 'When', 'Test with status Screenshot', '', $sScreenshotWindow) +_CallAu3LogFramework('test', $sTestObjectName, 'First test name', 'Ok', 'Then', 'Test with status Ok') -_callAu3LogFramework('test', $sTestObjectName, 'Second test name', 'Ok', 'Given', 'Test with status Ok') -_callAu3LogFramework('test', $sTestObjectName, 'Second test name', 'Ok', 'When', 'Test with status Ok') -_callAu3LogFramework('test', $sTestObjectName, 'Second test name', 'Ok', 'When', 'Test with status Ok') -_callAu3LogFramework('test', $sTestObjectName, 'Second test name', 'Screenshot', 'When', 'Test with status Screenshot', '', $sScreenshotWindow) -_callAu3LogFramework('test', $sTestObjectName, 'Second test name', 'Warn', 'Then', 'Test with status Warn', _getAdditionalInfoHtmlATag(), $sScreenshotWindow) +_CallAu3LogFramework('test', $sTestObjectName, 'Second test name', 'Ok', 'Given', 'Test with status Ok') +_CallAu3LogFramework('test', $sTestObjectName, 'Second test name', 'Ok', 'When', 'Test with status Ok') +_CallAu3LogFramework('test', $sTestObjectName, 'Second test name', 'Ok', 'When', 'Test with status Ok') +_CallAu3LogFramework('test', $sTestObjectName, 'Second test name', 'Screenshot', 'When', 'Test with status Screenshot', '', $sScreenshotWindow) +_CallAu3LogFramework('test', $sTestObjectName, 'Second test name', 'Warn', 'Then', 'Test with status Warn', _GetAdditionalInfoHtmlATag(), $sScreenshotWindow) -_callAu3LogFramework('test', $sTestObjectName, 'Third test name', 'Ok', 'Given', 'Test with status Ok') -_callAu3LogFramework('test', $sTestObjectName, 'Third test name', 'Ok', 'When', 'Test with status Ok') -_callAu3LogFramework('test', $sTestObjectName, 'Third test name', 'Warn', 'Then', 'Test with status Warn', _getAdditionalInfoHtmlATag(), $sScreenshotWindow) -_callAu3LogFramework('test', $sTestObjectName, 'Third test name', 'Screenshot', 'When', 'Test with status Screenshot', '', $sScreenshotWindow) -_callAu3LogFramework('test', $sTestObjectName, 'Third test name', 'Error', 'Then', 'Test with status Error', _getAdditionalInfoHtmlATag(), $sScreenshotWindow) +_CallAu3LogFramework('test', $sTestObjectName, 'Third test name', 'Ok', 'Given', 'Test with status Ok') +_CallAu3LogFramework('test', $sTestObjectName, 'Third test name', 'Ok', 'When', 'Test with status Ok') +_CallAu3LogFramework('test', $sTestObjectName, 'Third test name', 'Warn', 'Then', 'Test with status Warn', _GetAdditionalInfoHtmlATag(), $sScreenshotWindow) +_CallAu3LogFramework('test', $sTestObjectName, 'Third test name', 'Screenshot', 'When', 'Test with status Screenshot', '', $sScreenshotWindow) +_CallAu3LogFramework('test', $sTestObjectName, 'Third test name', 'Error', 'Then', 'Test with status Error', _GetAdditionalInfoHtmlATag(), $sScreenshotWindow) -_callAu3LogFramework('test', $sTestObjectName, 'Fourth test name', 'Warn', 'Given', 'Test with status Warn', '', $sScreenshotWindow) -_callAu3LogFramework('test', $sTestObjectName, 'Fourth test name', 'Ok', 'When', 'Test with status Ok') -_callAu3LogFramework('test', $sTestObjectName, 'Fourth test name', 'Ok', 'Then', 'Test with status Ok') +_CallAu3LogFramework('test', $sTestObjectName, 'Fourth test name', 'Warn', 'Given', 'Test with status Warn', '', $sScreenshotWindow) +_CallAu3LogFramework('test', $sTestObjectName, 'Fourth test name', 'Ok', 'When', 'Test with status Ok') +_CallAu3LogFramework('test', $sTestObjectName, 'Fourth test name', 'Ok', 'Then', 'Test with status Ok') -_callAu3LogFramework('test', $sTestObjectName, 'Sixth test name', 'Warn', 'Given', 'Test with status Warn', _getAdditionalInfoHtmlATag(), $sScreenshotWindow) -_callAu3LogFramework('test', $sTestObjectName, 'Sixth test name', 'Error', 'Then', 'Test with status Error', _getAdditionalInfoHtmlATag(), $sScreenshotWindow) +_CallAu3LogFramework('test', $sTestObjectName, 'Sixth test name', 'Warn', 'Given', 'Test with status Warn', _GetAdditionalInfoHtmlATag(), $sScreenshotWindow) +_CallAu3LogFramework('test', $sTestObjectName, 'Sixth test name', 'Error', 'Then', 'Test with status Error', _GetAdditionalInfoHtmlATag(), $sScreenshotWindow) -_callAu3LogFramework('test', $sTestObjectName, 'Seventh test name', 'Ok', 'Given', 'Test with status Ok') -_callAu3LogFramework('test', $sTestObjectName, 'Seventh test name', 'Ok', 'When', 'Test with status Ok') -_callAu3LogFramework('test', $sTestObjectName, 'Seventh test name', 'Ok', 'Then', 'Test with status Ok') +_CallAu3LogFramework('test', $sTestObjectName, 'Seventh test name', 'Ok', 'Given', 'Test with status Ok') +_CallAu3LogFramework('test', $sTestObjectName, 'Seventh test name', 'Ok', 'When', 'Test with status Ok') +_CallAu3LogFramework('test', $sTestObjectName, 'Seventh test name', 'Ok', 'Then', 'Test with status Ok') -_callAu3LogFramework('test', $sTestObjectName, 'Eighth test name', 'Ok', 'Given', 'Test with status Ok') -_callAu3LogFramework('test', $sTestObjectName, 'Eighth test name', 'Ok', 'When', 'Test with status Ok') -_callAu3LogFramework('test', $sTestObjectName, 'Eighth test name', 'Ok', 'Then', 'Test with status Ok') +_CallAu3LogFramework('test', $sTestObjectName, 'Eighth test name', 'Ok', 'Given', 'Test with status Ok') +_CallAu3LogFramework('test', $sTestObjectName, 'Eighth test name', 'Ok', 'When', 'Test with status Ok') +_CallAu3LogFramework('test', $sTestObjectName, 'Eighth test name', 'Ok', 'Then', 'Test with status Ok') -_callAu3LogFramework('stop') +_CallAu3LogFramework('stop') diff --git a/examples/AutoIt/Example.exe b/examples/AutoIt/Example.exe index 8c0fe1c..35b3749 100644 Binary files a/examples/AutoIt/Example.exe and b/examples/AutoIt/Example.exe differ diff --git a/src/Au3LogFramework.au3 b/src/Au3LogFramework.au3 index aa67eff..5328cd3 100644 --- a/src/Au3LogFramework.au3 +++ b/src/Au3LogFramework.au3 @@ -1,9 +1,9 @@ ; compiler information for AutoIt #pragma compile(CompanyName, © SOLVE SMART) -#pragma compile(FileVersion, 1.4.0) +#pragma compile(FileVersion, 1.5.0) #pragma compile(LegalCopyright, © Sven Seyfert) #pragma compile(ProductName, Au3LogFramework) -#pragma compile(ProductVersion, 1.4.0 - 2022-02-10) +#pragma compile(ProductVersion, 1.5.0 - 2022-02-14) #AutoIt3Wrapper_AU3Check_Stop_OnWarning=y #AutoIt3Wrapper_Icon=..\media\favicon.ico @@ -43,27 +43,27 @@ If $aInst[0][0] > 1 Then Exit Switch $aCmdArg[$eAu3LogFrameworkAction] Case 'start' If StringLower($bShouldDisplayResolutionBeAdjusted) == 'true' Then - _setDisplayResolution() + _SetDisplayResolution() Sleep(1500) EndIf - _createReportStructure() + _CreateReportStructure() Case 'test' Switch $aCmdArg[$eTestScenarioState] Case 'ok', 'screenshot' - _createTestScenarioOrScenarioStep($aColor[$eOk], $aCmdArg[$eTestScenarioState]) + _CreateTestScenarioOrScenarioStep($aColor[$eOk], $aCmdArg[$eTestScenarioState]) Case 'warn' - _createTestScenarioOrScenarioStep($aColor[$eWarn], $aCmdArg[$eTestScenarioState]) + _CreateTestScenarioOrScenarioStep($aColor[$eWarn], $aCmdArg[$eTestScenarioState]) Case 'error' - _createTestScenarioOrScenarioStep($aColor[$eError], $aCmdArg[$eTestScenarioState]) + _CreateTestScenarioOrScenarioStep($aColor[$eError], $aCmdArg[$eTestScenarioState]) EndSwitch Case 'stop' - $aIni[$eReportFile] = _readIniValue('ReportFile') - _setTestScenarioExecutionTime($aIni[$eReportFile]) + $aIni[$eReportFile] = _ReadIniValue('ReportFile') + _SetTestScenarioExecutionTime($aIni[$eReportFile]) If StringLower($bSilentModeWithoutMsgBoxes) == 'false' Then If MsgBox($iMsgBoxQuestionIcon, 'Question', 'Processing done.' & @CRLF & 'Open log report in default browser?', 30) == 6 Then @@ -71,8 +71,8 @@ Switch $aCmdArg[$eAu3LogFrameworkAction] EndIf EndIf - _setMaxDirectories($aPath[$eOutput], $iAmountOfLastReportsToStore) - _setMaxFiles($aPath[$eReports], $iAmountOfLastReportsToStore) + _SetMaxDirectories($aPath[$eOutput], $iAmountOfLastReportsToStore) + _SetMaxFiles($aPath[$eReports], $iAmountOfLastReportsToStore) Exit EndSwitch diff --git a/src/BasicFunctions.au3 b/src/BasicFunctions.au3 index cb4f6bd..8a9bbf6 100644 --- a/src/BasicFunctions.au3 +++ b/src/BasicFunctions.au3 @@ -1,10 +1,10 @@ -Func _showErrorMessage($sText) +Func _ShowErrorMessage($sText) If StringLower($bSilentModeWithoutMsgBoxes) == 'false' Then MsgBox($iMsgBoxErrorIcon, 'Error', $sText, 30) EndIf EndFunc -Func _setMaxDirectories($sPath, $i = 20) +Func _SetMaxDirectories($sPath, $i = 20) Local $aDirectories = _FileListToArray($sPath, '*', 2, True) If IsArray($aDirectories) Then Local $iDirectoriesCount = $aDirectories[0] @@ -16,7 +16,7 @@ Func _setMaxDirectories($sPath, $i = 20) EndIf EndFunc -Func _setMaxFiles($sPath, $i = 20) +Func _SetMaxFiles($sPath, $i = 20) Local $aFiles = _FileListToArray($sPath, '*.html', 1, True) If IsArray($aFiles) Then Local $iFilesCount = $aFiles[0] @@ -28,14 +28,14 @@ Func _setMaxFiles($sPath, $i = 20) EndIf EndFunc -Func _writeFile($sFile, $sText) +Func _WriteFile($sFile, $sText) Local $hFile = FileOpen($sFile, $iFileOpenMode) FileWrite($hFile, $sText) FileClose($hFile) EndFunc -Func _writeToFileLine($sFilePath, $iLine, $sText, $bOverWrite = True) - If StringLower($bDebug) == 'true' Then _debug($sFilePath, $iLine, $sText, $bOverWrite) +Func _WriteToFileLine($sFilePath, $iLine, $sText, $bOverWrite = True) + If StringLower($bDebug) == 'true' Then _Debug($sFilePath, $iLine, $sText, $bOverWrite) Local $aFileContent = FileReadToArray($sFilePath) Local $iLineCount = UBound($aFileContent) - 1 @@ -60,7 +60,7 @@ Func _writeToFileLine($sFilePath, $iLine, $sText, $bOverWrite = True) FileClose($hFile) EndFunc -Func _getFileLineNumberForLastSearchMatch($sFilePath, $sText) +Func _GetFileLineNumberForLastSearchMatch($sFilePath, $sText) Local $aFileContent = FileReadToArray($sFilePath) Local $iLineCount = UBound($aFileContent) - 1 @@ -69,11 +69,11 @@ Func _getFileLineNumberForLastSearchMatch($sFilePath, $sText) Next EndFunc -Func _getDiffTime($sFrom, $sTo) - Return _secondsToMinutes(_DateDiff('s', $sFrom, $sTo)) +Func _GetDiffTime($sFrom, $sTo) + Return _SecondsToMinutes(_DateDiff('s', $sFrom, $sTo)) EndFunc -Func _secondsToMinutes($iGivenSeconds) +Func _SecondsToMinutes($iGivenSeconds) Local $iHours = Int($iGivenSeconds / 3600) Local $iMinutes = Int(Mod($iGivenSeconds, 3600) / 60) Local $iSeconds = Mod($iGivenSeconds, 60) @@ -83,7 +83,7 @@ Func _secondsToMinutes($iGivenSeconds) If $iSeconds <= 59 Then Return StringFormat('%02d', $iSeconds) & ' seconds' EndFunc -Func _setDisplayResolution() +Func _SetDisplayResolution() Local Const $CDS_TEST = 0x00000002 Local Const $CDS_UPDATEREGISTRY = 0x00000001 Local Const $DM_BITSPERPEL = 0x00040000 @@ -122,6 +122,6 @@ Func _setDisplayResolution() $tDEVMODE = '' EndFunc -Func _spaces($iAmountOfSpaces) +Func _Spaces($iAmountOfSpaces) Return _StringRepeat(' ', $iAmountOfSpaces) EndFunc diff --git a/src/Declaration.au3 b/src/Declaration.au3 index 93936b9..b2790bb 100644 --- a/src/Declaration.au3 +++ b/src/Declaration.au3 @@ -91,7 +91,7 @@ Switch $iArgumentCount $aCmdArg[$eSystemUnderTestTitle] = $CmdLine[8] Case Else - _showErrorMessage('Wrong count of arguments is used while calling ' & $sProgramName & '. Please read the documentation (README.md).') + _ShowErrorMessage('Wrong count of arguments is used while calling ' & $sProgramName & '. Please read the documentation (README.md).') Exit -1 EndSwitch diff --git a/src/Functions.au3 b/src/Functions.au3 index c2e64b2..dc44f20 100644 --- a/src/Functions.au3 +++ b/src/Functions.au3 @@ -1,17 +1,17 @@ -Func _readIniValue($sKey) +Func _ReadIniValue($sKey) Return IniRead($aFile[$eConfig], 'Storage', $sKey, '') EndFunc -Func _writeIniValue($sKey, $sValue) +Func _WriteIniValue($sKey, $sValue) Return IniWrite($aFile[$eConfig], 'Storage', $sKey, $sValue) EndFunc -Func _renewIniValue($sKey, $sValue) - _writeIniValue($sKey, $sValue) - _getStoredIniValues() +Func _RenewIniValue($sKey, $sValue) + _WriteIniValue($sKey, $sValue) + _GetStoredIniValues() EndFunc -Func _createReportStructure() +Func _CreateReportStructure() Local $iYear = @YEAR, $iMonth = @MON, $iDay = @MDAY Local $iHour = @HOUR, $iMin = @MIN, $iSec = @SEC @@ -26,13 +26,13 @@ Func _createReportStructure() $sHtmlMain = StringReplace($sHtmlMain, '#{$sReportStart}#', $sReportStart) $sHtmlFooter = StringReplace($sHtmlFooter, '#{$sReportStart}#', $sReportStart) - _createIniStorageSection($sFileHtmlReport, $sOutputPath) - _writeFile($sFileHtmlReport, $sHtmlHead & $sHtmlMain & $sHtmlFooter) + _CreateIniStorageSection($sFileHtmlReport, $sOutputPath) + _WriteFile($sFileHtmlReport, $sHtmlHead & $sHtmlMain & $sHtmlFooter) DirCreate($sOutputPath) EndFunc -Func _createIniStorageSection($sFileHtmlReportString, $sOutputPathString) +Func _CreateIniStorageSection($sFileHtmlReportString, $sOutputPathString) Local $aSection[17][2] = _ [ _ [16, ''], _ @@ -57,83 +57,83 @@ Func _createIniStorageSection($sFileHtmlReportString, $sOutputPathString) IniWriteSection($aFile[$eConfig], 'Storage', $aSection) EndFunc -Func _getStoredIniValues() - $aIni[$eCountError] = _readIniValue('CountError') - $aIni[$eCountOk] = _readIniValue('CountOk') - $aIni[$eCountWarn] = _readIniValue('CountWarn') - $aIni[$eIsNewTestScenario] = _readIniValue('IsNewTestScenario') - $aIni[$eLineOfDataForFirstChart] = _readIniValue('LineOfDataForFirstChart') - $aIni[$eLineOfDataForSecondChart] = _readIniValue('LineOfDataForSecondChart') - $aIni[$eLineOfDuration] = _readIniValue('LineOfDuration') - $aIni[$eLineOfLogEndTime] = _readIniValue('LineOfLogEndTime') - $aIni[$eLineOfTitleTag] = _readIniValue('LineOfTitleTag') - $aIni[$eOutputPath] = _readIniValue('OutputPath') - $aIni[$eReportFile] = _readIniValue('ReportFile') - $aIni[$eScenarioStepMaxNumber] = _readIniValue('ScenarioStepMaxNumber') - $aIni[$eScenarioStepNumber] = _readIniValue('ScenarioStepNumber') - $aIni[$eTestScenarioName] = _readIniValue('TestScenarioName') - $aIni[$eTestScenarioNumber] = _readIniValue('TestScenarioNumber') - $aIni[$eWasThereAWarnInTheCurrentTestScenario] = _readIniValue('WasThereAWarnInTheCurrentTestScenario') +Func _GetStoredIniValues() + $aIni[$eCountError] = _ReadIniValue('CountError') + $aIni[$eCountOk] = _ReadIniValue('CountOk') + $aIni[$eCountWarn] = _ReadIniValue('CountWarn') + $aIni[$eIsNewTestScenario] = _ReadIniValue('IsNewTestScenario') + $aIni[$eLineOfDataForFirstChart] = _ReadIniValue('LineOfDataForFirstChart') + $aIni[$eLineOfDataForSecondChart] = _ReadIniValue('LineOfDataForSecondChart') + $aIni[$eLineOfDuration] = _ReadIniValue('LineOfDuration') + $aIni[$eLineOfLogEndTime] = _ReadIniValue('LineOfLogEndTime') + $aIni[$eLineOfTitleTag] = _ReadIniValue('LineOfTitleTag') + $aIni[$eOutputPath] = _ReadIniValue('OutputPath') + $aIni[$eReportFile] = _ReadIniValue('ReportFile') + $aIni[$eScenarioStepMaxNumber] = _ReadIniValue('ScenarioStepMaxNumber') + $aIni[$eScenarioStepNumber] = _ReadIniValue('ScenarioStepNumber') + $aIni[$eTestScenarioName] = _ReadIniValue('TestScenarioName') + $aIni[$eTestScenarioNumber] = _ReadIniValue('TestScenarioNumber') + $aIni[$eWasThereAWarnInTheCurrentTestScenario] = _ReadIniValue('WasThereAWarnInTheCurrentTestScenario') EndFunc -Func _createTestScenarioOrScenarioStep($sColor, $sTestScenarioState) - _getStoredIniValues() +Func _CreateTestScenarioOrScenarioStep($sColor, $sTestScenarioState) + _GetStoredIniValues() If $aIni[$eTestScenarioName] <> $aCmdArg[$eTestScenario] Then - _renewIniValue('IsNewTestScenario', 'true') - _renewIniValue('TestScenarioName', $aCmdArg[$eTestScenario]) - _renewIniValue('TestScenarioNumber', $aIni[$eTestScenarioNumber] + 1) - _renewIniValue('WasThereAWarnInTheCurrentTestScenario', 'false') - Local $iRowsToAdd = _writeNewTestScenario($sColor, $sTestScenarioState) + _RenewIniValue('IsNewTestScenario', 'true') + _RenewIniValue('TestScenarioName', $aCmdArg[$eTestScenario]) + _RenewIniValue('TestScenarioNumber', $aIni[$eTestScenarioNumber] + 1) + _RenewIniValue('WasThereAWarnInTheCurrentTestScenario', 'false') + Local $iRowsToAdd = _WriteNewTestScenario($sColor, $sTestScenarioState) Else - _renewIniValue('IsNewTestScenario', 'false') - Local $iRowsToAdd = _writeNewScenarioStepOfAGivenTestScenario($sColor, $sTestScenarioState) + _RenewIniValue('IsNewTestScenario', 'false') + Local $iRowsToAdd = _WriteNewScenarioStepOfAGivenTestScenario($sColor, $sTestScenarioState) EndIf - _renewIniValue('LineOfLogEndTime', $aIni[$eLineOfLogEndTime] + $iRowsToAdd) - _renewIniValue('ScenarioStepMaxNumber', $aIni[$eScenarioStepMaxNumber] + 1) - _renewIniValue('ScenarioStepNumber', $aIni[$eScenarioStepNumber] + 1) + _RenewIniValue('LineOfLogEndTime', $aIni[$eLineOfLogEndTime] + $iRowsToAdd) + _RenewIniValue('ScenarioStepMaxNumber', $aIni[$eScenarioStepMaxNumber] + 1) + _RenewIniValue('ScenarioStepNumber', $aIni[$eScenarioStepNumber] + 1) - _renewChartSectionValues() - _renewResultSectionValues() - _renewTheEndLogDateAndTheTestDurationTime() + _RenewChartSectionValues() + _RenewResultSectionValues() + _RenewTheEndLogDateAndTheTestDurationTime() EndFunc -Func _writeNewTestScenario($sColor, $sTestScenarioState) - _renewIniValue('ScenarioStepNumber', 0) - $sHtmlNewTestScenario = _replaceHtmlPlaceholder($sColor, $sHtmlNewTestScenario) - $sHtmlNewTestScenario = _addScreenshot($sTestScenarioState, $sHtmlNewTestScenario) +Func _WriteNewTestScenario($sColor, $sTestScenarioState) + _RenewIniValue('ScenarioStepNumber', 0) + $sHtmlNewTestScenario = _ReplaceHtmlPlaceholder($sColor, $sHtmlNewTestScenario) + $sHtmlNewTestScenario = _AddScreenshot($sTestScenarioState, $sHtmlNewTestScenario) - Local $iLine = _getFileLineNumberForLastSearchMatch($aIni[$eReportFile], '
') + Local $iLine = _GetFileLineNumberForLastSearchMatch($aIni[$eReportFile], '
') - _writeToFileLine($aIni[$eReportFile], $iLine , $sHtmlNewTestScenario, False) + _WriteToFileLine($aIni[$eReportFile], $iLine , $sHtmlNewTestScenario, False) Local $iLinesOfHtmlNewTestScenario = 7 Return $iLinesOfHtmlNewTestScenario EndFunc -Func _writeNewScenarioStepOfAGivenTestScenario($sColor, $sTestScenarioState) - $sHtmlNewScenarioStep = _replaceHtmlPlaceholder($sColor, $sHtmlNewScenarioStep) - $sHtmlNewScenarioStep = _addScreenshot($sTestScenarioState, $sHtmlNewScenarioStep) +Func _WriteNewScenarioStepOfAGivenTestScenario($sColor, $sTestScenarioState) + $sHtmlNewScenarioStep = _ReplaceHtmlPlaceholder($sColor, $sHtmlNewScenarioStep) + $sHtmlNewScenarioStep = _AddScreenshot($sTestScenarioState, $sHtmlNewScenarioStep) - Local $iLine = _getFileLineNumberForLastSearchMatch($aIni[$eReportFile], '') + Local $iLine = _GetFileLineNumberForLastSearchMatch($aIni[$eReportFile], '') - _writeToFileLine($aIni[$eReportFile], $iLine, $sHtmlNewScenarioStep, False) + _WriteToFileLine($aIni[$eReportFile], $iLine, $sHtmlNewScenarioStep, False) If $sColor <> $aColor[$eError] Then If $aIni[$eIsNewTestScenario] == 'false' And $aIni[$eWasThereAWarnInTheCurrentTestScenario] == 'true' Then $sColor = $aColor[$eWarn] If $aIni[$eIsNewTestScenario] == 'true' And $aIni[$eWasThereAWarnInTheCurrentTestScenario] == 'false' Then $sColor = $sColor EndIf - _replaceLine(_getFileLineNumberForLastSearchMatch($aIni[$eReportFile], '

'), 'color: #.+?;', 'color: #' & $sColor & ';') + _ReplaceLine(_GetFileLineNumberForLastSearchMatch($aIni[$eReportFile], '

'), 'color: #.+?;', 'color: #' & $sColor & ';') Local $iLinesOfHtmlNewScenarioStep = 1 Return $iLinesOfHtmlNewScenarioStep EndFunc -Func _replaceHtmlPlaceholder($sColor, $sText) +Func _ReplaceHtmlPlaceholder($sColor, $sText) $sText = StringReplace($sText, '#{$sColor}#', $sColor) $sText = StringReplace($sText, '#{$eTestScenarioNumber}#', $aIni[$eTestScenarioNumber]) $sText = StringReplace($sText, '#{$eTestScenario}#', $aCmdArg[$eTestScenario]) @@ -145,52 +145,52 @@ Func _replaceHtmlPlaceholder($sColor, $sText) Return StringReplace($sText, '#{$eTestScenarioAdditionalInfo}#', $aCmdArg[$eTestScenarioAdditionalInfo]) EndFunc -Func _addScreenshot($sState, $sText) +Func _AddScreenshot($sState, $sText) Switch $sState Case 'screenshot', 'error' - $sText = StringReplace($sText, '#{_setScreenshotFileToHtml()}#', _setScreenshotFileToHtml()) + $sText = StringReplace($sText, '#{_SetScreenshotFileToHtml()}#', _SetScreenshotFileToHtml()) Case 'warn' - $sText = StringReplace($sText, '#{_setScreenshotFileToHtml()}#', _setScreenshotFileToHtml()) - _renewIniValue('WasThereAWarnInTheCurrentTestScenario', 'true') + $sText = StringReplace($sText, '#{_SetScreenshotFileToHtml()}#', _SetScreenshotFileToHtml()) + _RenewIniValue('WasThereAWarnInTheCurrentTestScenario', 'true') Case Else - $sText = StringReplace($sText, '#{_setScreenshotFileToHtml()}#', '') + $sText = StringReplace($sText, '#{_SetScreenshotFileToHtml()}#', '') EndSwitch Return $sText EndFunc -Func _setScreenshotFileToHtml() +Func _SetScreenshotFileToHtml() $sScreenshotTime = @YEAR & '-' & @MON & '-' & @MDAY & ' ' & @HOUR & '''' & @MIN & '''' & @SEC & '''' & @MSEC Local $sScreenshotFile = StringReplace($aIni[$eOutputPath] & $sScreenshotTime & $sImageExtension, '\', '/') Return StringRegExpReplace($sScreenshotFile, '(.+?)output', '../output', 1) EndFunc -Func _replaceLine($iLine, $sPattern, $sReplace) +Func _ReplaceLine($iLine, $sPattern, $sReplace) Local $sLineContent = FileReadLine($aIni[$eReportFile], $iLine) $sLineContent = StringRegExpReplace($sLineContent, $sPattern, $sReplace) - _writeToFileLine($aIni[$eReportFile], $iLine, $sLineContent) + _WriteToFileLine($aIni[$eReportFile], $iLine, $sLineContent) EndFunc -Func _renewChartSectionValues() +Func _RenewChartSectionValues() Switch $aCmdArg[$eTestScenarioState] Case 'ok' - _renewIniValue('CountOk', $aIni[$eCountOk] + 1) + _RenewIniValue('CountOk', $aIni[$eCountOk] + 1) Case 'screenshot' - _renewIniValue('CountOk', $aIni[$eCountOk] + 1) - _createScreenshot() + _RenewIniValue('CountOk', $aIni[$eCountOk] + 1) + _CreateScreenshot() Case 'warn' - _renewIniValue('CountWarn', $aIni[$eCountWarn] + 1) - _createScreenshot() + _RenewIniValue('CountWarn', $aIni[$eCountWarn] + 1) + _CreateScreenshot() Case 'error' - _renewIniValue('CountError', $aIni[$eCountError] + 1) - _createScreenshot() + _RenewIniValue('CountError', $aIni[$eCountError] + 1) + _CreateScreenshot() EndSwitch Local $iFirstChartPercentageForOk = Round(100 / $aIni[$eTestScenarioNumber] * ($aIni[$eTestScenarioNumber] - $aIni[$eCountError]), 1) @@ -199,37 +199,37 @@ Func _renewChartSectionValues() Local $iSecondChartPercentageForError = Round(100 / $aIni[$eScenarioStepMaxNumber] * $aIni[$eCountError], 1) Local $iSecondChartPercentageForWarn = Round(100 / $aIni[$eScenarioStepMaxNumber] * $aIni[$eCountWarn], 1) - _writeToFileLine($aFile[$eJs], $aIni[$eLineOfDataForFirstChart] - 4, _StringRepeat(' ', 12) & 'labels: ["OK (' & $iFirstChartPercentageForOk & '%)", "ERROR (' & $iFirstChartPercentageForError & '%)"],') - _writeToFileLine($aFile[$eJs], $aIni[$eLineOfDataForSecondChart] - 4, _StringRepeat(' ', 12) & 'labels: ["OK (' & $iSecondChartPercentageForOk & '%)", "ERROR (' & $iSecondChartPercentageForError & '%)", "WARN (' & $iSecondChartPercentageForWarn & '%)"],') - _writeToFileLine($aFile[$eJs], $aIni[$eLineOfDataForFirstChart], _StringRepeat(' ', 20) & 'data: [' & $aIni[$eTestScenarioNumber] - $aIni[$eCountError] & ', ' & $aIni[$eCountError] & '],') - _writeToFileLine($aFile[$eJs], $aIni[$eLineOfDataForSecondChart], _StringRepeat(' ', 20) & 'data: [' & $aIni[$eCountOk] & ', ' & $aIni[$eCountError] & ', ' & $aIni[$eCountWarn] & '],') + _WriteToFileLine($aFile[$eJs], $aIni[$eLineOfDataForFirstChart] - 4, _StringRepeat(' ', 12) & 'labels: ["OK (' & $iFirstChartPercentageForOk & '%)", "ERROR (' & $iFirstChartPercentageForError & '%)"],') + _WriteToFileLine($aFile[$eJs], $aIni[$eLineOfDataForSecondChart] - 4, _StringRepeat(' ', 12) & 'labels: ["OK (' & $iSecondChartPercentageForOk & '%)", "ERROR (' & $iSecondChartPercentageForError & '%)", "WARN (' & $iSecondChartPercentageForWarn & '%)"],') + _WriteToFileLine($aFile[$eJs], $aIni[$eLineOfDataForFirstChart], _StringRepeat(' ', 20) & 'data: [' & $aIni[$eTestScenarioNumber] - $aIni[$eCountError] & ', ' & $aIni[$eCountError] & '],') + _WriteToFileLine($aFile[$eJs], $aIni[$eLineOfDataForSecondChart], _StringRepeat(' ', 20) & 'data: [' & $aIni[$eCountOk] & ', ' & $aIni[$eCountError] & ', ' & $aIni[$eCountWarn] & '],') EndFunc -Func _renewResultSectionValues() - _replaceLine($aIni[$eLineOfLogEndTime] - 8, '\d{1,}
', '' & $aIni[$eTestScenarioNumber] & '
') - _replaceLine($aIni[$eLineOfLogEndTime] - 7, 'OK\d{1,}
', 'OK' & $aIni[$eTestScenarioNumber] - $aIni[$eCountError] & '
') - _replaceLine($aIni[$eLineOfLogEndTime] - 6, 'ERRORS\d{1,}
', 'ERRORS' & $aIni[$eCountError] & '
') - _replaceLine($aIni[$eLineOfLogEndTime] - 4, '\d{1,}
', '' & $aIni[$eScenarioStepMaxNumber] & '
') - _replaceLine($aIni[$eLineOfLogEndTime] - 3, 'OK\d{1,}
', 'OK' & $aIni[$eCountOk] & '
') - _replaceLine($aIni[$eLineOfLogEndTime] - 2, 'ERRORS\d{1,}
', 'ERRORS' & $aIni[$eCountError] & '
') - _replaceLine($aIni[$eLineOfLogEndTime] - 1, 'WARN\d{1,}
', 'WARN' & $aIni[$eCountWarn] & '
') +Func _RenewResultSectionValues() + _ReplaceLine($aIni[$eLineOfLogEndTime] - 8, '\d{1,}
', '' & $aIni[$eTestScenarioNumber] & '
') + _ReplaceLine($aIni[$eLineOfLogEndTime] - 7, 'OK\d{1,}
', 'OK' & $aIni[$eTestScenarioNumber] - $aIni[$eCountError] & '
') + _ReplaceLine($aIni[$eLineOfLogEndTime] - 6, 'ERRORS\d{1,}
', 'ERRORS' & $aIni[$eCountError] & '
') + _ReplaceLine($aIni[$eLineOfLogEndTime] - 4, '\d{1,}
', '' & $aIni[$eScenarioStepMaxNumber] & '
') + _ReplaceLine($aIni[$eLineOfLogEndTime] - 3, 'OK\d{1,}
', 'OK' & $aIni[$eCountOk] & '
') + _ReplaceLine($aIni[$eLineOfLogEndTime] - 2, 'ERRORS\d{1,}
', 'ERRORS' & $aIni[$eCountError] & '
') + _ReplaceLine($aIni[$eLineOfLogEndTime] - 1, 'WARN\d{1,}
', 'WARN' & $aIni[$eCountWarn] & '
') EndFunc -Func _renewTheEndLogDateAndTheTestDurationTime() +Func _RenewTheEndLogDateAndTheTestDurationTime() Local $iEndYear = @YEAR, $iEndMon = @MON, $iEndMday = @MDAY Local $iEndHour = @HOUR, $iEndMin = @MIN, $iEndSec = @SEC Local $sTimestamp = $iEndYear & '-' & $iEndMon & '-' & $iEndMday & ' ' & $iEndHour & ':' & $iEndMin & ':' & $iEndSec - _replaceLine($aIni[$eLineOfLogEndTime], '\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}', $sTimestamp) + _ReplaceLine($aIni[$eLineOfLogEndTime], '\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}', $sTimestamp) Local $sStartDate = StringRegExpReplace(FileReadLine($aIni[$eReportFile], $aIni[$eLineOfTitleTag]), '.+?(\d{4})-(\d{2})-(\d{2}) (\d{2}:\d{2}:\d{2}).+?$', '$1/$2/$3 $4') Local $sEndDate = $iEndYear & '/' & $iEndMon & '/' & $iEndMday & ' ' & $iEndHour & ':' & $iEndMin & ':' & $iEndSec - _replaceLine($aIni[$eLineOfDuration], 'TEST DURATION: .+?$', 'TEST DURATION: ' & _getDiffTime($sStartDate, $sEndDate)) + _ReplaceLine($aIni[$eLineOfDuration], 'TEST DURATION: .+?$', 'TEST DURATION: ' & _GetDiffTime($sStartDate, $sEndDate)) EndFunc -Func _setTestScenarioExecutionTime($sFilePath) +Func _SetTestScenarioExecutionTime($sFilePath) Local $aFileContent = FileReadToArray($sFilePath) Local $iFileCount = UBound($aFileContent) @@ -237,29 +237,29 @@ Func _setTestScenarioExecutionTime($sFilePath) For $i = 1 To $iFileCount Step 1 If StringInStr($aFileContent[$i], '', 2) <> 0 Then - Local $sStartDate = _getDateTime($aFileContent[$i + 2]) + Local $sStartDate = _GetDateTime($aFileContent[$i + 2]) For $j = 1 To 200 Step 1 If StringInStr($aFileContent[$i + 2 + $j], '
', 2) <> 0 Then - Local $sEndDate = _getDateTime($aFileContent[$i + 2 + $j - 1]) + Local $sEndDate = _GetDateTime($aFileContent[$i + 2 + $j - 1]) ExitLoop EndIf Next - Local $sDiffTime = _getDiffTime($sStartDate, $sEndDate) - _writeToFileLine($sFilePath, $i - 1, StringReplace($aFileContent[$i - 1], '

', '(' & $sDiffTime & ') ')) + Local $sDiffTime = _GetDiffTime($sStartDate, $sEndDate) + _WriteToFileLine($sFilePath, $i - 1, StringReplace($aFileContent[$i - 1], '', '(' & $sDiffTime & ') ')) EndIf Next EndFunc -Func _getDateTime($sText) +Func _GetDateTime($sText) Local $aDateTime = StringRegExp($sText, '^.+?(\d{4})(.+?)', 3) Return StringTrimRight(StringReplace($aDateTime[0] & $aDateTime[1], '-', '/'), 4) EndFunc -Func _debug($sFilePath, $iFileLine, $sContent, $bOverwrite) +Func _Debug($sFilePath, $iFileLine, $sContent, $bOverwrite) Local $aFileContent = FileReadToArray($sFilePath) Local $iFileCount = UBound($aFileContent) diff --git a/src/HtmlStructure.au3 b/src/HtmlStructure.au3 index f52e8dc..b10a14c 100644 --- a/src/HtmlStructure.au3 +++ b/src/HtmlStructure.au3 @@ -2,64 +2,64 @@ Global $sHtmlHead = _ '' & @CRLF & _ '' & @CRLF & _ '' & @CRLF & _ - _spaces(4) & '#{$sHtmlReportTitle}#' & @CRLF & _ - _spaces(4) & '' & @CRLF & _ - _spaces(4) & '' & @CRLF & _ - _spaces(4) & '' & @CRLF & _ - _spaces(4) & '' & @CRLF & _ - _spaces(4) & '' & @CRLF & _ - _spaces(4) & '' & @CRLF & _ - _spaces(4) & '' & @CRLF & _ + _Spaces(4) & '#{$sHtmlReportTitle}#' & @CRLF & _ + _Spaces(4) & '' & @CRLF & _ + _Spaces(4) & '' & @CRLF & _ + _Spaces(4) & '' & @CRLF & _ + _Spaces(4) & '' & @CRLF & _ + _Spaces(4) & '' & @CRLF & _ + _Spaces(4) & '' & @CRLF & _ + _Spaces(4) & '' & @CRLF & _ '' & @CRLF & _ '' & @CRLF Global $sHtmlMain = _ - _spaces(4) & '' & @CRLF & _ - _spaces(4) & '

' & $sProgramName & '


' & @CRLF & _ - _spaces(4) & '
' & @CRLF & _ - _spaces(8) & ' COMPUTER: ' & @ComputerName & '   ' & _ + _Spaces(4) & '' & @CRLF & _ + _Spaces(4) & '

' & $sProgramName & '


' & @CRLF & _ + _Spaces(4) & '
' & @CRLF & _ + _Spaces(8) & ' COMPUTER: ' & @ComputerName & '   ' & _ ' OS: ' & @OSVersion & ' ' & @OSArch & '   ' & _ ' USER: ' & @UserName & '   ' & _ ' RESOLUTION: ' & $iDisplayWidth & 'x' & $iDisplayHeight & '   ' & _ ' TestRunner: ' & $sTestRunner & '   ' & _ ' TEST DURATION: 0 minutes' & @CRLF & _ - _spaces(4) & '
' & @CRLF & _ - _spaces(4) & '

Test Report Start: #{$sReportStart}#

' & @CRLF & _ - _spaces(4) & ' ' & @CRLF & _ - _spaces(4) & '' & @CRLF & _ - _spaces(4) & '
' & @CRLF & _ - _spaces(8) & '
' & @CRLF + _Spaces(4) & '
' & @CRLF & _ + _Spaces(4) & '

Test Report Start: #{$sReportStart}#

' & @CRLF & _ + _Spaces(4) & ' ' & @CRLF & _ + _Spaces(4) & '' & @CRLF & _ + _Spaces(4) & '
' & @CRLF & _ + _Spaces(8) & '
' & @CRLF Global $sHtmlFooter = _ - _spaces(8) & '
' & @CRLF & _ - _spaces(4) & '
' & @CRLF & _ - _spaces(4) & '

Result:     

' & @CRLF & _ - _spaces(4) & '
 GRAPH VIEWS
' & @CRLF & _ - _spaces(4) & '
' & @CRLF & _ - _spaces(4) & '
' & @CRLF & _ - _spaces(4) & '
 TEST SCENARIOS0
' & @CRLF & _ - _spaces(4) & '
 OK0
' & @CRLF & _ - _spaces(4) & '
 ERRORS0
' & @CRLF & _ - _spaces(4) & '
' & @CRLF & _ - _spaces(4) & '
 TEST STEPS0
' & @CRLF & _ - _spaces(4) & '
 OK0
' & @CRLF & _ - _spaces(4) & '
 ERRORS0
' & @CRLF & _ - _spaces(4) & '
 WARN0
' & @CRLF & _ - _spaces(4) & '

Test Report End:   #{$sReportStart}#

' & @CRLF & _ - _spaces(4) & '' & @CRLF & _ - _spaces(4) & '
' & $sProgramName & ' ' & @YEAR & ' Sven Seyfert // github
' & @CRLF & _ - _spaces(4) & '' & @CRLF & _ + _Spaces(8) & '
' & @CRLF & _ + _Spaces(4) & '' & @CRLF & _ + _Spaces(4) & '

Result:     

' & @CRLF & _ + _Spaces(4) & '
 GRAPH VIEWS
' & @CRLF & _ + _Spaces(4) & '
' & @CRLF & _ + _Spaces(4) & '
' & @CRLF & _ + _Spaces(4) & '
 TEST SCENARIOS0
' & @CRLF & _ + _Spaces(4) & '
 OK0
' & @CRLF & _ + _Spaces(4) & '
 ERRORS0
' & @CRLF & _ + _Spaces(4) & '
' & @CRLF & _ + _Spaces(4) & '
 TEST STEPS0
' & @CRLF & _ + _Spaces(4) & '
 OK0
' & @CRLF & _ + _Spaces(4) & '
 ERRORS0
' & @CRLF & _ + _Spaces(4) & '
 WARN0
' & @CRLF & _ + _Spaces(4) & '

Test Report End:   #{$sReportStart}#

' & @CRLF & _ + _Spaces(4) & '' & @CRLF & _ + _Spaces(4) & '
' & $sProgramName & ' ' & @YEAR & ' Sven Seyfert // github
' & @CRLF & _ + _Spaces(4) & '' & @CRLF & _ '' & @CRLF & _ '' & @CRLF Global $sHtmlNewTestScenario = _ - _spaces(8) & '
' & @CRLF & _ - _spaces(12) & '

 TEST SCENARIO #{$eTestScenarioNumber}#: #{$eTestScenario}#

' & @CRLF & _ - _spaces(12) & '' & @CRLF & _ - _spaces(16) & '' & @CRLF & _ - _spaces(16) & '' & @CRLF & _ - _spaces(12) & '
' & ' STEP NUMBER' & ' EXECUTION TIME' & ' STEP TYPE' & ' STEP DESCRIPTION' & ' INFO' & ' PROGRAM SCREENSHOT
' & '  #{$eTestScenarioNumber}#.#{$eScenarioStepNumber}#' & '#{$sExecutionTime}#' & '#{$eTestScenarioStepType}#' & '#{$eTestScenarioStepDescription}#' & '#{$eTestScenarioAdditionalInfo}#' & '' & $aCmdArg[$eSystemUnderTestTitle] & '
' & @CRLF & _ - _spaces(8) & '
' + _Spaces(8) & '
' & @CRLF & _ + _Spaces(12) & '

 TEST SCENARIO #{$eTestScenarioNumber}#: #{$eTestScenario}#

' & @CRLF & _ + _Spaces(12) & '' & @CRLF & _ + _Spaces(16) & '' & @CRLF & _ + _Spaces(16) & '' & @CRLF & _ + _Spaces(12) & '
' & ' STEP NUMBER' & ' EXECUTION TIME' & ' STEP TYPE' & ' STEP DESCRIPTION' & ' INFO' & ' PROGRAM SCREENSHOT
' & '  #{$eTestScenarioNumber}#.#{$eScenarioStepNumber}#' & '#{$sExecutionTime}#' & '#{$eTestScenarioStepType}#' & '#{$eTestScenarioStepDescription}#' & '#{$eTestScenarioAdditionalInfo}#' & '' & $aCmdArg[$eSystemUnderTestTitle] & '
' & @CRLF & _ + _Spaces(8) & '
' Global $sHtmlNewScenarioStep = _ - _spaces(16) & '' & '  #{$eTestScenarioNumber}#.#{$eScenarioStepNumber}#' & '#{$sExecutionTime}#' & '#{$eTestScenarioStepType}#' & '#{$eTestScenarioStepDescription}#' & '#{$eTestScenarioAdditionalInfo}#' & '' & $aCmdArg[$eSystemUnderTestTitle] & '' + _Spaces(16) & '' & '  #{$eTestScenarioNumber}#.#{$eScenarioStepNumber}#' & '#{$sExecutionTime}#' & '#{$eTestScenarioStepType}#' & '#{$eTestScenarioStepDescription}#' & '#{$eTestScenarioAdditionalInfo}#' & '' & $aCmdArg[$eSystemUnderTestTitle] & '' diff --git a/src/Screenshot.au3 b/src/Screenshot.au3 index 2aa161a..44f02ea 100644 --- a/src/Screenshot.au3 +++ b/src/Screenshot.au3 @@ -1,5 +1,5 @@ -Func _createScreenshot() - Local $hProgram = _getWindowHandle($aCmdArg[$eSystemUnderTestTitle]) +Func _CreateScreenshot() + Local $hProgram = _GetWindowHandle($aCmdArg[$eSystemUnderTestTitle]) WinActivate($hProgram) If StringLower($bMaximizeWindowInCaseOfTakenScreenshot) == 'true' Then @@ -9,7 +9,7 @@ Func _createScreenshot() _ScreenCapture_CaptureWnd($aIni[$eOutputPath] & $sScreenshotTime & $sImageExtension, $hProgram) EndFunc -Func _getWindowHandle($sTitle) +Func _GetWindowHandle($sTitle) Local $aListOfOpenWindows = WinList() For $i = 1 To $aListOfOpenWindows[0][0] Step 1