Skip to content

🐛 Fix printing variables when expect or assert fails #103

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

🐛 Fix printing variables when expect or assert fails #103

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
57 changes: 54 additions & 3 deletions include/GUnit/GAssert.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,36 @@ namespace testing {
inline namespace v1 {
namespace detail {

template <typename T1, typename T2>
AssertionResult CmpHelperAnd(const char* lhs_expression,
const char* rhs_expression,
const T1& lhs, const T2& rhs) {
if (lhs and rhs) {
return AssertionSuccess();
}
return internal::CmpHelperOpFailure(lhs_expression, rhs_expression, lhs, rhs, "and");
};

template <typename T1, typename T2>
AssertionResult CmpHelperOr(const char* lhs_expression,
const char* rhs_expression,
const T1& lhs, const T2& rhs) {
if (lhs or rhs) {
return AssertionSuccess();
}
return internal::CmpHelperOpFailure(lhs_expression, rhs_expression, lhs, rhs, "or");
};

template <typename T1, typename T2>
AssertionResult CmpHelperXor(const char* lhs_expression,
const char* rhs_expression,
const T1& lhs, const T2& rhs) {
if (lhs xor rhs) {
return AssertionSuccess();
}
return internal::CmpHelperOpFailure(lhs_expression, rhs_expression, lhs, rhs, "xor");
};

struct info {
const char* file{};
unsigned long line{};
Expand Down Expand Up @@ -127,6 +157,27 @@ class op {
info_, "<", lhs_, rhs};
}

template <class TRhs>
auto operator&&(const TRhs& rhs) const {
followed_ = true;
return msg<TShouldError, const TLhs&, const TRhs&, CmpHelperAnd>{
info_, "and", lhs_, rhs};
}

template <class TRhs>
auto operator||(const TRhs& rhs) const {
followed_ = true;
return msg<TShouldError, const TLhs&, const TRhs&, CmpHelperOr>{
info_, "or", lhs_, rhs};
}

template <class TRhs>
auto operator^(const TRhs& rhs) const {
followed_ = true;
return msg<TShouldError, const TLhs&, const TRhs&, CmpHelperXor>{
info_, "xor", lhs_, rhs};
}

operator bool() const { return result_; }

private:
Expand Down Expand Up @@ -213,7 +264,7 @@ void prevent_commas(T&&) {}
(::testing::detail::op<std::true_type>{ \
::testing::detail::info{__FILE__, __LINE__, #__VA_ARGS__, \
::testing::TestPartResult::kNonFatalFailure}} \
<< (__VA_ARGS__))
<< __VA_ARGS__)

#define EXPECT(...) \
GUNIT_PREVENT_COMMAS(__VA_ARGS__); \
Expand All @@ -223,14 +274,14 @@ void prevent_commas(T&&) {}
if (::testing::detail::op<std::false_type>{ \
::testing::detail::info{__FILE__, __LINE__, #__VA_ARGS__, \
::testing::TestPartResult::kFatalFailure}} \
<< (__VA_ARGS__)) \
<< __VA_ARGS__) \
void(::testing::detail::drop{}); \
else \
return ::testing::detail::ret_void{} == \
(::testing::detail::op<std::true_type>{::testing::detail::info{ \
__FILE__, __LINE__, #__VA_ARGS__, \
::testing::TestPartResult::kFatalFailure}} \
<< (__VA_ARGS__))
<< __VA_ARGS__)

#define ASSERT(...) \
GUNIT_PREVENT_COMMAS(__VA_ARGS__); \
Expand Down
18 changes: 18 additions & 0 deletions test/GAssert.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,20 @@
#include <gtest/gtest.h>
#include "GUnit/GAssert.h"

struct call_only_once {
int a{42};
bool called{false};

auto value() -> int {
if (called) {
throw std::runtime_error("Called twice, should only evaluate once.");
}

called = true;
return a;
}
};

TEST(GAssert, ShouldSupportExpect) {
auto i = 42;
const auto b = true;
Expand All @@ -16,6 +30,10 @@ TEST(GAssert, ShouldSupportExpect) {
EXPECT(!false) << "message";
EXPECT(b);

call_only_once once{};
EXPECT(once.value() == 42);
EXPECT_THROW(once.value(), std::runtime_error);

EXPECT(i == 42);
EXPECT(42 == i);
EXPECT(42 == i);
Expand Down
Loading