X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/884ca4e484c3c867407649c74b6f16a428d31a26..cd15bcaf50ead53ccf9d50965312f0dc754affb4:/tests/test.cpp?ds=inline diff --git a/tests/test.cpp b/tests/test.cpp index 676e33b351..cdb57c535a 100644 --- a/tests/test.cpp +++ b/tests/test.cpp @@ -4,7 +4,7 @@ // Author: Mike Wetherell // RCS-ID: $Id$ // Copyright: (c) 2004 Mike Wetherell -// Licence: wxWidgets licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ---------------------------------------------------------------------------- @@ -34,6 +34,7 @@ #include #include #include +#include #ifdef __VISUALC__ #pragma warning(default:4100) @@ -41,9 +42,10 @@ #include "wx/afterstd.h" #include "wx/cmdline.h" +#include #include -#ifdef __WXMSW__ +#ifdef __WINDOWS__ #include "wx/msw/msvcrt.h" #endif @@ -51,7 +53,12 @@ #include "wx/osx/private.h" #endif +#if wxUSE_GUI + #include "testableframe.h" +#endif + #include "wx/socket.h" +#include "wx/evtloop.h" using namespace std; @@ -80,6 +87,9 @@ struct CrtAssertFailure #if wxDEBUG_LEVEL +// Information about the last not yet handled assertion. +static wxString s_lastAssertMessage; + static wxString FormatAssertMessage(const wxString& file, int line, const wxString& func, @@ -99,16 +109,48 @@ static void TestAssertHandler(const wxString& file, const wxString& cond, const wxString& msg) { - // can't throw from other threads, die immediately + // Determine whether we can safely throw an exception to just make the test + // fail or whether we need to abort (in this case "msg" will contain the + // explanation why did we decide to do it). + wxString abortReason; + + const wxString + assertMessage = FormatAssertMessage(file, line, func, cond, msg); + if ( !wxIsMainThread() ) { - wxPrintf("%s in a worker thread -- aborting.", - FormatAssertMessage(file, line, func, cond, msg)); - fflush(stdout); - _exit(-1); + // Exceptions thrown from worker threads are not caught currently and + // so we'd just die without any useful information -- abort instead. + abortReason << assertMessage << "in a worker thread."; + } + else if ( uncaught_exception() ) + { + // Throwing while already handling an exception would result in + // terminate() being called and we wouldn't get any useful information + // about why the test failed then. + if ( s_lastAssertMessage.empty() ) + { + abortReason << assertMessage << "while handling an exception"; + } + else // In this case the exception is due to a previous assert. + { + abortReason << s_lastAssertMessage << "\n and another " + << assertMessage << " while handling it."; + } + } + else // Can "safely" throw from here. + { + // Remember this in case another assert happens while handling this + // exception: we want to show the original assert as it's usually more + // useful to determine the real root of the problem. + s_lastAssertMessage = assertMessage; + + throw TestAssertFailure(file, line, func, cond, msg); } - throw TestAssertFailure(file, line, func, cond, msg); + wxFputs(abortReason, stderr); + fflush(stderr); + _exit(-1); } #endif // wxDEBUG_LEVEL @@ -123,10 +165,10 @@ static string GetExceptionMessage() throw; } #if wxDEBUG_LEVEL - catch ( TestAssertFailure& e ) + catch ( TestAssertFailure& ) { - msg << FormatAssertMessage(e.m_file, e.m_line, e.m_func, - e.m_cond, e.m_msg); + msg = s_lastAssertMessage; + s_lastAssertMessage.clear(); } #endif // wxDEBUG_LEVEL #ifdef wxUSE_VC_CRTDBG @@ -189,7 +231,7 @@ public: virtual void startTest(CppUnit::Test *test) { - wxPrintf(" %-60s ", test->getName()); + printf(" %-60s ", test->getName().c_str()); m_result = RESULT_OK; m_watch.Start(); } @@ -202,10 +244,10 @@ public: virtual void endTest(CppUnit::Test * WXUNUSED(test)) { m_watch.Pause(); - wxPrintf(GetResultStr(m_result)); + printf("%s", GetResultStr(m_result)); if (m_timing) - wxPrintf(" %6d ms", m_watch.Time()); - wxPrintf("\n"); + printf(" %6ld ms", m_watch.Time()); + printf("\n"); } protected : @@ -217,7 +259,7 @@ protected : RESULT_MAX }; - wxString GetResultStr(ResultType type) const + const char* GetResultStr(ResultType type) const { static const char *resultTypeNames[] = { @@ -284,6 +326,9 @@ private: wxArrayString m_registries; wxLocale *m_locale; + // event loop for GUI tests + wxEventLoop* m_eventloop; + // event handling hooks FilterEventFunc m_filterEventFunc; ProcessEventFunc m_processEventFunc; @@ -367,6 +412,25 @@ extern bool IsNetworkAvailable() return online; } +extern bool IsAutomaticTest() +{ + static int s_isAutomatic = -1; + if ( s_isAutomatic == -1 ) + { + // Allow setting an environment variable to emulate buildslave user for + // testing. + wxString username; + if ( !wxGetEnv("WX_TEST_USER", &username) ) + username = wxGetUserId(); + + username.MakeLower(); + s_isAutomatic = username.Matches("buildslave*") || + username.Matches("sandbox*"); + } + + return s_isAutomatic == 1; +} + // 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) @@ -400,6 +464,7 @@ TestApp::TestApp() m_processEventFunc = NULL; m_locale = NULL; + m_eventloop = NULL; } // Init @@ -414,11 +479,24 @@ bool TestApp::OnInit() #else cout << "Test program for wxWidgets non-GUI features\n" #endif - << "build: " << WX_BUILD_OPTIONS_SIGNATURE << std::endl; + << "build: " << WX_BUILD_OPTIONS_SIGNATURE << "\n" + << "running under " << wxGetOsDescription() + << " as " << wxGetUserId() << std::endl; + + if ( m_detail ) + { + // Output some important information about the test environment. + cout << "Running under " << wxGetOsDescription() << ", " + "locale is " << setlocale(LC_ALL, NULL) << std::endl; + } #if wxUSE_GUI // create a hidden parent window to be used as parent for the GUI controls - new wxFrame(NULL, wxID_ANY, "Hidden wx test frame"); + wxTestableFrame* frame = new wxTestableFrame(); + frame->Show(); + + m_eventloop = new wxEventLoop; + wxEventLoop::SetActive(m_eventloop); #endif // wxUSE_GUI return true; @@ -441,7 +519,7 @@ void TestApp::OnInitCmdLine(wxCmdLineParser& parser) "print the test case names, run them", wxCMD_LINE_VAL_NONE, 0 }, { wxCMD_LINE_SWITCH, "t", "timing", - "print names and mesure running time of individual test, run them", + "print names and measure running time of individual test, run them", wxCMD_LINE_VAL_NONE, 0 }, { wxCMD_LINE_OPTION, "", "locale", "locale to use when running the program", @@ -530,8 +608,17 @@ int TestApp::OnRun() if ( m_registries.empty() ) { - // run or list all tests + // run or list all tests which use the CPPUNIT_TEST_SUITE_REGISTRATION() macro + // (i.e. those registered in the "All tests" registry); if there are other + // tests not registered with the CPPUNIT_TEST_SUITE_REGISTRATION() macro + // then they won't be listed/run! AddTest(runner, TestFactoryRegistry::getRegistry().makeTest()); + + if (m_list) + { + cout << "\nNote that the list above is not complete as it doesn't include the \n"; + cout << "tests disabled by default.\n"; + } } else // run only the selected tests { @@ -577,7 +664,9 @@ int TestApp::OnRun() runner.eventManager().pushProtector(new wxUnitTestProtector); bool printProgress = !(verbose || m_detail || m_timing); - return runner.run("", false, true, printProgress) ? EXIT_SUCCESS : EXIT_FAILURE; + runner.run("", false, true, printProgress); + + return runner.result().testFailures() == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } int TestApp::OnExit() @@ -586,6 +675,8 @@ int TestApp::OnExit() #if wxUSE_GUI delete GetTopWindow(); + wxEventLoop::SetActive(NULL); + delete m_eventloop; #endif // wxUSE_GUI return 0;