test both wxMBConvUTFxx and wxCSConv(wxFONTENCODING_UTFxx), they should behave the...

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

diff --git a/tests/streams/textstreamtest.cpp b/tests/streams/textstreamtest.cpp
index 0d9384e6b116358470dcfc23f63e9874f9cbbac5..13c9804334788def9756b21629c7e6076d6a8062 100644 (file)
--- a/tests/streams/textstreamtest.cpp
+++ b/tests/streams/textstreamtest.cpp
@@ -72,7 +72,7 @@ private:
     void TestEmbeddedZerosUTF16BEInput();
     void TestEmbeddedZerosUTF32LEInput();
     void TestEmbeddedZerosUTF32BEInput();
-    void TestInput(wxFontEncoding encoding,
+    void TestInput(const wxMBConv& conv,
                    const void* encodedText,
                    size_t encodedSize );
 #endif // wxUSE_UNICODE
@@ -222,34 +222,38 @@ const static unsigned char txtUtf32be[16] =
 
 void TextStreamTestCase::TestUTF8Input()
 {
-    TestInput(wxFONTENCODING_UTF8, txtUtf8, sizeof(txtUtf8));
+    TestInput(wxConvUTF8, txtUtf8, sizeof(txtUtf8));
+    TestInput(wxCSConv(wxFONTENCODING_UTF8), txtUtf8, sizeof(txtUtf8));
 }
 
 void TextStreamTestCase::TestEmbeddedZerosUTF16LEInput()
 {
-    TestInput(wxFONTENCODING_UTF16LE, txtUtf16le, sizeof(txtUtf16le));
+    TestInput(wxMBConvUTF16LE(), txtUtf16le, sizeof(txtUtf16le));
+    TestInput(wxCSConv(wxFONTENCODING_UTF16LE), txtUtf16le, sizeof(txtUtf16le));
 }
 
 void TextStreamTestCase::TestEmbeddedZerosUTF16BEInput()
 {
-    TestInput(wxFONTENCODING_UTF16BE, txtUtf16be, sizeof(txtUtf16be));
+    TestInput(wxMBConvUTF16BE(), txtUtf16be, sizeof(txtUtf16be));
+    TestInput(wxCSConv(wxFONTENCODING_UTF16BE), txtUtf16be, sizeof(txtUtf16be));
 }
 
 void TextStreamTestCase::TestEmbeddedZerosUTF32LEInput()
 {
-    TestInput(wxFONTENCODING_UTF32LE, txtUtf32le, sizeof(txtUtf32le));
+    TestInput(wxMBConvUTF32LE(), txtUtf32le, sizeof(txtUtf32le));
+    TestInput(wxCSConv(wxFONTENCODING_UTF32LE), txtUtf32le, sizeof(txtUtf32le));
 }
 
 void TextStreamTestCase::TestEmbeddedZerosUTF32BEInput()
 {
-    TestInput(wxFONTENCODING_UTF32BE, txtUtf32be, sizeof(txtUtf32be));
+    TestInput(wxMBConvUTF32BE(), txtUtf32be, sizeof(txtUtf32be));
+    TestInput(wxCSConv(wxFONTENCODING_UTF32BE), txtUtf32be, sizeof(txtUtf32be));
 }
 
-void TextStreamTestCase::TestInput(wxFontEncoding encoding,
+void TextStreamTestCase::TestInput(const wxMBConv& conv,
                                    const void *encodedText,
                                    size_t encodedSize)
 {
-    wxCSConv conv(encoding);
     wxMemoryInputStream byteIn(encodedText, encodedSize);
     wxTextInputStream textIn(byteIn, wxT("\n"), conv);