3party/googletest
0
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-01-01 14:57:54 +08:00
Code Issues Projects Releases Wiki Activity

Googletest export

Browse Source 
Remove unneeded check for NULL.
Note: this started as OSS PR https://github.com/google/googletest/pull/967 but changed
PiperOrigin-RevId: 209819732
This commit is contained in:
misterg 2018-08-22 16:30:23 -04:00 committed by Gennadiy Civil
parent 9dae300121
commit 87494afca7
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
googletest/src/gtest.cc
View File

@ -2679,18 +2679,18 @@ void TestInfo::Run() {
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);