Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unicode compilation fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38465 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-03-31 13:58:01 +00:00
parent dbcf443c7d
commit 18230eb6b6
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tests/textfile/textfiletest.cpp
View File

@@ -80,7 +80,7 @@ void TextFileTestCase::ReadEmpty()
CreateTestFile(""); CreateTestFile("");
wxTextFile f; wxTextFile f;
CPPUNIT_ASSERT( f.Open(GetTestFileName()) ); CPPUNIT_ASSERT( f.Open(wxString::FromAscii(GetTestFileName())) );
CPPUNIT_ASSERT_EQUAL( 0u, f.GetLineCount() ); CPPUNIT_ASSERT_EQUAL( 0u, f.GetLineCount() );
} }
@@ -90,13 +90,13 @@ void TextFileTestCase::ReadDOS()
CreateTestFile("foo\r\nbar\r\nbaz"); CreateTestFile("foo\r\nbar\r\nbaz");
wxTextFile f; wxTextFile f;
CPPUNIT_ASSERT( f.Open(GetTestFileName()) ); CPPUNIT_ASSERT( f.Open(wxString::FromAscii(GetTestFileName())) );
CPPUNIT_ASSERT_EQUAL( 3u, f.GetLineCount() ); CPPUNIT_ASSERT_EQUAL( 3u, f.GetLineCount() );
CPPUNIT_ASSERT_EQUAL( wxTextFileType_Dos, f.GetLineType(0) ); CPPUNIT_ASSERT_EQUAL( wxTextFileType_Dos, f.GetLineType(0) );
CPPUNIT_ASSERT_EQUAL( wxTextFileType_None, f.GetLineType(2) ); CPPUNIT_ASSERT_EQUAL( wxTextFileType_None, f.GetLineType(2) );
CPPUNIT_ASSERT_EQUAL( wxString("bar"), f.GetLine(1) ); CPPUNIT_ASSERT_EQUAL( wxString(_T("bar")), f.GetLine(1) );
CPPUNIT_ASSERT_EQUAL( wxString("baz"), f.GetLastLine() ); CPPUNIT_ASSERT_EQUAL( wxString(_T("baz")), f.GetLastLine() );
} }
void TextFileTestCase::ReadUnix() void TextFileTestCase::ReadUnix()
@@ -104,13 +104,13 @@ void TextFileTestCase::ReadUnix()
CreateTestFile("foo\nbar\nbaz"); CreateTestFile("foo\nbar\nbaz");
wxTextFile f; wxTextFile f;
CPPUNIT_ASSERT( f.Open(GetTestFileName()) ); CPPUNIT_ASSERT( f.Open(wxString::FromAscii(GetTestFileName())) );
CPPUNIT_ASSERT_EQUAL( 3u, f.GetLineCount() ); CPPUNIT_ASSERT_EQUAL( 3u, f.GetLineCount() );
CPPUNIT_ASSERT_EQUAL( wxTextFileType_Unix, f.GetLineType(0) ); CPPUNIT_ASSERT_EQUAL( wxTextFileType_Unix, f.GetLineType(0) );
CPPUNIT_ASSERT_EQUAL( wxTextFileType_None, f.GetLineType(2) ); CPPUNIT_ASSERT_EQUAL( wxTextFileType_None, f.GetLineType(2) );
CPPUNIT_ASSERT_EQUAL( wxString("bar"), f.GetLine(1) ); CPPUNIT_ASSERT_EQUAL( wxString(_T("bar")), f.GetLine(1) );
CPPUNIT_ASSERT_EQUAL( wxString("baz"), f.GetLastLine() ); CPPUNIT_ASSERT_EQUAL( wxString(_T("baz")), f.GetLastLine() );
} }
void TextFileTestCase::ReadMac() void TextFileTestCase::ReadMac()
@@ -118,13 +118,13 @@ void TextFileTestCase::ReadMac()
CreateTestFile("foo\rbar\rbaz"); CreateTestFile("foo\rbar\rbaz");
wxTextFile f; wxTextFile f;
CPPUNIT_ASSERT( f.Open(GetTestFileName()) ); CPPUNIT_ASSERT( f.Open(wxString::FromAscii(GetTestFileName())) );
CPPUNIT_ASSERT_EQUAL( 3u, f.GetLineCount() ); CPPUNIT_ASSERT_EQUAL( 3u, f.GetLineCount() );
CPPUNIT_ASSERT_EQUAL( wxTextFileType_Mac, f.GetLineType(0) ); CPPUNIT_ASSERT_EQUAL( wxTextFileType_Mac, f.GetLineType(0) );
CPPUNIT_ASSERT_EQUAL( wxTextFileType_None, f.GetLineType(2) ); CPPUNIT_ASSERT_EQUAL( wxTextFileType_None, f.GetLineType(2) );
CPPUNIT_ASSERT_EQUAL( wxString("bar"), f.GetLine(1) ); CPPUNIT_ASSERT_EQUAL( wxString(_T("bar")), f.GetLine(1) );
CPPUNIT_ASSERT_EQUAL( wxString("baz"), f.GetLastLine() ); CPPUNIT_ASSERT_EQUAL( wxString(_T("baz")), f.GetLastLine() );
} }
void TextFileTestCase::ReadMixed() void TextFileTestCase::ReadMixed()
@@ -132,15 +132,15 @@ void TextFileTestCase::ReadMixed()
CreateTestFile("foo\rbar\r\nbaz\n"); CreateTestFile("foo\rbar\r\nbaz\n");
wxTextFile f; wxTextFile f;
CPPUNIT_ASSERT( f.Open(GetTestFileName()) ); CPPUNIT_ASSERT( f.Open(wxString::FromAscii(GetTestFileName())) );
CPPUNIT_ASSERT_EQUAL( 3u, f.GetLineCount() ); CPPUNIT_ASSERT_EQUAL( 3u, f.GetLineCount() );
CPPUNIT_ASSERT_EQUAL( wxTextFileType_Mac, f.GetLineType(0) ); CPPUNIT_ASSERT_EQUAL( wxTextFileType_Mac, f.GetLineType(0) );
CPPUNIT_ASSERT_EQUAL( wxTextFileType_Dos, f.GetLineType(1) ); CPPUNIT_ASSERT_EQUAL( wxTextFileType_Dos, f.GetLineType(1) );
CPPUNIT_ASSERT_EQUAL( wxTextFileType_Unix, f.GetLineType(2) ); CPPUNIT_ASSERT_EQUAL( wxTextFileType_Unix, f.GetLineType(2) );
CPPUNIT_ASSERT_EQUAL( wxString("foo"), f.GetFirstLine() ); CPPUNIT_ASSERT_EQUAL( wxString(_T("foo")), f.GetFirstLine() );
CPPUNIT_ASSERT_EQUAL( wxString("bar"), f.GetLine(1) ); CPPUNIT_ASSERT_EQUAL( wxString(_T("bar")), f.GetLine(1) );
CPPUNIT_ASSERT_EQUAL( wxString("baz"), f.GetLastLine() ); CPPUNIT_ASSERT_EQUAL( wxString(_T("baz")), f.GetLastLine() );
} }
#endif // wxUSE_TEXTFILE #endif // wxUSE_TEXTFILE