Issue #237 parse flakyFailure and rerunFailure

Signed-off-by: Olivier Lamy <[email protected]>

Author: olamy

src/main/java/hudson/tasks/junit/CaseResult.java

@@ -84,8 +84,8 @@ public class CaseResult extends TestResult implements Comparable<CaseResult> {
     private String errorStackTrace;
     private String errorDetails;
     private Map<String, String> properties;
-    private List<FlakyFailure> flakyFailures = new ArrayList<>();
-    private List<RerunFailure> rerunFailures = new ArrayList<>();
+    private FlakyFailure[] flakyFailures;
+    private RerunFailure[] rerunFailures;
 
     @SuppressFBWarnings(value = "SE_TRANSIENT_FIELD_NOT_RESTORED", justification = "Specific method to restore it")
     private transient SuiteResult parent;
@@ -273,7 +273,7 @@ public static float clampDuration(float d) {
         return Math.min(365.0f * 24 * 60 * 60, Math.max(0.0f, d));
     }
 
-    static List<FlakyFailure> parseFlakyFailures(Element testCase) {
+    private static FlakyFailure[] parseFlakyFailures(Element testCase) {
         List<FlakyFailure> flakyFailures = new ArrayList<>();
         List<Element> flakyFailuresElements = testCase.elements("flakyFailure");
         if (flakyFailuresElements != null) {
@@ -286,10 +286,10 @@ static List<FlakyFailure> parseFlakyFailures(Element testCase) {
                 flakyFailures.add(new FlakyFailure(message, type, stackTrace, stdout, stderr));
             }
         }
-        return flakyFailures;
+        return flakyFailures.isEmpty() ? null : flakyFailures.toArray(new FlakyFailure[0]);
     }
 
-    static List<RerunFailure> parseRerunFailures(Element testCase) {
+    private static RerunFailure[] parseRerunFailures(Element testCase) {
         List<RerunFailure> rerunFailures = new ArrayList<>();
         List<Element> rerunFailureElements = testCase.elements("rerunFailure");
         if (rerunFailureElements != null) {
@@ -302,7 +302,7 @@ static List<RerunFailure> parseRerunFailures(Element testCase) {
                 rerunFailures.add(new RerunFailure(message, type, stackTrace, stdout, stderr));
             }
         }
-        return rerunFailures;
+        return rerunFailures.isEmpty() ? null : rerunFailures.toArray(new RerunFailure[0]);
     }
 
     static CaseResult parse(SuiteResult parent, final XMLStreamReader reader, String context, String ver)
@@ -1076,11 +1076,11 @@ void replaceParent(SuiteResult parent) {
         this.parent = parent;
     }
 
-    public List<FlakyFailure> getFlakyFailures() {
+    public @CheckForNull FlakyFailure[] getFlakyFailures() {
         return flakyFailures;
     }
 
-    public List<RerunFailure> getRerunFailures() {
+    public @CheckForNull RerunFailure[] getRerunFailures() {
         return rerunFailures;
     }
 

src/main/java/hudson/tasks/junit/FlakyFailure.java

@@ -0,0 +1,6 @@
+package hudson.tasks.junit;
+
+import java.io.Serializable;
+
+public record FlakyFailure(String message, String type, String stackTrace, String stdout, String stderr)
+        implements Serializable {}

src/main/java/hudson/tasks/junit/RerunFailure.java

@@ -0,0 +1,6 @@
+package hudson.tasks.junit;
+
+import java.io.Serializable;
+
+public record RerunFailure(String message, String type, String stackTrace, String stdout, String stderr)
+        implements Serializable {}

src/test/java/hudson/tasks/junit/TestResultTest.java

@@ -480,16 +480,12 @@ void includeFlakyAndRerun() throws IOException, URISyntaxException {
             assertNotNull(flakySuiteResult);
             assertEquals(
                     2,
-                    flakySuiteResult
-                            .getCase("io.olamy.FlakyTest.testApp")
-                            .getFlakyFailures()
-                            .size(),
+                    flakySuiteResult.getCase("io.olamy.FlakyTest.testApp").getFlakyFailures().length,
                     "Wrong number of flayfailures");
 
-            FlakyFailure flakyFailure = flakySuiteResult
-                    .getCase("io.olamy.FlakyTest.testApp")
-                    .getFlakyFailures()
-                    .get(0);
+            FlakyFailure flakyFailure =
+                    flakySuiteResult.getCase("io.olamy.FlakyTest.testApp").getFlakyFailures()[0];
+            assertNotNull(flakyFailure);
             assertEquals("junit.framework.AssertionFailedError", flakyFailure.type());
             assertEquals("obvious fail", flakyFailure.message());
             assertTrue(flakyFailure.stackTrace().contains("at io.olamy.FlakyTest.testApp(FlakyTest.java:27)"));
@@ -502,16 +498,12 @@ void includeFlakyAndRerun() throws IOException, URISyntaxException {
             assertNotNull(rerunSuite);
             assertEquals(
                     3,
-                    rerunSuite
-                            .getCase("io.olamy.AlwaysFailTest.testApp")
-                            .getRerunFailures()
-                            .size(),
+                    rerunSuite.getCase("io.olamy.AlwaysFailTest.testApp").getRerunFailures().length,
                     "Wrong number of rerun failures");
 
-            RerunFailure rerunFailure = rerunSuite
-                    .getCase("io.olamy.AlwaysFailTest.testApp")
-                    .getRerunFailures()
-                    .get(0);
+            RerunFailure rerunFailure =
+                    rerunSuite.getCase("io.olamy.AlwaysFailTest.testApp").getRerunFailures()[0];
+            assertNotNull(rerunFailure);
             assertEquals("junit.framework.AssertionFailedError", rerunFailure.type());
             assertEquals("built to fail", rerunFailure.message());
             assertTrue(

src/test/resources/hudson/tasks/junit/gh-237/TEST-io.olamy.AlwaysFailTest.xml

@@ -85,7 +85,7 @@
 ]]></system-out>
     <system-err><![CDATA[this will really fail
 ]]></system-err>
-    <rerunFailure message="built to fail" type="junit.framework.AssertionFailedError">
+      <rerunFailure message="built to fail" type="junit.framework.AssertionFailedError">
       <stackTrace><![CDATA[junit.framework.AssertionFailedError: built to fail
 	at junit.framework.Assert.fail(Assert.java:57)
 	at junit.framework.Assert.assertTrue(Assert.java:22)