diff options
Diffstat (limited to 'QA/Checker')
-rw-r--r-- | QA/Checker/IO.cpp | 80 | ||||
-rw-r--r-- | QA/Checker/checker.cpp | 118 |
2 files changed, 99 insertions, 99 deletions
diff --git a/QA/Checker/IO.cpp b/QA/Checker/IO.cpp index ad9f877..d8fcc96 100644 --- a/QA/Checker/IO.cpp +++ b/QA/Checker/IO.cpp @@ -10,56 +10,56 @@ #include <iostream> std::ostream& operator<<(std::ostream& os, const Swift::ByteArray& s) { - std::ios::fmtflags oldFlags = os.flags(); - os << std::hex; - for (Swift::ByteArray::const_iterator i = s.begin(); i != s.end(); ++i) { - if (*i >= 32 && *i < 127) { - os << *i; - } - else { - os << "\\x" << static_cast<unsigned int>(static_cast<unsigned char>(*i)); - } - } - os << std::endl; - os.flags(oldFlags); - return os; + std::ios::fmtflags oldFlags = os.flags(); + os << std::hex; + for (Swift::ByteArray::const_iterator i = s.begin(); i != s.end(); ++i) { + if (*i >= 32 && *i < 127) { + os << *i; + } + else { + os << "\\x" << static_cast<unsigned int>(static_cast<unsigned char>(*i)); + } + } + os << std::endl; + os.flags(oldFlags); + return os; } std::ostream& operator<<(std::ostream& os, const Swift::SafeByteArray& s) { - std::ios::fmtflags oldFlags = os.flags(); - os << std::hex; - for (Swift::SafeByteArray::const_iterator i = s.begin(); i != s.end(); ++i) { - if (*i >= 32 && *i < 127) { - os << *i; - } - else { - os << "\\x" << static_cast<unsigned int>(static_cast<unsigned char>(*i)); - } - } - os << std::endl; - os.flags(oldFlags); - return os; + std::ios::fmtflags oldFlags = os.flags(); + os << std::hex; + for (Swift::SafeByteArray::const_iterator i = s.begin(); i != s.end(); ++i) { + if (*i >= 32 && *i < 127) { + os << *i; + } + else { + os << "\\x" << static_cast<unsigned int>(static_cast<unsigned char>(*i)); + } + } + os << std::endl; + os.flags(oldFlags); + return os; } std::ostream& operator<<(std::ostream& os, const std::vector<int>& s) { - for (std::vector<int>::const_iterator i = s.begin(); i != s.end(); ++i) { - os << *i << " "; - } - os << std::endl; - return os; + for (std::vector<int>::const_iterator i = s.begin(); i != s.end(); ++i) { + os << *i << " "; + } + os << std::endl; + return os; } std::ostream& operator<<(std::ostream& os, const std::vector<size_t>& s) { - for (std::vector<size_t>::const_iterator i = s.begin(); i != s.end(); ++i) { - os << *i << " "; - } - os << std::endl; - return os; + for (std::vector<size_t>::const_iterator i = s.begin(); i != s.end(); ++i) { + os << *i << " "; + } + os << std::endl; + return os; } bool operator==(const Swift::ByteArray& a, const Swift::ByteArray& b) { - if (a.size() != b.size()) { - return false; - } - return std::equal(a.begin(), a.end(), b.begin()); + if (a.size() != b.size()) { + return false; + } + return std::equal(a.begin(), a.end(), b.begin()); } diff --git a/QA/Checker/checker.cpp b/QA/Checker/checker.cpp index 9cae75a..f1186cc 100644 --- a/QA/Checker/checker.cpp +++ b/QA/Checker/checker.cpp @@ -17,71 +17,71 @@ #include <Swiften/Base/Log.h> int main(int argc, char* argv[]) { - bool verbose = false; - bool outputXML = false; + bool verbose = false; + bool outputXML = false; - Swift::Log::setLogLevel(Swift::Log::error); + Swift::Log::setLogLevel(Swift::Log::error); - // Parse parameters - std::vector<std::string> testsToRun; - for (int i = 1; i < argc; ++i) { - std::string param(argv[i]); - if (param == "--verbose") { - verbose = true; - } - else if (param == "--xml") { - outputXML = true; - } - else if (param == "--debug") { - Swift::Log::setLogLevel(Swift::Log::debug); - } - else { - testsToRun.push_back(param); - } - } - if (testsToRun.empty()) { - testsToRun.push_back(""); - } + // Parse parameters + std::vector<std::string> testsToRun; + for (int i = 1; i < argc; ++i) { + std::string param(argv[i]); + if (param == "--verbose") { + verbose = true; + } + else if (param == "--xml") { + outputXML = true; + } + else if (param == "--debug") { + Swift::Log::setLogLevel(Swift::Log::debug); + } + else { + testsToRun.push_back(param); + } + } + if (testsToRun.empty()) { + testsToRun.push_back(""); + } - // Set up the listeners - CppUnit::TestResult controller; + // Set up the listeners + CppUnit::TestResult controller; - CppUnit::TestResultCollector result; - controller.addListener(&result); + CppUnit::TestResultCollector result; + controller.addListener(&result); - CppUnit::TextTestProgressListener progressListener; - CppUnit::BriefTestProgressListener verboseListener; - if (!outputXML) { - if (verbose) { - controller.addListener(&verboseListener); - } - else { - controller.addListener(&progressListener); - } - } + CppUnit::TextTestProgressListener progressListener; + CppUnit::BriefTestProgressListener verboseListener; + if (!outputXML) { + if (verbose) { + controller.addListener(&verboseListener); + } + else { + controller.addListener(&progressListener); + } + } - // Run the tests - CppUnit::TestRunner runner; - runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest()); - for (std::vector<std::string>::const_iterator i = testsToRun.begin(); i != testsToRun.end(); ++i) { - try { - runner.run(controller, *i); - } - catch (const std::exception& e) { - std::cerr << "Error: " << e.what() << std::endl; - return -1; - } - } + // Run the tests + CppUnit::TestRunner runner; + runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest()); + for (std::vector<std::string>::const_iterator i = testsToRun.begin(); i != testsToRun.end(); ++i) { + try { + runner.run(controller, *i); + } + catch (const std::exception& e) { + std::cerr << "Error: " << e.what() << std::endl; + return -1; + } + } - // Output the results - if (outputXML) { - CppUnit::XmlOutputter outputter(&result, std::cout); - outputter.write(); - } - else { - CppUnit::TextOutputter outputter(&result, std::cerr); - outputter.write(); - } + // Output the results + if (outputXML) { + CppUnit::XmlOutputter outputter(&result, std::cout); + outputter.write(); + } + else { + CppUnit::TextOutputter outputter(&result, std::cerr); + outputter.write(); + } - return result.wasSuccessful() ? 0 : 1; + return result.wasSuccessful() ? 0 : 1; } |