adjusting to changed ownership (font is only created in the GetFont call of wxTextAttr)

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

diff --git a/tests/filename/filenametest.cpp b/tests/filename/filenametest.cpp
index 9e27a359a0b960bb3c89e8e60cfc648b8a1af734..4145a2217e161391d2c273659aa84d2a6f44ebe0 100644 (file)
--- 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 },
@@ -288,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
@@ -335,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) );
     }
 }