X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4130044adffc2a063c54c7c695454e279c68c4fb..b5fe7ca67bf3121959a0b5a59afd00c1708f2f03:/tests/test.cpp diff --git a/tests/test.cpp b/tests/test.cpp index c503886511..00d746b2f8 100644 --- a/tests/test.cpp +++ b/tests/test.cpp @@ -7,13 +7,9 @@ // Licence: wxWidgets licence /////////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(__APPLE__) - #pragma implementation - #pragma interface -#endif - -// For compilers that support precompilation, includes "wx/wx.h". -#include "wx/wxprec.h" +// For compilers that support precompilation, includes "wx/wx.h" +// and "wx/cppunit.h" +#include "testprec.h" #ifdef __BORLANDC__ #pragma hdrstop @@ -24,32 +20,95 @@ #include "wx/wx.h" #endif +#include "wx/beforestd.h" +#ifdef __VISUALC__ + #pragma warning(disable:4100) +#endif +#include +#ifdef __VISUALC__ + #pragma warning(default:4100) +#endif +#include +#include +#include "wx/afterstd.h" + #include "wx/cmdline.h" -#include "wx/cppunit.h" #include using CppUnit::Test; using CppUnit::TestSuite; using CppUnit::TestFactoryRegistry; -using CppUnit::TextUi::TestRunner; -using std::string; -using std::vector; -using std::auto_ptr; -using std::cout; + +// Displays the test name before starting to execute it: this helps with +// diagnosing where exactly does a test crash or hang when/if it does. +class DetailListener : public CppUnit::TestListener +{ +public: + DetailListener(bool doTiming = false): + CppUnit::TestListener(), + m_timing(doTiming) + { + } + + virtual void startTest(CppUnit::Test *test) + { + std::cout << test->getName () << " "; + m_watch.Start(); + } + + virtual void endTest(CppUnit::Test * WXUNUSED(test)) + { + m_watch.Pause(); + if ( m_timing ) + std::cout << " (in "<< m_watch.Time() << " ms )"; + std::cout << "\n"; + } + +protected : + bool m_timing; + wxStopWatch m_watch; +}; + +using namespace std; + +#if wxUSE_GUI + typedef wxApp TestAppBase; +#else + typedef wxAppConsole TestAppBase; +#endif // The application class // -class TestApp : public wxAppConsole +class TestApp : public TestAppBase { public: TestApp(); // standard overrides - void OnInitCmdLine(wxCmdLineParser& parser); - bool OnCmdLineParsed(wxCmdLineParser& parser); - bool OnInit(); - int OnRun(); + virtual void OnInitCmdLine(wxCmdLineParser& parser); + virtual bool OnCmdLineParsed(wxCmdLineParser& parser); + virtual bool OnInit(); + virtual int OnRun(); + virtual int OnExit(); + + // used by events propagation test + virtual int FilterEvent(wxEvent& event); + virtual bool ProcessEvent(wxEvent& event); + + void SetFilterEventFunc(FilterEventFunc f) { m_filterEventFunc = f; } + void SetProcessEventFunc(ProcessEventFunc f) { m_processEventFunc = f; } + +#ifdef __WXDEBUG__ + virtual void OnAssertFailure(const wxChar *, + int, + const wxChar *, + const wxChar *, + const wxChar *) + { + throw TestAssertFailure(); + } +#endif // __WXDEBUG__ private: void List(Test *test, const string& parent = "") const; @@ -57,7 +116,13 @@ private: // command lines options/parameters bool m_list; bool m_longlist; + bool m_detail; + bool m_timing; vector m_registries; + + // event handling hooks + FilterEventFunc m_filterEventFunc; + ProcessEventFunc m_processEventFunc; }; IMPLEMENT_APP_CONSOLE(TestApp) @@ -66,33 +131,50 @@ TestApp::TestApp() : m_list(false), m_longlist(false) { + m_filterEventFunc = NULL; + m_processEventFunc = NULL; } // Init // bool TestApp::OnInit() { + if ( !TestAppBase::OnInit() ) + return false; + cout << "Test program for wxWidgets\n" << "build: " << WX_BUILD_OPTIONS_SIGNATURE << std::endl; - return wxAppConsole::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"); +#endif // wxUSE_GUI + + return true; +} // The table of command line options // void TestApp::OnInitCmdLine(wxCmdLineParser& parser) { - wxAppConsole::OnInitCmdLine(parser); + TestAppBase::OnInitCmdLine(parser); static const wxCmdLineEntryDesc cmdLineDesc[] = { - { wxCMD_LINE_SWITCH, _T("l"), _T("list"), - _T("list the test suites, do not run them"), + { wxCMD_LINE_SWITCH, "l", "list", + "list the test suites, do not run them", + wxCMD_LINE_VAL_NONE, 0 }, + { wxCMD_LINE_SWITCH, "L", "longlist", + "list the test cases, do not run them", wxCMD_LINE_VAL_NONE, 0 }, - { wxCMD_LINE_SWITCH, _T("L"), _T("longlist"), - _T("list the test cases, do not run them"), + { wxCMD_LINE_SWITCH, "d", "detail", + "print the test case names, run them", wxCMD_LINE_VAL_NONE, 0 }, - { wxCMD_LINE_PARAM, 0, 0, _T("REGISTRY"), wxCMD_LINE_VAL_STRING, + { wxCMD_LINE_SWITCH, "t", "timing", + "print names and mesure running time of individual test, run them", + wxCMD_LINE_VAL_NONE, 0 }, + { wxCMD_LINE_PARAM, NULL, NULL, "REGISTRY", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL | wxCMD_LINE_PARAM_MULTIPLE }, - { wxCMD_LINE_NONE , 0, 0, 0, wxCMD_LINE_VAL_NONE, 0 } + wxCMD_LINE_DESC_END }; parser.SetDesc(cmdLineDesc); @@ -110,15 +192,44 @@ bool TestApp::OnCmdLineParsed(wxCmdLineParser& parser) m_longlist = parser.Found(_T("longlist")); m_list = m_longlist || parser.Found(_T("list")); + m_timing = parser.Found(_T("timing")); + m_detail = !m_timing && parser.Found(_T("detail")); + + return TestAppBase::OnCmdLineParsed(parser); +} + +// Event handling +int TestApp::FilterEvent(wxEvent& event) +{ + if ( m_filterEventFunc ) + return (*m_filterEventFunc)(event); - return wxAppConsole::OnCmdLineParsed(parser); + return TestAppBase::FilterEvent(event); +} + +bool TestApp::ProcessEvent(wxEvent& event) +{ + if ( m_processEventFunc ) + return (*m_processEventFunc)(event); + + return TestAppBase::ProcessEvent(event); +} + +extern void SetFilterEventFunc(FilterEventFunc func) +{ + wxGetApp().SetFilterEventFunc(func); +} + +extern void SetProcessEventFunc(ProcessEventFunc func) +{ + wxGetApp().SetProcessEventFunc(func); } // Run // int TestApp::OnRun() { - TestRunner runner; + CppUnit::TextTestRunner runner; for (size_t i = 0; i < m_registries.size(); i++) { auto_ptr test(m_registries[i].empty() ? @@ -136,6 +247,11 @@ int TestApp::OnRun() runner.addTest(test.release()); } + if ( m_list ) + return EXIT_SUCCESS; + + runner.setOutputter(new CppUnit::CompilerOutputter(&runner.result(), cout)); + #if wxUSE_LOG // Switch off logging unless --verbose bool verbose = wxLog::GetVerbose(); @@ -144,9 +260,28 @@ int TestApp::OnRun() bool verbose = false; #endif - return ( m_list || runner.run("", false, true, !verbose) ) - ? EXIT_SUCCESS - : EXIT_FAILURE; + // there is a bug + // (http://sf.net/tracker/index.php?func=detail&aid=1649369&group_id=11795&atid=111795) + // in some versions of cppunit: they write progress dots to cout (and not + // cerr) and don't flush it so all the dots appear at once at the end which + // is not very useful so unbuffer cout to work around this + cout.setf(ios::unitbuf); + + // add detail listener if needed + DetailListener detailListener(m_timing); + if ( m_detail || m_timing ) + runner.eventManager().addListener(&detailListener); + + return runner.run("", false, true, !verbose) ? EXIT_SUCCESS : EXIT_FAILURE; +} + +int TestApp::OnExit() +{ +#if wxUSE_GUI + delete GetTopWindow(); +#endif // wxUSE_GUI + + return 0; } // List the tests @@ -160,7 +295,9 @@ void TestApp::List(Test *test, const string& parent /*=""*/) const // take the last component of the name and append to the parent name = test->getName(); string::size_type i = name.find_last_of(".:"); - name = parent + "." + (i != string::npos ? name.substr(i + 1) : name); + if (i != string::npos) + name = name.substr(i + 1); + name = parent + "." + name; // drop the 1st component from the display and indent if (parent != "") {