summaryrefslogtreecommitdiff
path: root/src/gtest-test-part.cc
diff options
context:
space:
mode:
authorzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2009-09-18 18:16:20 +0000
committerzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2009-09-18 18:16:20 +0000
commit334aaead71ccf797a18f2128c320f0304e724860 (patch)
tree875de13e45bdf6aff33769448b6934dc11d54bb8 /src/gtest-test-part.cc
parentd586f9f13c5b5ba31bc00c305f3bf2a97d5874f8 (diff)
downloadgtest-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 'src/gtest-test-part.cc')
-rw-r--r--src/gtest-test-part.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gtest-test-part.cc b/src/gtest-test-part.cc
index f053773..4f36df6 100644
--- a/src/gtest-test-part.cc
+++ b/src/gtest-test-part.cc
@@ -56,12 +56,12 @@ internal::String TestPartResult::ExtractSummary(const char* message) {
// Prints a TestPartResult object.
std::ostream& operator<<(std::ostream& os, const TestPartResult& result) {
- return os << result.file_name() << ":"
- << result.line_number() << ": "
- << (result.type() == TPRT_SUCCESS ? "Success" :
- result.type() == TPRT_FATAL_FAILURE ? "Fatal failure" :
- "Non-fatal failure") << ":\n"
- << result.message() << std::endl;
+ return os
+ << result.file_name() << ":" << result.line_number() << ": "
+ << (result.type() == TestPartResult::kSuccess ? "Success" :
+ result.type() == TestPartResult::kFatalFailure ? "Fatal failure" :
+ "Non-fatal failure") << ":\n"
+ << result.message() << std::endl;
}
// Constructs an empty TestPartResultArray.