diff options
author | srz_zumix <zumix.cpp@gmail.com> | 2018-08-20 22:45:38 (GMT) |
---|---|---|
committer | Gennadiy Civil <misterg@google.com> | 2018-08-23 20:03:39 (GMT) |
commit | 9dae300121bebe41d93d44926a8de513f6d2d240 (patch) | |
tree | b05386583bc0615c2e9fa66088f23f894a89c72b /googletest | |
parent | dc72f7c3b4da30461fe424b0f44d7f65c5acefec (diff) | |
download | googletest-9dae300121bebe41d93d44926a8de513f6d2d240.zip googletest-9dae300121bebe41d93d44926a8de513f6d2d240.tar.gz googletest-9dae300121bebe41d93d44926a8de513f6d2d240.tar.bz2 |
Googletest export
Internal Change
PiperOrigin-RevId: 209498445
Diffstat (limited to 'googletest')
-rw-r--r-- | googletest/include/gtest/gtest.h | 4 | ||||
-rw-r--r-- | googletest/test/gtest_setuptestcase_failure_test.cc | 58 | ||||
-rw-r--r-- | googletest/test/gtest_unittest.cc | 22 |
3 files changed, 23 insertions, 61 deletions
diff --git a/googletest/include/gtest/gtest.h b/googletest/include/gtest/gtest.h index 78cfc32..2be8b11 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 b20d9a4..0000000 --- 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 9875554..e1c30f3 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()); +} |