diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-09-11 06:59:42 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-09-11 06:59:42 +0000 |
| commit | b2ee82ebf9b8f1be859d08611b768ae6c0700090 (patch) | |
| tree | e9ef0e2d46fce05fcdf325c28b21c0c412567eda /test/gtest_unittest.cc | |
| parent | f6dd67a1550d25518cc37758364834f4f92a3570 (diff) | |
| download | googletest-b2ee82ebf9b8f1be859d08611b768ae6c0700090.tar.gz googletest-b2ee82ebf9b8f1be859d08611b768ae6c0700090.tar.bz2 googletest-b2ee82ebf9b8f1be859d08611b768ae6c0700090.zip | |
Improves EXPECT_DEATH_IF_SUPPORTED to allow streaming of messages and enforcing the validity of arguments (by Vlad Losev); adds samples for the event listener API (by Vlad Losev); simplifies the tests using EXPECT_DEATH_IF_SUPPORTED (by Zhanyong Wan).
Diffstat (limited to 'test/gtest_unittest.cc')
| -rw-r--r-- | test/gtest_unittest.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/test/gtest_unittest.cc b/test/gtest_unittest.cc index dcec9dad..07e60f51 100644 --- a/test/gtest_unittest.cc +++ b/test/gtest_unittest.cc @@ -6345,16 +6345,14 @@ TEST(EventListenerTest, SuppressEventForwarding) { EXPECT_EQ(0, on_start_counter); } -#if GTEST_HAS_DEATH_TEST // Tests that events generated by Google Test are not forwarded in // death test subprocesses. TEST(EventListenerDeathTest, EventsNotForwardedInDeathTestSubprecesses) { - EXPECT_DEATH({ // NOLINT + EXPECT_DEATH_IF_SUPPORTED({ GTEST_CHECK_(EventListenersAccessor::EventForwardingEnabled( *GetUnitTestImpl()->listeners())) << "expected failure";}, "expected failure"); } -#endif // GTEST_HAS_DEATH_TEST // Tests that a listener installed via SetDefaultResultPrinter() starts // receiving events and is returned via default_result_printer() and that |