diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-03-05 10:43:19 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-05 10:43:19 -0500 |
| commit | 829a8c966b80237b7c517da55a383698b52c357f (patch) | |
| tree | 4619144d24d9a5c381d8ccfcdec5cf5653036b5a | |
| parent | f8fbe1c82175b493acd010a6891119dbe5712b5d (diff) | |
| parent | 6c73adfc03e277f55cb1e4947b3a5e6c5ff4fe46 (diff) | |
| download | googletest-829a8c966b80237b7c517da55a383698b52c357f.tar.gz googletest-829a8c966b80237b7c517da55a383698b52c357f.tar.bz2 googletest-829a8c966b80237b7c517da55a383698b52c357f.zip | |
Merge branch 'master' into unsigned-wchar
| -rw-r--r-- | googletest/src/gtest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index 15cc9073..74c43a41 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -4012,9 +4012,9 @@ void JsonUnitTestResultPrinter::OutputJsonTestInfo(::std::ostream* stream, const std::string location = internal::FormatCompilerIndependentFileLocation(part.file_name(), part.line_number()); - const std::string summary = EscapeJson(location + "\n" + part.summary()); + const std::string message = EscapeJson(location + "\n" + part.message()); *stream << kIndent << " {\n" - << kIndent << " \"failure\": \"" << summary << "\",\n" + << kIndent << " \"failure\": \"" << message << "\",\n" << kIndent << " \"type\": \"\"\n" << kIndent << " }"; } |