X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4ca056ea2be22bacda4a7f0a0787803cd18b6b10..339e08c704a996c552b843e2e6a1854a577aa2e6:/tests/strings/strings.cpp diff --git a/tests/strings/strings.cpp b/tests/strings/strings.cpp index b486a32142..268197281f 100644 --- a/tests/strings/strings.cpp +++ b/tests/strings/strings.cpp @@ -36,6 +36,7 @@ private: CPPUNIT_TEST( PChar ); CPPUNIT_TEST( Format ); CPPUNIT_TEST( Constructors ); + CPPUNIT_TEST( StaticConstructors ); CPPUNIT_TEST( Extraction ); CPPUNIT_TEST( Trim ); CPPUNIT_TEST( Find ); @@ -52,14 +53,19 @@ private: CPPUNIT_TEST( ToULongLong ); #endif // wxLongLong_t CPPUNIT_TEST( ToDouble ); - CPPUNIT_TEST( WriteBuf ); - CPPUNIT_TEST( CStrData ); + CPPUNIT_TEST( StringBuf ); + CPPUNIT_TEST( UTF8Buf ); + CPPUNIT_TEST( CStrDataTernaryOperator ); + CPPUNIT_TEST( CStrDataOperators ); + CPPUNIT_TEST( CStrDataImplicitConversion ); + CPPUNIT_TEST( ExplicitConversion ); CPPUNIT_TEST_SUITE_END(); void String(); void PChar(); void Format(); void Constructors(); + void StaticConstructors(); void Extraction(); void Trim(); void Find(); @@ -76,9 +82,13 @@ private: void ToULongLong(); #endif // wxLongLong_t void ToDouble(); - void WriteBuf(); - void CStrData(); - void DoCStrData(bool cond); + void StringBuf(); + void UTF8Buf(); + void CStrDataTernaryOperator(); + void DoCStrDataTernaryOperator(bool cond); + void CStrDataOperators(); + void CStrDataImplicitConversion(); + void ExplicitConversion(); DECLARE_NO_COPY_CLASS(StringTestCase) }; @@ -151,22 +161,49 @@ void StringTestCase::Format() void StringTestCase::Constructors() { - #define TEST_CTOR(args, res) \ - { \ - wxString s args ; \ - CPPUNIT_ASSERT( s == res ); \ - } - - TEST_CTOR((_T('Z'), 4), _T("ZZZZ")); - TEST_CTOR((_T("Hello"), 4), _T("Hell")); - TEST_CTOR((_T("Hello"), 5), _T("Hello")); + WX_ASSERT_STR_EQUAL( "", wxString('Z', 0) ); + WX_ASSERT_STR_EQUAL( "Z", wxString('Z') ); + WX_ASSERT_STR_EQUAL( "ZZZZ", wxString('Z', 4) ); + WX_ASSERT_STR_EQUAL( "Hell", wxString("Hello", 4) ); + WX_ASSERT_STR_EQUAL( "Hello", wxString("Hello", 5) ); - static const wxChar *s = _T("?really!"); - const wxChar *start = wxStrchr(s, _T('r')); - const wxChar *end = wxStrchr(s, _T('!')); - TEST_CTOR((start, end), _T("really")); +#if wxUSE_UNICODE + WX_ASSERT_STR_EQUAL( L"", wxString(L'Z', 0) ); + WX_ASSERT_STR_EQUAL( L"Z", wxString(L'Z') ); + WX_ASSERT_STR_EQUAL( L"ZZZZ", wxString(L'Z', 4) ); + WX_ASSERT_STR_EQUAL( L"Hell", wxString(L"Hello", 4) ); + WX_ASSERT_STR_EQUAL( L"Hello", wxString(L"Hello", 5) ); +#endif // wxUSE_UNICODE + + static const char *s = "?really!"; + const char *start = wxStrchr(s, 'r'); + const char *end = wxStrchr(s, '!'); + WX_ASSERT_STR_EQUAL( "really", wxString(start, end) ); + + // test if creating string from NULL C pointer works: + WX_ASSERT_STR_EQUAL( "", wxString((const char *)NULL) ); } +void StringTestCase::StaticConstructors() +{ + WX_ASSERT_STR_EQUAL( "", wxString::FromAscii("") ); + WX_ASSERT_STR_EQUAL( "", wxString::FromAscii("Hello", 0) ); + WX_ASSERT_STR_EQUAL( "Hell", wxString::FromAscii("Hello", 4) ); + WX_ASSERT_STR_EQUAL( "Hello", wxString::FromAscii("Hello", 5) ); + WX_ASSERT_STR_EQUAL( "Hello", wxString::FromAscii("Hello") ); + + // FIXME: this doesn't work currently but should! + //WX_ASSERT_SIZET_EQUAL( 1, wxString::FromAscii("", 1).length() ); + + + WX_ASSERT_STR_EQUAL( "", wxString::FromUTF8("") ); + WX_ASSERT_STR_EQUAL( "", wxString::FromUTF8("Hello", 0) ); + WX_ASSERT_STR_EQUAL( "Hell", wxString::FromUTF8("Hello", 4) ); + WX_ASSERT_STR_EQUAL( "Hello", wxString::FromUTF8("Hello", 5) ); + WX_ASSERT_STR_EQUAL( "Hello", wxString::FromUTF8("Hello") ); + + //WX_ASSERT_SIZET_EQUAL( 1, wxString::FromUTF8("", 1).length() ); +} void StringTestCase::Extraction() { @@ -180,12 +217,20 @@ void StringTestCase::Extraction() CPPUNIT_ASSERT( wxStrcmp( s.substr(3, 5).c_str() , _T("lo, w") ) == 0 ); CPPUNIT_ASSERT( wxStrcmp( s.substr(3).c_str() , _T("lo, world!") ) == 0 ); +#if wxUSE_UNICODE + static const char *germanUTF8 = "Oberfl\303\244che"; + wxString strUnicode(wxString::FromUTF8(germanUTF8)); + + CPPUNIT_ASSERT( strUnicode.Mid(0, 10) == strUnicode ); + CPPUNIT_ASSERT( strUnicode.Mid(7, 2) == "ch" ); +#endif // wxUSE_UNICODE + wxString rest; #define TEST_STARTS_WITH(prefix, correct_rest, result) \ CPPUNIT_ASSERT_EQUAL(result, s.StartsWith(prefix, &rest)); \ if ( result ) \ - CPPUNIT_ASSERT_EQUAL(wxString(correct_rest), rest) + WX_ASSERT_STR_EQUAL(correct_rest, rest) TEST_STARTS_WITH( _T("Hello"), _T(", world!"), true ); TEST_STARTS_WITH( _T("Hello, "), _T("world!"), true ); @@ -197,10 +242,14 @@ void StringTestCase::Extraction() #undef TEST_STARTS_WITH + rest = "Hello world"; + CPPUNIT_ASSERT( rest.StartsWith("Hello ", &rest) ); + WX_ASSERT_STR_EQUAL("world", rest); + #define TEST_ENDS_WITH(suffix, correct_rest, result) \ CPPUNIT_ASSERT_EQUAL(result, s.EndsWith(suffix, &rest)); \ if ( result ) \ - CPPUNIT_ASSERT_EQUAL(wxString(correct_rest), rest) + WX_ASSERT_STR_EQUAL(correct_rest, rest) TEST_ENDS_WITH( _T(""), _T("Hello, world!"), true ); TEST_ENDS_WITH( _T("!"), _T("Hello, world"), true ); @@ -251,7 +300,7 @@ void StringTestCase::Replace() { \ wxString s = original; \ s.replace( pos , len , replacement ); \ - CPPUNIT_ASSERT( s == result ); \ + WX_ASSERT_STR_EQUAL( result, s ); \ } TEST_REPLACE( _T("012-AWORD-XYZ"), 4, 5, _T("BWORD"), _T("012-BWORD-XYZ") ); @@ -325,22 +374,6 @@ void StringTestCase::CaseChanges() CPPUNIT_ASSERT( s1l == _T("hello!") ); CPPUNIT_ASSERT( s2u == wxEmptyString ); CPPUNIT_ASSERT( s2l == wxEmptyString ); - -#if !wxUSE_UNICODE - wxLocale locRu(wxLANGUAGE_RUSSIAN, 0 /* flags */); - if ( locRu.IsOk() ) - { - // try upper casing 8bit strings - const wchar_t capital_ya[] = { 0x42f, 0 }, - small_ya[] = { 0x44f, 0 }; - - wxString sUpper(wxConvLibc.cWC2MB(capital_ya)), - sLower(wxConvLibc.cWC2MB(small_ya)); - - CPPUNIT_ASSERT( sUpper.Lower() == sLower ); - CPPUNIT_ASSERT( sLower.Upper() == sUpper ); - } -#endif // !wxUSE_UNICODE } void StringTestCase::Compare() @@ -616,7 +649,7 @@ void StringTestCase::ToDouble() // we need to use decimal point, not comma or whatever is its value for the // current locale - wxSetlocale(LC_ALL, _T("C")); + wxSetlocale(LC_ALL, "C"); size_t n; for ( n = 0; n < WXSIZEOF(doubleData); n++ ) @@ -628,39 +661,78 @@ void StringTestCase::ToDouble() } } -void StringTestCase::WriteBuf() +void StringTestCase::StringBuf() { + // check that buffer can be used to write into the string wxString s; wxStrcpy(wxStringBuffer(s, 10), _T("foo")); - CPPUNIT_ASSERT(s[0u] == _T('f') ); + WX_ASSERT_SIZET_EQUAL(3, s.length()); CPPUNIT_ASSERT(_T('f') == s[0u]); CPPUNIT_ASSERT(_T('o') == s[1]); CPPUNIT_ASSERT(_T('o') == s[2]); - CPPUNIT_ASSERT_EQUAL((size_t)3, s.length()); + { + // also check that the buffer initially contains the original string + // contents + wxStringBuffer buf(s, 10); + CPPUNIT_ASSERT_EQUAL( _T('f'), buf[0] ); + CPPUNIT_ASSERT_EQUAL( _T('o'), buf[1] ); + CPPUNIT_ASSERT_EQUAL( _T('o'), buf[2] ); + CPPUNIT_ASSERT_EQUAL( _T('\0'), buf[3] ); + } { wxStringBufferLength buf(s, 10); + CPPUNIT_ASSERT_EQUAL( _T('f'), buf[0] ); + CPPUNIT_ASSERT_EQUAL( _T('o'), buf[1] ); + CPPUNIT_ASSERT_EQUAL( _T('o'), buf[2] ); + CPPUNIT_ASSERT_EQUAL( _T('\0'), buf[3] ); + + // and check that it can be used to write only the specified number of + // characters to the string wxStrcpy(buf, _T("barrbaz")); buf.SetLength(4); } + WX_ASSERT_SIZET_EQUAL(4, s.length()); CPPUNIT_ASSERT(_T('b') == s[0u]); CPPUNIT_ASSERT(_T('a') == s[1]); CPPUNIT_ASSERT(_T('r') == s[2]); CPPUNIT_ASSERT(_T('r') == s[3]); - CPPUNIT_ASSERT_EQUAL((size_t)4, s.length()); - CPPUNIT_ASSERT_EQUAL( 0, wxStrcmp(_T("barr"), s) ); + // check that creating buffer of length smaller than string works, i.e. at + // least doesn't crash (it would if we naively copied the entire original + // string contents in the buffer) + *wxStringBuffer(s, 1) = '!'; +} + +void StringTestCase::UTF8Buf() +{ +#if wxUSE_UNICODE + // "czech" in Czech ("cestina"): + static const char *textUTF8 = "\304\215e\305\241tina"; + static const wchar_t textUTF16[] = {0x10D, 0x65, 0x161, 0x74, 0x69, 0x6E, 0x61, 0}; + + wxString s; + wxStrcpy(wxUTF8StringBuffer(s, 9), textUTF8); + CPPUNIT_ASSERT(s == textUTF16); + + { + wxUTF8StringBufferLength buf(s, 20); + wxStrcpy(buf, textUTF8); + buf.SetLength(5); + } + CPPUNIT_ASSERT(s == wxString(textUTF16, 0, 3)); +#endif // wxUSE_UNICODE } -void StringTestCase::CStrData() +void StringTestCase::CStrDataTernaryOperator() { - DoCStrData(true); - DoCStrData(false); + DoCStrDataTernaryOperator(true); + DoCStrDataTernaryOperator(false); } template bool CheckStr(const wxString& expected, T s) @@ -668,26 +740,75 @@ template bool CheckStr(const wxString& expected, T s) return expected == wxString(s); } -void StringTestCase::DoCStrData(bool cond) +void StringTestCase::DoCStrDataTernaryOperator(bool cond) { // test compilation of wxCStrData when used with operator?: (the asserts // are not very important, we're testing if the code compiles at all): wxString s("foo"); - const char *mbStr = "foo"; - const wchar_t *wcStr = L"foo"; - // FIXME-UTF8: when wxCStrData can handle both conversions, this should - // be changed to always test all versions, both MB and WC -#if wxUSE_UNICODE + const wchar_t *wcStr = L"foo"; CPPUNIT_ASSERT( CheckStr(s, (cond ? s.c_str() : wcStr)) ); - CPPUNIT_ASSERT( CheckStr(s, (cond ? s.c_str() : L"bar")) ); + CPPUNIT_ASSERT( CheckStr(s, (cond ? s.c_str() : L"foo")) ); CPPUNIT_ASSERT( CheckStr(s, (cond ? wcStr : s.c_str())) ); - CPPUNIT_ASSERT( CheckStr(s, (cond ? L"bar" : s.c_str())) ); -#else + CPPUNIT_ASSERT( CheckStr(s, (cond ? L"foo" : s.c_str())) ); + + const char *mbStr = "foo"; CPPUNIT_ASSERT( CheckStr(s, (cond ? s.c_str() : mbStr)) ); CPPUNIT_ASSERT( CheckStr(s, (cond ? s.c_str() : "foo")) ); CPPUNIT_ASSERT( CheckStr(s, (cond ? mbStr : s.c_str())) ); CPPUNIT_ASSERT( CheckStr(s, (cond ? "foo" : s.c_str())) ); + + wxString empty(""); + CPPUNIT_ASSERT( CheckStr(empty, (cond ? empty.c_str() : wxEmptyString)) ); + CPPUNIT_ASSERT( CheckStr(empty, (cond ? wxEmptyString : empty.c_str())) ); +} + +void StringTestCase::CStrDataOperators() +{ + wxString s("hello"); + + CPPUNIT_ASSERT( s.c_str()[0] == 'h' ); + CPPUNIT_ASSERT( s.c_str()[1] == 'e' ); + CPPUNIT_ASSERT( s.c_str()[5] == '\0' ); + + CPPUNIT_ASSERT( *s.c_str() == 'h' ); + CPPUNIT_ASSERT( *(s.c_str() + 2) == 'l' ); + CPPUNIT_ASSERT( *(s.c_str() + 5) == '\0' ); +} + +bool CheckStrChar(const wxString& expected, char *s) + { return CheckStr(expected, s); } +bool CheckStrWChar(const wxString& expected, wchar_t *s) + { return CheckStr(expected, s); } +bool CheckStrConstChar(const wxString& expected, const char *s) + { return CheckStr(expected, s); } +bool CheckStrConstWChar(const wxString& expected, const wchar_t *s) + { return CheckStr(expected, s); } + +void StringTestCase::CStrDataImplicitConversion() +{ + wxString s("foo"); + + CPPUNIT_ASSERT( CheckStrConstWChar(s, s.c_str()) ); + CPPUNIT_ASSERT( CheckStrConstChar(s, s.c_str()) ); + + // implicit conversion of wxString is not available in STL build +#if !wxUSE_STL + CPPUNIT_ASSERT( CheckStrConstWChar(s, s) ); + CPPUNIT_ASSERT( CheckStrConstChar(s, s) ); #endif } + +void StringTestCase::ExplicitConversion() +{ + wxString s("foo"); + + CPPUNIT_ASSERT( CheckStr(s, s.mb_str()) ); + CPPUNIT_ASSERT( CheckStrConstChar(s, s.mb_str()) ); + CPPUNIT_ASSERT( CheckStrChar(s, s.char_str()) ); + + CPPUNIT_ASSERT( CheckStr(s, s.wc_str()) ); + CPPUNIT_ASSERT( CheckStrConstWChar(s, s.wc_str()) ); + CPPUNIT_ASSERT( CheckStrWChar(s, s.wchar_str()) ); +}