OSDN Git Service

Add Testing/Data/LastLineEOL/2-3CRLF.txt
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Thu, 14 Mar 2019 01:22:41 +0000 (10:22 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Thu, 14 Mar 2019 01:22:41 +0000 (10:22 +0900)
Src/Test.cpp
Testing/Data/LastLineEOL/2-3CRLF.txt [new file with mode: 0644]

index 1e3b838..75cc07d 100644 (file)
@@ -201,7 +201,8 @@ TEST(FileCompare, LastLineEOL)
                _T("1None.txt"),\r
                _T("1CRLF.txt"),\r
                _T("3None.txt"),\r
-               _T("3CRLF.txt")\r
+               _T("3CRLF.txt"),\r
+               _T("2-3CRLF.txt")\r
        };\r
        CMessageBoxDialog dlg(nullptr, IDS_FILESSAME, 0U, 0U, IDS_FILESSAME);\r
        const int nPrevFormerResult = dlg.SetFormerResult(IDOK);\r
@@ -251,12 +252,12 @@ TEST(FileCompare, LastLineEOL)
                                                else\r
                                                {\r
                                                        CMergeEditView *pView = pDoc->GetView(0, 0); // merge\r
-                                                       EXPECT_EQ(1, pDoc->m_diffList.GetSize());\r
+                                                       EXPECT_LE(1, pDoc->m_diffList.GetSize());\r
                                                        pDoc->CopyAllList(0, 1);\r
                                                        EXPECT_EQ(0, pDoc->m_diffList.GetSize());\r
                                                        // undo\r
                                                        pView->SendMessage(WM_COMMAND, ID_EDIT_UNDO);\r
-                                                       EXPECT_EQ(1, pDoc->m_diffList.GetSize());\r
+                                                       EXPECT_LE(1, pDoc->m_diffList.GetSize());\r
                                                        // insert a character at the last line\r
                                                        pView->GotoLine(pDoc->m_ptBuf[0]->GetLineCount() - 1, false, 0);\r
                                                        pView->SendMessage(WM_CHAR, 'a');\r
diff --git a/Testing/Data/LastLineEOL/2-3CRLF.txt b/Testing/Data/LastLineEOL/2-3CRLF.txt
new file mode 100644 (file)
index 0000000..b5644eb
--- /dev/null
@@ -0,0 +1,2 @@
+2\r
+3\r