X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/59953bf4ba167311fb0cd2c2c0f3d5d0475b98c8..99529b9c4b711a81b85f80f556407cc9dbd055f7:/tests/strings/stdstrings.cpp

diff --git a/tests/strings/stdstrings.cpp b/tests/strings/stdstrings.cpp
index 9cb81dffe6..585d65c6e4 100644
--- a/tests/strings/stdstrings.cpp
+++ b/tests/strings/stdstrings.cpp
@@ -1,4 +1,4 @@
-///////////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////////
 // Name:        tests/strings/stdstrings.cpp
 // Purpose:     wxString unit test
 // Author:      Vadim Zeitlin, Wlodzimierz ABX Skiba
@@ -33,6 +33,7 @@ public:
 private:
     CPPUNIT_TEST_SUITE( StdStringTestCase );
         CPPUNIT_TEST( StdConstructors );
+        CPPUNIT_TEST( StdIterators );
         CPPUNIT_TEST( StdAppend );
         CPPUNIT_TEST( StdAssign );
         CPPUNIT_TEST( StdCompare );
@@ -52,6 +53,7 @@ private:
     CPPUNIT_TEST_SUITE_END();
 
     void StdConstructors();
+    void StdIterators();
     void StdAppend();
     void StdAssign();
     void StdCompare();
@@ -101,13 +103,22 @@ void StdStringTestCase::StdConstructors()
     CPPUNIT_ASSERT( s7 == s1 );
     CPPUNIT_ASSERT( s8 == _T("efgh") );
 
-    const char *pc = s1;
+    const char *pc = s1.c_str();
     WX_ASSERT_STR_EQUAL( "bcd", wxString(pc + 1, pc + 4) );
 
     const wchar_t *pw = s2.c_str();
     WX_ASSERT_STR_EQUAL( "a", wxString(pw, pw + 1) );
 }
 
+void StdStringTestCase::StdIterators()
+{
+    // test compilation of default iterators ctors:
+    wxString::iterator i1;
+    wxString::const_iterator i2;
+    wxString::reverse_iterator i3;
+    wxString::const_reverse_iterator i4;
+}
+
 void StdStringTestCase::StdAppend()
 {
     wxString s1, s2, s3, s4, s5, s6, s7, s8;
@@ -165,13 +176,16 @@ void StdStringTestCase::StdAssign()
     CPPUNIT_ASSERT( s5 == _T("aaa") );
     CPPUNIT_ASSERT( s6 == _T("ef") );
 
-    const char *pc = s1;
+    const char *pc = s1.c_str();
     s7.assign(pc, pc + 2);
     WX_ASSERT_STR_EQUAL( "de", s7 );
 
     const wchar_t *pw = s1.c_str();
     s8.assign(pw + 2, pw + 3);
     WX_ASSERT_STR_EQUAL( "f", s8 );
+
+    s1.assign(s1, 1, 1);
+    WX_ASSERT_STR_EQUAL("e", s1);
 }
 
 void StdStringTestCase::StdCompare()
@@ -474,6 +488,11 @@ void StdStringTestCase::StdResize()
     CPPUNIT_ASSERT( s2 == _T("abcABCdefD") );
     CPPUNIT_ASSERT( s3 == _T("abcABCdefDEF  ") );
     CPPUNIT_ASSERT( s4 == _T("abcABCdefDEFWW") );
+
+    wxString s =
+        wxString::FromUTF8("\xd0\x9f\xd1\x80\xd0\xb8\xd0\xb2\xd0\xb5\xd1\x82");
+    s.resize(3);
+    WX_ASSERT_STR_EQUAL("\xd0\x9f\xd1\x80\xd0\xb8", s);
 }
 
 void StdStringTestCase::StdRiter()
@@ -539,10 +558,21 @@ void StdStringTestCase::StdConversion()
     CPPUNIT_ASSERT( s3 == "std::wstring value" );
 
     wxString s4("hello");
+
+    // wxString -> std::string conversion is only available in wxUSE_STL case,
+    // because it conflicts with conversion to const char*/wchar_t*:
+#if wxUSE_STL
     std::string s5 = s4;
     CPPUNIT_ASSERT( s5 == "hello" );
 
     wxStdWideString s6 = s4;
     CPPUNIT_ASSERT( s6 == "hello" );
+#endif
+
+    std::string s7(s4);
+    CPPUNIT_ASSERT( s7 == "hello" );
+
+    wxStdWideString s8(s4);
+    CPPUNIT_ASSERT( s8 == "hello" );
 }
 #endif // wxUSE_STD_STRING