diff options
| author | Ladislav Zezula <ladislav.zezula@avast.com> | 2023-01-16 21:22:25 +0100 |
|---|---|---|
| committer | Ladislav Zezula <ladislav.zezula@avast.com> | 2023-01-16 21:22:25 +0100 |
| commit | cdceb0c5275d0ea9b1bbaadf5d6ee29dbb80a2fb (patch) | |
| tree | feae06c32f1f6aef7f1bdacbbda7b1609108bcb2 | |
| parent | 6f89c7ba8530c37f1f5a6048406cb18c40e5a458 (diff) | |
Fixed regression tests
| -rw-r--r-- | test/StormTest.cpp | 4 | ||||
| -rw-r--r-- | test/TLogHelper.cpp | 9 | ||||
| -rw-r--r-- | test/stormlib-test.txt | 6 |
3 files changed, 8 insertions, 11 deletions
diff --git a/test/StormTest.cpp b/test/StormTest.cpp index 97a3663..0123353 100644 --- a/test/StormTest.cpp +++ b/test/StormTest.cpp @@ -1333,14 +1333,14 @@ static bool CheckIfFileIsPresent(TLogHelper * pLogger, HANDLE hMpq, LPCSTR szFil if(SFileOpenFileEx(hMpq, szFileName, 0, &hFile))
{
if(bShouldExist == false)
- pLogger->PrintMessage("The file %s is present, but it should not be", szFileName);
+ pLogger->PrintMessage("The file \"%s\" is present, but it should not be", szFileName);
SFileCloseFile(hFile);
return true;
}
else
{
if(bShouldExist)
- pLogger->PrintMessage("The file %s is not present, but it should be", szFileName);
+ pLogger->PrintMessage("The file \"%s\" is not present, but it should be", szFileName);
return false;
}
}
diff --git a/test/TLogHelper.cpp b/test/TLogHelper.cpp index cdfa692..4dcc514 100644 --- a/test/TLogHelper.cpp +++ b/test/TLogHelper.cpp @@ -223,11 +223,11 @@ class TLogHelper if(szNewMainTitle != NULL)
{
if(szSubTitle1 != NULL && szSubTitle2 != NULL)
- nPrevPrinted = _tprintf(_T("Running %s (%s+%s) ..."), szMainTitleT, szSubTitle1, szSubTitle2);
+ nPrevPrinted = _tprintf(_T("\rRunning %s (%s+%s) ..."), szMainTitleT, szSubTitle1, szSubTitle2);
else if(szSubTitle1 != NULL)
- nPrevPrinted = _tprintf(_T("Running %s (%s) ..."), szMainTitleT, szSubTitle1);
+ nPrevPrinted = _tprintf(_T("\rRunning %s (%s) ..."), szMainTitleT, szSubTitle1);
else
- nPrevPrinted = _tprintf(_T("Running %s ..."), szMainTitleT);
+ nPrevPrinted = _tprintf(_T("\rRunning %s ..."), szMainTitleT);
}
}
@@ -238,9 +238,6 @@ class TLogHelper {
PrintVerdict(ERROR_SUCCESS);
}
-
-
- printf("\n");
}
//
diff --git a/test/stormlib-test.txt b/test/stormlib-test.txt index 2cdaed2..c910278 100644 --- a/test/stormlib-test.txt +++ b/test/stormlib-test.txt @@ -1,7 +1,7 @@ Microsoft Windows [Version 10.0.19045.2486] (c) Microsoft Corporation. All rights reserved. -E:\Ladik\AppDir\StormLib\bin\StormLib_test\x64\Release>StormLib_test.exe +E:\Ladik\Appdir\StormLib\bin\StormLib_test\x64\Release>StormLib_test.exe ==== Test Suite for StormLib version 9.24 ==== InitWorkDir: Work directory \Multimedia\MPQs (default) LocalListFile (FLAT-MAP:ListFile_Blizzard.txt) succeeded. @@ -2333,7 +2333,7 @@ ListFileTest (MPQ_2013_v4_SC2_EmptyMap.SC2Map) succeeded. CreateEmptyMpq: The file "File00000000.xxx" is present, but it should not be CreateEmptyMpq: The file "File00000000.xxx" is present, but it should not be CreateGapsTest (StormLibTest_GapsTest.mpq) succeeded. -NonStdNamesTest: Adding file " \ \ \ .txt" ... NonStdNamesTest: Adding file "Dir1 \Dir2 \File.txt ." ... NonStdNamesTest: Adding file "Dir1 \Dir2 \ . ." ... NonStdNamesTest (StormLibTest_NonStdNames.mpq) succeeded. +NonStdNamesTest (StormLibTest_NonStdNames.mpq) succeeded. SignExistingMpq (MPQ_1998_v1_StarDat.mpq) succeeded. ModifySignedTest (MPQ_1999_v1_WeakSignature.exe) succeeded. CreateSignedMpq (MPQ_1999_v1_WeakSigned1.mpq) succeeded. @@ -2354,4 +2354,4 @@ BigMpqTest (StormLibTest_BigArchive_v4.mpq) succeeded. ModifyTest (MPQ_2014_v4_Base.StormReplay) succeeded. ModifyTest (MPQ_2022_v1_v4.329.w3x) succeeded. -E:\Ladik\AppDir\StormLib\bin\StormLib_test\x64\Release>
\ No newline at end of file +E:\Ladik\Appdir\StormLib\bin\StormLib_test\x64\Release>
\ No newline at end of file |