You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2023/12/21 15:38:33 UTC
(maven-surefire) 01/01: [SUREFIRE-2224] StatelessXmlReporter#getTestProblems() does not properly reflect report schema structure
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch simplify
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit 6eb7d7e5492d72cbb9528c722548b31acd9e7c57
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Thu Dec 21 13:22:51 2023 +0100
[SUREFIRE-2224] StatelessXmlReporter#getTestProblems() does not properly reflect report schema structure
This closes #702
---
.../plugin/surefire/report/StatelessXmlReporter.java | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
index 62299da4e..a0aad4007 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
@@ -432,7 +432,7 @@ public class StatelessXmlReporter implements StatelessReportEventListener<Wrappe
boolean trimStackTrace,
OutputStream fw,
String testErrorType,
- boolean createOutErrElementsInside)
+ boolean enableNestedOutErrElements)
throws IOException {
ppw.startElement(testErrorType);
@@ -456,21 +456,13 @@ public class StatelessXmlReporter implements StatelessReportEventListener<Wrappe
}
}
- boolean hasNestedElements = createOutErrElementsInside & stackTrace != null;
-
- if (stackTrace != null) {
- if (hasNestedElements) {
- ppw.startElement("stackTrace");
+ if (enableNestedOutErrElements) {
+ ppw.startElement("stackTrace");
+ if (stackTrace != null) {
+ extraEscapeElementValue(stackTrace, outputStreamWriter, ppw, fw);
}
+ ppw.endElement();
- extraEscapeElementValue(stackTrace, outputStreamWriter, ppw, fw);
-
- if (hasNestedElements) {
- ppw.endElement();
- }
- }
-
- if (createOutErrElementsInside) {
createOutErrElements(outputStreamWriter, ppw, report, fw);
}