[FIXED JENKINS-18410] AbstractTestResultAction should be a RunAction2 so it need not persist its owning build.

jglick · olivergondza · commit b53770c70f53 · 2014-01-05T12:36:33.000+01:00
(cherry picked from commit fcdf749) Conflicts: changelog.html
diff --git a/core/src/main/java/hudson/tasks/junit/JUnitResultArchiver.java b/core/src/main/java/hudson/tasks/junit/JUnitResultArchiver.java
@@ -133,6 +133,7 @@ public boolean perform(AbstractBuild build, Launcher launcher,
 			TestResult result = parse(testResults, build, launcher, listener);
 
 			try {
+                // TODO can the build argument be omitted now, or is it used prior to the call to addAction?
 				action = new TestResultAction(build, result, listener);
 			} catch (NullPointerException npe) {
 				throw new AbortException(Messages.JUnitResultArchiver_BadXML(testResults));
@@ -173,7 +174,7 @@ public boolean perform(AbstractBuild build, Launcher launcher,
 			return true;
 		}
 
-		build.getActions().add(action);
+		build.addAction(action);
 		CHECKPOINT.report();
 
 		if (action.getResult().getFailCount() > 0)
diff --git a/core/src/main/java/hudson/tasks/junit/TestResultAction.java b/core/src/main/java/hudson/tasks/junit/TestResultAction.java
@@ -62,11 +62,17 @@ public class TestResultAction extends AbstractTestResultAction<TestResultAction>
     private Integer totalCount;
     private List<Data> testData = new ArrayList<Data>();
 
+    @Deprecated
     public TestResultAction(AbstractBuild owner, TestResult result, BuildListener listener) {
         super(owner);
         setResult(result, listener);
     }
 
+    /** @since 1.544 */
+    public TestResultAction(TestResult result, BuildListener listener) {
+        this(null, result, listener);
+    }
+
     /**
      * Overwrites the {@link TestResult} by a new data set.
      */
diff --git a/core/src/main/java/hudson/tasks/test/AbstractTestResultAction.java b/core/src/main/java/hudson/tasks/test/AbstractTestResultAction.java
@@ -28,6 +28,14 @@
 import hudson.tasks.junit.CaseResult;
 import hudson.util.*;
 import hudson.util.ChartUtil.NumberOnlyBuildLabel;
+
+import java.awt.*;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import jenkins.model.RunAction2;
 import org.jfree.chart.ChartFactory;
 import org.jfree.chart.JFreeChart;
 import org.jfree.chart.axis.CategoryAxis;
@@ -44,13 +52,6 @@
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
 
-import java.awt.*;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
 /**
  * Common base class for recording test result.
  *
@@ -61,15 +62,28 @@
  * @author Kohsuke Kawaguchi
  */
 @ExportedBean
-public abstract class AbstractTestResultAction<T extends AbstractTestResultAction> implements HealthReportingAction {
-    public final AbstractBuild<?,?> owner;
+public abstract class AbstractTestResultAction<T extends AbstractTestResultAction> implements HealthReportingAction, RunAction2 {
+    public transient AbstractBuild<?,?> owner;
 
     private Map<String,String> descriptions = new ConcurrentHashMap<String, String>();
 
+    /** @since 1.544 */
+    protected AbstractTestResultAction() {}
+
+    /** @deprecated Use the default constructor and just call {@link Run#addAction} to associate the build with the action. */
+    @Deprecated
     protected AbstractTestResultAction(AbstractBuild owner) {
         this.owner = owner;
     }
 
+    @Override public void onAttached(Run<?, ?> r) {
+        this.owner = (AbstractBuild<?,?>) r;
+    }
+
+    @Override public void onLoad(Run<?, ?> r) {
+        this.owner = (AbstractBuild<?,?>) r;
+    }
+
     /**
      * Gets the number of failed tests.
      */
diff --git a/core/src/main/java/hudson/tasks/test/AggregatedTestResultAction.java b/core/src/main/java/hudson/tasks/test/AggregatedTestResultAction.java
@@ -67,10 +67,14 @@ public Child(String name, int build) {
      */
     public final List<Child> children = new ArrayList<Child>();
 
+    @Deprecated
     public AggregatedTestResultAction(AbstractBuild owner) {
         super(owner);
     }
 
+    /** @since 1.544 */
+    public AggregatedTestResultAction() {}
+
     protected void update(List<? extends AbstractTestResultAction> children) {
         failCount = skipCount = totalCount = 0;
         this.children.clear();
diff --git a/core/src/main/java/hudson/tasks/test/AggregatedTestResultPublisher.java b/core/src/main/java/hudson/tasks/test/AggregatedTestResultPublisher.java
@@ -87,7 +87,7 @@ public AggregatedTestResultPublisher(String jobs, boolean includeFailedBuilds) {
 
     public boolean perform(AbstractBuild<?,?> build, Launcher launcher, BuildListener listener) throws InterruptedException, IOException {
         // add a TestResult just so that it can show up later.
-        build.addAction(new TestResultAction(jobs,includeFailedBuilds,build));
+        build.addAction(new TestResultAction(jobs, includeFailedBuilds));
         return true;
     }
 
@@ -131,6 +131,11 @@ public static final class TestResultAction extends AbstractTestResultAction {
         private transient List<AbstractProject> didntRun;
         private transient List<AbstractProject> noFingerprints;
 
+        public TestResultAction(String jobs, boolean includeFailedBuilds) {
+            this(jobs, includeFailedBuilds, null);
+        }
+
+        @Deprecated
         public TestResultAction(String jobs, boolean includeFailedBuilds, AbstractBuild<?,?> owner) {
             super(owner);
             this.includeFailedBuilds = includeFailedBuilds;
diff --git a/core/src/main/java/hudson/tasks/test/MatrixTestResult.java b/core/src/main/java/hudson/tasks/test/MatrixTestResult.java
@@ -38,10 +38,15 @@
  * @author Kohsuke Kawaguchi
  */
 public class MatrixTestResult extends AggregatedTestResultAction {
+
+    @Deprecated
     public MatrixTestResult(MatrixBuild owner) {
         super(owner);
     }
 
+    /** @since 1.544 */
+    public MatrixTestResult() {}
+
     /**
      * Use the configuration name.
      */
diff --git a/core/src/main/java/hudson/tasks/test/TestResultAggregator.java b/core/src/main/java/hudson/tasks/test/TestResultAggregator.java
@@ -46,7 +46,7 @@ public TestResultAggregator(MatrixBuild build, Launcher launcher, BuildListener
 
     @Override
     public boolean startBuild() throws InterruptedException, IOException {
-        result = new MatrixTestResult(build);
+        result = new MatrixTestResult();
         build.addAction(result);
         return true;
     }
diff --git a/test/src/test/java/hudson/tasks/test/TrivialTestResultAction.java b/test/src/test/java/hudson/tasks/test/TrivialTestResultAction.java
@@ -32,12 +32,19 @@
 public class TrivialTestResultAction extends AbstractTestResultAction<TrivialTestResultAction> implements StaplerProxy {
 
     protected TrivialTestResult result;
+
+    @Deprecated
     protected TrivialTestResultAction(AbstractBuild owner, TrivialTestResult result) {
         super(owner);
         this.result = result;
         this.result.setParentAction(this);
     }
 
+    /** @since 1.544 */
+    protected TrivialTestResultAction(TrivialTestResult result) {
+        this(null, result);
+    }
+
     /**
      * Gets the number of failed tests.
      */
diff --git a/test/src/test/java/hudson/tasks/test/TrivialTestResultRecorder.java b/test/src/test/java/hudson/tasks/test/TrivialTestResultRecorder.java
@@ -48,9 +48,9 @@ public boolean perform(AbstractBuild<?, ?> build,
         System.out.println("performing TrviialTestResultRecorder");
         listener.getLogger().println("perfoming TrivialTestResultRecorder");
         TrivialTestResult r = new TrivialTestResult("gubernatorial");
-        TrivialTestResultAction action = new TrivialTestResultAction(build, r);
+        TrivialTestResultAction action = new TrivialTestResultAction(r);
         r.setParentAction(action);
-        build.getActions().add(action);
+        build.addAction(action);
         listener.getLogger().println("done with TrivialTestResultRecorder");
         System.out.println("done with TrivialTestResultRecorder");
         return true;

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public TestResultAggregator(MatrixBuild build, Launcher launcher, BuildListener`
`46`	`46`
`47`	`47`	`@Override`
`48`	`48`	`public boolean startBuild() throws InterruptedException, IOException {`
`49`		`- result = new MatrixTestResult(build);`
	`49`	`+ result = new MatrixTestResult();`
`50`	`50`	`build.addAction(result);`
`51`	`51`	`return true;`
`52`	`52`	`}`