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

fix Normalize() test: can't use temporary wxStrings to initialize wxChar* pointers

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@56493 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-10-23 11:19:48 +00:00
parent e5bafa71da
commit 0b08b5e216
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tests/filename/filenametest.cpp
View File

@@ -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)
);
}
}