X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/be5be16a2326d8bfaa109d522212adffca4dcf5d..fe5816f08f6ca7b5b1e3c309cb8b4d874814aa25:/tests/filename/filenametest.cpp diff --git a/tests/filename/filenametest.cpp b/tests/filename/filenametest.cpp index ce964f54b9..eefd5ffd62 100644 --- a/tests/filename/filenametest.cpp +++ b/tests/filename/filenametest.cpp @@ -28,15 +28,7 @@ #include "wx/msw/registry.h" #endif // __WXMSW__ -// ---------------------------------------------------------------------------- -// 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(); -} +#include "testfile.h" // ---------------------------------------------------------------------------- // test data @@ -315,6 +307,8 @@ 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 }, // test wxPATH_NORM_TILDE: notice that ~ is only interpreted specially // when it is the first character in the file name