generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-25 02:06:04 +02:00
Code Issues Projects Releases Wiki Activity

allow to select long tests to be run from cmdline

Browse Source
This commit is contained in:
Brice Gros
2019-10-18 15:09:38 +02:00
parent d658cc25e7
commit 22c3ae8d30
13 changed files with 115 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
CppUnit/src/TestRunner.cpp
View File

@@ -35,7 +35,7 @@ TestRunner::~TestRunner()
void TestRunner::printBanner()
{
_ostr
<< "Usage: driver [-all] [-print] [-wait] [name] ..." << std::endl
<< "Usage: driver [-all] [-long] [-print] [-wait] [name] ..." << std::endl
<< " where name is the name of a test case class" << std::endl;
}
@@ -48,8 +48,11 @@ bool TestRunner::run(const std::vector<std::string>& args)
bool all = false;
bool wait = false;
bool printed = false;
bool long_running = false;
std::vector<std::string> setup;
std::vector<Test*> tests;
for (int i = 1; i < args.size(); i++)
{
const std::string& arg = args[i];
@@ -63,6 +66,11 @@ bool TestRunner::run(const std::vector<std::string>& args)
all = true;
continue;
}
else if (arg == "-long")
{
long_running = true;
continue;
}
else if (arg == "-print")
{
for (Mappings::iterator it = _mappings.begin(); it != _mappings.end(); ++it)
@@ -96,11 +104,8 @@ bool TestRunner::run(const std::vector<std::string>& args)
}
if (testToRun)
{
if (setup.size() > 0)
testToRun->addSetup(setup);
if (!run(testToRun)) success = false;
collectAllTestCases(testToRun, tests);
}
numberOfTests++;
if (!testToRun)
{
@@ -112,15 +117,24 @@ bool TestRunner::run(const std::vector<std::string>& args)
if (all)
{
tests.clear();
for (Mappings::iterator it = _mappings.begin(); it != _mappings.end(); ++it)
{
if (setup.size() > 0)
it->second->addSetup(setup);
if (!run(it->second)) success = false;
numberOfTests++;
collectAllTestCases(it->second, tests);
}
}
for (std::vector<Test*>::const_iterator it = tests.begin(); it != tests.end(); ++it)
{
Test* testToRun = *it;
if(testToRun->getType() == Test::Long && !long_running)
continue;
if (setup.size() > 0)
testToRun->addSetup(setup);
if (!run(testToRun)) success = false;
numberOfTests++;
}
if (numberOfTests == 0 && !printed)
{
printBanner();
@@ -194,4 +208,29 @@ Test* TestRunner::find(const std::string& name, Test* pTest, const std::string&
}
int TestRunner::collectAllTestCases(Test* pTest, std::vector<Test*>& testcases)
{
int added = 0;
if (pTest->getType() == Test::Suite)
{
TestSuite* pSuite = dynamic_cast<TestSuite*>(pTest);
if (pSuite)
{
const std::vector<Test*>& tests = pSuite->tests();
for (std::vector<Test*>::const_iterator it = tests.begin(); it != tests.end(); ++it)
{
added += collectAllTestCases(*it, testcases);
}
}
}
else
{
testcases.push_back(pTest);
added = 1;
}
return added;
}
} // namespace CppUnit

4
CppUnit/src/TestSuite.cpp
View File

@@ -35,11 +35,11 @@ void TestSuite::run(TestResult *result)
// Counts the number of test cases that will be run by this test.
int TestSuite::countTestCases()
int TestSuite::countTestCases() const
{
int count = 0;
for (std::vector<Test*>::iterator it = _tests.begin (); it != _tests.end (); ++it)
for (std::vector<Test*>::const_iterator it = _tests.begin (); it != _tests.end (); ++it)
count += (*it)->countTestCases();
return count;