From dc72f7c3b4da30461fe424b0f44d7f65c5acefec Mon Sep 17 00:00:00 2001 From: srz_zumix Date: Mon, 20 Aug 2018 16:18:41 -0400 Subject: [PATCH 1/3] Googletest export Internal Change PiperOrigin-RevId: 209471987 --- googletest/include/gtest/gtest.h | 4 +- .../test/gtest_setuptestcase_failure_test.cc | 58 +++++++++++++++++++ googletest/test/gtest_unittest.cc | 22 ------- 3 files changed, 61 insertions(+), 23 deletions(-) create mode 100644 googletest/test/gtest_setuptestcase_failure_test.cc diff --git a/googletest/include/gtest/gtest.h b/googletest/include/gtest/gtest.h index 2be8b112..78cfc329 100644 --- a/googletest/include/gtest/gtest.h +++ b/googletest/include/gtest/gtest.h @@ -868,7 +868,9 @@ class GTEST_API_ TestCase { bool Passed() const { return !Failed(); } // Returns true iff the test case failed. - bool Failed() const { return failed_test_count() > 0; } + bool Failed() const { + return failed_test_count() > 0 || ad_hoc_test_result().Failed(); + } // Returns the elapsed time, in milliseconds. TimeInMillis elapsed_time() const { return elapsed_time_; } diff --git a/googletest/test/gtest_setuptestcase_failure_test.cc b/googletest/test/gtest_setuptestcase_failure_test.cc new file mode 100644 index 00000000..b20d9a4e --- /dev/null +++ b/googletest/test/gtest_setuptestcase_failure_test.cc @@ -0,0 +1,58 @@ +// Copyright 2009 Google Inc. All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#include "gtest/gtest.h" + +using ::testing::InitGoogleTest; + +// Tests ad_hoc_test_result(). + +class AdHocTestResultTest : public testing::Test { + protected: + static void SetUpTestCase() { + FAIL() << "A failure happened inside SetUpTestCase()."; + } +}; + +TEST_F(AdHocTestResultTest, AdHocTestResultForTestCaseShowsFailure) { + const testing::TestResult& test_result = testing::UnitTest::GetInstance() + ->current_test_case() + ->ad_hoc_test_result(); + EXPECT_TRUE(test_result.Failed()); +} + +TEST_F(AdHocTestResultTest, AdHocTestResultTestForUnitTestDoesNotShowFailure) { + const testing::TestResult& test_result = + testing::UnitTest::GetInstance()->ad_hoc_test_result(); + EXPECT_FALSE(test_result.Failed()); +} + +int main(int argc, char **argv) { + InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS() ? 0 : 1; +} diff --git a/googletest/test/gtest_unittest.cc b/googletest/test/gtest_unittest.cc index e1c30f39..98755540 100644 --- a/googletest/test/gtest_unittest.cc +++ b/googletest/test/gtest_unittest.cc @@ -7771,25 +7771,3 @@ TEST(SkipPrefixTest, DoesNotSkipWhenPrefixDoesNotMatch) { EXPECT_FALSE(SkipPrefix("world!", &p)); EXPECT_EQ(str, p); } - -// Tests ad_hoc_test_result(). - -class AdHocTestResultTest : public testing::Test { - protected: - static void SetUpTestCase() { - FAIL() << "A failure happened inside SetUpTestCase()."; - } -}; - -TEST_F(AdHocTestResultTest, AdHocTestResultForTestCaseShowsFailure) { - const testing::TestResult& test_result = testing::UnitTest::GetInstance() - ->current_test_case() - ->ad_hoc_test_result(); - EXPECT_TRUE(test_result.Failed()); -} - -TEST_F(AdHocTestResultTest, AdHocTestResultTestForUnitTestDoesNotShowFailure) { - const testing::TestResult& test_result = - testing::UnitTest::GetInstance()->ad_hoc_test_result(); - EXPECT_FALSE(test_result.Failed()); -} From 9dae300121bebe41d93d44926a8de513f6d2d240 Mon Sep 17 00:00:00 2001 From: srz_zumix Date: Mon, 20 Aug 2018 18:45:38 -0400 Subject: [PATCH 2/3] Googletest export Internal Change PiperOrigin-RevId: 209498445 --- googletest/include/gtest/gtest.h | 4 +- .../test/gtest_setuptestcase_failure_test.cc | 58 ------------------- googletest/test/gtest_unittest.cc | 22 +++++++ 3 files changed, 23 insertions(+), 61 deletions(-) delete mode 100644 googletest/test/gtest_setuptestcase_failure_test.cc diff --git a/googletest/include/gtest/gtest.h b/googletest/include/gtest/gtest.h index 78cfc329..2be8b112 100644 --- a/googletest/include/gtest/gtest.h +++ b/googletest/include/gtest/gtest.h @@ -868,9 +868,7 @@ class GTEST_API_ TestCase { bool Passed() const { return !Failed(); } // Returns true iff the test case failed. - bool Failed() const { - return failed_test_count() > 0 || ad_hoc_test_result().Failed(); - } + bool Failed() const { return failed_test_count() > 0; } // Returns the elapsed time, in milliseconds. TimeInMillis elapsed_time() const { return elapsed_time_; } diff --git a/googletest/test/gtest_setuptestcase_failure_test.cc b/googletest/test/gtest_setuptestcase_failure_test.cc deleted file mode 100644 index b20d9a4e..00000000 --- a/googletest/test/gtest_setuptestcase_failure_test.cc +++ /dev/null @@ -1,58 +0,0 @@ -// Copyright 2009 Google Inc. All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -#include "gtest/gtest.h" - -using ::testing::InitGoogleTest; - -// Tests ad_hoc_test_result(). - -class AdHocTestResultTest : public testing::Test { - protected: - static void SetUpTestCase() { - FAIL() << "A failure happened inside SetUpTestCase()."; - } -}; - -TEST_F(AdHocTestResultTest, AdHocTestResultForTestCaseShowsFailure) { - const testing::TestResult& test_result = testing::UnitTest::GetInstance() - ->current_test_case() - ->ad_hoc_test_result(); - EXPECT_TRUE(test_result.Failed()); -} - -TEST_F(AdHocTestResultTest, AdHocTestResultTestForUnitTestDoesNotShowFailure) { - const testing::TestResult& test_result = - testing::UnitTest::GetInstance()->ad_hoc_test_result(); - EXPECT_FALSE(test_result.Failed()); -} - -int main(int argc, char **argv) { - InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS() ? 0 : 1; -} diff --git a/googletest/test/gtest_unittest.cc b/googletest/test/gtest_unittest.cc index 98755540..e1c30f39 100644 --- a/googletest/test/gtest_unittest.cc +++ b/googletest/test/gtest_unittest.cc @@ -7771,3 +7771,25 @@ TEST(SkipPrefixTest, DoesNotSkipWhenPrefixDoesNotMatch) { EXPECT_FALSE(SkipPrefix("world!", &p)); EXPECT_EQ(str, p); } + +// Tests ad_hoc_test_result(). + +class AdHocTestResultTest : public testing::Test { + protected: + static void SetUpTestCase() { + FAIL() << "A failure happened inside SetUpTestCase()."; + } +}; + +TEST_F(AdHocTestResultTest, AdHocTestResultForTestCaseShowsFailure) { + const testing::TestResult& test_result = testing::UnitTest::GetInstance() + ->current_test_case() + ->ad_hoc_test_result(); + EXPECT_TRUE(test_result.Failed()); +} + +TEST_F(AdHocTestResultTest, AdHocTestResultTestForUnitTestDoesNotShowFailure) { + const testing::TestResult& test_result = + testing::UnitTest::GetInstance()->ad_hoc_test_result(); + EXPECT_FALSE(test_result.Failed()); +} From 87494afca70c50e62d1915830169558d25ce67a5 Mon Sep 17 00:00:00 2001 From: misterg Date: Wed, 22 Aug 2018 16:30:23 -0400 Subject: [PATCH 3/3] 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 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index 888ffd1b..e9127a11 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -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);