Skip to content

GitLab

"xcode/vscode:/vscode.git/clone" did not exist on "3e93606333e03534923b25cc01f0723501b11231"
Unverified Commit ed6e84cc authored by Gennadiy Civil's avatar Gennadiy Civil Committed by GitHub
Browse files

Merge pull request #1850 from Jonny007-MKD/master 

Added special catch for std::exception in GTEST_TEST_NO_THROW_
parents c7a429a6 fd17c91b
Hide whitespace changes
Inline Side-by-side
Showing with 106 additions and 43 deletions
googletest/include/gtest/internal/gtest-internal.h
View file @ ed6e84cc
...@@ -1189,6 +1189,18 @@ class NativeArray { ...@@ -1189,6 +1189,18 @@ class NativeArray {
GTEST_DISALLOW_ASSIGN_(NativeArray); GTEST_DISALLOW_ASSIGN_(NativeArray);
}; };
class AdditionalMessage {
public:
AdditionalMessage(const char* message) : msg(message) {}
void set(const std::string& message) { msg = message; }
operator bool() const { return true; }
const std::string& get() const { return msg; }
private:
std::string msg;
};
} // namespace internal } // namespace internal
} // namespace testing } // namespace testing
...@@ -1214,45 +1226,60 @@ class NativeArray { ...@@ -1214,45 +1226,60 @@ class NativeArray {
#define GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement) \ #define GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement) \
if (::testing::internal::AlwaysTrue()) { statement; } if (::testing::internal::AlwaysTrue()) { statement; }
#define GTEST_TEST_THROW_(statement, expected_exception, fail) \ #define GTEST_TEST_THROW_(statement, expected_exception, fail) \
GTEST_AMBIGUOUS_ELSE_BLOCKER_ \ GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
if (::testing::internal::ConstCharPtr gtest_msg = "") { \ if (::testing::internal::AdditionalMessage message = "") { \
bool gtest_caught_expected = false; \ bool gtest_caught_expected = false; \
try { \ try { \
GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \ try { \
} \ GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
catch (expected_exception const&) { \ } catch (expected_exception const&) { \
gtest_caught_expected = true; \ gtest_caught_expected = true; \
} \ throw; \
catch (...) { \ } \
gtest_msg.value = \ } catch (const std::exception& e) { \
"Expected: " #statement " throws an exception of type " \ if (!gtest_caught_expected) { \
#expected_exception ".\n Actual: it throws a different type."; \ message.set( \
goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__); \ "it throws a different type " \
} \ "with message: " + \
if (!gtest_caught_expected) { \ std::string(e.what())); \
gtest_msg.value = \ goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__); \
"Expected: " #statement " throws an exception of type " \ } \
#expected_exception ".\n Actual: it throws nothing."; \ } catch (...) { \
goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__); \ if (!gtest_caught_expected) { \
} \ message.set("it throws a different type."); \
} else \ goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__); \
GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__): \ } \
fail(gtest_msg.value) } \
if (!gtest_caught_expected) { \
#define GTEST_TEST_NO_THROW_(statement, fail) \ message.set("it throws nothing."); \
GTEST_AMBIGUOUS_ELSE_BLOCKER_ \ goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__); \
if (::testing::internal::AlwaysTrue()) { \ } \
try { \ } else \
GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \ GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__) \
} \ : fail(("Expected: " #statement \
catch (...) { \ " throws an exception of type " #expected_exception \
goto GTEST_CONCAT_TOKEN_(gtest_label_testnothrow_, __LINE__); \ ".\n Actual: " + \
} \ message.get()) \
} else \ .c_str())
GTEST_CONCAT_TOKEN_(gtest_label_testnothrow_, __LINE__): \
fail("Expected: " #statement " doesn't throw an exception.\n" \ #define GTEST_TEST_NO_THROW_(statement, fail) \
" Actual: it throws.") GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
if (::testing::internal::AdditionalMessage message = ".") { \
try { \
GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
} catch (const std::exception& e) { \
message.set(std::string(": ") + e.what()); \
goto GTEST_CONCAT_TOKEN_(gtest_label_testnothrow_, __LINE__); \
} catch (...) { \
goto GTEST_CONCAT_TOKEN_(gtest_label_testnothrow_, __LINE__); \
} \
} else \
GTEST_CONCAT_TOKEN_(gtest_label_testnothrow_, __LINE__) \
: fail(("Expected: " #statement " doesn't throw an exception.\n" \
" Actual: it throws" + \
message.get()) \
.c_str())
#define GTEST_TEST_ANY_THROW_(statement, fail) \ #define GTEST_TEST_ANY_THROW_(statement, fail) \
GTEST_AMBIGUOUS_ELSE_BLOCKER_ \ GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
......
googletest/test/gtest_unittest.cc
View file @ ed6e84cc
...@@ -3328,6 +3328,7 @@ TEST_F(SingleEvaluationTest, OtherCases) { ...@@ -3328,6 +3328,7 @@ TEST_F(SingleEvaluationTest, OtherCases) {
void ThrowAnInteger() { void ThrowAnInteger() {
throw 1; throw 1;
} }
void ThrowAnException(const char* what) { throw std::runtime_error(what); }
// Tests that assertion arguments are evaluated exactly once. // Tests that assertion arguments are evaluated exactly once.
TEST_F(SingleEvaluationTest, ExceptionTests) { TEST_F(SingleEvaluationTest, ExceptionTests) {
...@@ -3370,6 +3371,26 @@ TEST_F(SingleEvaluationTest, ExceptionTests) { ...@@ -3370,6 +3371,26 @@ TEST_F(SingleEvaluationTest, ExceptionTests) {
// failed EXPECT_ANY_THROW // failed EXPECT_ANY_THROW
EXPECT_NONFATAL_FAILURE(EXPECT_ANY_THROW(a_++), "it doesn't"); EXPECT_NONFATAL_FAILURE(EXPECT_ANY_THROW(a_++), "it doesn't");
EXPECT_EQ(7, a_); EXPECT_EQ(7, a_);
// failed EXPECT_THROW std::exception, throws different
EXPECT_NONFATAL_FAILURE(EXPECT_THROW(
{ // NOLINT
a_++;
ThrowAnInteger();
},
std::exception),
"throws a different type");
EXPECT_EQ(8, a_);
// failed EXPECT_THROW, throws std::exception
EXPECT_NONFATAL_FAILURE(EXPECT_THROW(
{ // NOLINT
a_++;
ThrowAnException("blablubb");
},
bool),
"throws a different type with message: blablubb");
EXPECT_EQ(9, a_);
} }
#endif // GTEST_HAS_EXCEPTIONS #endif // GTEST_HAS_EXCEPTIONS
...@@ -3802,6 +3823,11 @@ TEST(AssertionTest, ASSERT_THROW) { ...@@ -3802,6 +3823,11 @@ TEST(AssertionTest, ASSERT_THROW) {
ASSERT_THROW(ThrowNothing(), bool), ASSERT_THROW(ThrowNothing(), bool),
"Expected: ThrowNothing() throws an exception of type bool.\n" "Expected: ThrowNothing() throws an exception of type bool.\n"
" Actual: it throws nothing."); " Actual: it throws nothing.");
EXPECT_FATAL_FAILURE(
ASSERT_THROW(ThrowAnException("b"), bool),
"Expected: ThrowAnException(\"b\") throws an exception of type bool.\n"
" Actual: it throws a different type with message: b");
} }
// Tests ASSERT_NO_THROW. // Tests ASSERT_NO_THROW.
...@@ -3810,6 +3836,9 @@ TEST(AssertionTest, ASSERT_NO_THROW) { ...@@ -3810,6 +3836,9 @@ TEST(AssertionTest, ASSERT_NO_THROW) {
EXPECT_FATAL_FAILURE(ASSERT_NO_THROW(ThrowAnInteger()), EXPECT_FATAL_FAILURE(ASSERT_NO_THROW(ThrowAnInteger()),
"Expected: ThrowAnInteger() doesn't throw an exception." "Expected: ThrowAnInteger() doesn't throw an exception."
"\n Actual: it throws."); "\n Actual: it throws.");
EXPECT_FATAL_FAILURE(ASSERT_NO_THROW(ThrowAnException("blablubb")),
"Expected: ThrowAnException(\"blablubb\") doesn't throw"
" an exception.\n Actual: it throws: blablubb");
} }
// Tests ASSERT_ANY_THROW. // Tests ASSERT_ANY_THROW.
...@@ -4536,13 +4565,17 @@ TEST(ExpectTest, EXPECT_GT) { ...@@ -4536,13 +4565,17 @@ TEST(ExpectTest, EXPECT_GT) {
// Tests EXPECT_THROW. // Tests EXPECT_THROW.
TEST(ExpectTest, EXPECT_THROW) { TEST(ExpectTest, EXPECT_THROW) {
EXPECT_THROW(ThrowAnInteger(), int); EXPECT_THROW(ThrowAnInteger(), int);
EXPECT_THROW(ThrowAnException(""), std::exception);
EXPECT_NONFATAL_FAILURE(EXPECT_THROW(ThrowAnInteger(), bool), EXPECT_NONFATAL_FAILURE(EXPECT_THROW(ThrowAnInteger(), bool),
"Expected: ThrowAnInteger() throws an exception of " "Expected: ThrowAnInteger() throws an exception of "
"type bool.\n Actual: it throws a different type."); "type bool.\n Actual: it throws a different type.");
EXPECT_NONFATAL_FAILURE( EXPECT_NONFATAL_FAILURE(EXPECT_THROW(ThrowNothing(), bool),
EXPECT_THROW(ThrowNothing(), bool), "Expected: ThrowNothing() throws an exception of "
"Expected: ThrowNothing() throws an exception of type bool.\n" "type bool.\n Actual: it throws nothing.");
" Actual: it throws nothing."); EXPECT_NONFATAL_FAILURE(EXPECT_THROW(ThrowAnException("buuh"), bool),
"Expected: ThrowAnException(\"buuh\") throws an "
"exception of type bool.\n Actual: "
"it throws a different type with message: buuh");
} }
// Tests EXPECT_NO_THROW. // Tests EXPECT_NO_THROW.
...@@ -4551,6 +4584,9 @@ TEST(ExpectTest, EXPECT_NO_THROW) { ...@@ -4551,6 +4584,9 @@ TEST(ExpectTest, EXPECT_NO_THROW) {
EXPECT_NONFATAL_FAILURE(EXPECT_NO_THROW(ThrowAnInteger()), EXPECT_NONFATAL_FAILURE(EXPECT_NO_THROW(ThrowAnInteger()),
"Expected: ThrowAnInteger() doesn't throw an " "Expected: ThrowAnInteger() doesn't throw an "
"exception.\n Actual: it throws."); "exception.\n Actual: it throws.");
EXPECT_NONFATAL_FAILURE(EXPECT_NO_THROW(ThrowAnException("blah")),
"Expected: ThrowAnException(\"blah\") doesn't "
"throw an exception.\n Actual: it throws: blah");
} }
// Tests EXPECT_ANY_THROW. // Tests EXPECT_ANY_THROW.
......
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