#include <iostream>
#include <string>
+#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/execution_monitor.hpp>
-#include <boost/test/unit_test_parameters.hpp>
-
#include <boost/test/utils/basic_cstring/io.hpp>
#include <boost/test/utils/lazy_ostream.hpp>
#include <boost/version.hpp>
-#include <boost/test/utils/setcolor.hpp>
-
using namespace boost::unit_test;
namespace cryptsvc {
const char* COLOR_END = "\033[m";
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::test_in_progress()
- ? 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.begin());
}
+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 << "\""<< std::endl;
+ if (test_unit_type_name_contains(tu, "suite")) {
+ output << "Finished test " << test_unit_type_name(tu) << " \"" << test_unit_name(tu) << "\"" <<
+ std::endl;
return;
}
+
std::string color = COLOR_GREEN;
std::string status = "OK";
if (m_isTestCaseFailed) {
std::ostream& output,
test_unit const& tu )
{
- output << "Test " << tu.p_type_name << " \"" << tu.p_name << "\"" << "is skipped" << std::endl;
+ output << "Test " << test_unit_type_name(tu) << " \"" << test_unit_name(tu)
+ << "\"" << "is skipped" << std::endl;
}
//____________________________________________________________________________//
void
+colour_log_formatter::log_exception(
+ std::ostream &output,
+ log_checkpoint_data const &checkpoint_data,
+ boost::execution_exception const &ex)
+{
+ boost::execution_exception::location const &loc = ex.where();
+ output << '\t' << COLOR_BOLD_YELLOW << get_basename(loc.m_file_name)
+ << '(' << loc.m_line_num << "), ";
+
+ output << "fatal error in \""
+ << (loc.m_function.is_empty() ? test_phase_identifier() : loc.m_function) <<
+ "\": ";
+
+ output << COLOR_END << ex.what();
+
+ if (!checkpoint_data.m_file_name.is_empty()) {
+ output << '\n';
+ output << "\tlast checkpoint : " << get_basename(checkpoint_data.m_file_name)
+ << '(' << checkpoint_data.m_line_num << ")";
+
+ if (!checkpoint_data.m_message.empty())
+ output << ": " << checkpoint_data.m_message;
+ }
+
+ output << std::endl;
+ m_isTestCaseFailed = true;
+}
+
+void
colour_log_formatter::log_exception_start(
std::ostream& output,
boost::unit_test::log_checkpoint_data const& checkpoint_data,