summaryrefslogtreecommitdiffstats
path: root/googletest/test
diff options
context:
space:
mode:
authorBaruch <bmburstein@gmail.com>2022-08-25 07:55:49 (GMT)
committerGitHub <noreply@github.com>2022-08-25 07:55:49 (GMT)
commitdd969ed5fed68a518027ea1655579fa8768f3aae (patch)
tree57545d600884b7ca7c7e3edebfc07cfea175ccd6 /googletest/test
parent3280a930bf3f2fdb77da9a6cdf5866ef22708ff1 (diff)
parent25cc5777a17820a6339204a3552aa1dd5e428669 (diff)
downloadgoogletest-dd969ed5fed68a518027ea1655579fa8768f3aae.zip
googletest-dd969ed5fed68a518027ea1655579fa8768f3aae.tar.gz
googletest-dd969ed5fed68a518027ea1655579fa8768f3aae.tar.bz2
Merge branch 'google:main' into custom_type_combine
Diffstat (limited to 'googletest/test')
-rw-r--r--googletest/test/gtest_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/googletest/test/gtest_unittest.cc b/googletest/test/gtest_unittest.cc
index b579e81..329ca54 100644
--- a/googletest/test/gtest_unittest.cc
+++ b/googletest/test/gtest_unittest.cc
@@ -3454,10 +3454,10 @@ TEST_F(NoFatalFailureTest, MessageIsStreamable) {
TestPartResultArray gtest_failures;
{
ScopedFakeTestPartResultReporter gtest_reporter(&gtest_failures);
- EXPECT_NO_FATAL_FAILURE(FAIL() << "foo") << "my message";
+ EXPECT_NO_FATAL_FAILURE([] { FAIL() << "foo"; }()) << "my message";
}
ASSERT_EQ(2, gtest_failures.size());
- EXPECT_EQ(TestPartResult::kNonFatalFailure,
+ EXPECT_EQ(TestPartResult::kFatalFailure,
gtest_failures.GetTestPartResult(0).type());
EXPECT_EQ(TestPartResult::kNonFatalFailure,
gtest_failures.GetTestPartResult(1).type());