X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a83f860948059b0273b5cc6d9e43fadad3ebfca..c29c95fe24973b94fd724db767193171ca7c513d:/tests/strings/unicode.cpp?ds=sidebyside diff --git a/tests/strings/unicode.cpp b/tests/strings/unicode.cpp index 35850eac1f..8a0574e43d 100644 --- a/tests/strings/unicode.cpp +++ b/tests/strings/unicode.cpp @@ -21,12 +21,16 @@ #include "wx/wx.h" #endif // WX_PRECOMP +#include "wx/encconv.h" + +// ---------------------------------------------------------------------------- // 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 { + // either str or wcs (but not both) may be NULL, this means that the conversion + // to it should fail StringConversionData(const char *str_, const wchar_t *wcs_, int flags_ = 0) : str(str_), wcs(wcs_), flags(flags_) { @@ -139,7 +143,7 @@ private: CPPUNIT_TEST_SUITE( UnicodeTestCase ); CPPUNIT_TEST( ToFromAscii ); CPPUNIT_TEST( ConstructorsWithConversion ); - CPPUNIT_TEST( ConversionEmpty ); + CPPUNIT_TEST( ConversionFixed ); CPPUNIT_TEST( ConversionWithNULs ); CPPUNIT_TEST( ConversionUTF7 ); CPPUNIT_TEST( ConversionUTF8 ); @@ -153,7 +157,7 @@ private: void ToFromAscii(); void ConstructorsWithConversion(); - void ConversionEmpty(); + void ConversionFixed(); void ConversionWithNULs(); void ConversionUTF7(); void ConversionUTF8(); @@ -170,7 +174,7 @@ private: // register in the unnamed registry so that these tests are run by default CPPUNIT_TEST_SUITE_REGISTRATION( UnicodeTestCase ); -// also include in it's own registry so that these tests can be run alone +// also include in its own registry so that these tests can be run alone CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( UnicodeTestCase, "UnicodeTestCase" ); UnicodeTestCase::UnicodeTestCase() @@ -193,9 +197,9 @@ void UnicodeTestCase::ToFromAscii() void UnicodeTestCase::ConstructorsWithConversion() { - // the string "Déjà" in UTF-8 and wchar_t: + // the string "Déjà " in UTF-8 and wchar_t: const unsigned char utf8Buf[] = {0x44,0xC3,0xA9,0x6A,0xC3,0xA0,0}; - const unsigned char utf8subBuf[] = {0x44,0xC3,0xA9,0x6A,0}; // just "Déj" + const unsigned char utf8subBuf[] = {0x44,0xC3,0xA9,0x6A,0}; // just "Déj" const char *utf8 = (char *)utf8Buf; const char *utf8sub = (char *)utf8subBuf; @@ -221,7 +225,7 @@ void UnicodeTestCase::ConstructorsWithConversion() CPPUNIT_ASSERT_EQUAL( sub, s4 ); // conversion should stop with failure at pos 35 - wxString s("\t[pl]open.format.Sformatuj dyskietkê=gfloppy %f", wxConvUTF8); + wxString s("\t[pl]open.format.Sformatuj dyskietk\xea=gfloppy %f", wxConvUTF8); CPPUNIT_ASSERT( s.empty() ); #endif // wxUSE_UNICODE @@ -238,7 +242,7 @@ void UnicodeTestCase::ConstructorsWithConversion() CPPUNIT_ASSERT( s5 != "SomethingElse" ); } -void UnicodeTestCase::ConversionEmpty() +void UnicodeTestCase::ConversionFixed() { size_t len; @@ -249,6 +253,15 @@ void UnicodeTestCase::ConversionEmpty() #endif // wxUSE_UNICODE/!wxUSE_UNICODE CPPUNIT_ASSERT_EQUAL( 0, len ); + +#if wxUSE_UNICODE + // check that when we convert a fixed number of characters we obtain the + // expected return value + CPPUNIT_ASSERT_EQUAL( 0, wxConvLibc.ToWChar(NULL, 0, "", 0) ); + CPPUNIT_ASSERT_EQUAL( 1, wxConvLibc.ToWChar(NULL, 0, "x", 1) ); + CPPUNIT_ASSERT_EQUAL( 2, wxConvLibc.ToWChar(NULL, 0, "x", 2) ); + CPPUNIT_ASSERT_EQUAL( 2, wxConvLibc.ToWChar(NULL, 0, "xy", 2) ); +#endif // wxUSE_UNICODE } void UnicodeTestCase::ConversionWithNULs() @@ -461,3 +474,4 @@ void UnicodeTestCase::Iteration() } } #endif // wxUSE_UNICODE +