pa-fazil
/
android_bionic
mirror of https://github.com/fazilsheik96/android_bionic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge "Escape failure messages in XML test output."

This commit is contained in:
Dan Albert 2016-01-14 06:12:32 +00:00 committed by Gerrit Code Review
parent c3aa3d892b 09a99641ec
commit 323900cd7d
1 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
tests/gtest_main.cpp
View File

@ -442,6 +442,36 @@ static void OnTestIterationEndPrint(const std::vector<TestCase>& testcase_list,
fflush(stdout);
}
std::string XmlEscape(const std::string& xml) {
std::string escaped;
escaped.reserve(xml.size());
for (auto c : xml) {
switch (c) {
case '<':
escaped.append("&lt;");
break;
case '>':
escaped.append("&gt;");
break;
case '&':
escaped.append("&amp;");
break;
case '\'':
escaped.append("&apos;");
break;
case '"':
escaped.append("&quot;");
break;
default:
escaped.append(1, c);
break;
}
}
return escaped;
}
// Output xml file when --gtest_output is used, write this function as we can't reuse
// gtest.cc:XmlUnitTestResultPrinter. The reason is XmlUnitTestResultPrinter is totally
// defined in gtest.cc and not expose to outside. What's more, as we don't run gtest in
@ -497,7 +527,8 @@ void OnTestIterationEndXmlPrint(const std::string& xml_output_filename,
} else {
fputs(">\n", fp);
const std::string& test_output = testcase.GetTest(j).GetTestOutput();
fprintf(fp, " <failure message=\"%s\" type=\"\">\n", test_output.c_str());
const std::string escaped_test_output = XmlEscape(test_output);
fprintf(fp, " <failure message=\"%s\" type=\"\">\n", escaped_test_output.c_str());
fputs(" </failure>\n", fp);
fputs(" </testcase>\n", fp);
}