X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/265d5cce058d11f3297d73b733e578ac2ad0dbe2..c437fde9f90fc7dfcac79053d214fc9146d7be21:/tests/strings/strings.cpp diff --git a/tests/strings/strings.cpp b/tests/strings/strings.cpp index b27fbc79f1..ce8b266ad7 100644 --- a/tests/strings/strings.cpp +++ b/tests/strings/strings.cpp @@ -11,7 +11,7 @@ // headers // ---------------------------------------------------------------------------- -#include "wx/wxprec.h" +#include "testprec.h" #ifdef __BORLANDC__ #pragma hdrstop @@ -23,8 +23,6 @@ #include "wx/tokenzr.h" -#include "wx/cppunit.h" - // ---------------------------------------------------------------------------- // test class // ---------------------------------------------------------------------------- @@ -42,11 +40,14 @@ private: CPPUNIT_TEST( Constructors ); #if wxUSE_WCHAR_T CPPUNIT_TEST( ConstructorsWithConversion ); -#endif CPPUNIT_TEST( Conversion ); + CPPUNIT_TEST( ConversionUTF7 ); + CPPUNIT_TEST( ConversionUTF8 ); +#endif // wxUSE_WCHAR_T CPPUNIT_TEST( Extraction ); CPPUNIT_TEST( Find ); CPPUNIT_TEST( Tokenizer ); + CPPUNIT_TEST( TokenizerGetPosition ); CPPUNIT_TEST( Replace ); CPPUNIT_TEST( Match ); CPPUNIT_TEST( CaseChanges ); @@ -60,18 +61,29 @@ private: void Constructors(); #if wxUSE_WCHAR_T void ConstructorsWithConversion(); -#endif void Conversion(); + void ConversionUTF7(); + void ConversionUTF8(); +#endif // wxUSE_WCHAR_T void Extraction(); void Find(); void SingleTokenizerTest( wxChar *str, wxChar *delims, size_t count , wxStringTokenizerMode mode ); void Tokenizer(); + void TokenizerGetPosition(); void Replace(); void Match(); void CaseChanges(); void Compare(); void CompareNoCase(); +#if wxUSE_WCHAR_T + // 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, wxCSConv& conv); +#endif // wxUSE_WCHAR_T + DECLARE_NO_COPY_CLASS(StringTestCase) }; @@ -153,11 +165,13 @@ 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); @@ -174,35 +188,120 @@ void StringTestCase::ConstructorsWithConversion() wxString s4(wchar, wxConvUTF8, 3); CPPUNIT_ASSERT( s3 == sub ); - CPPUNIT_ASSERT( s4 == 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() { #if wxUSE_UNICODE - wxString szTheString(wxT("TheString")); - szTheString.insert(3, 1, '\0'); + wxString szTheString(L"The\0String", wxConvLibc, 10); wxCharBuffer theBuffer = szTheString.mb_str(); - - CPPUNIT_ASSERT( memcmp(theBuffer.data(), "The\0String", 11) == 0 ); + + CPPUNIT_ASSERT( memcmp(theBuffer.data(), "The\0String", 11) == 0 ); + + wxString szTheString2("The\0String", wxConvLocal, 10); + CPPUNIT_ASSERT( szTheString2.length() == 11 ); + 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); - - CPPUNIT_ASSERT( memcmp(theBuffer.data(), L"The\0String", 11 * sizeof(wchar_t)) == 0 ); + + CPPUNIT_ASSERT( memcmp(theBuffer.data(), L"The\0String", 11 * sizeof(wchar_t)) == 0 ); wxString szLocalTheString(wxT("TheString")); szLocalTheString.insert(3, 1, '\0'); wxWCharBuffer theLocalBuffer = szLocalTheString.wc_str(wxConvLocal); - - CPPUNIT_ASSERT( memcmp(theLocalBuffer.data(), L"The\0String", 11 * sizeof(wchar_t)) == 0 ); -# endif + + CPPUNIT_ASSERT( memcmp(theLocalBuffer.data(), L"The\0String", 11 * sizeof(wchar_t)) == 0 ); +#endif +} + +void +StringTestCase::DoTestConversion(const char *s, + const wchar_t *ws, + wxCSConv& conv) +{ +#if wxUSE_UNICODE + if ( ws ) + { + wxCharBuffer buf(wxString(ws).mb_str(conv)); + + CPPUNIT_ASSERT( strcmp(buf, s) == 0 ); + } +#else // wxUSE_UNICODE + if ( s ) + { + wxWCharBuffer wbuf(wxString(s).wc_str(conv)); + + if ( ws ) + CPPUNIT_ASSERT( wcscmp(wbuf, ws) == 0 ); + else + CPPUNIT_ASSERT( !*wbuf ); + } +#endif // wxUSE_UNICODE/!wxUSE_UNICODE +} + +struct StringConversionData +{ + const char *str; + const wchar_t *wcs; +}; + +void StringTestCase::ConversionUTF7() +{ + static const StringConversionData utf7data[] = + { + { "+-", L"+" }, + { "+--", L"+-" }, +#if !defined(__GNUC__) || (__GNUC__ >= 3) + { "+AKM-", L"\u00a3" }, #endif + // Windows accepts invalid UTF-7 strings and so does our UTF-7 + // conversion code -- this is wrong IMO but the way it is for now + // + // notice that converting "+" still behaves as expected because the + // result is just an empty string, i.e. the same as if there were an + // error, but converting "a+" results in "a" while it really should + // fail + { "+", NULL }, + { "a+", L"a" }, + }; + + wxCSConv conv(_T("utf-7")); + for ( size_t n = 0; n < WXSIZEOF(utf7data); n++ ) + { + const StringConversionData& d = utf7data[n]; + DoTestConversion(d.str, d.wcs, conv); + } } +void StringTestCase::ConversionUTF8() +{ + static const StringConversionData utf8data[] = + { +#if !defined(__GNUC__) || (__GNUC__ >= 3) + { "\xc2\xa3", L"\u00a3" }, +#endif + { "\xc2", NULL }, + }; + + wxCSConv conv(_T("utf-8")); + for ( size_t n = 0; n < WXSIZEOF(utf8data); n++ ) + { + const StringConversionData& d = utf8data[n]; + DoTestConversion(d.str, d.wcs, conv); + } +} + +#endif // wxUSE_WCHAR_T + + void StringTestCase::Extraction() { wxString s(_T("Hello, world!")); @@ -254,33 +353,33 @@ void StringTestCase::SingleTokenizerTest( wxChar *str, wxChar *delims, size_t co wxChar *buf, *s = NULL, *last; if ( tkz.GetMode() == wxTOKEN_STRTOK ) - { - buf = new wxChar[wxStrlen(str) + 1]; - wxStrcpy(buf, str); - s = wxStrtok(buf, delims, &last); - } - else - { - buf = NULL; - } - - size_t count2 = 0; - while ( tkz.HasMoreTokens() ) - { - wxString token = tkz.GetNextToken(); - if ( buf ) - { - CPPUNIT_ASSERT( token == s ); - s = wxStrtok(NULL, delims, &last); - } - count2++; - } - - CPPUNIT_ASSERT( count2 == count ); - if ( buf ) - { - delete [] buf; - } + { + buf = new wxChar[wxStrlen(str) + 1]; + wxStrcpy(buf, str); + s = wxStrtok(buf, delims, &last); + } + else + { + buf = NULL; + } + + size_t count2 = 0; + while ( tkz.HasMoreTokens() ) + { + wxString token = tkz.GetNextToken(); + if ( buf ) + { + CPPUNIT_ASSERT( token == s ); + s = wxStrtok(NULL, delims, &last); + } + count2++; + } + + CPPUNIT_ASSERT( count2 == count ); + if ( buf ) + { + delete [] buf; + } } void StringTestCase::Tokenizer() @@ -300,6 +399,44 @@ void StringTestCase::Tokenizer() SingleTokenizerTest( _T("01-02/99"), _T("/-"), 3, wxTOKEN_RET_DELIMS ); } +// call this with the string to tokenize, delimeters to use and the expected +// positions (i.e. results of GetPosition()) after each GetNextToken() call, +// terminate positions with 0 +static void +DoTokenizerGetPosition(const wxChar *s, const wxChar *delims, int pos, ...) +{ + wxStringTokenizer tkz(s, delims); + + CPPUNIT_ASSERT( tkz.GetPosition() == 0 ); + + va_list ap; + va_start(ap, pos); + + for ( ;; ) + { + if ( !pos ) + { + CPPUNIT_ASSERT( !tkz.HasMoreTokens() ); + break; + } + + tkz.GetNextToken(); + + CPPUNIT_ASSERT( tkz.GetPosition() == (size_t)pos ); + + pos = va_arg(ap, int); + } + + va_end(ap); +} + +void StringTestCase::TokenizerGetPosition() +{ + DoTokenizerGetPosition(_T("foo"), _T("_"), 3, 0); + DoTokenizerGetPosition(_T("foo_bar"), _T("_"), 4, 7, 0); + DoTokenizerGetPosition(_T("foo_bar_"), _T("_"), 4, 8, 0); +} + void StringTestCase::Replace() { #define TEST_REPLACE( original , pos , len , replacement , result ) \ @@ -377,7 +514,7 @@ void StringTestCase::Compare() wxString neq2 = wxT("AH"); wxString neq3 = wxT("AHHH"); wxString neq4 = wxT("AhH"); - + CPPUNIT_ASSERT( s1 == eq ); CPPUNIT_ASSERT( s1 != neq1 ); CPPUNIT_ASSERT( s1 != neq2 ); @@ -396,7 +533,7 @@ void StringTestCase::Compare() neq2.insert(1,1,'\0'); neq3.insert(1,1,'\0'); neq4.insert(1,1,'\0'); - + CPPUNIT_ASSERT( s1 == eq ); CPPUNIT_ASSERT( s1 != neq1 ); CPPUNIT_ASSERT( s1 != neq2 ); @@ -413,7 +550,7 @@ void StringTestCase::CompareNoCase() wxString neq = wxT("HAH"); wxString neq2 = wxT("AH"); wxString neq3 = wxT("AHHH"); - + #define CPPUNIT_CNCEQ_ASSERT(s1, s2) CPPUNIT_ASSERT( s1.CmpNoCase(s2) == 0) #define CPPUNIT_CNCNEQ_ASSERT(s1, s2) CPPUNIT_ASSERT( s1.CmpNoCase(s2) != 0) @@ -433,7 +570,7 @@ void StringTestCase::CompareNoCase() // wxString _neq = wxT("H\0AH"); // wxString _neq2 = wxT("A\0H"); // wxString _neq3 = wxT("A\0HHH"); - + s1.insert(1,1,'\0'); eq.insert(1,1,'\0'); eq2.insert(1,1,'\0'); @@ -449,4 +586,5 @@ void StringTestCase::CompareNoCase() CPPUNIT_CNCNEQ_ASSERT( s1, neq ); CPPUNIT_CNCNEQ_ASSERT( s1, neq2 ); CPPUNIT_CNCNEQ_ASSERT( s1, neq3 ); -} \ No newline at end of file +} +