X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f7e98dee7eb8747ddd0b912600bcad1191818733..d924939be81c8a836516cded30f1392cd9b6baf5:/tests/strings/strings.cpp diff --git a/tests/strings/strings.cpp b/tests/strings/strings.cpp index c4346c0116..42db733cb5 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 @@ -21,10 +21,6 @@ #include "wx/wx.h" #endif // WX_PRECOMP -#include "wx/tokenzr.h" - -#include "wx/cppunit.h" - // ---------------------------------------------------------------------------- // test class // ---------------------------------------------------------------------------- @@ -40,37 +36,34 @@ private: CPPUNIT_TEST( PChar ); CPPUNIT_TEST( Format ); CPPUNIT_TEST( Constructors ); -#if wxUSE_WCHAR_T - CPPUNIT_TEST( ConstructorsWithConversion ); -#endif - CPPUNIT_TEST( Conversion ); CPPUNIT_TEST( Extraction ); + CPPUNIT_TEST( Trim ); CPPUNIT_TEST( Find ); - CPPUNIT_TEST( Tokenizer ); CPPUNIT_TEST( Replace ); CPPUNIT_TEST( Match ); CPPUNIT_TEST( CaseChanges ); CPPUNIT_TEST( Compare ); CPPUNIT_TEST( CompareNoCase ); + CPPUNIT_TEST( ToLong ); + CPPUNIT_TEST( ToULong ); + CPPUNIT_TEST( ToDouble ); CPPUNIT_TEST_SUITE_END(); void String(); void PChar(); void Format(); void Constructors(); -#if wxUSE_WCHAR_T - void ConstructorsWithConversion(); -#endif - void Conversion(); void Extraction(); + void Trim(); void Find(); - void SingleTokenizerTest( wxChar *str, wxChar *delims, size_t count , wxStringTokenizerMode mode ); - void Tokenizer(); void Replace(); void Match(); void CaseChanges(); void Compare(); void CompareNoCase(); + void ToLong(); + void ToULong(); + void ToDouble(); DECLARE_NO_COPY_CLASS(StringTestCase) }; @@ -130,6 +123,15 @@ void StringTestCase::Format() CPPUNIT_ASSERT( s1 == wxString::Format(_T("%03d"), 18) ); s2.Printf(_T("Number 18: %s\n"), s1.c_str()); CPPUNIT_ASSERT( s2 == wxString::Format(_T("Number 18: %s\n"), s1.c_str()) ); + + static const size_t lengths[] = { 1, 512, 1024, 1025, 2048, 4096, 4097 }; + for ( size_t n = 0; n < WXSIZEOF(lengths); n++ ) + { + const size_t len = lengths[n]; + + wxString s(_T('Z'), len); + CPPUNIT_ASSERT_EQUAL( len, wxString::Format(_T("%s"), s.c_str()).length()); + } } void StringTestCase::Constructors() @@ -150,60 +152,6 @@ void StringTestCase::Constructors() TEST_CTOR((start, end), _T("really")); } -#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}; - const wchar_t wchar[] = {0x44,0xE9,0x6A,0xE0,0}; - const char utf8sub[] = {0x44,0xC3,0xA9,0x6A,0}; // "Dej" - - wxString s1(utf8, wxConvUTF8); - wxString s2(wchar, wxConvUTF8); - -#if wxUSE_UNICODE - CPPUNIT_ASSERT( s1 == wchar ); - CPPUNIT_ASSERT( s2 == wchar ); -#else - CPPUNIT_ASSERT( s1 == utf8 ); - CPPUNIT_ASSERT( s2 == utf8 ); -#endif - - wxString sub(utf8sub, wxConvUTF8); // "Dej" substring - wxString s3(utf8, wxConvUTF8, 4); - wxString s4(wchar, wxConvUTF8, 3); - - CPPUNIT_ASSERT( s3 == sub ); - CPPUNIT_ASSERT( s4 == sub ); -} -#endif - -void StringTestCase::Conversion() -{ -#if wxUSE_UNICODE - wxString szTheString(L"The\0String", wxConvLibc, 10); - wxCharBuffer theBuffer = szTheString.mb_str(); - - 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 ); -#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 ); - - 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 -#endif -} void StringTestCase::Extraction() { @@ -219,11 +167,10 @@ void StringTestCase::Extraction() wxString rest; - #define TEST_STARTS_WITH( prefix , correct_rest, result ) \ - CPPUNIT_ASSERT( \ - ( s.StartsWith( prefix, &rest ) == result ) && \ - ( ( result == false ) || ( wxStrcmp( correct_rest , rest ) == 0 ) ) \ - ) + #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) TEST_STARTS_WITH( _T("Hello"), _T(", world!"), true ); TEST_STARTS_WITH( _T("Hello, "), _T("world!"), true ); @@ -234,6 +181,41 @@ void StringTestCase::Extraction() TEST_STARTS_WITH( _T("Hi"), _T(""), false ); #undef TEST_STARTS_WITH + + #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) + + TEST_ENDS_WITH( _T(""), _T("Hello, world!"), true ); + TEST_ENDS_WITH( _T("!"), _T("Hello, world"), true ); + TEST_ENDS_WITH( _T(", world!"), _T("Hello"), true ); + TEST_ENDS_WITH( _T("ello, world!"), _T("H"), true ); + TEST_ENDS_WITH( _T("Hello, world!"), _T(""), true ); + TEST_ENDS_WITH( _T("very long string"), _T(""), false ); + TEST_ENDS_WITH( _T("?"), _T(""), false ); + TEST_ENDS_WITH( _T("Hello, world"), _T(""), false ); + TEST_ENDS_WITH( _T("Gello, world!"), _T(""), false ); + + #undef TEST_ENDS_WITH +} + +void StringTestCase::Trim() +{ + #define TEST_TRIM( str , dir , result ) \ + CPPUNIT_ASSERT( wxString(str).Trim(dir) == result ) + + TEST_TRIM( _T(" Test "), true, _T(" Test") ); + TEST_TRIM( _T(" "), true, _T("") ); + TEST_TRIM( _T(" "), true, _T("") ); + TEST_TRIM( _T(""), true, _T("") ); + + TEST_TRIM( _T(" Test "), false, _T("Test ") ); + TEST_TRIM( _T(" "), false, _T("") ); + TEST_TRIM( _T(" "), false, _T("") ); + TEST_TRIM( _T(""), false, _T("") ); + + #undef TEST_TRIM } void StringTestCase::Find() @@ -248,60 +230,6 @@ void StringTestCase::Find() #undef TEST_FIND } -void StringTestCase::SingleTokenizerTest( wxChar *str, wxChar *delims, size_t count , wxStringTokenizerMode mode ) -{ - wxStringTokenizer tkz( str, delims, mode); - CPPUNIT_ASSERT( tkz.CountTokens() == count ); - - 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; - } -} - -void StringTestCase::Tokenizer() -{ - SingleTokenizerTest( _T(""), _T(" "), 0, wxTOKEN_DEFAULT ); - SingleTokenizerTest( _T("Hello, world"), _T(" "), 2, wxTOKEN_DEFAULT ); - SingleTokenizerTest( _T("Hello, world "), _T(" "), 2, wxTOKEN_DEFAULT ); - SingleTokenizerTest( _T("Hello, world"), _T(","), 2, wxTOKEN_DEFAULT ); - SingleTokenizerTest( _T("Hello, world!"), _T(",!"), 2, wxTOKEN_DEFAULT ); - SingleTokenizerTest( _T("Hello,, world!"), _T(",!"), 3, wxTOKEN_DEFAULT ); - SingleTokenizerTest( _T("Hello, world!"), _T(",!"), 3, wxTOKEN_RET_EMPTY_ALL ); - SingleTokenizerTest( _T("username:password:uid:gid:gecos:home:shell"), _T(":"), 7, wxTOKEN_DEFAULT ); - SingleTokenizerTest( _T("1 \t3\t4 6 "), wxDEFAULT_DELIMITERS, 4, wxTOKEN_DEFAULT ); - SingleTokenizerTest( _T("1 \t3\t4 6 "), wxDEFAULT_DELIMITERS, 6, wxTOKEN_RET_EMPTY ); - SingleTokenizerTest( _T("1 \t3\t4 6 "), wxDEFAULT_DELIMITERS, 9, wxTOKEN_RET_EMPTY_ALL ); - SingleTokenizerTest( _T("01/02/99"), _T("/-"), 3, wxTOKEN_DEFAULT ); - SingleTokenizerTest( _T("01-02/99"), _T("/-"), 3, wxTOKEN_RET_DELIMS ); -} - void StringTestCase::Replace() { #define TEST_REPLACE( original , pos , len , replacement , result ) \ @@ -317,6 +245,32 @@ void StringTestCase::Replace() TEST_REPLACE( _T("foobar"), 3, 0, _T("-"), _T("foo-bar") ); TEST_REPLACE( _T("barfoo"), 0, 6, _T("foobar"), _T("foobar") ); + + #define TEST_NULLCHARREPLACE( o , olen, pos , len , replacement , r, rlen ) \ + { \ + wxString s(o,olen); \ + s.replace( pos , len , replacement ); \ + CPPUNIT_ASSERT( s == wxString(r,rlen) ); \ + } + + TEST_NULLCHARREPLACE( _T("null\0char"), 9, 5, 1, _T("d"), + _T("null\0dhar"), 9 ); + + #define TEST_WXREPLACE( o , olen, olds, news, all, r, rlen ) \ + { \ + wxString s(o,olen); \ + s.Replace( olds, news, all ); \ + CPPUNIT_ASSERT( s == wxString(r,rlen) ); \ + } + + TEST_WXREPLACE( _T("null\0char"), 9, _T("c"), _T("de"), true, + _T("null\0dehar"), 10 ); + + TEST_WXREPLACE( _T("null\0dehar"), 10, _T("de"), _T("c"), true, + _T("null\0char"), 9 ); + + #undef TEST_WXREPLACE + #undef TEST_NULLCHARREPLACE #undef TEST_REPLACE } @@ -362,8 +316,11 @@ void StringTestCase::CaseChanges() if ( locRu.IsOk() ) { // try upper casing 8bit strings - wxString sUpper("\xdf"), - sLower("\xff"); + 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 ); @@ -379,7 +336,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 ); @@ -398,7 +355,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 ); @@ -415,7 +372,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) @@ -435,7 +392,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'); @@ -451,4 +408,96 @@ void StringTestCase::CompareNoCase() CPPUNIT_CNCNEQ_ASSERT( s1, neq ); CPPUNIT_CNCNEQ_ASSERT( s1, neq2 ); CPPUNIT_CNCNEQ_ASSERT( s1, neq3 ); -} \ No newline at end of file +} + +void StringTestCase::ToLong() +{ + long l; + static const struct ToLongData + { + const wxChar *str; + long value; + bool ok; + } longData[] = + { + { _T("1"), 1, true }, + { _T("0"), 0, true }, + { _T("a"), 0, false }, + { _T("12345"), 12345, true }, + { _T("-1"), -1, true }, + { _T("--1"), 0, false }, + }; + + size_t n; + for ( n = 0; n < WXSIZEOF(longData); n++ ) + { + const ToLongData& ld = longData[n]; + CPPUNIT_ASSERT_EQUAL( ld.ok, wxString(ld.str).ToLong(&l) ); + if ( ld.ok ) + CPPUNIT_ASSERT_EQUAL( ld.value, l ); + } +} + +void StringTestCase::ToULong() +{ + unsigned long ul; + static const struct ToULongData + { + const wxChar *str; + unsigned long value; + bool ok; + } ulongData[] = + { + { _T("1"), 1, true }, + { _T("0"), 0, true }, + { _T("a"), 0, false }, + { _T("12345"), 12345, true }, + // this is surprizing but consistent with strtoul() behaviour + { _T("-1"), ULONG_MAX, true }, + }; + + size_t n; + for ( n = 0; n < WXSIZEOF(ulongData); n++ ) + { + const ToULongData& uld = ulongData[n]; + CPPUNIT_ASSERT_EQUAL( uld.ok, wxString(uld.str).ToULong(&ul) ); + if ( uld.ok ) + CPPUNIT_ASSERT_EQUAL( uld.value, ul ); + } +} + +void StringTestCase::ToDouble() +{ + double d; + static const struct ToDoubleData + { + const wxChar *str; + double value; + bool ok; + } doubleData[] = + { + { _T("1"), 1, true }, + { _T("1.23"), 1.23, true }, + { _T(".1"), .1, true }, + { _T("1."), 1, true }, + { _T("1.."), 0, false }, + { _T("0"), 0, true }, + { _T("a"), 0, false }, + { _T("12345"), 12345, true }, + { _T("-1"), -1, true }, + { _T("--1"), 0, false }, + }; + + // we need to use decimal point, not comma or whatever is its value for the + // current locale + wxSetlocale(LC_ALL, _T("C")); + + size_t n; + for ( n = 0; n < WXSIZEOF(doubleData); n++ ) + { + const ToDoubleData& ld = doubleData[n]; + CPPUNIT_ASSERT_EQUAL( ld.ok, wxString(ld.str).ToDouble(&d) ); + if ( ld.ok ) + CPPUNIT_ASSERT_EQUAL( ld.value, d ); + } +}