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

add tests for wxPATH_NORM_CASE (unsuccessfully trying to reproduce the problem of #9162)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53636 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-05-18 11:38:33 +00:00
parent fe6f7f3c78
commit c7099635d1
1 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
tests/filename/filenametest.cpp
View File

@@ -72,9 +72,9 @@ static struct FileNameInfo
{ _T("c:\\foo.bar"), _T("c"), _T("\\"), _T("foo"), _T("bar"), true, wxPATH_DOS }, { _T("c:\\foo.bar"), _T("c"), _T("\\"), _T("foo"), _T("bar"), true, wxPATH_DOS },
{ _T("c:\\Windows\\command.com"), _T("c"), _T("\\Windows"), _T("command"), _T("com"), true, wxPATH_DOS }, { _T("c:\\Windows\\command.com"), _T("c"), _T("\\Windows"), _T("command"), _T("com"), true, wxPATH_DOS },
// NB: when using the wxFileName::GetLongPath() function on these two strings, // NB: when using the wxFileName::GetLongPath() function on these two
// the program will hang various seconds. All those time is taken by the // strings, the program will hang for several seconds blocking inside
// call to the win32 API GetLongPathName()... // Win32 GetLongPathName() function
{ _T("\\\\server\\foo.bar"), _T("server"), _T("\\"), _T("foo"), _T("bar"), true, wxPATH_DOS }, { _T("\\\\server\\foo.bar"), _T("server"), _T("\\"), _T("foo"), _T("bar"), true, wxPATH_DOS },
{ _T("\\\\server\\dir\\foo.bar"), _T("server"), _T("\\dir"), _T("foo"), _T("bar"), true, wxPATH_DOS }, { _T("\\\\server\\dir\\foo.bar"), _T("server"), _T("\\dir"), _T("foo"), _T("bar"), true, wxPATH_DOS },
@@ -291,33 +291,42 @@ void FileNameTestCase::TestNormalize()
wxString original; wxString original;
int flags; int flags;
wxString expected; wxString expected;
wxPathFormat fmt;
} tests[] = } tests[] =
{ {
// test wxPATH_NORM_ENV_VARS // test wxPATH_NORM_ENV_VARS
#ifdef __WXMSW__ #ifdef __WXMSW__
{ wxT("%ABCDEF%/g/h/i"), wxPATH_NORM_ENV_VARS, wxT("abcdef/g/h/i") }, { "%ABCDEF%/g/h/i", wxPATH_NORM_ENV_VARS, "abcdef/g/h/i", wxPATH_UNIX },
#else #else
{ wxT("$(ABCDEF)/g/h/i"), wxPATH_NORM_ENV_VARS, wxT("abcdef/g/h/i") }, { "$(ABCDEF)/g/h/i", wxPATH_NORM_ENV_VARS, "abcdef/g/h/i", wxPATH_UNIX },
#endif #endif
// test wxPATH_NORM_DOTS // test wxPATH_NORM_DOTS
{ wxT("a/.././b/c/../../"), wxPATH_NORM_DOTS, wxT("") }, { "a/.././b/c/../../", wxPATH_NORM_DOTS, "", wxPATH_UNIX },
// test wxPATH_NORM_TILDE // test wxPATH_NORM_TILDE
// NB: do the tilde expansion also under Windows to test if it works there too // NB: do the tilde expansion also under Windows to test if it works there too
{ wxT("/a/b/~"), wxPATH_NORM_TILDE, wxT("/a/b/~") }, { "/a/b/~", wxPATH_NORM_TILDE, "/a/b/~", wxPATH_UNIX },
{ wxT("/~/a/b"), wxPATH_NORM_TILDE, home + wxT("a/b") }, { "/~/a/b", wxPATH_NORM_TILDE, home + "a/b", wxPATH_UNIX },
{ wxT("~/a/b"), wxPATH_NORM_TILDE, home + wxT("a/b") }, { "~/a/b", wxPATH_NORM_TILDE, home + "a/b", wxPATH_UNIX },
// test wxPATH_NORM_CASE
{ "Foo", wxPATH_NORM_CASE, "Foo", wxPATH_UNIX },
{ "Foo", wxPATH_NORM_CASE, "foo", wxPATH_DOS },
{ "C:\\Program Files\\wx", wxPATH_NORM_CASE,
"c:\\program files\\wx", wxPATH_DOS },
{ "C:/Program Files/wx", wxPATH_NORM_ALL | wxPATH_NORM_CASE,
"c:\\program files\\wx", wxPATH_DOS },
// test wxPATH_NORM_ABSOLUTE // test wxPATH_NORM_ABSOLUTE
{ wxT("a/b/"), wxPATH_NORM_ABSOLUTE, cwd + wxT("a/b/") }, { "a/b/", wxPATH_NORM_ABSOLUTE, cwd + "a/b/", wxPATH_UNIX },
{ wxT("a/b/c.ext"), wxPATH_NORM_ABSOLUTE, cwd + wxT("a/b/c.ext") }, { "a/b/c.ext", wxPATH_NORM_ABSOLUTE, cwd + "a/b/c.ext", wxPATH_UNIX },
{ wxT("/a"), wxPATH_NORM_ABSOLUTE, wxT("/a") }, { "/a", wxPATH_NORM_ABSOLUTE, "/a", wxPATH_UNIX },
// test giving no flags at all to Normalize() // test giving no flags at all to Normalize()
{ wxT("a/b/"), 0, wxT("a/b/") }, { "a/b/", 0, "a/b/", wxPATH_UNIX },
{ wxT("a/b/c.ext"), 0, wxT("a/b/c.ext") }, { "a/b/c.ext", 0, "a/b/c.ext", wxPATH_UNIX },
{ wxT("/a"), 0, wxT("/a") } { "/a", 0, "/a", wxPATH_UNIX }
}; };
// set the env var ABCDEF // set the env var ABCDEF
@@ -325,17 +334,18 @@ void FileNameTestCase::TestNormalize()
for ( size_t i = 0; i < WXSIZEOF(tests); i++ ) for ( size_t i = 0; i < WXSIZEOF(tests); i++ )
{ {
wxFileName fn(tests[i].original, wxPATH_UNIX); const FileNameTest& fnt = tests[i];
wxFileName fn(fnt.original, fnt.fmt);
// be sure this normalization does not fail // be sure this normalization does not fail
CPPUNIT_ASSERT_MESSAGE CPPUNIT_ASSERT_MESSAGE
( (
(const char *)wxString::Format(_T("Normalize(%s) failed"), tests[i].original).mb_str(), (const char *)wxString::Format(_T("Normalize(%s) failed"), fnt.original).mb_str(),
fn.Normalize(tests[i].flags, cwd, wxPATH_UNIX) fn.Normalize(fnt.flags, cwd, fnt.fmt)
); );
// compare result with expected string // compare result with expected string
WX_ASSERT_STR_EQUAL( tests[i].expected, fn.GetFullPath(wxPATH_UNIX) ); WX_ASSERT_STR_EQUAL( fnt.expected, fn.GetFullPath(fnt.fmt) );
} }
} }