Test.cpp: Prevent the message box from displaying and stopping the test

diff --git a/Src/Test.cpp b/Src/Test.cpp
index c921574..4667053 100644 (file)
--- a/Src/Test.cpp
+++ b/Src/Test.cpp
@@ -87,7 +87,7 @@ TEST(SyntaxHighlight, Verilog)
                paths::ConcatPath(projectRoot, L"Testing/FileFormats/Verilog.v"),\r
                paths::ConcatPath(projectRoot, L"Testing/FileFormats/Verilog.v")\r
        };\r
-       CMessageBoxDialog dlg(nullptr, IDS_FILESSAME, 0U, 0U, IDS_FILESSAME);\r
+       CMessageBoxDialog dlg(nullptr, IDS_FILE_TO_ITSELF, 0U, 0U, IDS_FILE_TO_ITSELF);\r
        const int nPrevFormerResult = dlg.SetFormerResult(IDOK);\r
        EXPECT_TRUE(GetMainFrame()->DoFileOpen(&tFiles));\r
        CFrameWnd *pFrame = GetMainFrame()->GetActiveFrame();\r
@@ -114,7 +114,7 @@ TEST(SyntaxHighlight, Verilog)
 TEST(FileCompare, FindText)\r
 {\r
        String projectRoot = getProjectRoot();\r
-       CMessageBoxDialog dlg(nullptr, IDS_FILESSAME, 0U, 0U, IDS_FILESSAME);\r
+       CMessageBoxDialog dlg(nullptr, IDS_FILE_TO_ITSELF, 0U, 0U, IDS_FILE_TO_ITSELF);\r
        const int nPrevFormerResult = dlg.SetFormerResult(IDOK);\r
        CMergeDoc *pDoc = nullptr;\r
        CFrameWnd *pFrame = nullptr;\r
@@ -205,7 +205,9 @@ TEST(FileCompare, LastLineEOL)
                _T("2-3CRLF.txt")\r
        };\r
        CMessageBoxDialog dlg(nullptr, IDS_FILESSAME, 0U, 0U, IDS_FILESSAME);\r
+       CMessageBoxDialog dlg2(nullptr, IDS_FILE_TO_ITSELF, 0U, 0U, IDS_FILE_TO_ITSELF);\r
        const int nPrevFormerResult = dlg.SetFormerResult(IDOK);\r
+       const int nPrevFormerResult2 = dlg2.SetFormerResult(IDOK);\r
        CMergeDoc *pDoc = nullptr;\r
        CFrameWnd *pFrame = nullptr;\r
        for (bool bIgnoreBlankLines: { true, false })\r
@@ -283,6 +285,7 @@ TEST(FileCompare, LastLineEOL)
        }\r
        pFrame->PostMessage(WM_CLOSE);\r
        dlg.SetFormerResult(nPrevFormerResult);\r
+       dlg2.SetFormerResult(nPrevFormerResult2);\r
 }\r
 \r
 TEST(FolderCompare, IgnoreEOL)\r