diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-09-18 18:16:20 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-09-18 18:16:20 +0000 |
| commit | 334aaead71ccf797a18f2128c320f0304e724860 (patch) | |
| tree | 875de13e45bdf6aff33769448b6934dc11d54bb8 /include/gtest/gtest-spi.h | |
| parent | d586f9f13c5b5ba31bc00c305f3bf2a97d5874f8 (diff) | |
| download | gtest-334aaead71ccf797a18f2128c320f0304e724860.tar.gz gtest-334aaead71ccf797a18f2128c320f0304e724860.tar.bz2 gtest-334aaead71ccf797a18f2128c320f0304e724860.tar.xz | |
Renames the TestPartResult type enums and adjusts the order of methods in the event listener interface (by Vlad Losev).
git-svn-id: http://googletest.googlecode.com/svn/trunk@314 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'include/gtest/gtest-spi.h')
| -rw-r--r-- | include/gtest/gtest-spi.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/include/gtest/gtest-spi.h b/include/gtest/gtest-spi.h index a4e387a..db0100f 100644 --- a/include/gtest/gtest-spi.h +++ b/include/gtest/gtest-spi.h @@ -97,12 +97,12 @@ class SingleFailureChecker { public: // The constructor remembers the arguments. SingleFailureChecker(const TestPartResultArray* results, - TestPartResultType type, + TestPartResult::Type type, const char* substr); ~SingleFailureChecker(); private: const TestPartResultArray* const results_; - const TestPartResultType type_; + const TestPartResult::Type type_; const String substr_; GTEST_DISALLOW_COPY_AND_ASSIGN_(SingleFailureChecker); @@ -143,7 +143,7 @@ class SingleFailureChecker { };\ ::testing::TestPartResultArray gtest_failures;\ ::testing::internal::SingleFailureChecker gtest_checker(\ - >est_failures, ::testing::TPRT_FATAL_FAILURE, (substr));\ + >est_failures, ::testing::TestPartResult::kFatalFailure, (substr));\ {\ ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\ ::testing::ScopedFakeTestPartResultReporter:: \ @@ -160,7 +160,7 @@ class SingleFailureChecker { };\ ::testing::TestPartResultArray gtest_failures;\ ::testing::internal::SingleFailureChecker gtest_checker(\ - >est_failures, ::testing::TPRT_FATAL_FAILURE, (substr));\ + >est_failures, ::testing::TestPartResult::kFatalFailure, (substr));\ {\ ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\ ::testing::ScopedFakeTestPartResultReporter:: \ @@ -196,7 +196,8 @@ class SingleFailureChecker { do {\ ::testing::TestPartResultArray gtest_failures;\ ::testing::internal::SingleFailureChecker gtest_checker(\ - >est_failures, ::testing::TPRT_NONFATAL_FAILURE, (substr));\ + >est_failures, ::testing::TestPartResult::kNonFatalFailure, \ + (substr));\ {\ ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\ ::testing::ScopedFakeTestPartResultReporter:: \ @@ -209,7 +210,8 @@ class SingleFailureChecker { do {\ ::testing::TestPartResultArray gtest_failures;\ ::testing::internal::SingleFailureChecker gtest_checker(\ - >est_failures, ::testing::TPRT_NONFATAL_FAILURE, (substr));\ + >est_failures, ::testing::TestPartResult::kNonFatalFailure, \ + (substr));\ {\ ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\ ::testing::ScopedFakeTestPartResultReporter::INTERCEPT_ALL_THREADS,\ |