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

Correct the expected result of directory existence check.

Browse Source 
As /.. is the same as /, a directory with any number of ".." in it will always
exist.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64667 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-06-21 12:19:14 +00:00
parent ae4ea4e862
commit c14ae7f5b3
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/file/dir.cpp
View File

@@ -79,7 +79,7 @@ void DirTestCase::setUp()
wxDir::Make(DIRTEST_FOLDER + SEP + "folder1" + SEP + "subfolder2", wxS_DIR_DEFAULT, wxPATH_MKDIR_FULL); wxDir::Make(DIRTEST_FOLDER + SEP + "folder1" + SEP + "subfolder2", wxS_DIR_DEFAULT, wxPATH_MKDIR_FULL);
wxDir::Make(DIRTEST_FOLDER + SEP + "folder2", wxS_DIR_DEFAULT, wxPATH_MKDIR_FULL); wxDir::Make(DIRTEST_FOLDER + SEP + "folder2", wxS_DIR_DEFAULT, wxPATH_MKDIR_FULL);
wxDir::Make(DIRTEST_FOLDER + SEP + "folder3" + SEP + "subfolder1", wxS_DIR_DEFAULT, wxPATH_MKDIR_FULL); wxDir::Make(DIRTEST_FOLDER + SEP + "folder3" + SEP + "subfolder1", wxS_DIR_DEFAULT, wxPATH_MKDIR_FULL);
CreateTempFile(DIRTEST_FOLDER + SEP + "folder1" + SEP + "subfolder2" + SEP + "dummy"); CreateTempFile(DIRTEST_FOLDER + SEP + "folder1" + SEP + "subfolder2" + SEP + "dummy");
CreateTempFile(DIRTEST_FOLDER + SEP + "dummy"); CreateTempFile(DIRTEST_FOLDER + SEP + "dummy");
} }
@@ -172,14 +172,13 @@ void DirTestCase::DirExists()
{ {
const char *dirname; const char *dirname;
bool shouldExist; bool shouldExist;
} testData[] = } testData[] =
{ {
{ ".", true }, { ".", true },
{ "..", true }, { "..", true },
#if defined(__WXMSW__) #if defined(__WXMSW__)
{ "..\\..", true }, { "..\\..", true },
{ "..\\..\\..\\..\\..\\..\\..\\..\\..\\..\\..\\..\\..\\..\\..\\..\\..\\..\\..\\..", /*false*/ true }, { "..\\..\\..\\..\\..\\..\\..\\..\\..\\..\\..\\..\\..\\..\\..\\..\\..\\..\\..\\..", true },
// FIXME: should fail but it doesn't... looks like a bug in GetFileAttributes() win API
{ "c:", true }, { "c:", true },
{ "c:\\", true }, { "c:\\", true },
{ "c:\\\\", true }, { "c:\\\\", true },
@@ -190,7 +189,7 @@ void DirTestCase::DirExists()
{ "test.exe", false } // not a directory! { "test.exe", false } // not a directory!
#elif defined(__UNIX__) #elif defined(__UNIX__)
{ "../..", true }, { "../..", true },
{ "../../../../../../../../../../../../../../../../../../../..", false }, { "../../../../../../../../../../../../../../../../../../../..", true },
{ "/", true }, { "/", true },
{ "//", true }, { "//", true },
{ "/usr/bin", true }, { "/usr/bin", true },