#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"
using CppUnit::TestFactoryRegistry;
-// Displays the test name. This allow for quick investigation on which test hangs
+// 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:
virtual void startTest(CppUnit::Test *test)
{
- CppUnit::stdCOut() << test->getName () << " ";
+ std::cout << test->getName () << " ";
m_watch.Start();
}
{
m_watch.Pause();
if ( m_timing )
- CppUnit::stdCOut() << " (in "<< m_watch.Time() << " ms )";
- CppUnit::stdCOut() << "\n";
+ std::cout << " (in "<< m_watch.Time() << " ms )";
+ std::cout << "\n";
}
protected :
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;
bool m_longlist;
bool m_detail;
bool m_timing;
- vector<string> m_registries;
+ 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
{
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("");
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);
+}
+
+extern void SetFilterEventFunc(FilterEventFunc func)
+{
+ wxGetApp().SetFilterEventFunc(func);
+}
+
+extern void SetProcessEventFunc(ProcessEventFunc func)
+{
+ wxGetApp().SetProcessEventFunc(func);
+}
+
// Run
//
int TestApp::OnRun()
{
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