Skip to content

Commit a1b26c9

Browse files
committed
Escape invalid XML chars in testCase and testSuite names
1 parent 2393517 commit a1b26c9

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

java/src/com/github/bazel_contrib/contrib_rules_jvm/junit5/TestCaseXmlRenderer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public void toXml(XMLStreamWriter xml, TestData test) throws XMLStreamException
4747
}
4848

4949
xml.writeStartElement("testcase");
50-
xml.writeAttribute("name", name);
50+
xml.writeAttribute("name", escapeIllegalCharacters(name));
5151
xml.writeAttribute("classname", LegacyReportingUtils.getClassName(testPlan, id));
5252

5353
/* @Nullable */ Duration maybeDuration = test.getDuration();

java/src/com/github/bazel_contrib/contrib_rules_jvm/junit5/TestSuiteXmlRenderer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.github.bazel_contrib.contrib_rules_jvm.junit5;
22

3+
import static com.github.bazel_contrib.contrib_rules_jvm.junit5.SafeXml.escapeIllegalCharacters;
34
import static com.github.bazel_contrib.contrib_rules_jvm.junit5.SafeXml.writeTextElement;
45

56
import java.util.Collection;
@@ -19,7 +20,7 @@ public void toXml(XMLStreamWriter xml, TestData suite, Collection<TestData> test
1920
throws XMLStreamException {
2021
xml.writeStartElement("testsuite");
2122

22-
xml.writeAttribute("name", suite.getId().getLegacyReportingName());
23+
xml.writeAttribute("name", escapeIllegalCharacters(suite.getId().getLegacyReportingName()));
2324
xml.writeAttribute("tests", String.valueOf(tests.size()));
2425

2526
int errors = 0;

0 commit comments

Comments
 (0)