// Author: Mike Wetherell
// RCS-ID: $Id$
// Copyright: (c) 2004 Mike Wetherell
-// Licence: wxWidgets licence
+// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// ----------------------------------------------------------------------------
#include <cppunit/Test.h>
#include <cppunit/TestResult.h>
#include <cppunit/TestFailure.h>
+#include <cppunit/TestResultCollector.h>
#ifdef __VISUALC__
#pragma warning(default:4100)
#include "wx/afterstd.h"
#include "wx/cmdline.h"
+#include <exception>
#include <iostream>
-#ifdef __WXMSW__
+#ifdef __WINDOWS__
#include "wx/msw/msvcrt.h"
#endif
#include "wx/osx/private.h"
#endif
+#if wxUSE_GUI
+ #include "testableframe.h"
+#endif
+
#include "wx/socket.h"
+#include "wx/evtloop.h"
using namespace std;
#endif // wxUSE_VC_CRTDBG
+#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,
+ 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;
+
+ const wxString
+ assertMessage = FormatAssertMessage(file, line, func, cond, msg);
+
+ if ( !wxIsMainThread() )
+ {
+ // 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);
+ }
+
+ wxFputs(abortReason, stderr);
+ fflush(stderr);
+ _exit(-1);
+}
+
+#endif // wxDEBUG_LEVEL
+
// this function should only be called from a catch clause
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 = s_lastAssertMessage;
+ s_lastAssertMessage.clear();
}
#endif // wxDEBUG_LEVEL
#ifdef wxUSE_VC_CRTDBG
m_watch.Pause();
wxPrintf(GetResultStr(m_result));
if (m_timing)
- wxPrintf(" %6d ms", m_watch.Time());
+ wxPrintf(" %6ld ms", m_watch.Time());
wxPrintf("\n");
}
wxArrayString m_registries;
wxLocale *m_locale;
+ // event loop for GUI tests
+ wxEventLoop* m_eventloop;
+
// event handling hooks
FilterEventFunc m_filterEventFunc;
ProcessEventFunc m_processEventFunc;
#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
m_processEventFunc = NULL;
m_locale = NULL;
+ m_eventloop = NULL;
}
// Init
#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;
"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",
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
{
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()
#if wxUSE_GUI
delete GetTopWindow();
+ wxEventLoop::SetActive(NULL);
+ delete m_eventloop;
#endif // wxUSE_GUI
return 0;
projects / wxWidgets.git / blobdiff