X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/de830910772f149c6b6cc0878b239dd19df3d309..e1efca652844273c3e8d32c7e5f442b87e455ca7:/tests/test.cpp diff --git a/tests/test.cpp b/tests/test.cpp index eeefa10849..983bc4f3ce 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,6 +42,7 @@ #include "wx/afterstd.h" #include "wx/cmdline.h" +#include #include #ifdef __WXMSW__ @@ -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; @@ -78,6 +85,58 @@ struct CrtAssertFailure #endif // wxUSE_VC_CRTDBG +#if wxDEBUG_LEVEL + +static wxString FormatAssertMessage(const wxString& file, + int line, + const wxString& func, + const wxString& cond, + const wxString& msg) +{ + wxString str; + str << "wxWidgets assert: " << cond << " failed " + "at " << file << ":" << line << " in " << func + << " with message '" << msg << "'"; + return str; +} + +static void TestAssertHandler(const wxString& file, + int line, + const wxString& func, + const wxString& cond, + const wxString& msg) +{ + // 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; + if ( !wxIsMainThread() ) + { + // Exceptions thrown from worker threads are not caught currently and + // so we'd just die without any useful information -- abort instead. + abortReason = "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. + abortReason = "while handling an exception"; + } + else // Can "safely" throw from here. + { + throw TestAssertFailure(file, line, func, cond, msg); + } + + wxFprintf(stderr, "%s %s -- aborting.", + FormatAssertMessage(file, line, func, cond, msg), + abortReason); + fflush(stderr); + _exit(-1); +} + +#endif // wxDEBUG_LEVEL + // this function should only be called from a catch clause static string GetExceptionMessage() { @@ -90,9 +149,8 @@ static string GetExceptionMessage() #if wxDEBUG_LEVEL catch ( TestAssertFailure& e ) { - msg << "wxWidgets assert: " << e.m_cond << " failed " - "at " << e.m_file << ":" << e.m_line << " in " << e.m_func - << " with message '" << e.m_msg << "'"; + msg << FormatAssertMessage(e.m_file, e.m_line, e.m_func, + e.m_cond, e.m_msg); } #endif // wxDEBUG_LEVEL #ifdef wxUSE_VC_CRTDBG @@ -170,7 +228,7 @@ public: m_watch.Pause(); wxPrintf(GetResultStr(m_result)); if (m_timing) - wxPrintf(" %6d ms", m_watch.Time()); + wxPrintf(" %6ld ms", m_watch.Time()); wxPrintf("\n"); } @@ -250,6 +308,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; @@ -274,19 +335,6 @@ static int TestCrtReportHook(int reportType, char *message, int *) #endif // wxUSE_VC_CRTDBG -#if wxDEBUG_LEVEL - -static void TestAssertHandler(const wxString& file, - int line, - const wxString& func, - const wxString& cond, - const wxString& msg) -{ - throw TestAssertFailure(file, line, func, cond, msg); -} - -#endif // wxDEBUG_LEVEL - int main(int argc, char **argv) { // tests can be ran non-interactively so make sure we don't show any assert @@ -379,6 +427,7 @@ TestApp::TestApp() m_processEventFunc = NULL; m_locale = NULL; + m_eventloop = NULL; } // Init @@ -397,7 +446,11 @@ bool TestApp::OnInit() #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; @@ -420,7 +473,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", @@ -509,8 +562,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 { @@ -556,7 +618,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() @@ -565,6 +629,8 @@ int TestApp::OnExit() #if wxUSE_GUI delete GetTopWindow(); + wxEventLoop::SetActive(NULL); + delete m_eventloop; #endif // wxUSE_GUI return 0;