google/googletest
0
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-12-03 22:37:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Print message of unexpected std::exception in EXPECT_THROW, too

Browse Source
This commit is contained in:
Jonny007-MKD
2018-09-14 23:22:04 +02:00
parent 631e3a5838
commit 6494f5232b
2 changed files with 53 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
googletest/include/gtest/internal/gtest-internal.h
View File

@@ -1194,7 +1194,7 @@ class AdditionalMessage
public:
AdditionalMessage(const char* message) : value(message) {}
AdditionalMessage& operator=(const std::string& message) { value = message; return *this; }
operator bool() const { return ::testing::internal::AlwaysTrue(); }
operator bool() const { return true; }
const std::string& get() const { return value; }
@@ -1229,29 +1229,41 @@ private:
#define GTEST_TEST_THROW_(statement, expected_exception, fail) \
GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
if (::testing::internal::ConstCharPtr gtest_msg = "") { \
if (::testing::internal::AdditionalMessage message = "") { \
bool gtest_caught_expected = false; \
try { \
GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
try { \
GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
} \
catch (expected_exception const&) { \
gtest_caught_expected = true; \
throw; \
} \
} \
catch (expected_exception const&) { \
gtest_caught_expected = true; \
catch (const std::exception& e) { \
if (!gtest_caught_expected) { \
message = \
"it throws a different type " \
"with message: " + std::string(e.what()); \
goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__); \
} \
} \
catch (...) { \
gtest_msg.value = \
"Expected: " #statement " throws an exception of type " \
#expected_exception ".\n Actual: it throws a different type."; \
goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__); \
if (!gtest_caught_expected) { \
message = \
"it throws a different type."; \
goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__); \
} \
} \
if (!gtest_caught_expected) { \
gtest_msg.value = \
"Expected: " #statement " throws an exception of type " \
#expected_exception ".\n Actual: it throws nothing."; \
message = \
"it throws nothing."; \
goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__); \
} \
} else \
GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__): \
fail(gtest_msg.value)
fail(("Expected: " #statement " throws an exception of type " \
#expected_exception ".\n Actual: " + message.get()).c_str())
#define GTEST_TEST_NO_THROW_(statement, fail) \
GTEST_AMBIGUOUS_ELSE_BLOCKER_ \