X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad16130f66b69c4154b738ca3ca4158a41b2b02e..4462f911b111ad2462a3e4600892438d42a57c4c:/tests/test.cpp diff --git a/tests/test.cpp b/tests/test.cpp index ca527e17ec..eeefa10849 100644 --- a/tests/test.cpp +++ b/tests/test.cpp @@ -7,6 +7,10 @@ // Licence: wxWidgets licence /////////////////////////////////////////////////////////////////////////////// +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + // For compilers that support precompilation, includes "wx/wx.h" // and "wx/cppunit.h" #include "testprec.h" @@ -24,14 +28,16 @@ #ifdef __VISUALC__ #pragma warning(disable:4100) #endif + #include -#ifdef __VISUALC__ - #pragma warning(default:4100) -#endif #include #include #include #include + +#ifdef __VISUALC__ + #pragma warning(default:4100) +#endif #include "wx/afterstd.h" #include "wx/cmdline.h" @@ -41,12 +47,23 @@ #include "wx/msw/msvcrt.h" #endif +#ifdef __WXOSX__ + #include "wx/osx/private.h" +#endif + +#include "wx/socket.h" + using namespace std; using CppUnit::Test; using CppUnit::TestSuite; using CppUnit::TestFactoryRegistry; + +// ---------------------------------------------------------------------------- +// helper classes +// ---------------------------------------------------------------------------- + // exception class for MSVC debug CRT assertion failures #ifdef wxUSE_VC_CRTDBG @@ -75,7 +92,7 @@ static string GetExceptionMessage() { msg << "wxWidgets assert: " << e.m_cond << " failed " "at " << e.m_file << ":" << e.m_line << " in " << e.m_func - << " with message " << e.m_msg; + << " with message '" << e.m_msg << "'"; } #endif // wxDEBUG_LEVEL #ifdef wxUSE_VC_CRTDBG @@ -216,6 +233,15 @@ public: private: void List(Test *test, const string& parent = "") const; + // call List() if m_list or runner.addTest() otherwise + void AddTest(CppUnit::TestRunner& runner, Test *test) + { + if (m_list) + List(test); + else + runner.addTest(test); + } + // command lines options/parameters bool m_list; bool m_longlist; @@ -231,6 +257,11 @@ private: IMPLEMENT_APP_NO_MAIN(TestApp) + +// ---------------------------------------------------------------------------- +// global functions +// ---------------------------------------------------------------------------- + #ifdef wxUSE_VC_CRTDBG static int TestCrtReportHook(int reportType, char *message, int *) @@ -282,6 +313,64 @@ int main(int argc, char **argv) return -1; } +extern void SetFilterEventFunc(FilterEventFunc func) +{ + wxGetApp().SetFilterEventFunc(func); +} + +extern void SetProcessEventFunc(ProcessEventFunc func) +{ + wxGetApp().SetProcessEventFunc(func); +} + +extern bool IsNetworkAvailable() +{ + // NOTE: we could use wxDialUpManager here if it was in wxNet; since it's in + // wxCore we use a simple rough test: + + wxSocketBase::Initialize(); + + wxIPV4address addr; + if (!addr.Hostname("www.google.com") || !addr.Service("www")) + { + wxSocketBase::Shutdown(); + return false; + } + + wxSocketClient sock; + sock.SetTimeout(10); // 10 secs + bool online = sock.Connect(addr); + + wxSocketBase::Shutdown(); + + return online; +} + +// helper of OnRun(): gets the test with the given name, returning NULL (and +// not an empty test suite) if there is no such test +static Test *GetTestByName(const wxString& name) +{ + Test * + test = TestFactoryRegistry::getRegistry(string(name.mb_str())).makeTest(); + if ( test ) + { + TestSuite * const suite = dynamic_cast(test); + if ( !suite || !suite->countTestCases() ) + { + // it's a bogus test, don't use it + delete test; + test = NULL; + } + } + + return test; +} + + +// ---------------------------------------------------------------------------- +// TestApp +// ---------------------------------------------------------------------------- + TestApp::TestApp() : m_list(false), m_longlist(false) @@ -299,7 +388,11 @@ bool TestApp::OnInit() if ( !TestAppBase::OnInit() ) return false; - cout << "Test program for wxWidgets\n" +#if wxUSE_GUI + cout << "Test program for wxWidgets GUI features\n" +#else + cout << "Test program for wxWidgets non-GUI features\n" +#endif << "build: " << WX_BUILD_OPTIONS_SIGNATURE << std::endl; #if wxUSE_GUI @@ -349,11 +442,6 @@ bool TestApp::OnCmdLineParsed(wxCmdLineParser& parser) for (size_t i = 0; i < parser.GetParamCount(); i++) m_registries.push_back(parser.GetParam(i)); } - else - { - // FIXME: this is an ugly and unnecessary hack - m_registries.push_back(""); - } m_longlist = parser.Found("longlist"); m_list = m_longlist || parser.Found("list"); @@ -398,40 +486,17 @@ bool TestApp::ProcessEvent(wxEvent& event) return TestAppBase::ProcessEvent(event); } -extern void SetFilterEventFunc(FilterEventFunc func) -{ - wxGetApp().SetFilterEventFunc(func); -} - -extern void SetProcessEventFunc(ProcessEventFunc func) -{ - wxGetApp().SetProcessEventFunc(func); -} - -// helper of OnRun(): gets the test with the given name, returning NULL (and -// not an empty test suite) if there is no such test -static Test *GetTestByName(const wxString& name) -{ - Test * - test = TestFactoryRegistry::getRegistry(string(name.mb_str())).makeTest(); - if ( test ) - { - TestSuite * const suite = dynamic_cast(test); - if ( !suite || !suite->countTestCases() ) - { - // it's a bogus test, don't use it - delete test; - test = NULL; - } - } - - return test; -} - // Run // int TestApp::OnRun() { +#if wxUSE_GUI +#ifdef __WXOSX__ + // make sure there's always an autorelease pool ready + wxMacAutoreleasePool autoreleasepool; +#endif +#endif + #if wxUSE_LOG // Switch off logging unless --verbose bool verbose = wxLog::GetVerbose(); @@ -442,19 +507,17 @@ int TestApp::OnRun() CppUnit::TextTestRunner runner; - for (size_t i = 0; i < m_registries.size(); i++) + if ( m_registries.empty() ) { - Test *test; - - wxString reg = m_registries[i]; - if ( reg.empty() ) - { - // no test name, run all the tests - test = TestFactoryRegistry::getRegistry().makeTest(); - } - else // test name specified, run just this test + // run or list all tests + AddTest(runner, TestFactoryRegistry::getRegistry().makeTest()); + } + else // run only the selected tests + { + for (size_t i = 0; i < m_registries.size(); i++) { - test = GetTestByName(reg); + const wxString reg = m_registries[i]; + Test *test = GetTestByName(reg); if ( !test && !reg.EndsWith("TestCase") ) { @@ -466,12 +529,9 @@ int TestApp::OnRun() cerr << "No such test suite: " << string(reg.mb_str()) << endl; return 2; } - } - if (m_list) - List(test); - else - runner.addTest(test); + AddTest(runner, test); + } } if ( m_list )