} filenames[] =
{
// the empty string
- { _T(""), _(""), _(""), _(""), _(""), false, wxPATH_UNIX },
- { _T(""), _(""), _(""), _(""), _(""), false, wxPATH_DOS },
- { _T(""), _(""), _(""), _(""), _(""), false, wxPATH_VMS },
+ { _T(""), _T(""), _T(""), _T(""), _T(""), false, wxPATH_UNIX },
+ { _T(""), _T(""), _T(""), _T(""), _T(""), false, wxPATH_DOS },
+ { _T(""), _T(""), _T(""), _T(""), _T(""), false, wxPATH_VMS },
// Unix file names
{ _T("/usr/bin/ls"), _T(""), _T("/usr/bin"), _T("ls"), _T(""), true, wxPATH_UNIX },
{ _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 },
- // NB: when using the wxFileName::GetLongPath() function on these two strings,
- // the program will hang various seconds. All those time is taken by the
- // call to the win32 API GetLongPathName()...
+ // NB: when using the wxFileName::GetLongPath() function on these two
+ // strings, the program will hang for several seconds blocking inside
+ // Win32 GetLongPathName() function
{ _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 },
// consecutive [back]slashes should be treated as single occurrences of
// them and not interpreted as share names if there is a volume name
{ _T("c:\\aaa\\bbb\\ccc"), _T("c"), _T("\\aaa\\bbb"), _T("ccc"), _T(""), true, wxPATH_DOS },
- { _T("c:\\\\aaa\\bbb\\ccc"), _T("c"), _T("\\aaa\\bbb"), _T("ccc"), _T(""), true, wxPATH_DOS },
+ { _T("c:\\\\aaa\\bbb\\ccc"), _T("c"), _T("\\\\aaa\\bbb"), _T("ccc"), _T(""), true, wxPATH_DOS },
// wxFileName support for Mac file names is broken currently
#if 0
wxFileName fn(fni.fullname, fni.format);
+ // the original full name could contain consecutive [back]slashes,
+ // squeeze them except for the double backslash in the beginning in
+ // Windows filenames where it has special meaning
+ wxString fullnameOrig;
+ if ( fni.format == wxPATH_DOS )
+ {
+ // copy the backslashes at beginning unchanged
+ const wxChar *p = fni.fullname;
+ while ( *p == _T('\\') )
+ fullnameOrig += *p++;
+
+ // replace consecutive slashes with single ones in the rest
+ for ( wxChar chPrev = _T('\0'); *p; p++ )
+ {
+ if ( *p == _T('\\') && chPrev == _T('\\') )
+ continue;
+
+ chPrev = *p;
+ fullnameOrig += chPrev;
+ }
+ }
+ else // !wxPATH_DOS
+ {
+ fullnameOrig = fni.fullname;
+ }
+
+ fullnameOrig.Replace(_T("//"), _T("/"));
+
+
wxString fullname = fn.GetFullPath(fni.format);
- CPPUNIT_ASSERT_EQUAL( wxString(fni.fullname), fullname );
+ CPPUNIT_ASSERT_EQUAL( fullnameOrig, fullname );
// notice that we use a dummy working directory to ensure that paths
// with "../.." in them could be normalized, otherwise this would fail
if (cwd.Contains(wxT(':')))
cwd = cwd.AfterFirst(wxT(':'));
- static struct FileNameTest
+ static const struct FileNameTest
{
- const wxChar *original;
+ wxString original;
int flags;
wxString expected;
+ wxPathFormat fmt;
} tests[] =
{
// test wxPATH_NORM_ENV_VARS
#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
- { 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
// test wxPATH_NORM_DOTS
- { wxT("a/.././b/c/../../"), wxPATH_NORM_DOTS, wxT("") },
+ { "a/.././b/c/../../", wxPATH_NORM_DOTS, "", wxPATH_UNIX },
// 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") },
+ { "/a/b/~", wxPATH_NORM_TILDE, "/a/b/~", wxPATH_UNIX },
+ { "/~/a/b", wxPATH_NORM_TILDE, home + "a/b", wxPATH_UNIX },
+ { "~/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 },
+ { "C:\\Users\\zeitlin", wxPATH_NORM_ALL | wxPATH_NORM_CASE,
+ "c:\\users\\zeitlin", wxPATH_DOS },
// 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"), wxPATH_NORM_ABSOLUTE, wxT("/a") },
+ { "a/b/", wxPATH_NORM_ABSOLUTE, cwd + "a/b/", wxPATH_UNIX },
+ { "a/b/c.ext", wxPATH_NORM_ABSOLUTE, cwd + "a/b/c.ext", wxPATH_UNIX },
+ { "/a", wxPATH_NORM_ABSOLUTE, "/a", wxPATH_UNIX },
// test giving no flags at all to Normalize()
- { wxT("a/b/"), 0, wxT("a/b/") },
- { wxT("a/b/c.ext"), 0, wxT("a/b/c.ext") },
- { wxT("/a"), 0, wxT("/a") }
+ { "a/b/", 0, "a/b/", wxPATH_UNIX },
+ { "a/b/c.ext", 0, "a/b/c.ext", wxPATH_UNIX },
+ { "/a", 0, "/a", wxPATH_UNIX }
};
// set the env var ABCDEF
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
CPPUNIT_ASSERT_MESSAGE
(
- (const char *)wxString::Format(_T("Normalize(%s) failed"), tests[i].original).mb_str(),
- fn.Normalize(tests[i].flags, cwd, wxPATH_UNIX)
+ (const char *)wxString::Format(_T("Normalize(%s) failed"), fnt.original).mb_str(),
+ fn.Normalize(fnt.flags, cwd, fnt.fmt)
);
// compare result with expected string
- CPPUNIT_ASSERT_EQUAL( tests[i].expected, fn.GetFullPath(wxPATH_UNIX) );
+ CPPUNIT_ASSERT_EQUAL( fnt.expected, fn.GetFullPath(fnt.fmt) );
}
}
projects / wxWidgets.git / blobdiff