From 6ff9e6f003b01b876e7c81afeea402414ca89493 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Wed, 5 Feb 2014 18:29:35 +0000 Subject: [PATCH] TextFileTestCase: test for correct parsing of empty Mac lines. (This is failing both with and without r75387.) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75801 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- tests/textfile/textfiletest.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/textfile/textfiletest.cpp b/tests/textfile/textfiletest.cpp index 35d9257b4c..5971689af9 100644 --- a/tests/textfile/textfiletest.cpp +++ b/tests/textfile/textfiletest.cpp @@ -168,15 +168,19 @@ void TextFileTestCase::ReadUnixLast() void TextFileTestCase::ReadMac() { - CreateTestFile("foo\rbar\rbaz"); + CreateTestFile("foo\rbar\r\rbaz"); wxTextFile f; CPPUNIT_ASSERT( f.Open(wxString::FromAscii(GetTestFileName())) ); - CPPUNIT_ASSERT_EQUAL( (size_t)3, f.GetLineCount() ); + CPPUNIT_ASSERT_EQUAL( (size_t)4, f.GetLineCount() ); CPPUNIT_ASSERT_EQUAL( wxTextFileType_Mac, f.GetLineType(0) ); - CPPUNIT_ASSERT_EQUAL( wxTextFileType_None, f.GetLineType(2) ); + CPPUNIT_ASSERT_EQUAL( wxTextFileType_Mac, f.GetLineType(1) ); + CPPUNIT_ASSERT_EQUAL( wxTextFileType_Mac, f.GetLineType(2) ); + CPPUNIT_ASSERT_EQUAL( wxTextFileType_None, f.GetLineType(3) ); + CPPUNIT_ASSERT_EQUAL( wxString(wxT("foo")), f.GetLine(0) ); CPPUNIT_ASSERT_EQUAL( wxString(wxT("bar")), f.GetLine(1) ); + CPPUNIT_ASSERT_EQUAL( wxString(wxT("")), f.GetLine(2) ); CPPUNIT_ASSERT_EQUAL( wxString(wxT("baz")), f.GetLastLine() ); }