X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f7c69b905d28d316cc01bbb58f8d86239110d244..e57ee9bb0cd5d0e49a60b36b2ca31af01dbde454:/tests/filename/filenametest.cpp diff --git a/tests/filename/filenametest.cpp b/tests/filename/filenametest.cpp index 8a8f6842f2..9e27a359a0 100644 --- a/tests/filename/filenametest.cpp +++ b/tests/filename/filenametest.cpp @@ -24,6 +24,16 @@ #include "wx/filename.h" #include "wx/filefn.h" +// ---------------------------------------------------------------------------- +// local functions +// ---------------------------------------------------------------------------- + +// define stream inserter for wxFileName to use it in CPPUNIT_ASSERT_EQUAL() +inline std::ostream& operator<<(std::ostream& o, const wxFileName& fn) +{ + return o << fn.GetFullPath(); +} + // ---------------------------------------------------------------------------- // test data // ---------------------------------------------------------------------------- @@ -39,6 +49,11 @@ static struct FileNameInfo wxPathFormat format; } filenames[] = { + // the empty string + { _T(""), _(""), _(""), _(""), _(""), false, wxPATH_UNIX }, + { _T(""), _(""), _(""), _(""), _(""), false, wxPATH_DOS }, + { _T(""), _(""), _(""), _(""), _(""), false, wxPATH_VMS }, + // Unix file names { _T("/usr/bin/ls"), _T(""), _T("/usr/bin"), _T("ls"), _T(""), true, wxPATH_UNIX }, { _T("/usr/bin/"), _T(""), _T("/usr/bin"), _T(""), _T(""), true, wxPATH_UNIX }, @@ -63,6 +78,10 @@ static struct FileNameInfo { _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 }, // wxFileName support for Mac file names is broken currently #if 0 @@ -131,10 +150,46 @@ void FileNameTestCase::TestConstruction() 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( fullname == fni.fullname ); + CPPUNIT_ASSERT_EQUAL( fullnameOrig, fullname ); - CPPUNIT_ASSERT( fn.Normalize(wxPATH_NORM_ALL, _T(""), fni.format) ); + // notice that we use a dummy working directory to ensure that paths + // with "../.." in them could be normalized, otherwise this would fail + // if the test is run from root directory or its direct subdirectory + CPPUNIT_ASSERT_MESSAGE + ( + (const char *)wxString::Format(_T("Normalize(%s) failed"), fni.fullname).mb_str(), + fn.Normalize(wxPATH_NORM_ALL, _T("/foo/bar/baz"), fni.format) + ); if ( *fni.volume && *fni.path ) { @@ -144,12 +199,30 @@ void FileNameTestCase::TestConstruction() pathWithVolume += wxFileName::GetVolumeSeparator(fni.format); pathWithVolume += fni.path; - CPPUNIT_ASSERT( fn == wxFileName(pathWithVolume, + CPPUNIT_ASSERT_EQUAL( wxFileName(pathWithVolume, fni.name, fni.ext, - fni.format) ); + fni.format), fn ); } } + + wxFileName fn; + + // empty strings + fn.AssignDir(wxEmptyString); + CPPUNIT_ASSERT( !fn.IsOk() ); + + fn.Assign(wxEmptyString); + CPPUNIT_ASSERT( !fn.IsOk() ); + + fn.Assign(wxEmptyString, wxEmptyString); + CPPUNIT_ASSERT( !fn.IsOk() ); + + fn.Assign(wxEmptyString, wxEmptyString, wxEmptyString); + CPPUNIT_ASSERT( !fn.IsOk() ); + + fn.Assign(wxEmptyString, wxEmptyString, wxEmptyString, wxEmptyString); + CPPUNIT_ASSERT( !fn.IsOk() ); } void FileNameTestCase::TestComparison() @@ -158,7 +231,7 @@ void FileNameTestCase::TestComparison() wxFileName fn2(wxT("/tmp/dir2/../file2")); fn1.Normalize(); fn2.Normalize(); - CPPUNIT_ASSERT(fn1.GetPath() == fn2.GetPath()); + CPPUNIT_ASSERT_EQUAL(fn1.GetPath(), fn2.GetPath()); } void FileNameTestCase::TestSplit() @@ -170,15 +243,15 @@ void FileNameTestCase::TestSplit() wxFileName::SplitPath(fni.fullname, &volume, &path, &name, &ext, fni.format); - CPPUNIT_ASSERT( volume == fni.volume ); - CPPUNIT_ASSERT( path == fni.path ); - CPPUNIT_ASSERT( name == fni.name ); - CPPUNIT_ASSERT( ext == fni.ext ); + CPPUNIT_ASSERT_EQUAL( wxString(fni.volume), volume ); + CPPUNIT_ASSERT_EQUAL( wxString(fni.path), path ); + CPPUNIT_ASSERT_EQUAL( wxString(fni.name), name ); + CPPUNIT_ASSERT_EQUAL( wxString(fni.ext), ext ); } // special case of empty extension wxFileName fn(_T("foo.")); - CPPUNIT_ASSERT( fn.GetFullPath() == _T("foo.") ); + CPPUNIT_ASSERT_EQUAL( wxString(_T("foo.")), fn.GetFullPath() ); } void FileNameTestCase::TestSetPath() @@ -215,7 +288,7 @@ void FileNameTestCase::TestNormalize() static struct FileNameTest { - wxString original; + const wxChar *original; int flags; wxString expected; } tests[] = @@ -250,12 +323,16 @@ void FileNameTestCase::TestNormalize() // set the env var ABCDEF wxSetEnv(_T("ABCDEF"), _T("abcdef")); - 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); // be sure this normalization does not fail - CPPUNIT_ASSERT( fn.Normalize(tests[i].flags, cwd, wxPATH_UNIX) ); + CPPUNIT_ASSERT_MESSAGE + ( + (const char *)wxString::Format(_T("Normalize(%s) failed"), tests[i].original).mb_str(), + fn.Normalize(tests[i].flags, cwd, wxPATH_UNIX) + ); // compare result with expected string CPPUNIT_ASSERT_EQUAL( tests[i].expected, fn.GetFullPath(wxPATH_UNIX) ); @@ -271,13 +348,13 @@ wxString wxTestStripExtension(wxString szFile) void FileNameTestCase::TestStrip() { //test a crash - CPPUNIT_ASSERT( wxTestStripExtension( _T("") ) == _T("") ); + CPPUNIT_ASSERT_EQUAL( wxString(_T("")), wxTestStripExtension(_T("")) ); //others - CPPUNIT_ASSERT( wxTestStripExtension( _T(".") ) == _T("") ); - CPPUNIT_ASSERT( wxTestStripExtension( _T(".wav") ) == _T("") ); - CPPUNIT_ASSERT( wxTestStripExtension( _T("good.wav") ) == _T("good") ); - CPPUNIT_ASSERT( wxTestStripExtension( _T("good.wav.wav") ) == _T("good.wav") ); + CPPUNIT_ASSERT_EQUAL( wxString(_T("")), wxTestStripExtension(_T(".")) ); + CPPUNIT_ASSERT_EQUAL( wxString(_T("")), wxTestStripExtension(_T(".wav")) ); + CPPUNIT_ASSERT_EQUAL( wxString(_T("good")), wxTestStripExtension(_T("good.wav")) ); + CPPUNIT_ASSERT_EQUAL( wxString(_T("good.wav")), wxTestStripExtension(_T("good.wav.wav")) ); } #ifdef __WINDOWS__