2.5.3 - cleanups, fixes, etc. etc. -

[wxWidgets.git] / tests / strings / stdstrings.cpp

diff --git a/tests/strings/stdstrings.cpp b/tests/strings/stdstrings.cpp
index 5bdc4ac7910a0fe00595d81613e70c25b6cae3bf..454818265165ed7b35caa734a698d2f84b3c0b71 100644 (file)
--- a/tests/strings/stdstrings.cpp
+++ b/tests/strings/stdstrings.cpp
@@ -208,6 +208,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()
@@ -343,6 +370,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()
@@ -370,5 +419,24 @@ 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("") );
+
+
+//                                                                 1
+//                                             012 34567 89012 3456
+//    wxString s1 = _T("abc\0defg\0ABCD\0EFG");
+
+    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("") );
 }