use struct timeval and not a long to store socket timeout under Unix too

[wxWidgets.git] / tests / filename / filenametest.cpp

diff --git a/tests/filename/filenametest.cpp b/tests/filename/filenametest.cpp
index ff0e75fd1d8279a10acde248be9ee510282cbd4f..1dea6f12eb46afb94a856be89204322e38475650 100644 (file)
--- a/tests/filename/filenametest.cpp
+++ b/tests/filename/filenametest.cpp
@@ -292,9 +292,9 @@ void FileNameTestCase::TestNormalize()
 
     static const struct FileNameTest
     {
-        wxString original;
+        const char *original;
         int flags;
-        wxString expected;
+        const char *expected;
         wxPathFormat fmt;
     } tests[] =
     {
@@ -311,8 +311,8 @@ void FileNameTestCase::TestNormalize()
         // test wxPATH_NORM_TILDE
         // NB: do the tilde expansion also under Windows to test if it works there too
         { "/a/b/~", wxPATH_NORM_TILDE, "/a/b/~", wxPATH_UNIX },
-        { "/~/a/b", wxPATH_NORM_TILDE, home + "a/b", wxPATH_UNIX },
-        { "~/a/b", wxPATH_NORM_TILDE, home + "a/b", wxPATH_UNIX },
+        { "/~/a/b", wxPATH_NORM_TILDE, "HOME/a/b", wxPATH_UNIX },
+        { "~/a/b", wxPATH_NORM_TILDE, "HOME/a/b", wxPATH_UNIX },
 
         // test wxPATH_NORM_CASE
         { "Foo", wxPATH_NORM_CASE, "Foo", wxPATH_UNIX },
@@ -325,8 +325,8 @@ void FileNameTestCase::TestNormalize()
           "c:\\users\\zeitlin", wxPATH_DOS },
 
         // test wxPATH_NORM_ABSOLUTE
-        { "a/b/", wxPATH_NORM_ABSOLUTE, cwd + "a/b/", wxPATH_UNIX },
-        { "a/b/c.ext", wxPATH_NORM_ABSOLUTE, cwd + "a/b/c.ext", wxPATH_UNIX },
+        { "a/b/", wxPATH_NORM_ABSOLUTE, "CWD/a/b/", wxPATH_UNIX },
+        { "a/b/c.ext", wxPATH_NORM_ABSOLUTE, "CWD/a/b/c.ext", wxPATH_UNIX },
         { "/a", wxPATH_NORM_ABSOLUTE, "/a", wxPATH_UNIX },
 
         // test giving no flags at all to Normalize()
@@ -357,14 +357,21 @@ void FileNameTestCase::TestNormalize()
         wxFileName fn(fnt.original, fnt.fmt);
 
         // be sure this normalization does not fail
-        CPPUNIT_ASSERT_MESSAGE
+        WX_ASSERT_MESSAGE
         (
-            (const char *)wxString::Format(_T("Normalize(%s) failed"), fnt.original).mb_str(),
+            ("#%d: Normalize(%s) failed", (int)i, fnt.original),
             fn.Normalize(fnt.flags, cwd, fnt.fmt)
         );
 
         // compare result with expected string
-        CPPUNIT_ASSERT_EQUAL( fnt.expected, fn.GetFullPath(fnt.fmt) );
+        wxString expected(tests[i].expected);
+        expected.Replace(_T("HOME/"), home);
+        expected.Replace(_T("CWD/"), cwd);
+        WX_ASSERT_EQUAL_MESSAGE
+        (
+            ("array element #%d", (int)i),
+            expected, fn.GetFullPath(fnt.fmt)
+        );
     }
 }