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

cppunit: update from 1.4.2 & vs 2010 project

Browse Source
This commit is contained in:
Marian Krivos
2011-09-14 12:43:03 +00:00
parent 0eaa0ba34a
commit ff7f224691
14 changed files with 1222 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
CppUnit/src/TestRunner.cpp
View File

@@ -15,7 +15,14 @@
namespace CppUnit {
TestRunner::TestRunner()
TestRunner::TestRunner():
_ostr(std::cout)
{
}
TestRunner::TestRunner(std::ostream& ostr):
_ostr(ostr)
{
}
@@ -29,9 +36,9 @@ TestRunner::~TestRunner()
void TestRunner::printBanner()
{
std::cout
<< "Usage: driver [-all] [-print] [-wait] [name] ..." << std::endl
<< " where name is the name of a test case class" << std::endl;
_ostr
<< "Usage: driver [-all] [-print] [-wait] [name] ..." << std::endl
<< " where name is the name of a test case class" << std::endl;
}
@@ -88,12 +95,12 @@ bool TestRunner::run(const std::vector<std::string>& args)
}
numberOfTests++;
if (!testToRun)
{
std::cout << "Test " << testCase << " not found." << std::endl;
return false;
}
}
if (!testToRun)
{
_ostr << "Test " << testCase << " not found." << std::endl;
return false;
}
}
}
if (all)
@@ -111,11 +118,11 @@ bool TestRunner::run(const std::vector<std::string>& args)
return false;
}
if (wait)
{
std::cout << "<RETURN> to continue" << std::endl;
std::cin.get();
}
if (wait)
{
_ostr << "<RETURN> to continue" << std::endl;
std::cin.get();
}
return success;
}
@@ -123,12 +130,12 @@ bool TestRunner::run(const std::vector<std::string>& args)
bool TestRunner::run(Test* test)
{
TextTestResult result;
TextTestResult result(_ostr);
test->run(&result);
std::cout << result << std::endl;
test->run(&result);
_ostr << result << std::endl;
return result.wasSuccessful();
return result.wasSuccessful();
}
@@ -140,12 +147,12 @@ void TestRunner::addTest(const std::string& name, Test* test)
void TestRunner::print(const std::string& name, Test* pTest, int indent)
{
for (int i = 0; i < indent; ++i)
std::cout << " ";
std::cout << name << std::endl;
TestSuite* pSuite = dynamic_cast<TestSuite*>(pTest);
if (pSuite)
{
for (int i = 0; i < indent; ++i)
_ostr << " ";
_ostr << name << std::endl;
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)
{

44
CppUnit/src/TextTestResult.cpp
View File

@@ -16,24 +16,36 @@
namespace CppUnit {
TextTestResult::TextTestResult():
_ostr(std::cout)
{
}
TextTestResult::TextTestResult(std::ostream& ostr):
_ostr(ostr)
{
}
void TextTestResult::addError(Test* test, CppUnitException* e)
{
TestResult::addError(test, e);
std::cerr << "ERROR" << std::flush;
TestResult::addError(test, e);
_ostr << "ERROR" << std::flush;
}
void TextTestResult::addFailure(Test* test, CppUnitException* e)
{
TestResult::addFailure(test, e);
std::cerr << "FAILURE" << std::flush;
TestResult::addFailure(test, e);
_ostr << "FAILURE" << std::flush;
}
void TextTestResult::startTest(Test* test)
{
TestResult::startTest(test);
std::cerr << "\n" << shortName(test->toString()) << ": ";
TestResult::startTest(test);
_ostr << "\n" << shortName(test->toString()) << ": ";
}
@@ -144,16 +156,16 @@ void TextTestResult::print(std::ostream& stream)
void TextTestResult::printHeader(std::ostream& stream)
{
std::cout << "\n\n";
if (wasSuccessful())
std::cout << "OK ("
<< runTests() << " tests)"
<< std::endl;
else
std::cout << "!!!FAILURES!!!" << std::endl
<< "Runs: "
<< runTests ()
<< " Failures: "
stream << "\n\n";
if (wasSuccessful())
stream << "OK ("
<< runTests() << " tests)"
<< std::endl;
else
stream << "!!!FAILURES!!!" << std::endl
<< "Runs: "
<< runTests ()
<< " Failures: "
<< testFailures ()
<< " Errors: "
<< testErrors ()