diff options
| author | Arseny Aprelev <arseny.aprelev@gmail.com> | 2018-10-01 16:47:09 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-10-02 13:03:28 -0400 |
| commit | 00938b2b228f3b70d3d9e51f29a1505bdad43f1e (patch) | |
| tree | 2bebc032627672911353925d14d1fce101a36029 /googletest/src/gtest-test-part.cc | |
| parent | 2e91bbcf6f33eb85451001be2d4c95cca86ea9fc (diff) | |
| download | googletest-git-00938b2b228f3b70d3d9e51f29a1505bdad43f1e.tar.gz | |
Merge 2ce0685f76a4db403b7b2650433a584c150f2108 into 75e834700d19aa373b428c7c746f951737354c28
Closes #1544
With refinements and changes
PiperOrigin-RevId: 215273083
Diffstat (limited to 'googletest/src/gtest-test-part.cc')
| -rw-r--r-- | googletest/src/gtest-test-part.cc | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/googletest/src/gtest-test-part.cc b/googletest/src/gtest-test-part.cc index c88860d9..2855e3e9 100644 --- a/googletest/src/gtest-test-part.cc +++ b/googletest/src/gtest-test-part.cc @@ -47,12 +47,16 @@ std::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() == TestPartResult::kSuccess ? "Success" : - result.type() == TestPartResult::kFatalFailure ? "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::kSkip + ? "Skipped" + : result.type() == TestPartResult::kFatalFailure + ? "Fatal failure" + : "Non-fatal failure") + << ":\n" + << result.message() << std::endl; } // Appends a TestPartResult to the array. |