Make SetFont actually do something

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

diff --git a/tests/strings/strings.cpp b/tests/strings/strings.cpp
index 6cbeba609f0c4a089ac5d71eab19ca0f04679138..b83b8f18c3c22e19e7b3c9470e287c903533d183 100644 (file)
--- a/tests/strings/strings.cpp
+++ b/tests/strings/strings.cpp
@@ -53,6 +53,7 @@ private:
 #endif // wxLongLong_t
         CPPUNIT_TEST( ToDouble );
         CPPUNIT_TEST( WriteBuf );
+        CPPUNIT_TEST( UTF8Buf );
         CPPUNIT_TEST( CStrDataTernaryOperator );
         CPPUNIT_TEST( CStrDataOperators );
         CPPUNIT_TEST( CStrDataImplicitConversion );
@@ -80,6 +81,7 @@ private:
 #endif // wxLongLong_t
     void ToDouble();
     void WriteBuf();
+    void UTF8Buf();
     void CStrDataTernaryOperator();
     void DoCStrDataTernaryOperator(bool cond);
     void CStrDataOperators();
@@ -202,7 +204,7 @@ void StringTestCase::Extraction()
     #define TEST_STARTS_WITH(prefix, correct_rest, result)                    \
         CPPUNIT_ASSERT_EQUAL(result, s.StartsWith(prefix, &rest));            \
         if ( result )                                                         \
-            CPPUNIT_ASSERT_EQUAL(wxString(correct_rest), rest)
+            WX_ASSERT_STR_EQUAL(correct_rest, rest)
 
     TEST_STARTS_WITH( _T("Hello"),           _T(", world!"),      true  );
     TEST_STARTS_WITH( _T("Hello, "),         _T("world!"),        true  );
@@ -214,10 +216,14 @@ void StringTestCase::Extraction()
 
     #undef TEST_STARTS_WITH
 
+    rest = "Hello world";
+    CPPUNIT_ASSERT( rest.StartsWith("Hello ", &rest) );
+    WX_ASSERT_STR_EQUAL("world", rest);
+
     #define TEST_ENDS_WITH(suffix, correct_rest, result)                      \
         CPPUNIT_ASSERT_EQUAL(result, s.EndsWith(suffix, &rest));              \
         if ( result )                                                         \
-            CPPUNIT_ASSERT_EQUAL(wxString(correct_rest), rest)
+            WX_ASSERT_STR_EQUAL(correct_rest, rest)
 
     TEST_ENDS_WITH( _T(""),                 _T("Hello, world!"), true  );
     TEST_ENDS_WITH( _T("!"),                _T("Hello, world"),  true  );
@@ -268,7 +274,7 @@ void StringTestCase::Replace()
         { \
             wxString s = original; \
             s.replace( pos , len , replacement ); \
-            CPPUNIT_ASSERT( s == result ); \
+            WX_ASSERT_STR_EQUAL( result, s ); \
         }
 
     TEST_REPLACE( _T("012-AWORD-XYZ"), 4, 5, _T("BWORD"),  _T("012-BWORD-XYZ") );
@@ -654,7 +660,7 @@ void StringTestCase::WriteBuf()
     CPPUNIT_ASSERT(_T('f') == s[0u]);
     CPPUNIT_ASSERT(_T('o') == s[1]);
     CPPUNIT_ASSERT(_T('o') == s[2]);
-    CPPUNIT_ASSERT_EQUAL((size_t)3, s.length());
+    WX_ASSERT_SIZET_EQUAL(3, s.length());
 
 
     {
@@ -667,11 +673,31 @@ void StringTestCase::WriteBuf()
     CPPUNIT_ASSERT(_T('a') == s[1]);
     CPPUNIT_ASSERT(_T('r') == s[2]);
     CPPUNIT_ASSERT(_T('r') == s[3]);
-    CPPUNIT_ASSERT_EQUAL((size_t)4, s.length());
+    WX_ASSERT_SIZET_EQUAL(4, s.length());
 
     CPPUNIT_ASSERT_EQUAL( 0, wxStrcmp(_T("barr"), s) );
 }
 
+void StringTestCase::UTF8Buf()
+{
+#if wxUSE_UNICODE
+    // "czech" in Czech ("cestina"):
+    static const char *textUTF8 = "\304\215e\305\241tina";
+    static const wchar_t textUTF16[] = {0x10D, 0x65, 0x161, 0x74, 0x69, 0x6E, 0x61, 0};
+
+    wxString s;
+    wxStrcpy(wxUTF8StringBuffer(s, 9), textUTF8);
+    CPPUNIT_ASSERT(s == textUTF16);
+
+    {
+        wxUTF8StringBufferLength buf(s, 20);
+        wxStrcpy(buf, textUTF8);
+        buf.SetLength(5);
+    }
+    CPPUNIT_ASSERT(s == wxString(textUTF16, 0, 3));
+#endif // wxUSE_UNICODE
+}
+
 
 
 void StringTestCase::CStrDataTernaryOperator()