X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/34841b216c0c0a00b0dd26682e227400530737c5..37ed592f7106e4ba483baa6fba91a9c481048bbc:/tests/filename/filenametest.cpp

diff --git a/tests/filename/filenametest.cpp b/tests/filename/filenametest.cpp
index 3faef80e7a..4145a2217e 100644
--- a/tests/filename/filenametest.cpp
+++ b/tests/filename/filenametest.cpp
@@ -50,9 +50,9 @@ static struct FileNameInfo
 } filenames[] =
 {
     // the empty string
-    { _T(""), _(""), _(""), _(""), _(""), false, wxPATH_UNIX }, 
-    { _T(""), _(""), _(""), _(""), _(""), false, wxPATH_DOS }, 
-    { _T(""), _(""), _(""), _(""), _(""), false, wxPATH_VMS }, 
+    { _T(""), _T(""), _T(""), _T(""), _T(""), false, wxPATH_UNIX },
+    { _T(""), _T(""), _T(""), _T(""), _T(""), false, wxPATH_DOS },
+    { _T(""), _T(""), _T(""), _T(""), _T(""), false, wxPATH_VMS },
 
     // Unix file names
     { _T("/usr/bin/ls"), _T(""), _T("/usr/bin"), _T("ls"), _T(""), true, wxPATH_UNIX },
@@ -81,7 +81,7 @@ static struct FileNameInfo
     // 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 },
+    { _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
@@ -150,8 +150,37 @@ 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_EQUAL( wxString(fni.fullname), fullname );
+        CPPUNIT_ASSERT_EQUAL( fullnameOrig, fullname );
 
         // notice that we use a dummy working directory to ensure that paths
         // with "../.." in them could be normalized, otherwise this would fail
@@ -259,9 +288,9 @@ void FileNameTestCase::TestNormalize()
 
     static struct FileNameTest
     {
-        const wxChar *original;
+        const wxString original;
         int flags;
-        wxString expected;
+        const wxString expected;
     } tests[] =
     {
         // test wxPATH_NORM_ENV_VARS
@@ -306,7 +335,7 @@ void FileNameTestCase::TestNormalize()
         );
 
         // compare result with expected string
-        CPPUNIT_ASSERT_EQUAL( tests[i].expected, fn.GetFullPath(wxPATH_UNIX) );
+        WX_ASSERT_STR_EQUAL( tests[i].expected, fn.GetFullPath(wxPATH_UNIX) );
     }
 }