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

Fix DirTestCase to run on the systems without "C:" drive.

Browse Source 
"C:" drive doesn't need to exist under Windows, rely on HOMEDRIVE environment
variable defined in all recent Windows versions to get a valid drive letter
(still fall back to "C:" if the variable is not defined -- we could have use
wxFSVolume to find it then but this seems like an overkill).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-10-03 17:15:52 +00:00
parent 12249b199d
commit cb5eef9d87
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests/file/dir.cpp
View File

@@ -182,13 +182,13 @@ void DirTestCase::DirExists()
{ "$USER_DOCS_DIR\\", true }, { "$USER_DOCS_DIR\\", true },
{ "$USER_DOCS_DIR\\\\", true }, { "$USER_DOCS_DIR\\\\", true },
{ "..\\..", true }, { "..\\..", true },
{ "c:", true }, { "$MSW_DRIVE", true },
{ "c:\\", true }, { "$MSW_DRIVE\\", true },
{ "c:\\\\", true }, { "$MSW_DRIVE\\\\", true },
{ "\\\\non_existent_share\\file", false }, { "\\\\non_existent_share\\file", false },
{ "c:\\a\\directory\\which\\does\\not\\exist", false }, { "$MSW_DRIVE\\a\\directory\\which\\does\\not\\exist", false },
{ "c:\\a\\directory\\which\\does\\not\\exist\\", false }, { "$MSW_DRIVE\\a\\directory\\which\\does\\not\\exist\\", false },
{ "c:\\a\\directory\\which\\does\\not\\exist\\\\", false }, { "$MSW_DRIVE\\a\\directory\\which\\does\\not\\exist\\\\", false },
{ "test.exe", false } // not a directory! { "test.exe", false } // not a directory!
#elif defined(__UNIX__) #elif defined(__UNIX__)
{ "../..", true }, { "../..", true },
@@ -202,11 +202,21 @@ void DirTestCase::DirExists()
#endif #endif
}; };
#ifdef __WXMSW__
wxString homedrive = wxGetenv("HOMEDRIVE");
if ( homedrive.empty() )
homedrive = "c:";
#endif // __WXMSW__
for ( size_t n = 0; n < WXSIZEOF(testData); n++ ) for ( size_t n = 0; n < WXSIZEOF(testData); n++ )
{ {
wxString dirname = testData[n].dirname; wxString dirname = testData[n].dirname;
dirname.Replace("$USER_DOCS_DIR", wxStandardPaths::Get().GetDocumentsDir()); dirname.Replace("$USER_DOCS_DIR", wxStandardPaths::Get().GetDocumentsDir());
#ifdef __WXMSW__
dirname.Replace("$MSW_DRIVE", homedrive);
#endif // __WXMSW__
std::string errDesc = wxString::Format("failed on directory '%s'", dirname).ToStdString(); std::string errDesc = wxString::Format("failed on directory '%s'", dirname).ToStdString();
CPPUNIT_ASSERT_EQUAL_MESSAGE(errDesc, testData[n].shouldExist, wxDir::Exists(dirname)); CPPUNIT_ASSERT_EQUAL_MESSAGE(errDesc, testData[n].shouldExist, wxDir::Exists(dirname));