Merge pull request #4036 from zloylos:fix-output-json-3884

copybara-github · copybara-github · commit e07617d6c692 · 2022-10-19T13:25:11.000-07:00
PiperOrigin-RevId: 482287697
Change-Id: I1179a1570cd64fcb156bda26e5c779b876c51742
diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc
@@ -4829,6 +4829,9 @@ void JsonUnitTestResultPrinter::PrintJsonUnitTest(std::ostream* stream,
   // If there was a test failure outside of one of the test suites (like in a
   // test environment) include that in the output.
   if (unit_test.ad_hoc_test_result().Failed()) {
+    if (comma) {
+      *stream << ",\n";
+    }
     OutputJsonTestSuiteForTestResult(stream, unit_test.ad_hoc_test_result());
   }
 

Original file line number	Diff line number	Diff line change
`@@ -4829,6 +4829,9 @@ void JsonUnitTestResultPrinter::PrintJsonUnitTest(std::ostream* stream,`
`4829`	`4829`	`// If there was a test failure outside of one of the test suites (like in a`
`4830`	`4830`	`// test environment) include that in the output.`
`4831`	`4831`	`if (unit_test.ad_hoc_test_result().Failed()) {`
	`4832`	`+ if (comma) {`
	`4833`	`+ *stream << ",\n";`
	`4834`	`+ }`
`4832`	`4835`	`OutputJsonTestSuiteForTestResult(stream, unit_test.ad_hoc_test_result());`
`4833`	`4836`	`}`
`4834`	`4837`