use HasFlag(wxXX) instead of GetWindowStyle() & wxXX; it's more readable

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

diff --git a/tests/strings/strings.cpp b/tests/strings/strings.cpp
index a3fec565982508818f4ad3c3db48201d7eb5d01d..f9371210917e8028c965f613b311c1344846b358 100644 (file)
--- a/tests/strings/strings.cpp
+++ b/tests/strings/strings.cpp
@@ -60,6 +60,7 @@ private:
         CPPUNIT_TEST( CStrDataImplicitConversion );
         CPPUNIT_TEST( ExplicitConversion );
         CPPUNIT_TEST( IndexedAccess );
         CPPUNIT_TEST( CStrDataImplicitConversion );
         CPPUNIT_TEST( ExplicitConversion );
         CPPUNIT_TEST( IndexedAccess );

+        CPPUNIT_TEST( BeforeAndAfter );

     CPPUNIT_TEST_SUITE_END();
 
     void String();
     CPPUNIT_TEST_SUITE_END();
 
     void String();


@@ -91,6 +92,7 @@ private:
     void CStrDataImplicitConversion();
     void ExplicitConversion();
     void IndexedAccess();
     void CStrDataImplicitConversion();
     void ExplicitConversion();
     void IndexedAccess();

+    void BeforeAndAfter();

 
     DECLARE_NO_COPY_CLASS(StringTestCase)
 };
 
     DECLARE_NO_COPY_CLASS(StringTestCase)
 };


@@ -529,7 +531,7 @@ enum
     Number_Unsigned = 2,    // if not specified, works for signed conversion
     Number_Signed   = 4,    // if not specified, works for unsigned
     Number_LongLong = 8,    // only for long long tests
     Number_Unsigned = 2,    // if not specified, works for signed conversion
     Number_Signed   = 4,    // if not specified, works for unsigned
     Number_LongLong = 8,    // only for long long tests

-    Number_Long     = 16,   // only for long tests
+    Number_Long     = 16    // only for long tests

 };
 
 static const struct ToLongData
 };
 
 static const struct ToLongData


@@ -832,12 +834,33 @@ void StringTestCase::ExplicitConversion()
 void StringTestCase::IndexedAccess()
 {
     wxString s("bar");
 void StringTestCase::IndexedAccess()
 {
     wxString s("bar");

-    CPPUNIT_ASSERT_EQUAL( 'r', s[2] );
+    CPPUNIT_ASSERT_EQUAL( 'r', (char)s[2] );

 
     // this tests for a possible bug in UTF-8 based wxString implementation:
     // the 3rd character of the underlying byte string is going to change, but
     // the 3rd character of wxString should remain the same
     s[0] = L'\u00e9';
 
     // this tests for a possible bug in UTF-8 based wxString implementation:
     // the 3rd character of the underlying byte string is going to change, but
     // the 3rd character of wxString should remain the same
     s[0] = L'\u00e9';

-    CPPUNIT_ASSERT_EQUAL( 'r', s[2] );
+    CPPUNIT_ASSERT_EQUAL( 'r', (char)s[2] );
+}
+
+void StringTestCase::BeforeAndAfter()
+{
+    const wxString s(L"letter=\u00e9;\u00e7a=l\u00e0");
+
+    CPPUNIT_ASSERT_EQUAL( "letter", s.BeforeFirst('=') );
+    CPPUNIT_ASSERT_EQUAL( s, s.BeforeFirst('!') );
+    CPPUNIT_ASSERT_EQUAL( L"letter=\u00e9", s.BeforeFirst(';') );
+
+    CPPUNIT_ASSERT_EQUAL( L"letter=\u00e9;\u00e7a", s.BeforeLast('=') );
+    CPPUNIT_ASSERT_EQUAL( "", s.BeforeLast('!') );
+    CPPUNIT_ASSERT_EQUAL( L"letter=\u00e9", s.BeforeLast(';') );
+
+    CPPUNIT_ASSERT_EQUAL( L"\u00e9;\u00e7a=l\u00e0", s.AfterFirst('=') );
+    CPPUNIT_ASSERT_EQUAL( "", s.AfterFirst('!') );
+    CPPUNIT_ASSERT_EQUAL( L"\u00e7a=l\u00e0", s.AfterFirst(';') );
+
+    CPPUNIT_ASSERT_EQUAL( L"l\u00e0", s.AfterLast('=') );
+    CPPUNIT_ASSERT_EQUAL( s, s.AfterLast('!') );
+    CPPUNIT_ASSERT_EQUAL( L"\u00e7a=l\u00e0", s.AfterLast(';') );

 }
 
 }