From 0b08b5e2163a7ca41d5b4007eaaff484053d64ae Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 23 Oct 2008 11:19:48 +0000 Subject: [PATCH] fix Normalize() test: can't use temporary wxStrings to initialize wxChar* pointers git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@56493 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- tests/filename/filenametest.cpp | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/tests/filename/filenametest.cpp b/tests/filename/filenametest.cpp index 2a2ef773e6..9dd9a5a3c2 100644 --- a/tests/filename/filenametest.cpp +++ b/tests/filename/filenametest.cpp @@ -306,12 +306,12 @@ void FileNameTestCase::TestNormalize() // test wxPATH_NORM_TILDE // NB: do the tilde expansion also under Windows to test if it works there too { wxT("/a/b/~"), wxPATH_NORM_TILDE, wxT("/a/b/~") }, - { wxT("/~/a/b"), wxPATH_NORM_TILDE, home + wxT("a/b") }, - { wxT("~/a/b"), wxPATH_NORM_TILDE, home + wxT("a/b") }, + { wxT("/~/a/b"), wxPATH_NORM_TILDE, wxT("HOME/a/b") }, + { wxT("~/a/b"), wxPATH_NORM_TILDE, wxT("HOME/a/b") }, // test wxPATH_NORM_ABSOLUTE - { wxT("a/b/"), wxPATH_NORM_ABSOLUTE, cwd + wxT("a/b/") }, - { wxT("a/b/c.ext"), wxPATH_NORM_ABSOLUTE, cwd + wxT("a/b/c.ext") }, + { wxT("a/b/"), wxPATH_NORM_ABSOLUTE, wxT("CWD/a/b/") }, + { wxT("a/b/c.ext"), wxPATH_NORM_ABSOLUTE, wxT("CWD/a/b/c.ext") }, { wxT("/a"), wxPATH_NORM_ABSOLUTE, wxT("/a") }, // test giving no flags at all to Normalize() @@ -335,7 +335,16 @@ void FileNameTestCase::TestNormalize() ); // compare result with expected string - CPPUNIT_ASSERT_EQUAL( wxString(tests[i].expected), fn.GetFullPath(wxPATH_UNIX) ); + wxString expected(tests[i].expected); + expected.Replace(_T("HOME/"), home); + expected.Replace(_T("CWD/"), cwd); + CPPUNIT_ASSERT_EQUAL_MESSAGE + ( + (const char *) + wxString::Format(_T("Test #%lu (\"%s\") failed"), + (unsigned long)i, tests[i].original).mb_str(), + expected, fn.GetFullPath(wxPATH_UNIX) + ); } }