fixed FromUTF8() to accept NULL as well as len==npos; this fixes crashes when loading...

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

diff --git a/tests/strings/stdstrings.cpp b/tests/strings/stdstrings.cpp
index a50f65ab21f7b62672b8b36d6f4a6342c344f6d5..9cb81dffe6e40e9641b46ff8f89644bc07b21c2a 100644 (file)
--- a/tests/strings/stdstrings.cpp
+++ b/tests/strings/stdstrings.cpp
@@ -46,6 +46,9 @@ private:
         CPPUNIT_TEST( StdResize );
         CPPUNIT_TEST( StdRiter );
         CPPUNIT_TEST( StdSubstr );
+#if wxUSE_STD_STRING
+        CPPUNIT_TEST( StdConversion );
+#endif
     CPPUNIT_TEST_SUITE_END();
 
     void StdConstructors();
@@ -62,6 +65,9 @@ private:
     void StdResize();
     void StdRiter();
     void StdSubstr();
+#if wxUSE_STD_STRING
+    void StdConversion();
+#endif
 
     DECLARE_NO_COPY_CLASS(StdStringTestCase)
 };
@@ -94,13 +100,19 @@ void StdStringTestCase::StdConstructors()
     CPPUNIT_ASSERT( s6 == s1 );
     CPPUNIT_ASSERT( s7 == s1 );
     CPPUNIT_ASSERT( s8 == _T("efgh") );
+
+    const char *pc = s1;
+    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::StdAppend()
 {
     wxString s1, s2, s3, s4, s5, s6, s7, s8;
 
-    s1 = s2 = s3 = s4 = s5 = s6 = s7 = _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);
@@ -117,6 +129,14 @@ void StdStringTestCase::StdAppend()
     CPPUNIT_ASSERT( s5 == _T("abcaaaxxy") );
     CPPUNIT_ASSERT( s6 == _T("abcdef") );
 
+    const char *pc = s1.c_str() + 2;
+    s7.append(pc, pc + 4);
+    WX_ASSERT_STR_EQUAL( "cdef", s7 );
+
+    const wchar_t *pw = s2.c_str() + 2;
+    s8.append(pw, pw + 4);
+    WX_ASSERT_STR_EQUAL( "cdef", s8 );
+
     s7 = s8 = wxString(_T("null\0time"), 9);
 
     s7.append(_T("def"));
@@ -144,6 +164,14 @@ void StdStringTestCase::StdAssign()
     CPPUNIT_ASSERT( s4 == _T("def") );
     CPPUNIT_ASSERT( s5 == _T("aaa") );
     CPPUNIT_ASSERT( s6 == _T("ef") );
+
+    const char *pc = s1;
+    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 );
 }
 
 void StdStringTestCase::StdCompare()
@@ -492,3 +520,29 @@ void StdStringTestCase::StdSubstr()
     CPPUNIT_ASSERT( s1.substr( 17, 30 ) == _T("") );
 }
 
+#if wxUSE_STD_STRING
+void StdStringTestCase::StdConversion()
+{
+    std::string strStd("std::string value");
+    wxStdWideString strStdWide(L"std::wstring value");
+
+    wxString s1(strStd);
+    CPPUNIT_ASSERT( s1 == "std::string value" );
+
+    wxString s2(strStdWide);
+    CPPUNIT_ASSERT( s2 == "std::wstring value" );
+
+    wxString s3;
+    s3 = strStd;
+    CPPUNIT_ASSERT( s3 == "std::string value" );
+    s3 = strStdWide;
+    CPPUNIT_ASSERT( s3 == "std::wstring value" );
+
+    wxString s4("hello");
+    std::string s5 = s4;
+    CPPUNIT_ASSERT( s5 == "hello" );
+
+    wxStdWideString s6 = s4;
+    CPPUNIT_ASSERT( s6 == "hello" );
+}
+#endif // wxUSE_STD_STRING