Extracting MatrixAggregatable dependency.

(cherry picked from commit 5d9e4d7b)

core/src/main/java/hudson/tasks/junit/JUnitResultArchiver.java

@@ -28,9 +28,6 @@ import hudson.AbortException;
 import hudson.Extension;
 import hudson.FilePath;
 import hudson.Launcher;
-import hudson.matrix.MatrixAggregatable;
-import hudson.matrix.MatrixAggregator;
-import hudson.matrix.MatrixBuild;
 import hudson.model.AbstractBuild;
 import hudson.model.AbstractProject;
 import hudson.model.Action;
@@ -44,7 +41,6 @@ import hudson.tasks.BuildStepMonitor;
 import hudson.tasks.Publisher;
 import hudson.tasks.Recorder;
 import hudson.tasks.junit.TestResultAction.Data;
-import hudson.tasks.test.TestResultAggregator;
 import hudson.tasks.test.TestResultProjectAction;
 import hudson.util.DescribableList;
 import hudson.util.FormValidation;
@@ -67,7 +63,7 @@ import java.util.List;
  * 
  * @author Kohsuke Kawaguchi
  */
-public class JUnitResultArchiver extends Recorder implements MatrixAggregatable {
+public class JUnitResultArchiver extends Recorder {
 
     /**
      * {@link FileSet} "includes" string, like "foo/bar/*.xml"
@@ -213,11 +209,6 @@ public class JUnitResultArchiver extends Recorder implements MatrixAggregatable
 		return Collections.<Action>singleton(new TestResultProjectAction(project));
 	}
 
-	public MatrixAggregator createAggregator(MatrixBuild build,
-			Launcher launcher, BuildListener listener) {
-		return new TestResultAggregator(build, launcher, listener);
-	}
-
 	/**
 	 * @return the keepLongStdio
 	 */

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

-/*
- * The MIT License
- * 
- * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Yahoo!, Inc.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package hudson.tasks.test;
-
-import hudson.matrix.Combination;
-import hudson.matrix.MatrixBuild;
-import hudson.matrix.MatrixRun;
-import hudson.model.AbstractBuild;
-import hudson.model.Action;
-
-/**
- * {@link Action} that aggregates all the test results from {@link MatrixRun}s.
- *
- * <p>
- * This object is attached to {@link MatrixBuild}.
- *
- * @author Kohsuke Kawaguchi
- */
-public class MatrixTestResult extends AggregatedTestResultAction {
-
-    @Deprecated
-    public MatrixTestResult(MatrixBuild owner) {
-        super(owner);
-    }
-
-    /** @since 1.545 */
-    public MatrixTestResult() {}
-
-    /**
-     * Use the configuration name.
-     */
-    @Override
-    protected String getChildName(AbstractTestResultAction tr) {
-        return tr.owner.getProject().getName();
-    }
-
-    @Override
-    public AbstractBuild<?,?> resolveChild(Child child) {
-        MatrixBuild b = (MatrixBuild)owner;
-        return b.getProject().getItem(Combination.fromString(child.name)).getBuildByNumber(child.build);
-    }
-
-    @Override
-    public String getTestResultPath(TestResult it) {
-        // Prepend Configuration path
-        return it.getOwner().getParent().getShortUrl() + super.getTestResultPath(it);
-    }
-}

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

-/*
- * The MIT License
- * 
- * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Yahoo!, Inc.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package hudson.tasks.test;
-
-import hudson.Launcher;
-import hudson.matrix.MatrixAggregator;
-import hudson.matrix.MatrixBuild;
-import hudson.matrix.MatrixRun;
-import hudson.model.BuildListener;
-
-import java.io.IOException;
-
-/**
- * Aggregates {@link AbstractTestResultAction}s of {@link MatrixRun}s
- * into {@link MatrixBuild}.
- * 
- * @author Kohsuke Kawaguchi
- */
-public class TestResultAggregator extends MatrixAggregator {
-    private MatrixTestResult result;
-
-    public TestResultAggregator(MatrixBuild build, Launcher launcher, BuildListener listener) {
-        super(build, launcher, listener);
-    }
-
-    @Override
-    public boolean startBuild() throws InterruptedException, IOException {
-        result = new MatrixTestResult();
-        build.addAction(result);
-        return true;
-    }
-
-    @Override
-    public boolean endRun(MatrixRun run) throws InterruptedException, IOException {
-        AbstractTestResultAction atr = run.getAction(AbstractTestResultAction.class);
-        if(atr!=null)   result.add(atr);
-        return true;
-    }
-}