Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test program improvements (patch 927429)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-04-01 11:51:09 +00:00
parent 993da3969b
commit a81f30662b
1 changed files with 39 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
tests/test.cpp
View File

@@ -49,7 +49,8 @@ private:
// command lines options/parameters // command lines options/parameters
bool m_list; bool m_list;
string m_registry; bool m_longlist;
vector<string> m_registries;
}; };
IMPLEMENT_APP_CONSOLE(TestApp) IMPLEMENT_APP_CONSOLE(TestApp)
@@ -76,10 +77,13 @@ void TestApp::OnInitCmdLine(wxCmdLineParser& parser)
static const wxCmdLineEntryDesc cmdLineDesc[] = { static const wxCmdLineEntryDesc cmdLineDesc[] = {
{ wxCMD_LINE_SWITCH, _T("l"), _T("list"), { wxCMD_LINE_SWITCH, _T("l"), _T("list"),
_T("list the tests, do not run them"), _T("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_VAL_NONE, 0 }, wxCMD_LINE_VAL_NONE, 0 },
{ wxCMD_LINE_PARAM, 0, 0, _T("REGISTRY"), wxCMD_LINE_VAL_STRING, { wxCMD_LINE_PARAM, 0, 0, _T("REGISTRY"), wxCMD_LINE_VAL_STRING,
wxCMD_LINE_PARAM_OPTIONAL }, wxCMD_LINE_PARAM_OPTIONAL | wxCMD_LINE_PARAM_MULTIPLE },
{ wxCMD_LINE_NONE , 0, 0, 0, wxCMD_LINE_VAL_NONE, 0 } { wxCMD_LINE_NONE , 0, 0, 0, wxCMD_LINE_VAL_NONE, 0 }
}; };
@@ -90,10 +94,14 @@ void TestApp::OnInitCmdLine(wxCmdLineParser& parser)
// //
bool TestApp::OnCmdLineParsed(wxCmdLineParser& parser) bool TestApp::OnCmdLineParsed(wxCmdLineParser& parser)
{ {
if (parser.GetParamCount() > 0) if (parser.GetParamCount())
m_registry = parser.GetParam(0).mb_str(); 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_list = parser.Found(_T("list")); m_longlist = parser.Found(_T("longlist"));
m_list = m_longlist || parser.Found(_T("list"));
return wxAppConsole::OnCmdLineParsed(parser); return wxAppConsole::OnCmdLineParsed(parser);
} }
@@ -102,30 +110,42 @@ bool TestApp::OnCmdLineParsed(wxCmdLineParser& parser)
// //
int TestApp::OnRun() int TestApp::OnRun()
{ {
Test *test = m_registry.empty()? TextUi::TestRunner runner;
TestFactoryRegistry::getRegistry().makeTest() :
TestFactoryRegistry::getRegistry(m_registry).makeTest();
if (m_list) { for (size_t i = 0; i < m_registries.size(); i++) {
List(test); auto_ptr<Test> test(m_registries[i].empty() ?
return EXIT_SUCCESS; TestFactoryRegistry::getRegistry().makeTest() :
} else { TestFactoryRegistry::getRegistry(m_registries[i]).makeTest());
TextUi::TestRunner runner;
runner.addTest(test); TestSuite *suite = dynamic_cast<TestSuite*>(test.get());
return runner.run("", false, true, false) ? EXIT_SUCCESS : EXIT_FAILURE;
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());
} }
// Switch off logging unless --verbose
wxLog::EnableLogging(wxLog::GetVerbose());
return m_list || runner.run("", false, true, !wxLog::GetVerbose()) ?
EXIT_SUCCESS : EXIT_FAILURE;
} }
// List the tests // List the tests
// //
void TestApp::List(Test *test, int depth /*=0*/) const void TestApp::List(Test *test, int depth /*=0*/) const
{ {
cout << string(depth * 2, ' ') << test->getName() << "\n";
TestSuite *suite = dynamic_cast<TestSuite*>(test); TestSuite *suite = dynamic_cast<TestSuite*>(test);
if (suite || m_longlist)
cout << string(depth * 2, ' ') << test->getName() << "\n";
if (suite) { if (suite) {
typedef const std::vector<Test*> Tests; typedef const vector<Test*> Tests;
typedef Tests::const_iterator Iter; typedef Tests::const_iterator Iter;
Tests& tests = suite->getTests(); Tests& tests = suite->getTests();