X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bdd8f35a58b2793fafd5020d2f45ff9e39865f64..eb3e6de33b0df985a3d2af7d040f16e733dec3ce:/tests/strings/strings.cpp

diff --git a/tests/strings/strings.cpp b/tests/strings/strings.cpp
index afb6207ae1..8b1c6235b6 100644
--- 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
 // ----------------------------------------------------------------------------
@@ -43,8 +41,6 @@ private:
 #if wxUSE_WCHAR_T
         CPPUNIT_TEST( ConstructorsWithConversion );
         CPPUNIT_TEST( Conversion );
-#endif
-#if wxUSE_UNICODE
         CPPUNIT_TEST( ConversionUTF7 );
 #endif
         CPPUNIT_TEST( Extraction );
@@ -65,8 +61,6 @@ private:
 #if wxUSE_WCHAR_T
     void ConstructorsWithConversion();
     void Conversion();
-#endif
-#if wxUSE_UNICODE
     void ConversionUTF7();
 #endif
     void Extraction();
@@ -188,10 +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
-#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
 }
 
@@ -204,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');
@@ -219,19 +210,45 @@ void StringTestCase::Conversion()
         CPPUNIT_ASSERT( memcmp(theLocalBuffer.data(), L"The\0String", 11 * sizeof(wchar_t)) == 0 );
 #endif
 }
-#endif // wxUSE_WCHAR_T
 
-#if wxUSE_UNICODE
 void StringTestCase::ConversionUTF7()
 {
-    const wxChar wdata[] = { 0x00A3, 0x00A3, 0x00A3, 0x00A3, 0 }; // pound signs
+    const wchar_t data[] = { 0x00A3, 0x00A3, 0x00A3, 0x00A3, 0 }; // pound signs
+
+    //utf7 and utf7alt are equivelent
     const char *utf7 = "+AKM-+AKM-+AKM-+AKM-";
-    wxString str(wdata);
+    const char *utf7alt = "+AKMAowCjAKM-";
+
+#if wxUSE_UNICODE
+    wxString str(data);
 
     wxCSConv conv(_T("utf-7"));
-    CPPUNIT_ASSERT( strcmp(str.mb_str(conv), utf7) == 0 );
-}
+
+    wxCharBuffer theBuffer = str.mb_str(conv);
+
+    CPPUNIT_ASSERT( strcmp(theBuffer, utf7) == 0 || strcmp(theBuffer, utf7alt) == 0);
+#else //ANSI
+    wxString str(utf7);
+
+    wxCSConv conv(_T("utf-7"));
+
+    wxWCharBuffer theWBuffer = str.wc_str(conv);
+
+    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
+}
+
+#endif // wxUSE_WCHAR_T
+
 
 void StringTestCase::Extraction()
 {