*/
// Boost.Test
#include <colour_log_formatter.h>
+#include <boost/test/impl/execution_monitor.ipp>
+#if BOOST_VERSION >= 105900
+#include <boost/test/tree/test_unit.hpp>
+#else
#include <boost/test/unit_test_suite_impl.hpp>
+#endif
#include <boost/test/framework.hpp>
#include <boost/test/utils/basic_cstring/io.hpp>
#include <boost/test/utils/lazy_ostream.hpp>
namespace SecurityManager {
namespace {
+const_string
+test_unit_type_name(const test_unit &tu)
+{
+#if BOOST_VERSION >= 105900
+ return const_string(tu.p_type_name);
+#else
+ return tu.p_type_name.get();
+#endif
+}
+
+const_string
+test_unit_name(const test_unit &tu)
+{
+#if BOOST_VERSION >= 105900
+ return const_string(tu.p_name);
+#else
+ return tu.p_name.get();
+#endif
+}
const_string
test_phase_identifier()
{
- return framework::is_initialized()
- ? const_string(framework::current_test_case().p_name.get())
- : BOOST_TEST_L("Test setup");
+ return test_unit_name(framework::current_test_case());
}
const_string
return basename(file_name.c_str());
}
+bool
+test_unit_type_name_contains(const test_unit &tu, const std::string &substr)
+{
+ return test_unit_type_name(tu).find(const_string(substr)) == 0;
+}
+
} // local namespace
//____________________________________________________________________________//
std::ostream &output,
test_unit const &tu)
{
- if (tu.p_type_name->find(const_string("suite")) == 0) {
- output << "Starting test " << tu.p_type_name << " \"" << tu.p_name << "\"" <<
- std::endl;
+ if (test_unit_type_name_contains(tu, "suite")) {
+ output << "Starting test ";
} else {
- output << "Running test " << tu.p_type_name << " \"" << tu.p_name << "\"" <<
- std::endl;
+ output << "Running test ";
}
+ output << test_unit_type_name(tu) << " \"" << test_unit_name(tu) << "\"" <<
+ std::endl;
+
}
//____________________________________________________________________________//
test_unit const &tu,
unsigned long elapsed)
{
- if (tu.p_type_name->find(const_string("suite")) == 0) {
- output << "Finished test " << tu.p_type_name << " \"" << tu.p_name << "\"" <<
+ if (test_unit_type_name_contains(tu, "suite")) {
+ output << "Finished test " << test_unit_type_name(tu) << " \"" << test_unit_name(tu) << "\"" <<
std::endl;
return;
}
std::ostream &output,
test_unit const &tu)
{
- output << "Test " << tu.p_type_name << " \"" << tu.p_name << "\"" <<
+ output << "Test " << test_unit_type_name(tu) << " \"" << test_unit_name(tu) << "\"" <<
"is skipped" << std::endl;
}
//____________________________________________________________________________//
void
-colour_log_formatter::log_exception(
+colour_log_formatter::log_exception_start(
std::ostream &output,
log_checkpoint_data const &checkpoint_data,
boost::execution_exception const &ex)
//____________________________________________________________________________//
void
+colour_log_formatter::log_exception_finish(std::ostream &os)
+{
+ (void)os;
+}
+
+//____________________________________________________________________________//
+
+void
colour_log_formatter::log_entry_start(
std::ostream &output,
log_entry_data const &entry_data,
//____________________________________________________________________________//
+void
+colour_log_formatter::entry_context_start(std::ostream& os, boost::unit_test::log_level l)
+{
+ (void)os;
+ (void)l;
+}
+void
+colour_log_formatter::log_entry_context(std::ostream& os, boost::unit_test::const_string value)
+{
+ (void)os;
+ (void)value;
+}
+void
+colour_log_formatter::entry_context_finish(std::ostream& os)
+{
+ (void)os;
+}
//____________________________________________________________________________//
} // namespace SecurityManager
public:
// Formatter interface
colour_log_formatter() : m_isTestCaseFailed(false) {}
- void log_start(
- std::ostream &,
- boost::unit_test::counter_t test_cases_amount);
- void log_finish(std::ostream &);
- void log_build_info(std::ostream &);
+ void log_start(std::ostream &, boost::unit_test::counter_t test_cases_amount);
+ void log_finish(std::ostream &);
+ void log_build_info(std::ostream &);
- void test_unit_start(
- std::ostream &,
- boost::unit_test::test_unit const &tu);
- void test_unit_finish(
- std::ostream &,
- boost::unit_test::test_unit const &tu,
- unsigned long elapsed);
- void test_unit_skipped(
- std::ostream &,
- boost::unit_test::test_unit const &tu);
+ void test_unit_start(std::ostream &, boost::unit_test::test_unit const &tu);
+ void test_unit_finish(std::ostream &, boost::unit_test::test_unit const &tu,
+ unsigned long elapsed);
+ void test_unit_skipped(std::ostream &, boost::unit_test::test_unit const &tu);
- void log_exception(
- std::ostream &,
- boost::unit_test::log_checkpoint_data const &,
- boost::execution_exception const &ex);
+ void log_exception_start(std::ostream &,
+ boost::unit_test::log_checkpoint_data const &,
+ boost::execution_exception const &ex);
+ void log_exception_finish(std::ostream &os);
- void log_entry_start(
- std::ostream &,
- boost::unit_test::log_entry_data const &,
- log_entry_types let);
- void log_entry_value(
- std::ostream &,
- boost::unit_test::const_string value);
- void log_entry_value(
- std::ostream &,
- boost::unit_test::lazy_ostream const &value);
- void log_entry_finish(std::ostream &);
+ void log_entry_start(std::ostream &, boost::unit_test::log_entry_data const &,
+ log_entry_types let);
+ void log_entry_value(std::ostream &, boost::unit_test::const_string value);
+ void log_entry_value(std::ostream &, boost::unit_test::lazy_ostream const &value);
+ void log_entry_finish(std::ostream &);
+
+ void entry_context_start(std::ostream& os, boost::unit_test::log_level l);
+ void log_entry_context(std::ostream& os, boost::unit_test::const_string value);
+ void entry_context_finish(std::ostream& os);
private:
bool m_isTestCaseFailed;
~LogSetup() {}
};
-BOOST_GLOBAL_FIXTURE(TestConfig)
-BOOST_GLOBAL_FIXTURE(LogSetup)
+BOOST_GLOBAL_FIXTURE(TestConfig);
+BOOST_GLOBAL_FIXTURE(LogSetup);
* @version 1.0
*/
+#include <ostream>
#include <stdlib.h>
#include <string>
#include <sys/types.h>
#include "privilege_db.h"
#include "privilege_db_fixture.h"
+#if BOOST_VERSION >= 105900
+
+namespace boost {
+
+namespace test_tools {
+
+namespace tt_detail {
+
+// tell boost howto print pair of std::string and std::vector
+template<typename T, typename U>
+struct print_log_value<std::pair<T, std::vector<U>>> {
+ void operator()(std::ostream& os, std::pair<T, std::vector<U>> const& pr) {
+ os << "<" << std::get<0>(pr) << ",";
+ os << '[';
+ bool first = true;
+ for (auto &element : std::get<1>(pr)) {
+ os << (!first ? "," : "") << element;
+ first = false;
+ }
+ os << ']';
+ }
+};
+
+} //namespace tt_detail
+
+} //namespace test_tools
+
+} //namespace boost
+
+#else
+
namespace boost
{
-// tell boost howto print vector
-template <typename T> wrap_stringstream&
-operator<<(wrap_stringstream &wrapped, const std::vector<T> &elements)
+
+// tell Boost.Test how to print std::vector
+template <typename T>
+inline wrap_stringstream&
+operator<<(wrap_stringstream &wrapped, const std::vector<T> &item)
{
wrapped << '[';
bool first = true;
- for (auto &element : elements) {
+ for (const auto& element : item) {
wrapped << (!first ? "," : "") << element;
first = false;
}
return wrapped << ']';
}
-// tell boost howto print pair
-template <typename X, typename Y> wrap_stringstream&
-operator<<(wrap_stringstream &wrapped, const std::pair<X, Y> &item)
+// teach Boost.Test how to print std::pair<K,V>
+template <typename T, typename V>
+inline wrap_stringstream &operator<<(wrap_stringstream &wrapped, const std::pair<T, V> &item)
{
return wrapped << '<' << item.first << ',' << item.second << '>';
}
} //namespace boost
+#endif
+
typedef std::map<std::string, std::vector<std::string>> PrivateSharingMap;
//Fixture for sharing