X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/50a73bb10422d59e57a222568bc8b40ac793ae00..bf8f10225c08bf5473fa35423f56e01f1819f971:/tests/textfile/textfiletest.cpp diff --git a/tests/textfile/textfiletest.cpp b/tests/textfile/textfiletest.cpp index 25d3f830f4..1e1184b413 100644 --- a/tests/textfile/textfiletest.cpp +++ b/tests/textfile/textfiletest.cpp @@ -85,7 +85,7 @@ private: // register in the unnamed registry so that these tests are run by default CPPUNIT_TEST_SUITE_REGISTRATION( TextFileTestCase ); -// also include in it's own registry so that these tests can be run alone +// also include in its own registry so that these tests can be run alone CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TextFileTestCase, "TextFileTestCase" ); void TextFileTestCase::CreateTestFile(size_t len, const char *contents) @@ -117,8 +117,8 @@ void TextFileTestCase::ReadDOS() CPPUNIT_ASSERT_EQUAL( (size_t)3, f.GetLineCount() ); CPPUNIT_ASSERT_EQUAL( wxTextFileType_Dos, f.GetLineType(0) ); CPPUNIT_ASSERT_EQUAL( wxTextFileType_None, f.GetLineType(2) ); - CPPUNIT_ASSERT_EQUAL( wxString(_T("bar")), f.GetLine(1) ); - CPPUNIT_ASSERT_EQUAL( wxString(_T("baz")), f.GetLastLine() ); + CPPUNIT_ASSERT_EQUAL( wxString(wxT("bar")), f.GetLine(1) ); + CPPUNIT_ASSERT_EQUAL( wxString(wxT("baz")), f.GetLastLine() ); } void TextFileTestCase::ReadUnix() @@ -131,8 +131,8 @@ void TextFileTestCase::ReadUnix() CPPUNIT_ASSERT_EQUAL( (size_t)3, f.GetLineCount() ); CPPUNIT_ASSERT_EQUAL( wxTextFileType_Unix, f.GetLineType(0) ); CPPUNIT_ASSERT_EQUAL( wxTextFileType_None, f.GetLineType(2) ); - CPPUNIT_ASSERT_EQUAL( wxString(_T("bar")), f.GetLine(1) ); - CPPUNIT_ASSERT_EQUAL( wxString(_T("baz")), f.GetLastLine() ); + CPPUNIT_ASSERT_EQUAL( wxString(wxT("bar")), f.GetLine(1) ); + CPPUNIT_ASSERT_EQUAL( wxString(wxT("baz")), f.GetLastLine() ); } void TextFileTestCase::ReadMac() @@ -145,8 +145,8 @@ void TextFileTestCase::ReadMac() CPPUNIT_ASSERT_EQUAL( (size_t)3, f.GetLineCount() ); CPPUNIT_ASSERT_EQUAL( wxTextFileType_Mac, f.GetLineType(0) ); CPPUNIT_ASSERT_EQUAL( wxTextFileType_None, f.GetLineType(2) ); - CPPUNIT_ASSERT_EQUAL( wxString(_T("bar")), f.GetLine(1) ); - CPPUNIT_ASSERT_EQUAL( wxString(_T("baz")), f.GetLastLine() ); + CPPUNIT_ASSERT_EQUAL( wxString(wxT("bar")), f.GetLine(1) ); + CPPUNIT_ASSERT_EQUAL( wxString(wxT("baz")), f.GetLastLine() ); } void TextFileTestCase::ReadMixed() @@ -160,9 +160,9 @@ void TextFileTestCase::ReadMixed() CPPUNIT_ASSERT_EQUAL( wxTextFileType_Mac, f.GetLineType(0) ); CPPUNIT_ASSERT_EQUAL( wxTextFileType_Dos, f.GetLineType(1) ); CPPUNIT_ASSERT_EQUAL( wxTextFileType_Unix, f.GetLineType(2) ); - CPPUNIT_ASSERT_EQUAL( wxString(_T("foo")), f.GetFirstLine() ); - CPPUNIT_ASSERT_EQUAL( wxString(_T("bar")), f.GetLine(1) ); - CPPUNIT_ASSERT_EQUAL( wxString(_T("baz")), f.GetLastLine() ); + CPPUNIT_ASSERT_EQUAL( wxString(wxT("foo")), f.GetFirstLine() ); + CPPUNIT_ASSERT_EQUAL( wxString(wxT("bar")), f.GetLine(1) ); + CPPUNIT_ASSERT_EQUAL( wxString(wxT("baz")), f.GetLastLine() ); } #if wxUSE_UNICODE