summaryrefslogtreecommitdiff
path: root/googletest/test/gtest_assert_by_exception_test.cc
diff options
context:
space:
mode:
Diffstat (limited to 'googletest/test/gtest_assert_by_exception_test.cc')
-rw-r--r--googletest/test/gtest_assert_by_exception_test.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/googletest/test/gtest_assert_by_exception_test.cc b/googletest/test/gtest_assert_by_exception_test.cc
index 0eae8575f3fe..ada4cb30ef68 100644
--- a/googletest/test/gtest_assert_by_exception_test.cc
+++ b/googletest/test/gtest_assert_by_exception_test.cc
@@ -80,8 +80,7 @@ TEST(Test, Test) {
try {
AssertFalse();
} catch(const testing::AssertionException& e) {
- if (strstr(e.what(), "Expected failure") != NULL)
- throw;
+ if (strstr(e.what(), "Expected failure") != nullptr) throw;
printf("%s",
"A failed assertion did throw an exception of the right type, "
@@ -97,7 +96,6 @@ TEST(Test, Test) {
int kTestForContinuingTest = 0;
TEST(Test, Test2) {
- // FIXME: how to force Test2 to be after Test?
kTestForContinuingTest = 1;
}