X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ae431935713fabbdae1759450dd97840330b6bd0..4f2511d706e5274a34e1521e11c1b95fed735b42:/tests/strings/unicode.cpp diff --git a/tests/strings/unicode.cpp b/tests/strings/unicode.cpp index fc6e1679df..6211e9e489 100644 --- a/tests/strings/unicode.cpp +++ b/tests/strings/unicode.cpp @@ -21,6 +21,106 @@ #include "wx/wx.h" #endif // WX_PRECOMP +// helper class holding the matching MB and WC strings +// +// either str or wcs (but not both) may be NULL, this means that the conversion +// to it should fail +struct StringConversionData +{ + const char *str; + const wchar_t *wcs; + + enum + { + TEST_BOTH = 0, // test both str -> wcs and wcs -> str + ONLY_MB2WC = 1 // only test str -> wcs conversion + }; + + int flags; + + // test that the conversion between str and wcs (subject to flags) succeeds + // + // the first argument is the index in the test array and is used solely for + // diagnostics + void Test(size_t n, wxMBConv& conv) const + { + if ( str ) + { + wxWCharBuffer wbuf = conv.cMB2WC(str); + + if ( wcs ) + { + CPPUNIT_ASSERT_MESSAGE + ( + Message(n, "MB2WC failed"), + wbuf.data() + ); + + CPPUNIT_ASSERT_MESSAGE + ( + Message(n, "MB2WC", wbuf, wcs), + wxStrcmp(wbuf, wcs) == 0 + ); + } + else // conversion is supposed to fail + { + CPPUNIT_ASSERT_MESSAGE + ( + Message(n, "MB2WC succeeded"), + !wbuf.data() + ); + } + } + + if ( wcs && !(flags & ONLY_MB2WC) ) + { + wxCharBuffer buf = conv.cWC2MB(wcs); + + if ( str ) + { + CPPUNIT_ASSERT_MESSAGE + ( + Message(n, "WC2MB failed"), + buf.data() + ); + + CPPUNIT_ASSERT_MESSAGE + ( + Message(n, "WC2MB", buf, str), + strcmp(buf, str) == 0 + ); + } + else + { + CPPUNIT_ASSERT_MESSAGE + ( + Message(n, "WC2MB succeeded"), + !buf.data() + ); + } + } + } + +private: + static std::string + Message(size_t n, const wxString& msg) + { + return std::string(wxString::Format("#%lu: %s", (unsigned long)n, msg)); + } + + template + static std::string + Message(size_t n, + const char *func, + const wxCharTypeBuffer& actual, + const T *expected) + { + return Message(n, + wxString::Format("%s returned \"%s\", expected \"%s\"", + func, actual.data(), expected)); + } +}; + // ---------------------------------------------------------------------------- // test class // ---------------------------------------------------------------------------- @@ -59,13 +159,6 @@ private: void Iteration(); #endif - // test if converting s using the given encoding gives ws and vice versa - // - // if either of the first 2 arguments is NULL, the conversion is supposed - // to fail - void DoTestConversion(const char *s, const wchar_t *w, wxMBConv& conv); - - DECLARE_NO_COPY_CLASS(UnicodeTestCase) }; @@ -105,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 @@ -131,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" ); } @@ -183,40 +276,6 @@ void UnicodeTestCase::ConversionWithNULs() #endif // wxUSE_UNICODE/!wxUSE_UNICODE } -void -UnicodeTestCase::DoTestConversion(const char *s, - const wchar_t *ws, - wxMBConv& conv) -{ - if ( ws ) - { - wxCharBuffer buf = conv.cWC2MB(ws, (size_t)-1, NULL); - - CPPUNIT_ASSERT( strcmp(buf, s) == 0 ); - } - - if ( s ) - { - wxWCharBuffer wbuf = conv.cMB2WC(s, (size_t)-1, NULL); - - if ( ws ) - { - CPPUNIT_ASSERT( wbuf.data() ); - CPPUNIT_ASSERT( wxStrcmp(wbuf, ws) == 0 ); - } - else // conversion is supposed to fail - { - CPPUNIT_ASSERT_EQUAL( (wchar_t *)NULL, wbuf.data() ); - } - } -} - -struct StringConversionData -{ - const char *str; - const wchar_t *wcs; -}; - void UnicodeTestCase::ConversionUTF7() { static const StringConversionData utf7data[] = @@ -225,6 +284,9 @@ void UnicodeTestCase::ConversionUTF7() { "+AKM-", L"\xa3" }, { "+AOk-t+AOk-", L"\xe9t\xe9" }, + // this one is an alternative valid encoding of the same string + { "+AOk-t+AOk", L"\xe9t\xe9", StringConversionData::ONLY_MB2WC }, + // some special cases { "+-", L"+" }, { "+--", L"+-" }, @@ -249,9 +311,9 @@ void UnicodeTestCase::ConversionUTF7() // // I have no idea how to fix this so just disable the test for now #if 0 - DoTestConversion(d.str, d.wcs, wxCSConv("utf-7")); + d.Test(n, wxCSConv("utf-7")); #endif - DoTestConversion(d.str, d.wcs, wxConvUTF7); + d.Test(n, wxConvUTF7); } } @@ -269,8 +331,8 @@ void UnicodeTestCase::ConversionUTF8() for ( size_t n = 0; n < WXSIZEOF(utf8data); n++ ) { const StringConversionData& d = utf8data[n]; - DoTestConversion(d.str, d.wcs, conv); - DoTestConversion(d.str, d.wcs, wxConvUTF8); + d.Test(n, conv); + d.Test(n, wxConvUTF8); } } @@ -290,7 +352,7 @@ void UnicodeTestCase::ConversionUTF16() for ( size_t n = 0; n < WXSIZEOF(utf16data); n++ ) { const StringConversionData& d = utf16data[n]; - DoTestConversion(d.str, d.wcs, conv); + d.Test(n, conv); } // special case: this string has consecutive NULs inside it which don't @@ -317,7 +379,7 @@ void UnicodeTestCase::ConversionUTF32() for ( size_t n = 0; n < WXSIZEOF(utf32data); n++ ) { const StringConversionData& d = utf32data[n]; - DoTestConversion(d.str, d.wcs, conv); + d.Test(n, conv); } size_t len; @@ -329,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 }