X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/76c6fcbc315d53676d220bac80b5198849020804..955f0add8917579c3da701330ff16848fc35ca40:/tests/strings/strings.cpp?ds=sidebyside diff --git a/tests/strings/strings.cpp b/tests/strings/strings.cpp index 9053cf47b1..a17c815519 100644 --- a/tests/strings/strings.cpp +++ b/tests/strings/strings.cpp @@ -42,8 +42,9 @@ private: CPPUNIT_TEST( Constructors ); #if wxUSE_WCHAR_T CPPUNIT_TEST( ConstructorsWithConversion ); -#endif CPPUNIT_TEST( Conversion ); + CPPUNIT_TEST( ConversionUTF7 ); +#endif CPPUNIT_TEST( Extraction ); CPPUNIT_TEST( Find ); CPPUNIT_TEST( Tokenizer ); @@ -61,8 +62,9 @@ private: void Constructors(); #if wxUSE_WCHAR_T void ConstructorsWithConversion(); -#endif void Conversion(); + void ConversionUTF7(); +#endif void Extraction(); void Find(); void SingleTokenizerTest( wxChar *str, wxChar *delims, size_t count , wxStringTokenizerMode mode ); @@ -155,10 +157,12 @@ void StringTestCase::Constructors() #if wxUSE_WCHAR_T void StringTestCase::ConstructorsWithConversion() { - // Déj`a in UTF-8 and wchar_t: - const char utf8[] = {0x44,0xC3,0xA9,0x6A,0xC3,0xA0,0}; + // the string "Déjà" in UTF-8 and wchar_t: + const unsigned char utf8Buf[] = {0x44,0xC3,0xA9,0x6A,0xC3,0xA0,0}; const wchar_t wchar[] = {0x44,0xE9,0x6A,0xE0,0}; - const char utf8sub[] = {0x44,0xC3,0xA9,0x6A,0}; // "Dej" + const unsigned char utf8subBuf[] = {0x44,0xC3,0xA9,0x6A,0}; // just "Déj" + const char *utf8 = (char *)utf8Buf; + const char *utf8sub = (char *)utf8subBuf; wxString s1(utf8, wxConvUTF8); wxString s2(wchar, wxConvUTF8); @@ -177,8 +181,12 @@ void StringTestCase::ConstructorsWithConversion() CPPUNIT_ASSERT( s3 == sub ); CPPUNIT_ASSERT( s4 == sub ); -} + +#if wxUSE_UNICODE + CPPUNIT_ASSERT ( wxString("\t[pl]open.format.Sformatuj dyskietkê=gfloppy %f", + wxConvUTF8) == wxT("") ); //should stop at pos 35 #endif +} void StringTestCase::Conversion() { @@ -189,9 +197,8 @@ void StringTestCase::Conversion() CPPUNIT_ASSERT( memcmp(theBuffer.data(), "The\0String", 11) == 0 ); wxString szTheString2("The\0String", wxConvLocal, 10); - CPPUNIT_ASSERT( wxMemcmp(szTheString2.c_str(), L"The\0String", 11) == 0 ); + CPPUNIT_ASSERT( wxTmemcmp(szTheString2.c_str(), L"The\0String", 11) == 0 ); #else -# if wxUSE_WCHAR_T wxString szTheString(wxT("TheString")); szTheString.insert(3, 1, '\0'); wxWCharBuffer theBuffer = szTheString.wc_str(wxConvLibc); @@ -203,10 +210,48 @@ void StringTestCase::Conversion() wxWCharBuffer theLocalBuffer = szLocalTheString.wc_str(wxConvLocal); CPPUNIT_ASSERT( memcmp(theLocalBuffer.data(), L"The\0String", 11 * sizeof(wchar_t)) == 0 ); -# endif #endif } +void StringTestCase::ConversionUTF7() +{ + const wchar_t data[] = { 0x00A3, 0x00A3, 0x00A3, 0x00A3, 0 }; // pound signs + + //utf7 and utf7alt are equivelent + const char *utf7 = "+AKM-+AKM-+AKM-+AKM-"; + const char *utf7alt = "+AKMAowCjAKM-"; + +#if wxUSE_UNICODE + wxString str(data); + + wxCSConv conv(_T("utf-7")); + + wxCharBuffer theBuffer = str.mb_str(conv); + + CPPUNIT_ASSERT( strcmp(theBuffer, utf7) == 0 || strcmp(theBuffer, utf7alt) == 0); +#else //ANSI + wxString str(utf7); + + wxCSConv conv(_T("utf-7")); + + wxWCharBuffer theWBuffer = str.wc_str(conv); + + CPPUNIT_ASSERT( wxWcslen(theWBuffer) == wxWcslen(data) ); + CPPUNIT_ASSERT( memcmp(theWBuffer, data, wxWcslen(data) * sizeof(wchar_t)) == 0 ); + + wxString stralt(utf7alt); + + wxWCharBuffer theWBufferAlt = stralt.wc_str(conv); + + CPPUNIT_ASSERT( wxWcslen(theWBufferAlt) == wxWcslen(data) ); + CPPUNIT_ASSERT( memcmp(theWBufferAlt, data, wxWcslen(data) * sizeof(wchar_t)) == 0 ); + +#endif // wxUSE_UNICODE +} + +#endif // wxUSE_WCHAR_T + + void StringTestCase::Extraction() { wxString s(_T("Hello, world!")); @@ -338,8 +383,8 @@ DoTokenizerGetPosition(const wxChar *s, const wxChar *delims, int pos, ...) void StringTestCase::TokenizerGetPosition() { DoTokenizerGetPosition(_T("foo"), _T("_"), 3, 0); - DoTokenizerGetPosition(_T("foo_bar"), _T("_"), 3, 7, 0); - DoTokenizerGetPosition(_T("foo_bar_"), _T("_"), 3, 7,8, 0); + DoTokenizerGetPosition(_T("foo_bar"), _T("_"), 4, 7, 0); + DoTokenizerGetPosition(_T("foo_bar_"), _T("_"), 4, 8, 0); } void StringTestCase::Replace()