generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-26 10:32:56 +01:00
Code Issues Projects Releases Wiki Activity

Add -ignore <file> option to get rid of DOS script issues.

Browse Source 
Rollback to previous rendering.
This commit is contained in:
Francis ANDRE
2019-12-18 16:27:19 +01:00
parent b5ca9353be
commit 6a81580533
7 changed files with 172 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
CppUnit/src/TextTestResult.cpp
View File

@@ -8,17 +8,47 @@
#include "CppUnit/Test.h"
#include "CppUnit/estring.h"
#include <iostream>
#include <fstream>
#include <sstream>
#include <iomanip>
#include <cstdlib>
#include <cctype>
#include <exception>
namespace CppUnit {
TextTestResult::TextTestResult():
TextTestResult::TextTestResult() :
_ostr(std::cout)
{
}
TextTestResult::TextTestResult(const std::string& ignore):
_ostr(std::cout)
{
if (!ignore.empty())
{
try {
std::ifstream ifs(ignore);
if (ifs.is_open()) {
char line[256];
while (ifs.getline(line, sizeof(line)))
{
if (line[0] == '#')
continue;
std::string ignored(line);
std::string::const_iterator it = ignored.begin();
std::string::const_iterator end = ignored.end();
ignoring(ignored);
}
ifs.close();
}
}
catch (std::exception e) {
std::cout << e.what() << std::endl;
}
}
setup();
}
@@ -26,10 +56,45 @@ TextTestResult::TextTestResult():
TextTestResult::TextTestResult(std::ostream& ostr):
_ostr(ostr)
{
}
TextTestResult::TextTestResult(std::ostream& ostr, const std::string& ignore) :
_ostr(ostr)
{
if (!ignore.empty())
{
std::ifstream ifs(ignore);
if (ifs.is_open()) {
char line[256];
while (ifs.getline(line, sizeof(line)))
{
if (line[0] == '#')
continue;
std::string ignored(line);
std::string::const_iterator it = ignored.begin();
std::string::const_iterator end = ignored.end();
ignoring(ignored);
}
ifs.close();
}
}
setup();
}
void TextTestResult::ignoring(const std::string ignore)
{
std::string::const_iterator it = ignore.begin();
std::string::const_iterator end = ignore.end();
for (;;)
{
while (it != end && (std::isspace(*it) || *it == '"' || *it == ',' || *it == '\'')) ++it;
if (it == end)
break;
std::string test;
while (it != end && *it != ',' && *it != '"' && *it != '\'') test += *it++;
if (!test.empty()) _ignored.insert(test.erase(test.find_last_not_of(" \n\r\t") + 1));
}
}
void TextTestResult::setup()
{
#if !defined(_WIN32_WCE)
@@ -39,17 +104,9 @@ void TextTestResult::setup()
std::string ignored = env;
std::string::const_iterator it = ignored.begin();
std::string::const_iterator end = ignored.end();
for (;;)
{
while (it != end && (std::isspace(*it) || *it == '"' || *it == ',' || *it == '\'')) ++it;
if (it == end)
break;
std::string test;
while (it != end && *it != ',' && *it != '"' && *it != '\'') test += *it++;
if (!test.empty()) _ignored.insert(test);
}
ignoring(ignored);
}
#endif
}
@@ -196,18 +253,11 @@ void TextTestResult::print(std::ostream& stream)
void TextTestResult::printHeader(std::ostream& stream)
{
if (wasSuccessful())
stream << "OK ("
<< runTests() << " tests)"
<< std::endl;
else
if (!wasSuccessful())
stream << "!!!FAILURES!!!" << std::endl
<< "Runs: "
<< runTests ()
<< " Failures: "
<< testFailures ()
<< " Errors: "
<< testErrors ()
<< "Runs: " << runTests()
<< " Failures: " << testFailures()
<< " Errors: " << testErrors()
<< std::endl;
}