Deprecating getTestResultAction as an unwanted link from the model pa…

…ckage to hudson.tasks.test package.

core/src/main/java/hudson/model/AbstractBuild.java

@@ -1039,14 +1039,14 @@ public final VariableResolver<String> getBuildVariableResolver() {
     }
 
     /**
-     * Gets {@link AbstractTestResultAction} associated with this build if any.
+     * @deprecated Use {@link #getAction(Class)} on {@link AbstractTestResultAction}.
      */
     public AbstractTestResultAction getTestResultAction() {
         return getAction(AbstractTestResultAction.class);
     }
 
     /**
-     * Gets {@link AggregatedTestResultAction} associated with this build if any.
+     * @deprecated Use {@link #getAction(Class)} on {@link AggregatedTestResultAction}.
      */
     public AggregatedTestResultAction getAggregatedTestResultAction() {
         return getAction(AggregatedTestResultAction.class);

core/src/main/java/hudson/model/Run.java

@@ -2034,9 +2034,9 @@ public Summary(boolean worse, String message) {
      */
     private @Nonnull Summary determineDetailedUnstableSummary(Boolean worseOverride) {
         if(((Run)this) instanceof AbstractBuild) {
-            AbstractTestResultAction trN = ((AbstractBuild)(Run)this).getTestResultAction();
+            AbstractTestResultAction trN = ((AbstractBuild)(Run)this).getAction(AbstractTestResultAction.class);
             Run prev = getPreviousBuild();
-            AbstractTestResultAction trP = prev==null ? null : ((AbstractBuild) prev).getTestResultAction();
+            AbstractTestResultAction trP = prev==null ? null : ((AbstractBuild) prev).getAction(AbstractTestResultAction.class);
             if(trP==null) {
                 if(trN!=null && trN.getFailCount()>0)
                     return new Summary(worseOverride != null ? worseOverride : true,

core/src/main/java/hudson/tasks/test/TestResult.java

@@ -55,7 +55,7 @@ public void setParentAction(AbstractTestResultAction action) {
      * this test result.
      */
     public AbstractTestResultAction getParentAction() {
-        return getOwner().getTestResultAction();
+        return getOwner().getAction(AbstractTestResultAction.class);
     }
 
     /**

core/src/main/java/hudson/tasks/test/TestResultProjectAction.java

@@ -76,7 +76,7 @@ public AbstractTestResultAction getLastTestResultAction() {
 
         AbstractBuild<?,?> b=project.getLastBuild();
         while(b!=null) {
-            AbstractTestResultAction a = b.getTestResultAction();
+            AbstractTestResultAction a = b.getAction(AbstractTestResultAction.class);
             if(a!=null && (!b.isBuilding())) return a;
             if(b==tb)
                 // if even the last successful build didn't produce the test result,

core/src/main/resources/META-INF/upgrade/AbstractTestResultAction.hint

@@ -0,0 +1,2 @@
+$b.getTestResultAction() :: $b instanceof hudson.model.AbstractBuild => $b.getAction(hudson.tasks.test.AbstractTestResultAction.class);;
+$b.getAggregatedTestResultAction() :: $b instanceof hudson.model.AbstractBuild => $b.getAction(hudson.tasks.test.AggregatedTestResultAction.class);;

core/src/test/java/hudson/model/BuildStatusSummaryTest.java

@@ -187,7 +187,7 @@ public void testBuildGotNoTests() {
         when(this.build.getResult()).thenReturn(Result.UNSTABLE);
         when(this.prevBuild.getResult()).thenReturn(Result.UNSTABLE);
         // Null test result action recorded
-        when(((AbstractBuild) this.build).getTestResultAction()).thenReturn(null);
+        when(((AbstractBuild) this.build).getAction(AbstractTestResultAction.class)).thenReturn(null);
 
         Summary summary = this.build.getBuildStatusSummary();
 
@@ -293,6 +293,6 @@ private void buildHasTestResult(AbstractBuild build, int failedTests) {
         AbstractTestResultAction testResult = mock(AbstractTestResultAction.class);
         when(testResult.getFailCount()).thenReturn(failedTests);
 
-        when(build.getTestResultAction()).thenReturn(testResult);
+        when(build.getAction(AbstractTestResultAction.class)).thenReturn(testResult);
     }
 }