// Author: Mike Wetherell
// RCS-ID: $Id$
// Copyright: (c) 2004 Mike Wetherell
-// Licence: wxWidgets licence
+// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// ----------------------------------------------------------------------------
#ifdef __VISUALC__
#pragma warning(disable:4100)
#endif
+
#include <cppunit/TestListener.h>
-#ifdef __VISUALC__
- #pragma warning(default:4100)
-#endif
#include <cppunit/Protector.h>
#include <cppunit/Test.h>
#include <cppunit/TestResult.h>
#include <cppunit/TestFailure.h>
+
+#ifdef __VISUALC__
+ #pragma warning(default:4100)
+#endif
#include "wx/afterstd.h"
#include "wx/cmdline.h"
#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)
+{
+ // can't throw from other threads, die immediately
+ if ( !wxIsMainThread() )
+ {
+ wxPrintf("%s in a worker thread -- aborting.",
+ FormatAssertMessage(file, line, func, cond, msg));
+ fflush(stdout);
+ _exit(-1);
+ }
+
+ throw TestAssertFailure(file, line, func, cond, msg);
+}
+
+#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 << FormatAssertMessage(e.m_file, e.m_line, e.m_func,
+ e.m_cond, e.m_msg);
}
#endif // wxDEBUG_LEVEL
#ifdef wxUSE_VC_CRTDBG
#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
}
wxSocketClient sock;
+ sock.SetTimeout(10); // 10 secs
bool online = sock.Connect(addr);
wxSocketBase::Shutdown();
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
"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
{