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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43988 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-12-16 15:09:32 +00:00
parent 0d8a01fdaa
commit 0646b21922

View File

@@ -72,7 +72,7 @@ private:
void TestEmbeddedZerosUTF16BEInput(); void TestEmbeddedZerosUTF16BEInput();
void TestEmbeddedZerosUTF32LEInput(); void TestEmbeddedZerosUTF32LEInput();
void TestEmbeddedZerosUTF32BEInput(); void TestEmbeddedZerosUTF32BEInput();
void TestInput(wxFontEncoding encoding, void TestInput(const wxMBConv& conv,
const void* encodedText, const void* encodedText,
size_t encodedSize ); size_t encodedSize );
#endif // wxUSE_UNICODE #endif // wxUSE_UNICODE
@@ -222,34 +222,38 @@ const static unsigned char txtUtf32be[16] =
void TextStreamTestCase::TestUTF8Input() void TextStreamTestCase::TestUTF8Input()
{ {
TestInput(wxFONTENCODING_UTF8, txtUtf8, sizeof(txtUtf8)); TestInput(wxConvUTF8, txtUtf8, sizeof(txtUtf8));
TestInput(wxCSConv(wxFONTENCODING_UTF8), txtUtf8, sizeof(txtUtf8));
} }
void TextStreamTestCase::TestEmbeddedZerosUTF16LEInput() void TextStreamTestCase::TestEmbeddedZerosUTF16LEInput()
{ {
TestInput(wxFONTENCODING_UTF16LE, txtUtf16le, sizeof(txtUtf16le)); TestInput(wxMBConvUTF16LE(), txtUtf16le, sizeof(txtUtf16le));
TestInput(wxCSConv(wxFONTENCODING_UTF16LE), txtUtf16le, sizeof(txtUtf16le));
} }
void TextStreamTestCase::TestEmbeddedZerosUTF16BEInput() void TextStreamTestCase::TestEmbeddedZerosUTF16BEInput()
{ {
TestInput(wxFONTENCODING_UTF16BE, txtUtf16be, sizeof(txtUtf16be)); TestInput(wxMBConvUTF16BE(), txtUtf16be, sizeof(txtUtf16be));
TestInput(wxCSConv(wxFONTENCODING_UTF16BE), txtUtf16be, sizeof(txtUtf16be));
} }
void TextStreamTestCase::TestEmbeddedZerosUTF32LEInput() void TextStreamTestCase::TestEmbeddedZerosUTF32LEInput()
{ {
TestInput(wxFONTENCODING_UTF32LE, txtUtf32le, sizeof(txtUtf32le)); TestInput(wxMBConvUTF32LE(), txtUtf32le, sizeof(txtUtf32le));
TestInput(wxCSConv(wxFONTENCODING_UTF32LE), txtUtf32le, sizeof(txtUtf32le));
} }
void TextStreamTestCase::TestEmbeddedZerosUTF32BEInput() 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, const void *encodedText,
size_t encodedSize) size_t encodedSize)
{ {
wxCSConv conv(encoding);
wxMemoryInputStream byteIn(encodedText, encodedSize); wxMemoryInputStream byteIn(encodedText, encodedSize);
wxTextInputStream textIn(byteIn, wxT("\n"), conv); wxTextInputStream textIn(byteIn, wxT("\n"), conv);