applying editor part of patch, see #15003

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

diff --git a/tests/strings/unichar.cpp b/tests/strings/unichar.cpp
index 67c03f8d7397e035cd960c606ed225f662583076..e955aa0b9b84c8c5a87f003ca570d7d6805c139f 100644 (file)
--- a/tests/strings/unichar.cpp
+++ b/tests/strings/unichar.cpp
@@ -38,7 +38,9 @@ private:
         CPPUNIT_TEST( CharCompare );
         CPPUNIT_TEST( CharCompareIntl );
         CPPUNIT_TEST( StringCompare );
         CPPUNIT_TEST( CharCompare );
         CPPUNIT_TEST( CharCompareIntl );
         CPPUNIT_TEST( StringCompare );

+#if wxUSE_UNICODE

         CPPUNIT_TEST( StringCompareIntl );
         CPPUNIT_TEST( StringCompareIntl );

+#endif // wxUSE_UNICODE

     CPPUNIT_TEST_SUITE_END();
 
     void CharCompare();
     CPPUNIT_TEST_SUITE_END();
 
     void CharCompare();


@@ -52,7 +54,7 @@ private:
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION( UniCharTestCase );
 
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION( UniCharTestCase );
 

-// also include in it's own registry so that these tests can be run alone
+// also include in its own registry so that these tests can be run alone

 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( UniCharTestCase, "UniCharTestCase" );
 
 void UniCharTestCase::CharCompare()
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( UniCharTestCase, "UniCharTestCase" );
 
 void UniCharTestCase::CharCompare()


@@ -66,48 +68,96 @@ void UniCharTestCase::CharCompare()
     CPPUNIT_ASSERT( a == wxUniChar('a') );
     CPPUNIT_ASSERT( a == wxUniChar(wxT('a')) );
 
     CPPUNIT_ASSERT( a == wxUniChar('a') );
     CPPUNIT_ASSERT( a == wxUniChar(wxT('a')) );
 

+    CPPUNIT_ASSERT( a == a );
+    CPPUNIT_ASSERT( 'a' == a );
+    CPPUNIT_ASSERT( wxT('a') == a );
+    CPPUNIT_ASSERT( wxUniChar('a') == a );
+    CPPUNIT_ASSERT( wxUniChar(wxT('a')) == a );
+

     CPPUNIT_ASSERT( a != b );
     CPPUNIT_ASSERT( a != 'b' );
     CPPUNIT_ASSERT( a != wxT('b') );
     CPPUNIT_ASSERT( a != wxUniChar('b') );
     CPPUNIT_ASSERT( a != wxUniChar(wxT('b')) );
 
     CPPUNIT_ASSERT( a != b );
     CPPUNIT_ASSERT( a != 'b' );
     CPPUNIT_ASSERT( a != wxT('b') );
     CPPUNIT_ASSERT( a != wxUniChar('b') );
     CPPUNIT_ASSERT( a != wxUniChar(wxT('b')) );
 

+    CPPUNIT_ASSERT( b != a );
+    CPPUNIT_ASSERT( 'b' != a );
+    CPPUNIT_ASSERT( wxT('b') != a );
+    CPPUNIT_ASSERT( wxUniChar('b') != a );
+    CPPUNIT_ASSERT( wxUniChar(wxT('b')) != a );
+

     CPPUNIT_ASSERT( a < b );
     CPPUNIT_ASSERT( a < 'b' );
     CPPUNIT_ASSERT( a < wxT('b') );
     CPPUNIT_ASSERT( a < wxUniChar('b') );
     CPPUNIT_ASSERT( a < wxUniChar(wxT('b')) );
 
     CPPUNIT_ASSERT( a < b );
     CPPUNIT_ASSERT( a < 'b' );
     CPPUNIT_ASSERT( a < wxT('b') );
     CPPUNIT_ASSERT( a < wxUniChar('b') );
     CPPUNIT_ASSERT( a < wxUniChar(wxT('b')) );
 

+    CPPUNIT_ASSERT( b > a );
+    CPPUNIT_ASSERT( 'b' > a );
+    CPPUNIT_ASSERT( wxT('b') > a );
+    CPPUNIT_ASSERT( wxUniChar('b') > a );
+    CPPUNIT_ASSERT( wxUniChar(wxT('b')) > a );
+

     CPPUNIT_ASSERT( a <= b );
     CPPUNIT_ASSERT( a <= 'b' );
     CPPUNIT_ASSERT( a <= wxT('b') );
     CPPUNIT_ASSERT( a <= wxUniChar('b') );
     CPPUNIT_ASSERT( a <= wxUniChar(wxT('b')) );
 
     CPPUNIT_ASSERT( a <= b );
     CPPUNIT_ASSERT( a <= 'b' );
     CPPUNIT_ASSERT( a <= wxT('b') );
     CPPUNIT_ASSERT( a <= wxUniChar('b') );
     CPPUNIT_ASSERT( a <= wxUniChar(wxT('b')) );
 

+    CPPUNIT_ASSERT( b >= a );
+    CPPUNIT_ASSERT( 'b' >= a );
+    CPPUNIT_ASSERT( wxT('b') >= a );
+    CPPUNIT_ASSERT( wxUniChar('b') >= a );
+    CPPUNIT_ASSERT( wxUniChar(wxT('b')) >= a );
+

     CPPUNIT_ASSERT( a <= a );
     CPPUNIT_ASSERT( a <= 'a' );
     CPPUNIT_ASSERT( a <= wxT('a') );
     CPPUNIT_ASSERT( a <= wxUniChar('a') );
     CPPUNIT_ASSERT( a <= wxUniChar(wxT('a')) );
 
     CPPUNIT_ASSERT( a <= a );
     CPPUNIT_ASSERT( a <= 'a' );
     CPPUNIT_ASSERT( a <= wxT('a') );
     CPPUNIT_ASSERT( a <= wxUniChar('a') );
     CPPUNIT_ASSERT( a <= wxUniChar(wxT('a')) );
 

+    CPPUNIT_ASSERT( a >= a );
+    CPPUNIT_ASSERT( 'a' >= a );
+    CPPUNIT_ASSERT( wxT('a') >= a );
+    CPPUNIT_ASSERT( wxUniChar('a') >= a );
+    CPPUNIT_ASSERT( wxUniChar(wxT('a')) >= a );
+

     CPPUNIT_ASSERT( b > a );
     CPPUNIT_ASSERT( b > 'a' );
     CPPUNIT_ASSERT( b > wxT('a') );
     CPPUNIT_ASSERT( b > wxUniChar('a') );
     CPPUNIT_ASSERT( b > wxUniChar(wxT('a')) );
 
     CPPUNIT_ASSERT( b > a );
     CPPUNIT_ASSERT( b > 'a' );
     CPPUNIT_ASSERT( b > wxT('a') );
     CPPUNIT_ASSERT( b > wxUniChar('a') );
     CPPUNIT_ASSERT( b > wxUniChar(wxT('a')) );
 

+    CPPUNIT_ASSERT( a < b );
+    CPPUNIT_ASSERT( 'a' < b );
+    CPPUNIT_ASSERT( wxT('a') < b );
+    CPPUNIT_ASSERT( wxUniChar('a') < b );
+    CPPUNIT_ASSERT( wxUniChar(wxT('a')) < b );
+

     CPPUNIT_ASSERT( b >= a );
     CPPUNIT_ASSERT( b >= 'a' );
     CPPUNIT_ASSERT( b >= wxT('a') );
     CPPUNIT_ASSERT( b >= wxUniChar('a') );
     CPPUNIT_ASSERT( b >= wxUniChar(wxT('a')) );
 
     CPPUNIT_ASSERT( b >= a );
     CPPUNIT_ASSERT( b >= 'a' );
     CPPUNIT_ASSERT( b >= wxT('a') );
     CPPUNIT_ASSERT( b >= wxUniChar('a') );
     CPPUNIT_ASSERT( b >= wxUniChar(wxT('a')) );
 

+    CPPUNIT_ASSERT( a <= b );
+    CPPUNIT_ASSERT( 'a' <= b );
+    CPPUNIT_ASSERT( wxT('a') <= b );
+    CPPUNIT_ASSERT( wxUniChar('a') <= b );
+    CPPUNIT_ASSERT( wxUniChar(wxT('a')) <= b );
+

     CPPUNIT_ASSERT( b >= b );
     CPPUNIT_ASSERT( b >= 'b' );
     CPPUNIT_ASSERT( b >= wxT('b') );
     CPPUNIT_ASSERT( b >= wxUniChar('b') );
     CPPUNIT_ASSERT( b >= wxUniChar(wxT('b')) );
 
     CPPUNIT_ASSERT( b >= b );
     CPPUNIT_ASSERT( b >= 'b' );
     CPPUNIT_ASSERT( b >= wxT('b') );
     CPPUNIT_ASSERT( b >= wxUniChar('b') );
     CPPUNIT_ASSERT( b >= wxUniChar(wxT('b')) );
 

+    CPPUNIT_ASSERT( b <= b );
+    CPPUNIT_ASSERT( 'b' <= b );
+    CPPUNIT_ASSERT( wxT('b') <= b );
+    CPPUNIT_ASSERT( wxUniChar('b') <= b );
+    CPPUNIT_ASSERT( wxUniChar(wxT('b')) <= b );
+

     CPPUNIT_ASSERT( b - a == 1 );
     CPPUNIT_ASSERT( a - b == -1 );
 }
     CPPUNIT_ASSERT( b - a == 1 );
     CPPUNIT_ASSERT( a - b == -1 );
 }


@@ -199,6 +249,7 @@ void UniCharTestCase::StringCompare()
     CPPUNIT_ASSERT( sb[0] != sa);
 }
 
     CPPUNIT_ASSERT( sb[0] != sa);
 }
 

+#if wxUSE_UNICODE

 void UniCharTestCase::StringCompareIntl()
 {
     // test string comparison with chars
 void UniCharTestCase::StringCompareIntl()
 {
     // test string comparison with chars


@@ -234,3 +285,4 @@ void UniCharTestCase::StringCompareIntl()
     CPPUNIT_ASSERT( sa != sb[0]);
     CPPUNIT_ASSERT( sb[0] != sa);
 }
     CPPUNIT_ASSERT( sa != sb[0]);
     CPPUNIT_ASSERT( sb[0] != sa);
 }

+#endif // wxUSE_UNICODE