X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0a19929958e22101608221753f0245dd31e76702..0c7e0a87719f1034c8a9b3e748f5e0ca1cdaeb13:/tests/strings/stdstrings.cpp diff --git a/tests/strings/stdstrings.cpp b/tests/strings/stdstrings.cpp index 5bdc4ac791..10fdf882c8 100644 --- a/tests/strings/stdstrings.cpp +++ b/tests/strings/stdstrings.cpp @@ -11,7 +11,7 @@ // headers // ---------------------------------------------------------------------------- -#include "wx/wxprec.h" +#include "testprec.h" #ifdef __BORLANDC__ #pragma hdrstop @@ -21,8 +21,6 @@ #include "wx/wx.h" #endif // WX_PRECOMP -#include "wx/cppunit.h" - // ---------------------------------------------------------------------------- // test class // ---------------------------------------------------------------------------- @@ -46,6 +44,7 @@ private: CPPUNIT_TEST( StdReplace ); CPPUNIT_TEST( StdRFind ); CPPUNIT_TEST( StdResize ); + CPPUNIT_TEST( StdRiter ); CPPUNIT_TEST( StdSubstr ); CPPUNIT_TEST_SUITE_END(); @@ -61,6 +60,7 @@ private: void StdReplace(); void StdRFind(); void StdResize(); + void StdRiter(); void StdSubstr(); DECLARE_NO_COPY_CLASS(StdStringTestCase) @@ -100,7 +100,7 @@ void StdStringTestCase::StdAppend() { wxString s1, s2, s3, s4, s5, s6, s7, s8; - s1 = s2 = s3 = s4 = s5 = s6 = s7 = s8 = _T("abc"); + s1 = s2 = s3 = s4 = s5 = s6 = _T("abc"); s1.append(_T("def")); s2.append(_T("defgh"), 3); s3.append(wxString(_T("abcdef")), 3, 6); @@ -114,6 +114,14 @@ void StdStringTestCase::StdAppend() CPPUNIT_ASSERT( s4 == _T("abcabcdef") ); CPPUNIT_ASSERT( s5 == _T("abcaaa") ); CPPUNIT_ASSERT( s6 == _T("abcdef") ); + + s7 = s8 = wxString(_T("null\0time"), 9); + + s7.append(_T("def")); + s8.append(_T("defgh"), 3); + + CPPUNIT_ASSERT( s7 == wxString(_T("null\0timedef"), 12) ); + CPPUNIT_ASSERT( s8 == wxString(_T("null\0timedef"), 12) ); } void StdStringTestCase::StdAssign() @@ -208,6 +216,33 @@ void StdStringTestCase::StdFind() CPPUNIT_ASSERT( s1.find(s2) == 6u ); CPPUNIT_ASSERT( s1.find(s2, 7) == wxString::npos ); CPPUNIT_ASSERT( s1.find(s2, 6) == 6u ); + + // 0 1 2 + // 0123456 78901234567 8901234567 + //wxString _s1 = _T("abcdefg\0ABCDEFGabc\0ABCabcABC"); + //wxString _s2 = _T("g\0AB"); + wxString _s1 = _T("abcdefgABCDEFGabcABCabcABC"); + wxString _s2 = _T("gAB"); + + _s1.insert(7, 1, '\0'); + _s1.insert(18, 1, '\0'); + _s2.insert(1, 1, '\0'); + + CPPUNIT_ASSERT( _s1.find(_T('A')) == 8u ); + CPPUNIT_ASSERT( _s1.find(_T('A'), 8) == 8u ); + CPPUNIT_ASSERT( _s1.find(_T('Z')) == wxString::npos ); + CPPUNIT_ASSERT( _s1.find(_T('C'), 22) == 27u ); + + CPPUNIT_ASSERT( _s1.find(_T("AB")) == 8u ); + CPPUNIT_ASSERT( _s1.find(_T("AB"), 26) == wxString::npos ); + CPPUNIT_ASSERT( _s1.find(_T("AB"), 23) == 25u ); + + CPPUNIT_ASSERT( _s1.find(_T("ABZZZ"), 2, 2) == 8u ); + CPPUNIT_ASSERT( _s1.find(_T("ABZZZ"), 26, 2) == wxString::npos ); + + CPPUNIT_ASSERT( _s1.find(_s2) == 6u ); + CPPUNIT_ASSERT( _s1.find(_s2, 7) == wxString::npos ); + CPPUNIT_ASSERT( _s1.find(_s2, 6) == 6u ); } void StdStringTestCase::StdFindFirst() @@ -259,6 +294,33 @@ void StdStringTestCase::StdFindLast() CPPUNIT_ASSERT( s1.find_last_of(_T("ijklm")) == 16u ); CPPUNIT_ASSERT( s1.find_last_of(_T("ijklma"), 33, 4) == 16u ); CPPUNIT_ASSERT( s1.find_last_of(_T("a"), 17) == 17u ); + + + + // 0 1 2 3 + // 012345 67890123456789 01234567890123456 +// wxString s1 = _T("aaaaaa\0bcdefghlkjiaa\0aaaabcdbcdbcdbcd"); +// wxString s2 = _T("aaaaaa\0"); + s1.insert(6,1,'\0'); + s1.insert(20,1,'\0'); + s2.insert(6,1,'\0'); + + CPPUNIT_ASSERT( s2.find_last_not_of(_T('a')) == 6u ); + CPPUNIT_ASSERT( s1.find_last_not_of(_T('d')) == 35u ); + CPPUNIT_ASSERT( s1.find_last_not_of(_T('d'), 27) == 26u ); + + CPPUNIT_ASSERT( s1.find_last_not_of(_T("bcd")) == 24u ); + CPPUNIT_ASSERT( s1.find_last_not_of(_T("abc"), 26) == 20u ); + + CPPUNIT_ASSERT( s1.find_last_not_of(_T("abcdefghijklmnopqrstuv"), 26, 3) == 20u ); + + CPPUNIT_ASSERT( s2.find_last_of(_T('c')) == wxString::npos ); + CPPUNIT_ASSERT( s1.find_last_of(_T('a')) == 24u ); + CPPUNIT_ASSERT( s1.find_last_of(_T('b'), 26) == 25u ); + + CPPUNIT_ASSERT( s1.find_last_of(_T("ijklm")) == 17u ); + CPPUNIT_ASSERT( s1.find_last_of(_T("ijklma"), 35, 4) == 17u ); + CPPUNIT_ASSERT( s1.find_last_of(_T("a"), 18) == 18u ); } void StdStringTestCase::StdInsert() @@ -343,6 +405,28 @@ void StdStringTestCase::StdRFind() CPPUNIT_ASSERT( s1.rfind(s2, 5) == wxString::npos ); CPPUNIT_ASSERT( s1.rfind(s2, 6) == 6u ); CPPUNIT_ASSERT( s1.rfind(s3, 1) == 0u ); + + + // 0 1 2 + // 01234 56789012 345678901234567 +// wxString s1 = _T("abcde\0fgABCDE\0FGabcABCabcABC"); +// wxString s2 = _T("gAB"); +// wxString s3 = _T("ab"); + + s1.insert(5,1,'\0'); + s1.insert(13,1,'\0'); + + CPPUNIT_ASSERT( s1.rfind(_T('A')) == 25u ); + CPPUNIT_ASSERT( s1.rfind(_T('A'), 8) == 8u ); + CPPUNIT_ASSERT( s1.rfind(_T('Z')) == wxString::npos ); + CPPUNIT_ASSERT( s1.rfind(_T('C'), 22) == 21u ); + + CPPUNIT_ASSERT( s1.rfind(_T("cAB")) == 24u ); + CPPUNIT_ASSERT( s1.rfind(_T("cAB"), 15) == wxString::npos ); + CPPUNIT_ASSERT( s1.rfind(_T("cAB"), 21) == 18u ); + + CPPUNIT_ASSERT( s1.rfind(_T("gABZZZ"), 8, 3) == 7u ); + CPPUNIT_ASSERT( s1.rfind(_T("gABZZZ"), 5, 3) == wxString::npos ); } void StdStringTestCase::StdResize() @@ -362,6 +446,26 @@ void StdStringTestCase::StdResize() CPPUNIT_ASSERT( s4 == _T("abcABCdefDEFWW") ); } +void StdStringTestCase::StdRiter() +{ + const wxString s(_T("fozbar")); + + wxString::const_reverse_iterator ri(s.rbegin()); + CPPUNIT_ASSERT_EQUAL( _T('r'), *ri ); + CPPUNIT_ASSERT_EQUAL( _T('a'), *++ri ); + CPPUNIT_ASSERT_EQUAL( _T('r'), *--ri ); + + ri = s.rend(); + ri--; + CPPUNIT_ASSERT_EQUAL( _T('f'), *ri ); + + --ri; + CPPUNIT_ASSERT_EQUAL( _T('o'), *ri ); + + wxString::const_iterator i = ri.base(); + CPPUNIT_ASSERT_EQUAL( _T('z'), *i ); +} + void StdStringTestCase::StdSubstr() { wxString s1 = _T("abcdefgABCDEFG"); @@ -370,5 +474,19 @@ void StdStringTestCase::StdSubstr() CPPUNIT_ASSERT( s1.substr( 1, 13 ) == _T("bcdefgABCDEFG") ); CPPUNIT_ASSERT( s1.substr( 1, 20 ) == _T("bcdefgABCDEFG") ); CPPUNIT_ASSERT( s1.substr( 14, 30 ) == _T("") ); + + s1.insert(3,1,'\0'); + s1.insert(8,1,'\0'); + s1.insert(13,1,'\0'); + + wxString s2 = wxT("bcdefgABCDEFG"); + s2.insert(2,1,'\0'); + s2.insert(7,1,'\0'); + s2.insert(12,1,'\0'); + + CPPUNIT_ASSERT( s1.substr( 0, 17 ) == s1 ); + CPPUNIT_ASSERT( s1.substr( 1, 17 ) == s2 ); + CPPUNIT_ASSERT( s1.substr( 1, 20 ) == s2 ); + CPPUNIT_ASSERT( s1.substr( 17, 30 ) == _T("") ); }