diff options
| author | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2009-09-18 18:17:19 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2009-09-18 18:17:19 +0000 |
| commit | bbd6e105e786dd6d4e1fdd6b1467f969121bcca3 (patch) | |
| tree | 1bccbafa8e38fea292f0fadba4b09589fa21e7a7 | |
| parent | 93244dc36979a7755d02f0b210659160ce593144 (diff) | |
| download | googletest-bbd6e105e786dd6d4e1fdd6b1467f969121bcca3.tar.gz googletest-bbd6e105e786dd6d4e1fdd6b1467f969121bcca3.tar.bz2 googletest-bbd6e105e786dd6d4e1fdd6b1467f969121bcca3.zip | |
Picks up gtest r314.
| -rw-r--r-- | src/gmock-internal-utils.cc | 8 | ||||
| -rw-r--r-- | test/gmock-spec-builders_test.cc | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/gmock-internal-utils.cc b/src/gmock-internal-utils.cc index e72e019b..196ec74b 100644 --- a/src/gmock-internal-utils.cc +++ b/src/gmock-internal-utils.cc @@ -77,8 +77,12 @@ class GoogleTestFailureReporter : public FailureReporterInterface { public: virtual void ReportFailure(FailureType type, const char* file, int line, const string& message) { - AssertHelper(type == FATAL ? TPRT_FATAL_FAILURE : TPRT_NONFATAL_FAILURE, - file, line, message.c_str()) = Message(); + AssertHelper(type == FATAL ? + TestPartResult::kFatalFailure : + TestPartResult::kNonFatalFailure, + file, + line, + message.c_str()) = Message(); if (type == FATAL) { posix::Abort(); } diff --git a/test/gmock-spec-builders_test.cc b/test/gmock-spec-builders_test.cc index 3f2918fa..707d8968 100644 --- a/test/gmock-spec-builders_test.cc +++ b/test/gmock-spec-builders_test.cc @@ -985,7 +985,7 @@ TEST(UnexpectedCallTest, UnsatisifiedPrerequisites) { // There should be one non-fatal failure. ASSERT_EQ(1, failures.size()); const ::testing::TestPartResult& r = failures.GetTestPartResult(0); - EXPECT_EQ(::testing::TPRT_NONFATAL_FAILURE, r.type()); + EXPECT_EQ(::testing::TestPartResult::kNonFatalFailure, r.type()); // Verifies that the failure message contains the two unsatisfied // pre-requisites but not the satisfied one. |