Skip to content

🎨 Pass extra args through CIB_ASSERT #718

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 31, 2025
Merged

🎨 Pass extra args through CIB_ASSERT #718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions include/log/log.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,10 @@ template <stdx::ct_string Fmt, typename Env, typename F, typename L>
logging::detail::panic<MSG, cib_log_env_t>( \
__FILE__, __LINE__ __VA_OPT__(, ) __VA_ARGS__)

#define CIB_ASSERT(expr) \
((expr) ? void(0) : CIB_FATAL("Assertion failure: " #expr))
#define CIB_ASSERT(expr, ...) \
((expr) \
? void(0) \
: CIB_FATAL("Assertion failure: " #expr __VA_OPT__(, ) __VA_ARGS__))

namespace logging {
template <typename Env, typename... Ts> static auto log_version() -> void {
Expand Down
21 changes: 21 additions & 0 deletions test/log/log.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,3 +110,24 @@ TEST_CASE("CIB_FATAL passes extra arguments to panic", "[log]") {
CHECK(buffer.find("Hello 42") != std::string::npos);
CHECK(panicked);
}

TEST_CASE("CIB_ASSERT is equivalent to CIB_FATAL on failure", "[log]") {
reset_test_state();
expected_why = "Assertion failure: true == false";

CIB_ASSERT(true == false);
CAPTURE(buffer);
CHECK(buffer.find(expected_why) != std::string::npos);
CHECK(panicked);
}

TEST_CASE("CIB_ASSERT passes arguments to panic", "[log]") {
reset_test_state();
expected_why = "Assertion failure: true == false";
expected_args = std::make_tuple(stdx::make_tuple(), 42);

CIB_ASSERT(true == false, 42);
CAPTURE(buffer);
CHECK(buffer.find(expected_why) != std::string::npos);
CHECK(panicked);
}
Loading