Commit 8f33b03e authored by Dominik Charousset's avatar Dominik Charousset

Merge branch 'topic/neverlord/dead-code'

parents 186e2a16 d7a79799
......@@ -13,6 +13,11 @@ is based on [Keep a Changelog](https://keepachangelog.com).
via config file or CLI to `0s` and then printing the config parameter, e.g.,
via `--dump-config`.
### Removed
- Dropped three obsolete (and broken) macros in the `unit_test.hpp` header:
`CAF_CHECK_FAILED`, `CAF_CHECK_FAIL` and `CAF_CHECK_PASSED`.
## [0.18.3] - 2021-05-21
### Added
......
......@@ -877,7 +877,7 @@ CAF_TEST_FIXTURE_SCOPE_END()
auto res = make_config_value_list(__VA_ARGS__); \
CHECK_EQ(*converted, get<config_value::list>(res)); \
} else { \
CAF_CHECK_FAILED(converted.error()); \
CAF_ERROR(converted.error()); \
} \
})()
......@@ -898,7 +898,7 @@ CAF_TEST(list baseline testing) {
auto res = config_value::dictionary{__VA_ARGS__}; \
CHECK_EQ(*converted, res); \
} else { \
CAF_CHECK_FAILED(converted.error()); \
CAF_ERROR(converted.error()); \
} \
})()
......
......@@ -514,28 +514,6 @@ using caf_test_case_auto_fixture = caf::test::dummy_fixture;
::caf::test::engine::last_check_line(__LINE__); \
} while (false)
#define CAF_CHECK_PASSED(msg) \
do { \
auto out = ::caf::test::logger::instance().massive(); \
out << term::green << "** " << term::blue << __FILE__ << term::yellow \
<< ":" << term::blue << __LINE__ \
<< ::caf::test::detail::fill(__LINE__) << term::reset << msg << '\n'; \
::caf::test::engine::current_test()->pass(); \
::caf::test::engine::last_check_file(__FILE__); \
::caf::test::engine::last_check_line(__LINE__); \
} while (false)
#define CAF_CHECK_FAILED(msg) \
do { \
auto out = ::caf::test::logger::instance().massive(); \
out << term::red << "!! " << term::blue << __FILE__ << term::yellow << ":" \
<< term::blue << __LINE__ << ::caf::test::detail::fill(__LINE__) \
<< term::reset << msg << '\n'; \
::caf::test::engine::current_test()->fail(false); \
::caf::test::engine::last_check_file(__FILE__); \
::caf::test::engine::last_check_line(__LINE__); \
} while (false)
#define CAF_CHECK(...) \
[](bool expr_result) { \
return ::caf::test::detail::check_un(expr_result, __FILE__, __LINE__, \
......@@ -550,20 +528,9 @@ using caf_test_case_auto_fixture = caf::test::dummy_fixture;
__FILE__, __LINE__, \
CAF_FUNC_EXPR(func, x_expr, y_expr), false, \
comparator(x_val, y_val), x_val, y_val); \
::caf::test::engine::last_check_file(__FILE__); \
::caf::test::engine::last_check_line(__LINE__); \
return caf_check_res; \
}(x_expr, y_expr)
#define CAF_CHECK_FAIL(...) \
do { \
static_cast<void>(::caf::test::detail::check( \
::caf::test::engine::current_test(), __FILE__, __LINE__, #__VA_ARGS__, \
true, static_cast<bool>(__VA_ARGS__))); \
::caf::test::engine::last_check_file(__FILE__); \
::caf::test::engine::last_check_line(__LINE__); \
} while (false)
#define CAF_FAIL(msg) \
do { \
CAF_TEST_PRINT_ERROR(msg); \
......@@ -579,8 +546,6 @@ using caf_test_case_auto_fixture = caf::test::dummy_fixture;
static_cast<bool>(__VA_ARGS__)); \
if (!CAF_UNIQUE(__result)) \
::caf::test::detail::requirement_failed(#__VA_ARGS__); \
::caf::test::engine::last_check_file(__FILE__); \
::caf::test::engine::last_check_line(__LINE__); \
} while (false)
#define CAF_REQUIRE_FUNC(func, x_expr, y_expr) \
......@@ -595,8 +560,6 @@ using caf_test_case_auto_fixture = caf::test::dummy_fixture;
if (!CAF_UNIQUE(__result)) \
::caf::test::detail::requirement_failed( \
CAF_FUNC_EXPR(func, x_expr, y_expr)); \
::caf::test::engine::last_check_file(__FILE__); \
::caf::test::engine::last_check_line(__LINE__); \
} while (false)
#define CAF_TEST_IMPL(name, disabled_by_default) \
......
......@@ -150,6 +150,8 @@ bool check(test* parent, const char* file, size_t line, const char* expr,
<< term::blue << line << fill(line) << term::reset << expr << '\n';
parent->fail(should_fail);
}
engine::last_check_file(file);
engine::last_check_line(line);
return result;
}
......
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