test predefined wxConvUTF[78] too

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38485 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/tests/strings/unicode.cpp b/tests/strings/unicode.cpp
index 3ccf6be1dbfe3db0c6308c85982b6315f3a9c34e..d6c5e5be23af96bb473941713a34ad65ac86428c 100644 (file)
--- a/tests/strings/unicode.cpp
+++ b/tests/strings/unicode.cpp
@@ -70,7 +70,7 @@ private:
     //
     // if either of the first 2 arguments is NULL, the conversion is supposed
     // to fail
     //
     // if either of the first 2 arguments is NULL, the conversion is supposed
     // to fail

-    void DoTestConversion(const char *s, const wchar_t *w, wxCSConv& conv);
+    void DoTestConversion(const char *s, const wchar_t *w, wxMBConv& conv);

 #endif // wxUSE_WCHAR_T
 
 
 #endif // wxUSE_WCHAR_T
 
 


@@ -168,7 +168,7 @@ void UnicodeTestCase::Conversion()
 void
 UnicodeTestCase::DoTestConversion(const char *s,
                                   const wchar_t *ws,
 void
 UnicodeTestCase::DoTestConversion(const char *s,
                                   const wchar_t *ws,

-                                  wxCSConv& conv)
+                                  wxMBConv& conv)

 {
 #if wxUSE_UNICODE
     if ( ws )
 {
 #if wxUSE_UNICODE
     if ( ws )


@@ -217,6 +217,7 @@ void UnicodeTestCase::ConversionUTF7()
     {
         const StringConversionData& d = utf7data[n];
         DoTestConversion(d.str, d.wcs, conv);
     {
         const StringConversionData& d = utf7data[n];
         DoTestConversion(d.str, d.wcs, conv);

+        DoTestConversion(d.str, d.wcs, wxConvUTF7);

     }
 }
 
     }
 }
 


@@ -236,6 +237,7 @@ void UnicodeTestCase::ConversionUTF8()
     {
         const StringConversionData& d = utf8data[n];
         DoTestConversion(d.str, d.wcs, conv);
     {
         const StringConversionData& d = utf8data[n];
         DoTestConversion(d.str, d.wcs, conv);

+        DoTestConversion(d.str, d.wcs, wxConvUTF8);

     }
 }
 
     }
 }