X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d6609db5a734520636d931e417f13167495e2ad4..25199f9859ebfb704f9630588bd3fd57d8e3bba3:/tests/filename/filenametest.cpp diff --git a/tests/filename/filenametest.cpp b/tests/filename/filenametest.cpp index a45a5db035..bf584ef665 100644 --- a/tests/filename/filenametest.cpp +++ b/tests/filename/filenametest.cpp @@ -322,8 +322,11 @@ void FileNameTestCase::TestNormalize() // test wxPATH_NORM_DOTS { "a/.././b/c/../../", wxPATH_NORM_DOTS, "", wxPATH_UNIX }, - { "./", wxPATH_NORM_DOTS, "", wxPATH_UNIX }, - { "b/../", wxPATH_NORM_DOTS, "", wxPATH_UNIX }, + { "", wxPATH_NORM_DOTS, "", wxPATH_UNIX }, + { "./foo", wxPATH_NORM_DOTS, "foo", wxPATH_UNIX }, + { "b/../bar", wxPATH_NORM_DOTS, "bar", wxPATH_UNIX }, + { "c/../../quux", wxPATH_NORM_DOTS, "../quux", wxPATH_UNIX }, + { "/c/../../quux", wxPATH_NORM_DOTS, "/quux", wxPATH_UNIX }, // test wxPATH_NORM_TILDE: notice that ~ is only interpreted specially // when it is the first character in the file name @@ -596,7 +599,7 @@ void FileNameTestCase::TestCreateTempFileName() #ifdef __WXMSW__ { "$USER_DOCS_DIR\\", "$USER_DOCS_DIR", true }, { "c:\\a\\directory\\which\\does\\not\\exist", "", false }, -#else if defined( __UNIX__ ) +#elif defined( __UNIX__ ) { "$USER_DOCS_DIR/", "$USER_DOCS_DIR", true }, { "/tmp/foo", "/tmp", true }, { "/tmp/a/directory/which/does/not/exist", "", false },