don't really enable the window when its parent is disabled, just remember to do it...

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

diff --git a/tests/strings/strings.cpp b/tests/strings/strings.cpp
index 85e91dad86910b4af75946580a99db78c86cb9bb..fac42532758fedd7a30017cf5c47d7a1712ec131 100644 (file)
--- a/tests/strings/strings.cpp
+++ b/tests/strings/strings.cpp
@@ -355,6 +355,26 @@ void StringTestCase::Compare()
     CPPUNIT_ASSERT( s1 != neq3 );
     CPPUNIT_ASSERT( s1 != neq4 );
 
+    CPPUNIT_ASSERT( s1 == wxT("AHH") );
+    CPPUNIT_ASSERT( s1 != wxT("no") );
+    CPPUNIT_ASSERT( s1 < wxT("AZ") );
+    CPPUNIT_ASSERT( s1 <= wxT("AZ") );
+    CPPUNIT_ASSERT( s1 <= wxT("AHH") );
+    CPPUNIT_ASSERT( s1 > wxT("AA") );
+    CPPUNIT_ASSERT( s1 >= wxT("AA") );
+    CPPUNIT_ASSERT( s1 >= wxT("AHH") );
+
+    // test comparison with C strings in Unicode build (must work in ANSI as
+    // well, of course):
+    CPPUNIT_ASSERT( s1 == "AHH" );
+    CPPUNIT_ASSERT( s1 != "no" );
+    CPPUNIT_ASSERT( s1 < "AZ" );
+    CPPUNIT_ASSERT( s1 <= "AZ" );
+    CPPUNIT_ASSERT( s1 <= "AHH" );
+    CPPUNIT_ASSERT( s1 > "AA" );
+    CPPUNIT_ASSERT( s1 >= "AA" );
+    CPPUNIT_ASSERT( s1 >= "AHH" );
+
 //    wxString _s1 = wxT("A\0HH");
 //    wxString _eq = wxT("A\0HH");
 //    wxString _neq1 = wxT("H\0AH");
@@ -613,20 +633,21 @@ void StringTestCase::WriteBuf()
     CPPUNIT_ASSERT_EQUAL(_T('f'), s[0u]);
     CPPUNIT_ASSERT_EQUAL(_T('o'), s[1]);
     CPPUNIT_ASSERT_EQUAL(_T('o'), s[2]);
-    CPPUNIT_ASSERT_EQUAL(3u, s.length());
+    CPPUNIT_ASSERT_EQUAL((size_t)3, s.length());
+
 
     {
-        wxChar *p = s.GetWriteBuf(10);
-        wxStrcpy(p, _T("barrbaz"));
-        s.UngetWriteBuf(4);
+        wxStringBufferLength buf(s, 10);
+        wxStrcpy(buf, _T("barrbaz"));
+        buf.SetLength(4);
+    }
 
-        CPPUNIT_ASSERT_EQUAL(_T('b'), s[0u]);
-        CPPUNIT_ASSERT_EQUAL(_T('a'), s[1]);
-        CPPUNIT_ASSERT_EQUAL(_T('r'), s[2]);
-        CPPUNIT_ASSERT_EQUAL(_T('r'), s[3]);
-        CPPUNIT_ASSERT_EQUAL(4u, s.length());
+    CPPUNIT_ASSERT_EQUAL(_T('b'), s[0u]);
+    CPPUNIT_ASSERT_EQUAL(_T('a'), s[1]);
+    CPPUNIT_ASSERT_EQUAL(_T('r'), s[2]);
+    CPPUNIT_ASSERT_EQUAL(_T('r'), s[3]);
+    CPPUNIT_ASSERT_EQUAL((size_t)4, s.length());
 
-        CPPUNIT_ASSERT_EQUAL( 0, wxStrcmp(_T("barr"), s) );
-    }
+    CPPUNIT_ASSERT_EQUAL( 0, wxStrcmp(_T("barr"), s) );
 }