[SUREFIRE-2224] StatelessXmlReporter#getTestProblems() does not prope…

…rly reflect report schema structure This closes #702
apache · Dec 21, 2023 · 6eb7d7e · 6eb7d7e
1 parent 8676714
commit 6eb7d7e
Showing 1 changed file with 6 additions and 14 deletions.
diff --git a/...re-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java b/...re-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
@@ -432,7 +432,7 @@ private static void getTestProblems(
             boolean trimStackTrace,
             OutputStream fw,
             String testErrorType,
-            boolean createOutErrElementsInside)
+            boolean enableNestedOutErrElements)
             throws IOException {
         ppw.startElement(testErrorType);
 
@@ -456,21 +456,13 @@ private static void getTestProblems(
             }
         }
 
-        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);
         }