From: Włodzimierz Skiba Date: Wed, 10 Nov 2004 21:29:08 +0000 (+0000) Subject: Patch 1053127 - Test fixes. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/3e5f6c1c4f79af395e094be3fa2957394e2e5825 Patch 1053127 - Test fixes. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30431 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/tests/formatconverter/formatconvertertest.cpp b/tests/formatconverter/formatconvertertest.cpp index 0893dd3ee8..aa924fe9f4 100644 --- a/tests/formatconverter/formatconvertertest.cpp +++ b/tests/formatconverter/formatconvertertest.cpp @@ -56,9 +56,8 @@ extern wxString wxConvertFormat(const wxChar *format); #endif -using namespace std; -using namespace CppUnit; - +using CppUnit::TestCase; +using std::string; /////////////////////////////////////////////////////////////////////////////// // The test case diff --git a/tests/regex/regextest.cpp b/tests/regex/regextest.cpp index 261435e8ed..be54588c77 100644 --- a/tests/regex/regextest.cpp +++ b/tests/regex/regextest.cpp @@ -15,19 +15,19 @@ // // To run all the regex tests: // test regex -// +// // Some tests must be skipped since they use features which we do not make // available through wxRegEx. To see the list of tests that have been skipped // turn on verbose logging, e.g.: // test --verbose regex -// +// // The tests here are for the builtin library, tests for wxRegEx in general // should go in wxregex.cpp // // The tests are generated from Henry Spencer's reg.test, additional test // can be added in wxreg.test. These test files are then turned into a C++ // include file 'regex.inc' (included below) using a script 'regex.pl'. -// +// // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" @@ -43,10 +43,16 @@ #include "wx/regex.h" #include "wx/cppunit.h" -#include +#include +#include -using namespace std; -using namespace CppUnit; +using CppUnit::Test; +using CppUnit::TestCase; +using CppUnit::TestSuite; +using CppUnit::Exception; + +using std::vector; +using std::string; // many of the tests are specific to the builtin regex lib, so only attempts // to do them when using the builtin regex lib. @@ -135,7 +141,7 @@ RegExTestCase::RegExTestCase( } failIf(badconv, _T("cannot convert to default character encoding")); - + // the flags need further parsing... parseFlags(m_flags); @@ -148,10 +154,10 @@ int wxWcscmp(const wchar_t* s1, const wchar_t* s2) { size_t nLen1 = wxWcslen(s1); size_t nLen2 = wxWcslen(s2); - + if (nLen1 != nLen2) return nLen1 - nLen2; - + return wxMemcmp(s1, s2, nLen1); } @@ -221,7 +227,7 @@ void RegExTestCase::runTest() doTest(wxRE_ADVANCED); #endif } - + // Try the test for a single flavour of expression // void RegExTestCase::doTest(int flavor) @@ -293,7 +299,7 @@ void RegExTestCase::fail(const wxString& msg) const for (it = m_expected.begin(); it != m_expected.end(); ++it) str << _T(" ") << quote(*it); - + if (str.length() > 77) str = str.substr(0, 74) + _T("..."); @@ -314,7 +320,7 @@ wxString RegExTestCase::quote(const wxString& arg) for (size_t i = 0; i < arg.length(); i++) { wxUChar ch = arg[i]; const wxChar *p = wxStrchr(needEscape, ch); - + if (p) str += wxString::Format(_T("\\%c"), escapes[p - needEscape]); else if (wxIscntrl(ch)) @@ -358,7 +364,7 @@ void RegExTestSuite::add( expected_results.push_back(expected); va_end(ap); - + try { addTest(new RegExTestCase( name, mode, id, flags, pattern, data, expected_results)); diff --git a/tests/regex/wxregextest.cpp b/tests/regex/wxregextest.cpp index 6e798a1821..ee16ff81df 100644 --- a/tests/regex/wxregextest.cpp +++ b/tests/regex/wxregextest.cpp @@ -24,8 +24,10 @@ #include "wx/tokenzr.h" #include -using namespace std; -using namespace CppUnit; +using CppUnit::Test; +using CppUnit::TestCase; +using CppUnit::TestSuite; +using std::string; /////////////////////////////////////////////////////////////////////////////// @@ -143,7 +145,7 @@ public: m_expected(expected), m_count(count), m_flags(flags) - { } + { } protected: void runTest(); diff --git a/tests/streams/bstream.cpp b/tests/streams/bstream.cpp index cdbc90eafa..d03458ef28 100644 --- a/tests/streams/bstream.cpp +++ b/tests/streams/bstream.cpp @@ -27,7 +27,8 @@ #include "wx/cppunit.h" #include "bstream.h" -using namespace CppUnit; +using CppUnit::TestSuite; +using CppUnit::Test; /////////////////////////////////////////////////////////////////////////////// // Streams main test suite, it houses all stream test suites. @@ -36,8 +37,8 @@ using namespace CppUnit; class StreamCase : public TestSuite { public: - StreamCase() - :TestSuite(STREAM_TEST_NAME) + StreamCase() + :TestSuite(STREAM_TEST_NAME) { /* Nothing extra */ } static Test *suite(); }; @@ -49,14 +50,14 @@ Test *StreamCase::suite() /* * Register all sub stream test suites. */ - + STREAM_REGISTER_SUB_SUITE(memStream); STREAM_REGISTER_SUB_SUITE(strStream); STREAM_REGISTER_SUB_SUITE(fileStream); STREAM_REGISTER_SUB_SUITE(ffileStream); STREAM_REGISTER_SUB_SUITE(zlibStream); - /* + /* ** Add more stream subtests here */ diff --git a/tests/streams/bstream.h b/tests/streams/bstream.h index 4d15aa503f..a73b495384 100644 --- a/tests/streams/bstream.h +++ b/tests/streams/bstream.h @@ -11,7 +11,6 @@ #define _WX_TESTBSTREAM_H__ #include "wx/cppunit.h" -using namespace CppUnit; /////////////////////////////////////////////////////////////////////////////// // Some macros preventing us from typing too much ;-) @@ -21,10 +20,10 @@ using namespace CppUnit; #define COMPOSE_TEST_NAME(Name) \ STREAM_TEST_NAME "." #Name #define STREAM_REGISTER_SUB_SUITE(Name) \ - extern Test* Get##Name##Suite(); \ + extern CppUnit::Test* Get##Name##Suite(); \ suite->addTest(Get##Name##Suite()) #define STREAM_IMPLEMENT_SUB_REGISTRATION_ROUTINE(Name) \ - Test* Get##Name##Suite() { return Name::suite(); } + CppUnit::Test* Get##Name##Suite() { return Name::suite(); } #define STREAM_TEST_SUBSUITE_NAMED_REGISTRATION(Name) \ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( Name, COMPOSE_TEST_NAME(Name) ); \ STREAM_IMPLEMENT_SUB_REGISTRATION_ROUTINE( Name ) @@ -34,7 +33,7 @@ using namespace CppUnit; // Template class that implements a test for all base stream functions. // -template class BaseStreamTestCase : public TestCase +template class BaseStreamTestCase : public CppUnit::TestCase { protected: typedef BaseStreamTestCase StreamTestCase; diff --git a/tests/streams/ffilestream.cpp b/tests/streams/ffilestream.cpp index de181e5d57..134830530e 100644 --- a/tests/streams/ffilestream.cpp +++ b/tests/streams/ffilestream.cpp @@ -29,9 +29,6 @@ #include "bstream.h" -using namespace std; -using namespace CppUnit; - #define DATABUFFER_SIZE 1024 static const wxString FILENAME_FFILEINSTREAM = _T("ffileinstream.test"); @@ -74,7 +71,7 @@ protected: private: // Implement base class functions. - virtual wxFFileInputStream *DoCreateInStream(); + virtual wxFFileInputStream *DoCreateInStream(); virtual wxFFileOutputStream *DoCreateOutStream(); virtual void DoDeleteOutStream(); @@ -95,14 +92,14 @@ ffileStream::~ffileStream() ::wxRemoveFile(FILENAME_FFILEOUTSTREAM); } -wxFFileInputStream *ffileStream::DoCreateInStream() -{ +wxFFileInputStream *ffileStream::DoCreateInStream() +{ wxFFileInputStream *pFileInStream = new wxFFileInputStream(GetInFileName()); CPPUNIT_ASSERT(pFileInStream->IsOk()); return pFileInStream; } wxFFileOutputStream *ffileStream::DoCreateOutStream() -{ +{ wxFFileOutputStream *pFileOutStream = new wxFFileOutputStream(FILENAME_FFILEOUTSTREAM); CPPUNIT_ASSERT(pFileOutStream->IsOk()); return pFileOutStream; @@ -124,7 +121,7 @@ wxString ffileStream::GetInFileName() const // Make sure we have a input file... char buf[DATABUFFER_SIZE]; wxFFileOutputStream out(FILENAME_FFILEINSTREAM); - + // Init the data buffer. for (size_t i = 0; i < DATABUFFER_SIZE; i++) buf[i] = (i % 0xFF); diff --git a/tests/streams/filestream.cpp b/tests/streams/filestream.cpp index 90f05f7af1..ae005e25b1 100644 --- a/tests/streams/filestream.cpp +++ b/tests/streams/filestream.cpp @@ -29,9 +29,6 @@ #include "bstream.h" -using namespace std; -using namespace CppUnit; - #define DATABUFFER_SIZE 1024 static const wxString FILENAME_FILEINSTREAM = _T("fileinstream.test"); @@ -74,7 +71,7 @@ protected: private: // Implement base class functions. - virtual wxFileInputStream *DoCreateInStream(); + virtual wxFileInputStream *DoCreateInStream(); virtual wxFileOutputStream *DoCreateOutStream(); virtual void DoDeleteOutStream(); @@ -94,14 +91,14 @@ fileStream::~fileStream() ::wxRemoveFile(FILENAME_FILEOUTSTREAM); } -wxFileInputStream *fileStream::DoCreateInStream() -{ +wxFileInputStream *fileStream::DoCreateInStream() +{ wxFileInputStream *pFileInStream = new wxFileInputStream(GetInFileName()); CPPUNIT_ASSERT(pFileInStream->IsOk()); return pFileInStream; } wxFileOutputStream *fileStream::DoCreateOutStream() -{ +{ wxFileOutputStream *pFileOutStream = new wxFileOutputStream(FILENAME_FILEOUTSTREAM); CPPUNIT_ASSERT(pFileOutStream->IsOk()); return pFileOutStream; @@ -123,7 +120,7 @@ wxString fileStream::GetInFileName() const // Make sure we have a input file... char buf[DATABUFFER_SIZE]; wxFileOutputStream out(FILENAME_FILEINSTREAM); - + // Init the data buffer. for (size_t i = 0; i < DATABUFFER_SIZE; i++) buf[i] = (i % 0xFF); diff --git a/tests/streams/memstream.cpp b/tests/streams/memstream.cpp index a785904bfe..6c5a602271 100644 --- a/tests/streams/memstream.cpp +++ b/tests/streams/memstream.cpp @@ -29,9 +29,6 @@ #include "bstream.h" -using namespace std; -using namespace CppUnit; - #define DATABUFFER_SIZE 256 /////////////////////////////////////////////////////////////////////////////// @@ -74,7 +71,7 @@ private: private: // Implement base class functions. - virtual wxMemoryInputStream *DoCreateInStream(); + virtual wxMemoryInputStream *DoCreateInStream(); virtual wxMemoryOutputStream *DoCreateOutStream(); private: @@ -98,14 +95,14 @@ const char *memStream::GetDataBuffer() return m_DataBuffer; } -wxMemoryInputStream *memStream::DoCreateInStream() -{ +wxMemoryInputStream *memStream::DoCreateInStream() +{ wxMemoryInputStream *pMemInStream = new wxMemoryInputStream(GetDataBuffer(), DATABUFFER_SIZE); CPPUNIT_ASSERT(pMemInStream->IsOk()); return pMemInStream; } wxMemoryOutputStream *memStream::DoCreateOutStream() -{ +{ wxMemoryOutputStream *pMemOutStream = new wxMemoryOutputStream(); CPPUNIT_ASSERT(pMemOutStream->IsOk()); return pMemOutStream; diff --git a/tests/streams/sstream.cpp b/tests/streams/sstream.cpp index bc42c32e95..20dfd40b5e 100644 --- a/tests/streams/sstream.cpp +++ b/tests/streams/sstream.cpp @@ -23,9 +23,6 @@ #include "bstream.h" -using namespace std; -using namespace CppUnit; - /////////////////////////////////////////////////////////////////////////////// // The test case // @@ -65,7 +62,7 @@ protected: private: // Implement base class functions. - virtual wxStringInputStream *DoCreateInStream(); + virtual wxStringInputStream *DoCreateInStream(); virtual wxStringOutputStream *DoCreateOutStream(); wxString m_str; @@ -85,15 +82,15 @@ strStream::~strStream() { } -wxStringInputStream *strStream::DoCreateInStream() -{ +wxStringInputStream *strStream::DoCreateInStream() +{ wxStringInputStream *pStrInStream = new wxStringInputStream(m_str); CPPUNIT_ASSERT(pStrInStream->IsOk()); return pStrInStream; } wxStringOutputStream *strStream::DoCreateOutStream() -{ +{ wxStringOutputStream *pStrOutStream = new wxStringOutputStream(); CPPUNIT_ASSERT(pStrOutStream->IsOk()); return pStrOutStream; diff --git a/tests/streams/zlibstream.cpp b/tests/streams/zlibstream.cpp index 56d0e23978..6f65cf1089 100644 --- a/tests/streams/zlibstream.cpp +++ b/tests/streams/zlibstream.cpp @@ -33,8 +33,7 @@ #include "bstream.h" -using namespace std; -using namespace CppUnit; +using std::string; #define WXTEST_WITH_GZIP_CONDITION(testMethod) \ WXTEST_WITH_CONDITION( COMPOSE_TEST_NAME(zlibStream), wxZlibInputStream::CanHandleGZip() && wxZlibOutputStream::CanHandleGZip(), testMethod ) @@ -112,7 +111,7 @@ protected: void TestStream_ZLibGZip(); // Try to decompress bad data. void Decompress_BadData(); - // 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) // Note: This test is limited in testing range! #if WXWIN_COMPATIBILITY_2_4 @@ -120,9 +119,9 @@ protected: #endif void Decompress_wx251_zlib114_Data_NoHeader(); void Decompress_wx251_zlib114_Data_ZLib(); - void Decompress_gzip135Data(); + void Decompress_gzip135Data(); -private: +private: const char *GetDataBuffer(); const unsigned char *GetCompressedData(); void doTestStreamData(int input_flag, int output_flag, int compress_level); @@ -130,12 +129,12 @@ private: private: // Implement base class functions. - virtual wxZlibInputStream *DoCreateInStream(); + virtual wxZlibInputStream *DoCreateInStream(); virtual wxZlibOutputStream *DoCreateOutStream(); virtual void DoDeleteInStream(); virtual void DoDeleteOutStream(); - // Helper that can be used to create new wx compatibility tests... + // Helper that can be used to create new wx compatibility tests... // Otherwise not used by the tests. void genExtTestData(wxTextOutputStream &out, const char *buf, int flag); @@ -235,7 +234,7 @@ void zlibStream::TestStream_GZip_BestComp() void zlibStream::TestStream_ZLibGZip() { - // Only use default compression level, as this test is + // Only use default compression level, as this test is // for testing if the streams can determine the stream type info them self... doTestStreamData(wxZLIB_AUTO, wxZLIB_ZLIB, wxZ_DEFAULT_COMPRESSION); doTestStreamData(wxZLIB_AUTO, wxZLIB_GZIP, wxZ_DEFAULT_COMPRESSION); @@ -247,7 +246,7 @@ void zlibStream::Decompress_BadData() wxMemoryInputStream memstream_in(GetDataBuffer(), DATABUFFER_SIZE); CPPUNIT_ASSERT(memstream_in.IsOk()); wxZlibInputStream zstream_in(memstream_in); - CPPUNIT_ASSERT(zstream_in.IsOk()); // We did not yet read from the stream + CPPUNIT_ASSERT(zstream_in.IsOk()); // We did not yet read from the stream // so it should still be OK. // Try to force the stream to go to bad status. CPPUNIT_ASSERT(!zstream_in.Eof()); @@ -262,7 +261,7 @@ void zlibStream::Decompress_BadData() #if WXWIN_COMPATIBILITY_2_4 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) // 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"; @@ -324,13 +323,13 @@ const unsigned char *zlibStream::GetCompressedData() zstream_out.Write(buf, strlen(buf)); } - // Copy the to the + // Copy the to the m_SizeCompressedData = memstream_out.GetSize(); m_pCompressedData = new unsigned char[m_SizeCompressedData]; memstream_out.CopyTo(m_pCompressedData, m_SizeCompressedData); } - CPPUNIT_ASSERT(m_pCompressedData != NULL); + CPPUNIT_ASSERT(m_pCompressedData != NULL); return m_pCompressedData; } @@ -356,7 +355,7 @@ void zlibStream::doTestStreamData(int input_flag, int output_flag, int compress_ fstream_out.PutC(' '); } - { // Part two: Verify that the compressed data when uncompressed + { // Part two: Verify that the compressed data when uncompressed // matches the original data. wxFileInputStream fstream_in(FILENAME_GZ); CPPUNIT_ASSERT(fstream_in.IsOk()); @@ -368,7 +367,7 @@ void zlibStream::doTestStreamData(int input_flag, int output_flag, int compress_ for (fail_pos = 0; !zstream_in.Eof(); fail_pos++) { last_value = zstream_in.GetC(); - if (zstream_in.LastRead() != 1 || + if (zstream_in.LastRead() != 1 || last_value != pbuf[fail_pos]) break; } @@ -382,7 +381,7 @@ 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"), + 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)); CPPUNIT_FAIL(string(msg.mb_str())); } @@ -413,7 +412,7 @@ void zlibStream::doDecompress_ExternalData(const unsigned char *data, const char wxLogError(_T("gzip data seems to not be gzip data!")); break; case wxZLIB_AUTO: - if (!(data_size >= 1 && data[0] == 0x78) || + if (!(data_size >= 1 && data[0] == 0x78) || !(data_size >= 2 && data[0] == 0x1F && data[1] == 0x8B)) wxLogError(_T("Data seems to not be zlib or gzip data!")); default: @@ -460,13 +459,13 @@ void zlibStream::doDecompress_ExternalData(const unsigned char *data, const char // Move one item along in the stream. (void)zstream_in.GetC(); i++; - + // Check if we are in an infinite loop by multiplying value_size // by 5 to have a *much* bigger range then the real range. - // Note: Incase you ask your self, why 5, the answer is no reason... - // it is not to big and not to small a size, nothing more + // Note: Incase you ask your self, why 5, the answer is no reason... + // it is not to big and not to small a size, nothing more // nothing less to it. - if (i > (value_size*5)) + if (i > (value_size*5)) { // Note: Please make sure Input_Eof test passed. CPPUNIT_FAIL("Infinite stream detected, breaking the infinite loop"); @@ -476,12 +475,12 @@ void zlibStream::doDecompress_ExternalData(const unsigned char *data, const char } } - CPPUNIT_ASSERT_MESSAGE("Could not decompress the compressed data, original and restored value did not match.", + CPPUNIT_ASSERT_MESSAGE("Could not decompress the compressed data, original and restored value did not match.", i == value_size && bValueEq); } -wxZlibInputStream *zlibStream::DoCreateInStream() -{ +wxZlibInputStream *zlibStream::DoCreateInStream() +{ const unsigned char *buf = GetCompressedData(); m_pTmpMemInStream = new wxMemoryInputStream(buf, m_SizeCompressedData); CPPUNIT_ASSERT(m_pTmpMemInStream->IsOk()); @@ -490,20 +489,20 @@ wxZlibInputStream *zlibStream::DoCreateInStream() return pzstream_in; } wxZlibOutputStream *zlibStream::DoCreateOutStream() -{ +{ m_pTmpMemOutStream = new wxMemoryOutputStream(); CPPUNIT_ASSERT(m_pTmpMemOutStream->IsOk()); wxZlibOutputStream *pzstream_out = new wxZlibOutputStream(*m_pTmpMemOutStream); CPPUNIT_ASSERT(pzstream_out->IsOk()); return pzstream_out; } -void zlibStream::DoDeleteInStream() -{ +void zlibStream::DoDeleteInStream() +{ delete m_pTmpMemInStream; m_pTmpMemInStream = NULL; } -void zlibStream::DoDeleteOutStream() -{ +void zlibStream::DoDeleteOutStream() +{ delete m_pTmpMemOutStream; m_pTmpMemOutStream = NULL; } @@ -513,7 +512,7 @@ void zlibStream::genExtTestData(wxTextOutputStream &out, const char *buf, int fl { unsigned char *data; size_t size; - + { // Gen data wxMemoryOutputStream memstream_out; { @@ -522,7 +521,7 @@ void zlibStream::genExtTestData(wxTextOutputStream &out, const char *buf, int fl } if (flag == wxZLIB_NO_HEADER) memstream_out.PutC(' '); - + size = memstream_out.GetSize(); data = new unsigned char[size]; memstream_out.CopyTo(data, size); @@ -530,7 +529,7 @@ void zlibStream::genExtTestData(wxTextOutputStream &out, const char *buf, int fl out << _T("void zlibStream::Decompress_wxXXXData()") << _T("\n"); out << _T("{") << _T("\n") << _T(" const unsigned char data[] = {"); - + size_t i; for (i = 0; i < size; i++) { @@ -538,7 +537,7 @@ void zlibStream::genExtTestData(wxTextOutputStream &out, const char *buf, int fl out << wxString::Format(_T("%d,"), data[i]); else out << wxString::Format(_T("%d"), data[i]); - } + } delete [] data; out << _T("};") << _T("\n"); diff --git a/tests/test.cpp b/tests/test.cpp index ae856107fa..97df72a276 100644 --- a/tests/test.cpp +++ b/tests/test.cpp @@ -28,8 +28,15 @@ #include "wx/cppunit.h" #include -using namespace std; -using namespace CppUnit; +using CppUnit::Test; +using CppUnit::TestSuite; +using CppUnit::TestFactoryRegistry; +using CppUnit::TextUi::TestRunner; + +using std::string; +using std::vector; +using std::auto_ptr; +using std::cout; // The application class // @@ -66,7 +73,7 @@ TestApp::TestApp() bool TestApp::OnInit() { cout << "Test program for wxWidgets\n" - << "build: " << WX_BUILD_OPTIONS_SIGNATURE << endl; + << "build: " << WX_BUILD_OPTIONS_SIGNATURE << std::endl; return wxAppConsole::OnInit(); }; @@ -100,7 +107,7 @@ bool TestApp::OnCmdLineParsed(wxCmdLineParser& parser) m_registries.push_back(string(parser.GetParam(i).mb_str())); else m_registries.push_back(""); - + m_longlist = parser.Found(_T("longlist")); m_list = m_longlist || parser.Found(_T("list")); @@ -112,7 +119,7 @@ bool TestApp::OnCmdLineParsed(wxCmdLineParser& parser) // int TestApp::OnRun() { - TextUi::TestRunner runner; + TestRunner runner; for (size_t i = 0; i < m_registries.size(); i++) { auto_ptr test(m_registries[i].empty() ? @@ -132,16 +139,15 @@ int TestApp::OnRun() #if wxUSE_LOG // Switch off logging unless --verbose - wxLog::EnableLogging(wxLog::GetVerbose()); -#endif // wxUSE_LOG - - return m_list || runner.run("", false, true, -#if wxUSE_LOG - !wxLog::GetVerbose() + bool verbose = wxLog::GetVerbose(); + wxLog::EnableLogging(verbose); #else - true -#endif // wxUSE_LOG - ) ? EXIT_SUCCESS : EXIT_FAILURE; + bool verbose = false; +#endif + + return ( m_list || runner.run("", false, true, !verbose) ) + ? EXIT_SUCCESS + : EXIT_FAILURE; } // List the tests