Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

made DoTestConversion() work with strings containing NULs

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38496 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-04-01 03:24:23 +00:00
parent 6901ac371f
commit 7e0a8463eb
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/strings/unicode.cpp
View File

@@ -175,19 +175,19 @@ UnicodeTestCase::DoTestConversion(const char *s,
#if wxUSE_UNICODE #if wxUSE_UNICODE
if ( ws ) if ( ws )
{ {
wxCharBuffer buf(wxString(ws).mb_str(conv)); wxCharBuffer buf = conv.cWC2MB(ws, (size_t)-1, NULL);
CPPUNIT_ASSERT( strcmp(buf, s) == 0 ); CPPUNIT_ASSERT( strcmp(buf, s) == 0 );
} }
#else // wxUSE_UNICODE #else // wxUSE_UNICODE
if ( s ) if ( s )
{ {
wxWCharBuffer wbuf(wxString(s).wc_str(conv)); wxWCharBuffer wbuf = conv.cMB2WC(s, (size_t)-1, NULL);
if ( ws ) if ( ws )
CPPUNIT_ASSERT( wx_wcscmp(wbuf, ws) == 0 ); CPPUNIT_ASSERT( wx_wcscmp(wbuf, ws) == 0 );
else else
CPPUNIT_ASSERT_EQUAL( L'\0', *wbuf ); CPPUNIT_ASSERT_EQUAL( (wchar_t *)NULL, wbuf.data() );
} }
#endif // wxUSE_UNICODE/!wxUSE_UNICODE #endif // wxUSE_UNICODE/!wxUSE_UNICODE
} }
@@ -248,10 +248,10 @@ void UnicodeTestCase::ConversionUTF16()
static const StringConversionData utf16data[] = static const StringConversionData utf16data[] =
{ {
#ifdef wxHAVE_U_ESCAPE #ifdef wxHAVE_U_ESCAPE
{ "\x04\x1f\x04\x40\x04\x38\x04\x32\x04\x35\x04\x42", { "\x04\x1f\x04\x40\x04\x38\x04\x32\x04\x35\x04\x42\0\0",
L"\u041f\u0440\u0438\u0432\u0435\u0442" }, L"\u041f\u0440\u0438\u0432\u0435\u0442" },
#endif #endif
{ "\0f\0o\0o", L"foo" }, { "\0f\0o\0o\0\0", L"foo" },
}; };
wxCSConv conv(wxFONTENCODING_UTF16BE); wxCSConv conv(wxFONTENCODING_UTF16BE);