Fixes to FIXME about stock IDs usage.

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

diff --git a/tests/strings/strings.cpp b/tests/strings/strings.cpp
index 66d1d7475210a624d8fe442d968f5131280ebc34..8b1c6235b643873f6e77e70e96107af232f6de32 100644 (file)
--- a/tests/strings/strings.cpp
+++ b/tests/strings/strings.cpp
@@ -11,7 +11,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#include "wx/wxprec.h"
+#include "testprec.h"
 
 #ifdef __BORLANDC__
     #pragma hdrstop
@@ -23,8 +23,6 @@
 
 #include "wx/tokenzr.h"
 
-#include "wx/cppunit.h"
-
 // ----------------------------------------------------------------------------
 // test class
 // ----------------------------------------------------------------------------
@@ -184,11 +182,7 @@ void StringTestCase::ConstructorsWithConversion()
 
 #if wxUSE_UNICODE
     CPPUNIT_ASSERT ( wxString("\t[pl]open.format.Sformatuj dyskietkê=gfloppy %f", 
-                               wxConvUTF8) == wxT("") ); //Pos 35 (funky e) is invalid UTF8
-//FIXME:
-//#else
-//    CPPUNIT_ASSERT ( wxString(L"\t[pl]open.format.Sformatuj dyskietkê=gfloppy %f", 
-//                               wxConvUTF8) == wxT("") ); //Pos 35 (funky e) is invalid UTF8
+                               wxConvUTF8) == wxT("") ); //should stop at pos 35 
 #endif
 }
 
@@ -201,7 +195,7 @@ void StringTestCase::Conversion()
         CPPUNIT_ASSERT( memcmp(theBuffer.data(), "The\0String", 11) == 0 );
 
         wxString szTheString2("The\0String", wxConvLocal, 10);
-        CPPUNIT_ASSERT( wxMemcmp(szTheString2.c_str(), L"The\0String", 11) == 0 );
+        CPPUNIT_ASSERT( wxTmemcmp(szTheString2.c_str(), L"The\0String", 11) == 0 );
 #else
         wxString szTheString(wxT("TheString"));
         szTheString.insert(3, 1, '\0');
@@ -220,7 +214,10 @@ void StringTestCase::Conversion()
 void StringTestCase::ConversionUTF7()
 {
     const wchar_t data[] = { 0x00A3, 0x00A3, 0x00A3, 0x00A3, 0 }; // pound signs
+
+    //utf7 and utf7alt are equivelent
     const char *utf7 = "+AKM-+AKM-+AKM-+AKM-";
+    const char *utf7alt = "+AKMAowCjAKM-";
 
 #if wxUSE_UNICODE
     wxString str(data);
@@ -229,8 +226,7 @@ void StringTestCase::ConversionUTF7()
 
     wxCharBuffer theBuffer = str.mb_str(conv);
 
-    if (theBuffer.data()[0u])
-        CPPUNIT_ASSERT( strcmp(theBuffer, utf7) == 0 );
+    CPPUNIT_ASSERT( strcmp(theBuffer, utf7) == 0 || strcmp(theBuffer, utf7alt) == 0);
 #else //ANSI
     wxString str(utf7);
 
@@ -238,11 +234,16 @@ void StringTestCase::ConversionUTF7()
 
     wxWCharBuffer theWBuffer = str.wc_str(conv);
 
-    if (theWBuffer.data()[0u])
-    {
-        CPPUNIT_ASSERT( wxWcslen(theWBuffer) == wxWcslen(data) );
-        CPPUNIT_ASSERT( memcmp(theWBuffer, data, wxWcslen(data) * sizeof(wchar_t)) == 0 );
-    }
+    CPPUNIT_ASSERT( wxWcslen(theWBuffer) == wxWcslen(data) );
+    CPPUNIT_ASSERT( memcmp(theWBuffer, data, wxWcslen(data) * sizeof(wchar_t)) == 0 );
+
+    wxString stralt(utf7alt);
+
+    wxWCharBuffer theWBufferAlt = stralt.wc_str(conv);
+
+    CPPUNIT_ASSERT( wxWcslen(theWBufferAlt) == wxWcslen(data) );
+    CPPUNIT_ASSERT( memcmp(theWBufferAlt, data, wxWcslen(data) * sizeof(wchar_t)) == 0 );
+
 #endif // wxUSE_UNICODE
 }