use a different known good face name under non-MSW

[wxWidgets.git] / tests / strings / tokenizer.cpp

diff --git a/tests/strings/tokenizer.cpp b/tests/strings/tokenizer.cpp
index f694339c2b5bdd5778ab9a76b2e7e7d7b02d9c63..c22c5ba3b5f9a3015a0abacafdb13b5e5cea5f72 100644 (file)
--- a/tests/strings/tokenizer.cpp
+++ b/tests/strings/tokenizer.cpp
@@ -123,7 +123,8 @@ gs_testData[] =
 // fails in the diagnostic message
 static std::string Nth(size_t n)
 {
-    return wxString::Format(_T("for loop index %lu"), (unsigned long)n).mb_str();
+    return std::string(wxString::Format(_T("for loop index %lu"),
+                                        (unsigned long)n).mb_str());
 }
 
 // ----------------------------------------------------------------------------
@@ -204,7 +205,7 @@ DoTestGetString(const wxChar *s, const wxChar *delims, int pos, ...)
     {
         if ( !pos )
         {
-            CPPUNIT_ASSERT_EQUAL( wxString(), tkz.GetString() );
+            CPPUNIT_ASSERT( tkz.GetString().empty() ) ;
             break;
         }