commit 87494afca70c50e62d1915830169558d25ce67a5
author misterg <misterg@google.com> Wed Aug 22 16:30:23 2018 -0400
committer Gennadiy Civil <misterg@google.com> Thu Aug 23 16:03:46 2018 -0400
tree 83974344e47119f9363ec654f67c1b839b510b80
parent 9dae300121bebe41d93d44926a8de513f6d2d240

Googletest export

Remove unneeded check for NULL.
Note: this started as OSS PR https://github.com/google/googletest/pull/967 but changed
PiperOrigin-RevId: 209819732

googletest/src/gtest.cc

diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc
index 888ffd1..e9127a1 100644
--- a/googletest/src/gtest.cc
+++ b/googletest/src/gtest.cc
@@ -2679,18 +2679,18 @@
       factory_, &internal::TestFactoryBase::CreateTest,
       "the test fixture's constructor");
 
-  // Runs the test only if the test object was created and its
-  // constructor didn't generate a fatal failure.
-  if ((test != NULL) && !Test::HasFatalFailure()) {
+  // Runs the test if the constructor didn't generate a fatal failure.
+  // Note that the object will not be null
+  if (!Test::HasFatalFailure()) {
     // This doesn't throw as all user code that can throw are wrapped into
     // exception handling code.
     test->Run();
   }
 
-  // Deletes the test object.
-  impl->os_stack_trace_getter()->UponLeavingGTest();
-  internal::HandleExceptionsInMethodIfSupported(
-      test, &Test::DeleteSelf_, "the test fixture's destructor");
+    // Deletes the test object.
+    impl->os_stack_trace_getter()->UponLeavingGTest();
+    internal::HandleExceptionsInMethodIfSupported(
+        test, &Test::DeleteSelf_, "the test fixture's destructor");
 
   result_.set_elapsed_time(internal::GetTimeInMillis() - start);