Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove WXTEST_WITH_CONDITION macro to simplify the code

Browse Source 
It was only used as part of WXTEST_WITH_GZIP_CONDITION which was
necessary only to support running the tests on systems using zlib < 1.2
which is not a concern since many years any more, so simplify the code
by using the simple non-conditional CPPUNIT_TEST instead and drop the
helper macros which were required only for this.
This commit is contained in:
Vadim Zeitlin
2017-10-30 14:16:11 +01:00
parent b5aaede7b1
commit 9f609a8148
2 changed files with 7 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/wx/cppunit.h
View File

@@ -77,27 +77,6 @@
// Set of helpful test macros.
//
// Base macro for wrapping CPPUNIT_TEST macros and so making them conditional
// tests, meaning that the test only get registered and thus run when a given
// runtime condition is true.
// In case the condition is evaluated as false a skip message is logged
// (the message will only be shown in verbose mode).
#define WXTEST_ANY_WITH_CONDITION(suiteName, Condition, testMethod, anyTest) \
if (Condition) \
{ anyTest; } \
else \
wxLogInfo(wxString::Format(wxT("skipping: %s.%s\n reason: %s equals false\n"), \
wxString(suiteName, wxConvUTF8).c_str(), \
wxString(#testMethod, wxConvUTF8).c_str(), \
wxString(#Condition, wxConvUTF8).c_str()))
// Conditional CPPUNIT_TEST macro.
#define WXTEST_WITH_CONDITION(suiteName, Condition, testMethod) \
WXTEST_ANY_WITH_CONDITION(suiteName, Condition, testMethod, CPPUNIT_TEST(testMethod))
// Conditional CPPUNIT_TEST_FAIL macro.
#define WXTEST_FAIL_WITH_CONDITION(suiteName, Condition, testMethod) \
WXTEST_ANY_WITH_CONDITION(suiteName, Condition, testMethod, CPPUNIT_TEST_FAIL(testMethod))
CPPUNIT_NS_BEGIN
// provide an overload of cppunit assertEquals(T, T) which can be used to

17
tests/streams/zlibstream.cpp
View File

@@ -29,9 +29,6 @@
using std::string;
#define WXTEST_WITH_GZIP_CONDITION(testMethod) \
WXTEST_WITH_CONDITION( COMPOSE_TEST_NAME(zlibStream), wxZlibInputStream::CanHandleGZip() && wxZlibOutputStream::CanHandleGZip(), testMethod )
#define DATABUFFER_SIZE 1024
static const wxString FILENAME_GZ = wxT("zlibtest.gz");
@@ -76,16 +73,16 @@ public:
CPPUNIT_TEST(TestStream_ZLib_NoComp);
CPPUNIT_TEST(TestStream_ZLib_SpeedComp);
CPPUNIT_TEST(TestStream_ZLib_BestComp);
WXTEST_WITH_GZIP_CONDITION(TestStream_GZip_Default);
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(TestStream_GZip_Default);
CPPUNIT_TEST(TestStream_GZip_NoComp);
CPPUNIT_TEST(TestStream_GZip_SpeedComp);
CPPUNIT_TEST(TestStream_GZip_BestComp);
CPPUNIT_TEST(TestStream_GZip_Dictionary);
CPPUNIT_TEST(TestStream_ZLibGZip);
CPPUNIT_TEST(Decompress_BadData);
CPPUNIT_TEST(Decompress_wx251_zlib114_Data_NoHeader);
CPPUNIT_TEST(Decompress_wx251_zlib114_Data_ZLib);
WXTEST_WITH_GZIP_CONDITION(Decompress_gzip135Data);
CPPUNIT_TEST(Decompress_gzip135Data);
CPPUNIT_TEST_SUITE_END();
protected: