From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Thu, 14 Mar 2019 01:22:41 +0000 (+0900)
Subject: Add Testing/Data/LastLineEOL/2-3CRLF.txt
X-Git-Tag: 2.16.5~430
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=46ec61269aba5e49454cb706bba45704fdc7437c;p=winmerge-jp%2Fwinmerge-jp.git

Add Testing/Data/LastLineEOL/2-3CRLF.txt
---

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