X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8899b155a1e4fa5f4b90e1f3bebe28088ea46bc9..b5fe7ca67bf3121959a0b5a59afd00c1708f2f03:/tests/streams/zlibstream.cpp diff --git a/tests/streams/zlibstream.cpp b/tests/streams/zlibstream.cpp index 30a87ee618..58b3c3b34e 100644 --- a/tests/streams/zlibstream.cpp +++ b/tests/streams/zlibstream.cpp @@ -23,8 +23,8 @@ #include "wx/zstream.h" #include "wx/wfstream.h" #include "wx/mstream.h" - #include "wx/txtstrm.h" +#include "wx/buffer.h" #include "bstream.h" @@ -55,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); @@ -71,6 +72,7 @@ public: CPPUNIT_TEST(TestStream_NoHeader_NoComp); CPPUNIT_TEST(TestStream_NoHeader_SpeedComp); CPPUNIT_TEST(TestStream_NoHeader_BestComp); + CPPUNIT_TEST(TestStream_NoHeader_Dictionary); CPPUNIT_TEST(TestStream_ZLib_Default); CPPUNIT_TEST(TestStream_ZLib_NoComp); CPPUNIT_TEST(TestStream_ZLib_SpeedComp); @@ -79,11 +81,9 @@ public: WXTEST_WITH_GZIP_CONDITION(TestStream_GZip_NoComp); WXTEST_WITH_GZIP_CONDITION(TestStream_GZip_SpeedComp); WXTEST_WITH_GZIP_CONDITION(TestStream_GZip_BestComp); + WXTEST_WITH_GZIP_CONDITION(TestStream_GZip_Dictionary); 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); @@ -95,6 +95,7 @@ protected: void TestStream_NoHeader_NoComp(); void TestStream_NoHeader_SpeedComp(); void TestStream_NoHeader_BestComp(); + void TestStream_NoHeader_Dictionary(); void TestStream_ZLib_Default(); void TestStream_ZLib_NoComp(); void TestStream_ZLib_SpeedComp(); @@ -103,15 +104,13 @@ protected: void TestStream_GZip_NoComp(); void TestStream_GZip_SpeedComp(); void TestStream_GZip_BestComp(); + void TestStream_GZip_Dictionary(); void TestStream_ZLibGZip(); // Try to decompress bad data. void Decompress_BadData(); // 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(); @@ -119,7 +118,7 @@ protected: private: const char *GetDataBuffer(); const unsigned char *GetCompressedData(); - void doTestStreamData(int input_flag, int output_flag, int compress_level); + void doTestStreamData(int input_flag, int output_flag, int compress_level, const wxMemoryBuffer *buf = NULL); void doDecompress_ExternalData(const unsigned char *data, const char *value, size_t data_size, size_t value_size, int flag = wxZLIB_AUTO); private: @@ -137,6 +136,7 @@ private: char m_DataBuffer[DATABUFFER_SIZE]; size_t m_SizeCompressedData; unsigned char *m_pCompressedData; + wxMemoryBuffer m_Dictionary; // Used by the base Creat[In|Out]Stream and Delete[In|Out]Stream. wxMemoryInputStream *m_pTmpMemInStream; @@ -153,6 +153,8 @@ zlibStream::zlibStream() for (size_t i = 0; i < DATABUFFER_SIZE; i++) m_DataBuffer[i] = (i % 0xFF); + m_Dictionary.AppendData(m_DataBuffer, sizeof(m_DataBuffer) / 2); + // Set extra base config settings. m_bSimpleTellITest = true; m_bSimpleTellOTest = true; @@ -192,6 +194,10 @@ void zlibStream::TestStream_NoHeader_BestComp() { doTestStreamData(wxZLIB_NO_HEADER, wxZLIB_NO_HEADER, wxZ_BEST_COMPRESSION); } +void zlibStream::TestStream_NoHeader_Dictionary() +{ + doTestStreamData(wxZLIB_NO_HEADER, wxZLIB_NO_HEADER, wxZ_DEFAULT_COMPRESSION, &m_Dictionary); +} void zlibStream::TestStream_ZLib_Default() { @@ -226,6 +232,10 @@ void zlibStream::TestStream_GZip_BestComp() { doTestStreamData(wxZLIB_GZIP, wxZLIB_GZIP, wxZ_BEST_COMPRESSION); } +void zlibStream::TestStream_GZip_Dictionary() +{ + doTestStreamData(wxZLIB_GZIP, wxZLIB_GZIP, wxZ_DEFAULT_COMPRESSION, &m_Dictionary); +} void zlibStream::TestStream_ZLibGZip() { @@ -253,22 +263,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}; @@ -328,7 +322,7 @@ const unsigned char *zlibStream::GetCompressedData() return m_pCompressedData; } -void zlibStream::doTestStreamData(int input_flag, int output_flag, int compress_level) +void zlibStream::doTestStreamData(int input_flag, int output_flag, int compress_level, const wxMemoryBuffer *buf) { size_t fail_pos; char last_value = 0; @@ -341,6 +335,9 @@ void zlibStream::doTestStreamData(int input_flag, int output_flag, int compress_ wxZlibOutputStream zstream_out(fstream_out, compress_level, output_flag); CPPUNIT_ASSERT_MESSAGE("Could not create the output stream", zstream_out.IsOk()); + if (buf) + zstream_out.SetDictionary(*buf); + // Next: Compress some data so the file is containing something. zstream_out.Write(GetDataBuffer(), DATABUFFER_SIZE); } @@ -357,6 +354,9 @@ void zlibStream::doTestStreamData(int input_flag, int output_flag, int compress_ wxZlibInputStream zstream_in(fstream_in, input_flag); CPPUNIT_ASSERT_MESSAGE("Could not create the input stream", zstream_in.IsOk()); + if (buf) + zstream_in.SetDictionary(*buf); + // Next: Check char per char if the returned data is valid. const char *pbuf = GetDataBuffer(); for (fail_pos = 0; !zstream_in.Eof(); fail_pos++) @@ -376,8 +376,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())); } } @@ -395,9 +398,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!"));