aboutsummaryrefslogtreecommitdiffstats
path: root/test/gtest-death-test_test.cc
diff options
context:
space:
mode:
authorvladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925>2010-10-18 22:09:55 +0000
committervladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925>2010-10-18 22:09:55 +0000
commit50f4deb1cf3ef32282c13b7cb84a81b1bf61e0d8 (patch)
tree3d20f998d4faf253f25acc6ea747ad39c545a3be /test/gtest-death-test_test.cc
parent2c8101052343798fe1e2fbcc7f07c27fd3556d1c (diff)
downloadgoogletest-50f4deb1cf3ef32282c13b7cb84a81b1bf61e0d8.tar.gz
googletest-50f4deb1cf3ef32282c13b7cb84a81b1bf61e0d8.tar.bz2
googletest-50f4deb1cf3ef32282c13b7cb84a81b1bf61e0d8.zip
Modifies handling of C++ exceptions in death tests to treat exceptions escaping them as failures.
Diffstat (limited to 'test/gtest-death-test_test.cc')
-rw-r--r--test/gtest-death-test_test.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/test/gtest-death-test_test.cc b/test/gtest-death-test_test.cc
index 2f1d3859..b83b0db2 100644
--- a/test/gtest-death-test_test.cc
+++ b/test/gtest-death-test_test.cc
@@ -538,15 +538,18 @@ TEST_F(TestForDeathTest, SingleEvaluation) {
}
// Tests that run-away death tests are reported as failures.
-TEST_F(TestForDeathTest, Runaway) {
+TEST_F(TestForDeathTest, RunawayIsFailure) {
EXPECT_NONFATAL_FAILURE(EXPECT_DEATH(static_cast<void>(0), "Foo"),
"failed to die.");
+}
+// Tests that death tests report executing 'return' in the statement as
+// failure.
+TEST_F(TestForDeathTest, ReturnIsFailure) {
EXPECT_FATAL_FAILURE(ASSERT_DEATH(return, "Bar"),
"illegal return in test statement.");
}
-
// Tests that EXPECT_DEBUG_DEATH works as expected,
// that is, in debug mode, it:
// 1. Asserts on death.