// 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
#endif
#include "wx/cmdline.h"
-#include "wx/cppunit.h"
#include <iostream>
using CppUnit::Test;
using CppUnit::TestSuite;
using CppUnit::TestFactoryRegistry;
using CppUnit::TextUi::TestRunner;
+using CppUnit::CompilerOutputter;
-using std::string;
-using std::vector;
-using std::auto_ptr;
-using std::cout;
+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();
private:
void List(Test *test, const string& parent = "") const;
//
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, _T("L"), _T("longlist"),
- _T("list the test cases, do not run them"),
+ { wxCMD_LINE_SWITCH, "L", "longlist",
+ "list the test cases, do not run them",
wxCMD_LINE_VAL_NONE, 0 },
- { wxCMD_LINE_PARAM, 0, 0, _T("REGISTRY"), wxCMD_LINE_VAL_STRING,
+ { 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);
m_longlist = parser.Found(_T("longlist"));
m_list = m_longlist || parser.Found(_T("list"));
- return wxAppConsole::OnCmdLineParsed(parser);
+ return TestAppBase::OnCmdLineParsed(parser);
}
// Run
runner.addTest(test.release());
}
+ runner.setOutputter(new CompilerOutputter(&runner.result(), cout));
+
#if wxUSE_LOG
// Switch off logging unless --verbose
bool verbose = wxLog::GetVerbose();
: EXIT_FAILURE;
}
+int TestApp::OnExit()
+{
+#if wxUSE_GUI
+ delete GetTopWindow();
+#endif // wxUSE_GUI
+
+ return 0;
+}
+
// List the tests
//
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 != "") {