Merge branch 'master' of https://github.com/google/googletest

2018-03-05 12:26:24 -05:00
parent 0d5e01ad7b 915c8d051d
commit a518bd5cf2
3 changed files with 8 additions and 2 deletions
--- 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 << "  }";
    }