X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/670ec357654cdee164e8ade5f6b7852f3108fa26..0c61ab6f66b526747d23b8b77d67712e070ca6d5:/tests/test.cpp diff --git a/tests/test.cpp b/tests/test.cpp index 11e6909081..1559f2944f 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 @@ -25,37 +21,48 @@ #endif #include "wx/cmdline.h" -#include "wx/cppunit.h" #include +using CppUnit::Test; +using CppUnit::TestSuite; +using CppUnit::TestFactoryRegistry; + using namespace std; -using namespace CppUnit; + +#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, int depth = 0) const; + void List(Test *test, const string& parent = "") const; // command lines options/parameters bool m_list; - string m_registry; + bool m_longlist; + vector m_registries; }; IMPLEMENT_APP_CONSOLE(TestApp) TestApp::TestApp() - : m_list(false) + : m_list(false), + m_longlist(false) { } @@ -63,24 +70,36 @@ TestApp::TestApp() // bool TestApp::OnInit() { + if ( !TestAppBase::OnInit() ) + return false; + cout << "Test program for wxWidgets\n" - << "build: " << WX_BUILD_OPTIONS_SIGNATURE << endl; - return wxAppConsole::OnInit(); -}; + << "build: " << WX_BUILD_OPTIONS_SIGNATURE << std::endl; + +#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 tests, do not run them"), + { wxCMD_LINE_SWITCH, "l", "list", + "list the test suites, do not run them", wxCMD_LINE_VAL_NONE, 0 }, - { wxCMD_LINE_PARAM, 0, 0, _T("REGISTRY"), wxCMD_LINE_VAL_STRING, - wxCMD_LINE_PARAM_OPTIONAL }, - { wxCMD_LINE_NONE , 0, 0, 0, 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_PARAM, NULL, NULL, "REGISTRY", wxCMD_LINE_VAL_STRING, + wxCMD_LINE_PARAM_OPTIONAL | wxCMD_LINE_PARAM_MULTIPLE }, + wxCMD_LINE_DESC_END }; parser.SetDesc(cmdLineDesc); @@ -90,47 +109,107 @@ void TestApp::OnInitCmdLine(wxCmdLineParser& parser) // bool TestApp::OnCmdLineParsed(wxCmdLineParser& parser) { - if (parser.GetParamCount() > 0) - m_registry = parser.GetParam(0).mb_str(); - - m_list = parser.Found(_T("list")); + if (parser.GetParamCount()) + for (size_t i = 0; i < parser.GetParamCount(); i++) + m_registries.push_back(string(parser.GetParam(i).mb_str())); + else + m_registries.push_back(""); + + m_longlist = parser.Found(_T("longlist")); + m_list = m_longlist || parser.Found(_T("list")); - return wxAppConsole::OnCmdLineParsed(parser); + return TestAppBase::OnCmdLineParsed(parser); } // Run // int TestApp::OnRun() { - Test *test = m_registry.empty()? - TestFactoryRegistry::getRegistry().makeTest() : - TestFactoryRegistry::getRegistry(m_registry).makeTest(); + CppUnit::TextTestRunner runner; + + for (size_t i = 0; i < m_registries.size(); i++) { + auto_ptr test(m_registries[i].empty() ? + TestFactoryRegistry::getRegistry().makeTest() : + TestFactoryRegistry::getRegistry(m_registries[i]).makeTest()); + + TestSuite *suite = dynamic_cast(test.get()); + + if (suite && suite->countTestCases() == 0) + wxLogError(_T("No such test suite: %s"), + wxString(m_registries[i].c_str(), wxConvUTF8).c_str()); + else if (m_list) + List(test.get()); + else + runner.addTest(test.release()); + } - if (m_list) { - List(test); + if ( m_list ) return EXIT_SUCCESS; - } else { - TextUi::TestRunner runner; - runner.addTest(test); - return runner.run("", false, true, false) ? EXIT_SUCCESS : EXIT_FAILURE; - } + + runner.setOutputter(new CppUnit::CompilerOutputter(&runner.result(), cout)); + +#if wxUSE_LOG + // Switch off logging unless --verbose + bool verbose = wxLog::GetVerbose(); + wxLog::EnableLogging(verbose); +#else + bool verbose = false; +#endif + + // 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); + + 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 // -void TestApp::List(Test *test, int depth /*=0*/) const +void TestApp::List(Test *test, const string& parent /*=""*/) const { - cout << string(depth * 2, ' ') << test->getName() << "\n"; - TestSuite *suite = dynamic_cast(test); + string name; if (suite) { - typedef const std::vector Tests; + // take the last component of the name and append to the parent + name = test->getName(); + string::size_type i = name.find_last_of(".:"); + if (i != string::npos) + name = name.substr(i + 1); + name = parent + "." + name; + + // drop the 1st component from the display and indent + if (parent != "") { + string::size_type j = i = name.find('.', 1); + while ((j = name.find('.', j + 1)) != string::npos) + cout << " "; + cout << " " << name.substr(i + 1) << "\n"; + } + + typedef vector Tests; typedef Tests::const_iterator Iter; - Tests& tests = suite->getTests(); + const Tests& tests = suite->getTests(); for (Iter it = tests.begin(); it != tests.end(); ++it) - List(*it, depth + 1); + List(*it, name); + } + else if (m_longlist) { + string::size_type i = 0; + while ((i = parent.find('.', i + 1)) != string::npos) + cout << " "; + cout << " " << test->getName() << "\n"; } }