2.4 backward compatiblity tests should be run only if the library was built in compatibility mode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26963 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -87,7 +87,9 @@ public:
|
|||||||
WXTEST_WITH_GZIP_CONDITION(TestStream_GZip_BestComp);
|
WXTEST_WITH_GZIP_CONDITION(TestStream_GZip_BestComp);
|
||||||
WXTEST_WITH_GZIP_CONDITION(TestStream_ZLibGZip);
|
WXTEST_WITH_GZIP_CONDITION(TestStream_ZLibGZip);
|
||||||
CPPUNIT_TEST(Decompress_BadData);
|
CPPUNIT_TEST(Decompress_BadData);
|
||||||
|
#if WXWIN_COMPATIBILITY_2_4
|
||||||
CPPUNIT_TEST(Decompress_wx24Data);
|
CPPUNIT_TEST(Decompress_wx24Data);
|
||||||
|
#endif
|
||||||
CPPUNIT_TEST(Decompress_wx251_zlib114_Data_NoHeader);
|
CPPUNIT_TEST(Decompress_wx251_zlib114_Data_NoHeader);
|
||||||
CPPUNIT_TEST(Decompress_wx251_zlib114_Data_ZLib);
|
CPPUNIT_TEST(Decompress_wx251_zlib114_Data_ZLib);
|
||||||
WXTEST_WITH_GZIP_CONDITION(Decompress_gzip135Data);
|
WXTEST_WITH_GZIP_CONDITION(Decompress_gzip135Data);
|
||||||
@@ -113,7 +115,9 @@ protected:
|
|||||||
// Decompress data that was compress by an external app.
|
// Decompress data that was compress by an external app.
|
||||||
// (like test wx 2.4.2, 2.5.1 and gzip data)
|
// (like test wx 2.4.2, 2.5.1 and gzip data)
|
||||||
// Note: This test is limited in testing range!
|
// Note: This test is limited in testing range!
|
||||||
|
#if WXWIN_COMPATIBILITY_2_4
|
||||||
void Decompress_wx24Data();
|
void Decompress_wx24Data();
|
||||||
|
#endif
|
||||||
void Decompress_wx251_zlib114_Data_NoHeader();
|
void Decompress_wx251_zlib114_Data_NoHeader();
|
||||||
void Decompress_wx251_zlib114_Data_ZLib();
|
void Decompress_wx251_zlib114_Data_ZLib();
|
||||||
void Decompress_gzip135Data();
|
void Decompress_gzip135Data();
|
||||||
@@ -255,6 +259,7 @@ void zlibStream::Decompress_BadData()
|
|||||||
CPPUNIT_ASSERT(!zstream_in.IsOk());
|
CPPUNIT_ASSERT(!zstream_in.IsOk());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if WXWIN_COMPATIBILITY_2_4
|
||||||
void zlibStream::Decompress_wx24Data()
|
void zlibStream::Decompress_wx24Data()
|
||||||
{
|
{
|
||||||
// The wx24_value was used in a wxWidgets 2.4(.2)
|
// The wx24_value was used in a wxWidgets 2.4(.2)
|
||||||
@@ -268,6 +273,7 @@ void zlibStream::Decompress_wx24Data()
|
|||||||
// Perform a generic data test on the data.
|
// Perform a generic data test on the data.
|
||||||
doDecompress_ExternalData(wx24_data, wx24_value, data_size, value_size, wxZLIB_24COMPATIBLE);
|
doDecompress_ExternalData(wx24_data, wx24_value, data_size, value_size, wxZLIB_24COMPATIBLE);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
void zlibStream::Decompress_wx251_zlib114_Data_NoHeader()
|
void zlibStream::Decompress_wx251_zlib114_Data_NoHeader()
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user