X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3e5f6c1c4f79af395e094be3fa2957394e2e5825..cfcc02a8a4f019e3846b73660209080602e44967:/tests/streams/zlibstream.cpp

diff --git a/tests/streams/zlibstream.cpp b/tests/streams/zlibstream.cpp
index 6f65cf1089..423d549159 100644
--- a/tests/streams/zlibstream.cpp
+++ b/tests/streams/zlibstream.cpp
@@ -7,13 +7,9 @@
 // Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma implementation
-    #pragma interface
-#endif
-
 // For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
+// and "wx/cppunit.h"
+#include "testprec.h"
 
 #ifdef __BORLANDC__
     #pragma hdrstop
@@ -24,7 +20,6 @@
     #include "wx/wx.h"
 #endif
 
-#include "wx/cppunit.h"
 #include "wx/zstream.h"
 #include "wx/wfstream.h"
 #include "wx/mstream.h"
@@ -60,6 +55,7 @@ public:
         CPPUNIT_TEST(Input_Read);
         CPPUNIT_TEST(Input_Eof);
         CPPUNIT_TEST(Input_LastRead);
+        CPPUNIT_TEST(Input_CanRead);
         CPPUNIT_TEST_FAIL(Input_SeekI);
         CPPUNIT_TEST(Input_TellI);
         CPPUNIT_TEST(Input_Peek);
@@ -86,9 +82,6 @@ public:
         WXTEST_WITH_GZIP_CONDITION(TestStream_GZip_BestComp);
         WXTEST_WITH_GZIP_CONDITION(TestStream_ZLibGZip);
         CPPUNIT_TEST(Decompress_BadData);
-#if WXWIN_COMPATIBILITY_2_4
-        CPPUNIT_TEST(Decompress_wx24Data);
-#endif
         CPPUNIT_TEST(Decompress_wx251_zlib114_Data_NoHeader);
         CPPUNIT_TEST(Decompress_wx251_zlib114_Data_ZLib);
         WXTEST_WITH_GZIP_CONDITION(Decompress_gzip135Data);
@@ -114,9 +107,6 @@ protected:
     // Decompress data that was compress by an external app.
     // (like test wx 2.4.2, 2.5.1 and gzip data)
     // Note: This test is limited in testing range!
-#if WXWIN_COMPATIBILITY_2_4
-    void Decompress_wx24Data();
-#endif
     void Decompress_wx251_zlib114_Data_NoHeader();
     void Decompress_wx251_zlib114_Data_ZLib();
     void Decompress_gzip135Data();
@@ -258,22 +248,6 @@ void zlibStream::Decompress_BadData()
     CPPUNIT_ASSERT(!zstream_in.IsOk());
 }
 
-#if WXWIN_COMPATIBILITY_2_4
-void zlibStream::Decompress_wx24Data()
-{
-    // The wx24_value was used in a wxWidgets 2.4(.2)
-    // application to produce wx24_data, using wxZlibOutputStream.
-    const unsigned char wx24_data[] = {120,156,242,72,205,201,201,87,40,207,47,202,73,97,0,0,0,0,255,255,0};
-    const char *wx24_value = "Hello world";
-    // Size of the value and date items.
-    const size_t data_size = sizeof(wx24_data);
-    const size_t value_size = strlen(wx24_value) + 1; // +1 because the wx24 app also did this.
-
-    // Perform a generic data test on the data.
-    doDecompress_ExternalData(wx24_data, wx24_value, data_size, value_size, wxZLIB_24COMPATIBLE);
-}
-#endif
-
 void zlibStream::Decompress_wx251_zlib114_Data_NoHeader()
 {
     const unsigned char data[] = {171,202,201,76,82,72,73,44,73,84,72,46,74,77,44,73,77,81,40,207,44,201,80,40,175,8,207,76,73,79,45,41,86,48,210,51,213,171,80,136,246,77,44,74,206,80,48,50,143,213,1,202,69,249,120,58,197,251,249,199,123,184,58,186,184,6,233,40,84,129,12,49,212,51,212,51,1,0,32};
@@ -381,8 +355,11 @@ void zlibStream::doTestStreamData(int input_flag, int output_flag, int compress_
     // Check state of the verify action.
     if (fail_pos != DATABUFFER_SIZE || !bWasEOF)
     {
-        wxString msg(wxString::Format(_T("Wrong data item at pos %d (Org_val %d != Zlib_val %d), with compression level %d"),
-                                            fail_pos, GetDataBuffer()[fail_pos], last_value, compress_level));
+        wxString msg;
+        msg << _T("Wrong data item at pos ") << fail_pos
+            << _T(" (Org_val ") << GetDataBuffer()[fail_pos]
+            << _T(" != Zlib_val ") << last_value
+            << _T("), with compression level ") << compress_level;
         CPPUNIT_FAIL(string(msg.mb_str()));
     }
 }
@@ -400,9 +377,6 @@ void zlibStream::doDecompress_ExternalData(const unsigned char *data, const char
     {
     case wxZLIB_NO_HEADER:
         break;
-#if WXWIN_COMPATIBILITY_2_4
-    case wxZLIB_24COMPATIBLE:
-#endif
     case wxZLIB_ZLIB:
         if (!(data_size >= 1 && data[0] == 0x78))
             wxLogError(_T("zlib data seems to not be zlib data!"));