#include "wx/wx.h"
#endif
+#include "wx/beforestd.h"
+#ifdef __VISUALC__
+ #pragma warning(disable:4100)
+#endif
+#include <cppunit/TestListener.h>
+#ifdef __VISUALC__
+ #pragma warning(default:4100)
+#endif
+#include <cppunit/Test.h>
+#include <cppunit/TestResult.h>
+#include "wx/afterstd.h"
+
#include "wx/cmdline.h"
#include <iostream>
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;
// command lines options/parameters
bool m_list;
bool m_longlist;
- vector<string> m_registries;
+ bool m_detail;
+ bool m_timing;
+ wxArrayString m_registries;
+
+ // event handling hooks
+ FilterEventFunc m_filterEventFunc;
+ ProcessEventFunc m_processEventFunc;
};
IMPLEMENT_APP_CONSOLE(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);
{
if (parser.GetParamCount())
for (size_t i = 0; i < parser.GetParamCount(); i++)
- m_registries.push_back(string(parser.GetParam(i).mb_str()));
+ m_registries.push_back(parser.GetParam(i));
else
m_registries.push_back("");
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 TestAppBase::FilterEvent(event);
+}
+
+bool TestApp::ProcessEvent(wxEvent& event)
+{
+ if ( m_processEventFunc )
+ return (*m_processEventFunc)(event);
+
+ return TestAppBase::ProcessEvent(event);
+}
- return wxAppConsole::OnCmdLineParsed(parser);
+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> test(m_registries[i].empty() ?
+ for (size_t i = 0; i < m_registries.size(); i++)
+ {
+ wxString reg = m_registries[i];
+ if (!reg.empty() && !reg.EndsWith("TestCase"))
+ reg += "TestCase";
+ // allow the user to specify the name of the testcase "in short form"
+ // (all wx test cases end with TestCase postfix)
+
+ auto_ptr<Test> test(reg.empty() ?
TestFactoryRegistry::getRegistry().makeTest() :
- TestFactoryRegistry::getRegistry(m_registries[i]).makeTest());
+ TestFactoryRegistry::getRegistry(string(reg.mb_str())).makeTest());
TestSuite *suite = dynamic_cast<TestSuite*>(test.get());
if (suite && suite->countTestCases() == 0)
- wxLogError(_T("No such test suite: %s"),
- wxString(m_registries[i].c_str(), wxConvUTF8).c_str());
+ wxLogError(_T("No such test suite: %s"), reg);
else if (m_list)
List(test.get());
else
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();
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
projects / wxWidgets.git / blobdiff