Commit 71fde408 authored by Dominik Charousset's avatar Dominik Charousset

Print line in CAF_MESSAGE & bad tests in summary

parent 4fdd363c
...@@ -419,7 +419,8 @@ using caf_test_case_auto_fixture = caf::test::dummy_fixture; ...@@ -419,7 +419,8 @@ using caf_test_case_auto_fixture = caf::test::dummy_fixture;
#define CAF_TEST_PRINT(level, msg, colorcode) \ #define CAF_TEST_PRINT(level, msg, colorcode) \
(::caf::test::logger::instance(). level () \ (::caf::test::logger::instance(). level () \
<< ::caf::test::engine::color(::caf::test:: colorcode ) \ << ::caf::test::engine::color(::caf::test:: colorcode ) \
<< " -> " << ::caf::test::engine::color(::caf::test::reset) << msg << '\n') << " -> " << ::caf::test::engine::color(::caf::test::reset) << msg \
<< " [line " << __LINE__ << "]\n")
#define CAF_TEST_PRINT_ERROR(msg) CAF_TEST_PRINT(info, msg, red) #define CAF_TEST_PRINT_ERROR(msg) CAF_TEST_PRINT(info, msg, red)
#define CAF_TEST_PRINT_INFO(msg) CAF_TEST_PRINT(info, msg, yellow) #define CAF_TEST_PRINT_INFO(msg) CAF_TEST_PRINT(info, msg, yellow)
......
...@@ -374,18 +374,17 @@ bool engine::run(bool colorize, ...@@ -374,18 +374,17 @@ bool engine::run(bool colorize,
&& ! std::regex_search(x, blacklist); && ! std::regex_search(x, blacklist);
}; };
# endif # endif
std::vector<std::string> failed_tests;
for (auto& p : instance().suites_) { for (auto& p : instance().suites_) {
if (! enabled(suites, not_suites, p.first)) { if (! enabled(suites, not_suites, p.first))
continue; continue;
}
auto suite_name = p.first.empty() ? "<unnamed>" : p.first; auto suite_name = p.first.empty() ? "<unnamed>" : p.first;
auto pad = std::string((bar.size() - suite_name.size()) / 2, ' '); auto pad = std::string((bar.size() - suite_name.size()) / 2, ' ');
bool displayed_header = false; bool displayed_header = false;
size_t tests_ran = 0; size_t tests_ran = 0;
for (auto& t : p.second) { for (auto& t : p.second) {
if (! enabled(tests, not_tests, t->name())) { if (! enabled(tests, not_tests, t->name()))
continue; continue;
}
instance().current_test_ = t.get(); instance().current_test_ = t.get();
++tests_ran; ++tests_ran;
if (! displayed_header) { if (! displayed_header) {
...@@ -425,6 +424,10 @@ bool engine::run(bool colorize, ...@@ -425,6 +424,10 @@ bool engine::run(bool colorize,
<< "took " << color(cyan) << render(elapsed) << "took " << color(cyan) << render(elapsed)
<< color(reset) << '\n'; << color(reset) << '\n';
if (bad > 0) { if (bad > 0) {
// concat suite name + test name
failed_tests.emplace_back(p.first);
failed_tests.back() += ":";
failed_tests.back() += t->name();
log.verbose() << " (" << color(green) << good << color(reset) << '/' log.verbose() << " (" << color(green) << good << color(reset) << '/'
<< color(red) << bad << color(reset) << ")" << '\n'; << color(red) << bad << color(reset) << ")" << '\n';
} else { } else {
...@@ -474,8 +477,14 @@ bool engine::run(bool colorize, ...@@ -474,8 +477,14 @@ bool engine::run(bool colorize,
<< render(runtime) << '\n' << color(reset) << indent << render(runtime) << '\n' << color(reset) << indent
<< "success: " << "success: "
<< (total_bad == total_bad_expected ? color(green) : color(red)) << (total_bad == total_bad_expected ? color(green) : color(red))
<< percent_good << "%" << color(reset) << "\n\n" << color(cyan) << percent_good << "%" << color(reset) << "\n\n";
<< bar << color(reset) << '\n'; if (! failed_tests.empty()) {
log.info() << indent << "failed tests:" << '\n';
for (auto& name : failed_tests)
log.info() << indent << "- " << name << '\n';
log.info() << '\n';
}
log.info() << color(cyan) << bar << color(reset) << '\n';
return total_bad == total_bad_expected; return total_bad == total_bad_expected;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment