X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/422d306cb3acaebe95a0554754ab8a15f13a1784..f2ea42557b8570b18082542f043c26b9ba346d21:/tests/strings/stdstrings.cpp

diff --git a/tests/strings/stdstrings.cpp b/tests/strings/stdstrings.cpp
index ded78080c4..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,18 +216,18 @@ 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 );
@@ -404,7 +412,7 @@ void StdStringTestCase::StdRFind()
 //    wxString s1 = _T("abcde\0fgABCDE\0FGabcABCabcABC");
 //    wxString s2 = _T("gAB");
 //    wxString s3 = _T("ab");
-    
+
     s1.insert(5,1,'\0');
     s1.insert(13,1,'\0');
 
@@ -438,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");
@@ -447,11 +475,6 @@ void StdStringTestCase::StdSubstr()
     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');
@@ -460,7 +483,7 @@ void StdStringTestCase::StdSubstr()
     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 );