diff options
| author | Ihor Dutchak <ihor.youw@gmail.com> | 2019-08-06 13:22:08 (GMT) |
|---|---|---|
| committer | Ihor Dutchak <ihor.youw@gmail.com> | 2019-10-30 19:57:48 (GMT) |
| commit | f626deda19e54adaaff1cd0d7b22421f934dec55 (patch) | |
| tree | 15dd8a196df5958e5a0ac439944deac6b0b4b084 /googletest/test | |
| parent | 11be5f534cfca1139880dd66727c15f5bd1e0780 (diff) | |
| download | googletest-f626deda19e54adaaff1cd0d7b22421f934dec55.zip googletest-f626deda19e54adaaff1cd0d7b22421f934dec55.tar.gz googletest-f626deda19e54adaaff1cd0d7b22421f934dec55.tar.bz2 | |
Added special catch for std::exception in GTEST_TEST_NO_THROW_refs/pull/2373/head
Diffstat (limited to 'googletest/test')
| -rw-r--r-- | googletest/test/gtest_unittest.cc | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/googletest/test/gtest_unittest.cc b/googletest/test/gtest_unittest.cc index 2b00b70..2496c59 100644 --- a/googletest/test/gtest_unittest.cc +++ b/googletest/test/gtest_unittest.cc @@ -3351,6 +3351,9 @@ TEST_F(SingleEvaluationTest, OtherCases) { void ThrowAnInteger() { throw 1; } +void ThrowRuntimeError(const char* what) { + throw std::runtime_error(what); +} // Tests that assertion arguments are evaluated exactly once. TEST_F(SingleEvaluationTest, ExceptionTests) { @@ -3830,6 +3833,11 @@ TEST(AssertionTest, ASSERT_NO_THROW) { EXPECT_FATAL_FAILURE(ASSERT_NO_THROW(ThrowAnInteger()), "Expected: ThrowAnInteger() doesn't throw an exception." "\n Actual: it throws."); + EXPECT_FATAL_FAILURE(ASSERT_NO_THROW(ThrowRuntimeError("A description")), + "Expected: ThrowRuntimeError(\"A description\") " + "doesn't throw an exception.\n " + "Actual: it throws std::exception-derived exception " + "with description: \"A description\"."); } // Tests ASSERT_ANY_THROW. @@ -4567,6 +4575,11 @@ TEST(ExpectTest, EXPECT_NO_THROW) { EXPECT_NONFATAL_FAILURE(EXPECT_NO_THROW(ThrowAnInteger()), "Expected: ThrowAnInteger() doesn't throw an " "exception.\n Actual: it throws."); + EXPECT_NONFATAL_FAILURE(EXPECT_NO_THROW(ThrowRuntimeError("A description")), + "Expected: ThrowRuntimeError(\"A description\") " + "doesn't throw an exception.\n " + "Actual: it throws std::exception-derived exception " + "with description: \"A description\"."); } // Tests EXPECT_ANY_THROW. |