Fix warnings in the MSW IE backend.

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

diff --git a/tests/strings/unicode.cpp b/tests/strings/unicode.cpp
index 18bd0f286f7ea0dfeb4d42a62c20ecd40a41cbb4..8a0574e43d29b44294dcbd644992aba2c003aef4 100644 (file)
--- a/tests/strings/unicode.cpp
+++ b/tests/strings/unicode.cpp
@@ -21,12 +21,16 @@
     #include "wx/wx.h"
 #endif // WX_PRECOMP
 
     #include "wx/wx.h"
 #endif // WX_PRECOMP
 

+#include "wx/encconv.h"
+
+// ----------------------------------------------------------------------------

 // helper class holding the matching MB and WC strings
 // helper class holding the matching MB and WC strings

-//
-// either str or wcs (but not both) may be NULL, this means that the conversion
-// to it should fail
+// ----------------------------------------------------------------------------
+

 struct StringConversionData
 {
 struct StringConversionData
 {

+    // either str or wcs (but not both) may be NULL, this means that the conversion
+    // to it should fail

     StringConversionData(const char *str_, const wchar_t *wcs_, int flags_ = 0)
         : str(str_), wcs(wcs_), flags(flags_)
     {
     StringConversionData(const char *str_, const wchar_t *wcs_, int flags_ = 0)
         : str(str_), wcs(wcs_), flags(flags_)
     {


@@ -139,7 +143,7 @@ private:
     CPPUNIT_TEST_SUITE( UnicodeTestCase );
         CPPUNIT_TEST( ToFromAscii );
         CPPUNIT_TEST( ConstructorsWithConversion );
     CPPUNIT_TEST_SUITE( UnicodeTestCase );
         CPPUNIT_TEST( ToFromAscii );
         CPPUNIT_TEST( ConstructorsWithConversion );

-        CPPUNIT_TEST( ConversionEmpty );
+        CPPUNIT_TEST( ConversionFixed );

         CPPUNIT_TEST( ConversionWithNULs );
         CPPUNIT_TEST( ConversionUTF7 );
         CPPUNIT_TEST( ConversionUTF8 );
         CPPUNIT_TEST( ConversionWithNULs );
         CPPUNIT_TEST( ConversionUTF7 );
         CPPUNIT_TEST( ConversionUTF8 );


@@ -153,7 +157,7 @@ private:
 
     void ToFromAscii();
     void ConstructorsWithConversion();
 
     void ToFromAscii();
     void ConstructorsWithConversion();

-    void ConversionEmpty();
+    void ConversionFixed();

     void ConversionWithNULs();
     void ConversionUTF7();
     void ConversionUTF8();
     void ConversionWithNULs();
     void ConversionUTF7();
     void ConversionUTF8();


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

-// 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( UnicodeTestCase, "UnicodeTestCase" );
 
 UnicodeTestCase::UnicodeTestCase()
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( UnicodeTestCase, "UnicodeTestCase" );
 
 UnicodeTestCase::UnicodeTestCase()


@@ -238,7 +242,7 @@ void UnicodeTestCase::ConstructorsWithConversion()
     CPPUNIT_ASSERT( s5 != "SomethingElse" );
 }
 
     CPPUNIT_ASSERT( s5 != "SomethingElse" );
 }
 

-void UnicodeTestCase::ConversionEmpty()
+void UnicodeTestCase::ConversionFixed()

 {
     size_t len;
 
 {
     size_t len;
 


@@ -249,6 +253,15 @@ void UnicodeTestCase::ConversionEmpty()
 #endif // wxUSE_UNICODE/!wxUSE_UNICODE
 
     CPPUNIT_ASSERT_EQUAL( 0, len );
 #endif // wxUSE_UNICODE/!wxUSE_UNICODE
 
     CPPUNIT_ASSERT_EQUAL( 0, len );

+
+#if wxUSE_UNICODE
+    // check that when we convert a fixed number of characters we obtain the
+    // expected return value
+    CPPUNIT_ASSERT_EQUAL( 0, wxConvLibc.ToWChar(NULL, 0, "", 0) );
+    CPPUNIT_ASSERT_EQUAL( 1, wxConvLibc.ToWChar(NULL, 0, "x", 1) );
+    CPPUNIT_ASSERT_EQUAL( 2, wxConvLibc.ToWChar(NULL, 0, "x", 2) );
+    CPPUNIT_ASSERT_EQUAL( 2, wxConvLibc.ToWChar(NULL, 0, "xy", 2) );
+#endif // wxUSE_UNICODE

 }
 
 void UnicodeTestCase::ConversionWithNULs()
 }
 
 void UnicodeTestCase::ConversionWithNULs()


@@ -461,3 +474,4 @@ void UnicodeTestCase::Iteration()
     }
 }
 #endif // wxUSE_UNICODE
     }
 }
 #endif // wxUSE_UNICODE

+