Minor corrections to make dist after reports

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

diff --git a/tests/strings/unicode.cpp b/tests/strings/unicode.cpp
index db32c6d06cd5714a4b110a8f2eba40b9de645258..6211e9e489bfea653b3b5f45ac8cc12df589a12f 100644 (file)
--- a/tests/strings/unicode.cpp
+++ b/tests/strings/unicode.cpp
@@ -198,13 +198,13 @@ void UnicodeTestCase::ConstructorsWithConversion()
 
 #if wxUSE_UNICODE
     const wchar_t wchar[] = {0x44,0xE9,0x6A,0xE0,0};
-    WX_ASSERT_STR_EQUAL( wchar, s1 );
+    CPPUNIT_ASSERT_EQUAL( wchar, s1 );
 
     wxString s2(wchar);
-    WX_ASSERT_STR_EQUAL( wchar, s2 );
-    WX_ASSERT_STR_EQUAL( utf8, s2 );
+    CPPUNIT_ASSERT_EQUAL( wchar, s2 );
+    CPPUNIT_ASSERT_EQUAL( utf8, s2 );
 #else
-    WX_ASSERT_STR_EQUAL( utf8, s1 );
+    CPPUNIT_ASSERT_EQUAL( utf8, s1 );
 #endif
 
     wxString sub(utf8sub, wxConvUTF8); // "Dej" substring
@@ -224,12 +224,12 @@ void UnicodeTestCase::ConstructorsWithConversion()
     // test using Unicode strings together with char* strings (this must work
     // in ANSI mode as well, of course):
     wxString s5("ascii");
-    WX_ASSERT_STR_EQUAL( "ascii", s5 );
+    CPPUNIT_ASSERT_EQUAL( "ascii", s5 );
 
     s5 += " value";
 
     CPPUNIT_ASSERT( strcmp(s5.mb_str(), "ascii value") == 0 );
-    WX_ASSERT_STR_EQUAL( "ascii value", s5 );
+    CPPUNIT_ASSERT_EQUAL( "ascii value", s5 );
     CPPUNIT_ASSERT( s5 != "SomethingElse" );
 }
 
@@ -391,11 +391,12 @@ void UnicodeTestCase::ConversionUTF32()
 void UnicodeTestCase::IsConvOk()
 {
     CPPUNIT_ASSERT( wxCSConv(wxFONTENCODING_SYSTEM).IsOk() );
-    CPPUNIT_ASSERT( wxCSConv(_T("UTF-8")).IsOk() );
-    CPPUNIT_ASSERT( !wxCSConv(_T("NoSuchConversion")).IsOk() );
+    CPPUNIT_ASSERT( wxCSConv("US-ASCII").IsOk() );
+    CPPUNIT_ASSERT( wxCSConv("UTF-8").IsOk() );
+    CPPUNIT_ASSERT( !wxCSConv("NoSuchConversion").IsOk() );
 
 #ifdef __WINDOWS__
-    CPPUNIT_ASSERT( wxCSConv(_T("WINDOWS-437")).IsOk() );
+    CPPUNIT_ASSERT( wxCSConv("WINDOWS-437").IsOk() );
 #endif
 }