External storage - Part 1

pom.xml

@@ -113,6 +113,32 @@
             <artifactId>workflow-durable-task-step</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jenkins-ci.plugins</groupId>
+            <artifactId>database</artifactId>
+            <version>1.5</version>
+            <scope>test</scope>
+            <exclusions> <!-- TODO pending fixes upstream -->
+                <exclusion>
+                    <groupId>antlr</groupId>
+                    <artifactId>antlr</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.validation</groupId>
+                    <artifactId>validation-api</artifactId>
+                </exclusion>
+                <exclusion> <!-- clashes with org.jenkins-ci.dom4j:dom4j -->
+                    <groupId>dom4j</groupId>
+                    <artifactId>dom4j</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.jenkins-ci.plugins</groupId>
+            <artifactId>database-h2</artifactId>
+            <version>1.1</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <dependencyManagement>
         <dependencies>

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

@@ -24,6 +24,8 @@
 package hudson.tasks.junit;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import hudson.tasks.junit.storage.TestResultImpl;
+import hudson.tasks.junit.storage.TestResultStorage;
 import hudson.util.TextFile;
 import org.apache.commons.collections.iterators.ReverseListIterator;
 import org.apache.commons.io.FileUtils;
@@ -34,6 +36,7 @@
 import hudson.tasks.test.TestResult;
 
 import org.dom4j.Element;
+import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.export.Exported;
 
 import javax.annotation.CheckForNull;
@@ -101,6 +104,46 @@ private static float parseTime(Element testCase) {
         return new TimeToFloat(time).parse();
     }
 
+
+    /**
+     * Used to create a fake failure, when Hudson fails to load data from XML files.
+     * Public since 1.526.
+     *
+     * @param parent Parent result.
+     * @param testName Test name.
+     * @param errorStackTrace Error stack trace.
+     */
+    public CaseResult(SuiteResult parent, String testName, String errorStackTrace) {
+        this(parent, testName, errorStackTrace, "");
+    }
+
+    public CaseResult(SuiteResult parent, String testName, String errorStackTrace, String errorDetails) {
+        this.className = parent == null ? "unnamed" : parent.getName();
+        this.testName = testName;
+        this.errorStackTrace = errorStackTrace;
+        this.errorDetails = errorDetails;
+        this.parent = parent;
+        this.stdout = null;
+        this.stderr = null;
+        this.duration = 0.0f;
+        this.skipped = false;
+        this.skippedMessage = null;
+    }
+
+    public CaseResult(SuiteResult parent, String className, String testName, String errorDetails, String skippedMessage) {
+        this.className = className;
+        this.testName = testName;
+        this.errorStackTrace = null;
+        this.errorDetails = errorDetails;
+        this.parent = parent;
+        this.stdout = null;
+        this.stderr = null;
+        this.duration = 0.0f;
+
+        this.skipped = skippedMessage != null;
+        this.skippedMessage = skippedMessage;
+    }
+
     CaseResult(SuiteResult parent, Element testCase, String testClassName, boolean keepLongStdio) {
         // schema for JUnit report XML format is not available in Ant,
         // so I don't know for sure what means what.
@@ -197,32 +240,6 @@ private static int halfMaxSize(Collection<CaseResult> results) {
         return HALF_MAX_SIZE;
     }
 
-
-    /**
-     * Used to create a fake failure, when Hudson fails to load data from XML files.
-     * Public since 1.526.
-     *
-     * @param parent Parent result.
-     * @param testName Test name.
-     * @param errorStackTrace Error stack trace.
-     */
-    public CaseResult(SuiteResult parent, String testName, String errorStackTrace) {
-        this(parent, testName, errorStackTrace, "");
-    }
-
-    public CaseResult(SuiteResult parent, String testName, String errorStackTrace, String errorDetails) {
-        this.className = parent == null ? "unnamed" : parent.getName();
-        this.testName = testName;
-        this.errorStackTrace = errorStackTrace;
-        this.errorDetails = errorDetails;
-        this.parent = parent;
-        this.stdout = null;
-        this.stderr = null;
-        this.duration = 0.0f;
-        this.skipped = false;
-        this.skippedMessage = null;
-    }
-
     public ClassResult getParent() {
         return classResult;
     }
@@ -427,6 +444,13 @@ else if (getRun() != null) {
     }
 
     public Run<?,?> getFailedSinceRun() {
+        TestResultStorage storage = TestResultStorage.find();
+        if (storage != null) {
+            Run<?, ?> run = Stapler.getCurrentRequest().findAncestorObject(Run.class);
+            TestResultImpl pluggableStorage = storage.load(run.getParent().getFullName(), run.getNumber());
+            return pluggableStorage.getFailedSinceRun(this);
+        }
+
         return getRun().getParent().getBuildByNumber(getFailedSince());
     }
 
@@ -650,6 +674,33 @@ public void freeze(SuiteResult parent) {
         recomputeFailedSinceIfNeeded();
     }
 
+    @Override
+    public String toString() {
+        StringBuilder b = new StringBuilder("CaseResult{className=").append(className).append(", testName=").append(testName);
+        if (errorDetails != null) {
+            b.append(", errorDetails=").append(errorDetails);
+        }
+        if (errorStackTrace != null) {
+            b.append(", errorStackTrace=").append(errorStackTrace);
+        }
+        if (skipped) {
+            b.append(", skipped=true");
+        }
+        if (skippedMessage != null) {
+            b.append(", skippedMessage=").append(skippedMessage);
+        }
+        if (duration != 0.0f) {
+            b.append(", duration=").append(duration);
+        }
+        if (stdout != null) {
+            b.append(", stdout=").append(stdout);
+        }
+        if (stderr != null) {
+            b.append(", stderr=").append(stderr);
+        }
+        return b.append('}').toString();
+    }
+
     public int compareTo(CaseResult that) {
         if (this == that) {
             return 0;
@@ -693,7 +744,7 @@ public Status getStatus() {
         }
     }
 
-    /*package*/ void setClass(ClassResult classResult) {
+    public void setClass(ClassResult classResult) {
         this.classResult = classResult;
     }
 

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

@@ -24,9 +24,12 @@
 package hudson.tasks.junit;
 
 import hudson.model.Run;
+import hudson.tasks.junit.storage.TestResultImpl;
+import hudson.tasks.junit.storage.TestResultStorage;
 import hudson.tasks.test.TabulatedResult;
 import hudson.tasks.test.TestResult;
 import hudson.tasks.test.TestObject;
+import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
 import org.kohsuke.stapler.export.Exported;
@@ -52,7 +55,7 @@ public final class ClassResult extends TabulatedResult implements Comparable<Cla
 
     private final PackageResult parent;
 
-    ClassResult(PackageResult parent, String className) {
+    public ClassResult(PackageResult parent, String className) {
         this.parent = parent;
         this.className = className;
     }
@@ -128,7 +131,15 @@ public CaseResult getCaseResult(String name) {
 
     @Override
     public Object getDynamic(String name, StaplerRequest req, StaplerResponse rsp) {
-    	CaseResult c = getCaseResult(name);
+        TestResultStorage storage = TestResultStorage.find();
+        CaseResult c;
+        if (storage != null) {
+            Run<?, ?> run = Stapler.getCurrentRequest().findAncestorObject(Run.class);
+            TestResultImpl pluggableStorage = storage.load(run.getParent().getFullName(), run.getNumber());
+            c = pluggableStorage.getCaseResult(name);
+        } else {
+            c = getCaseResult(name);
+        }
     	if (c != null) {
             return c;
     	} else {

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

@@ -77,6 +77,7 @@ public boolean historyAvailable() {
 
     public List<TestResult> getList(int start, int end) {
     	List<TestResult> list = new ArrayList<>();
+        // TODO this must not stand
     	end = Math.min(end, testObject.getRun().getParent().getBuilds().size());
     	for (Run<?,?> b: testObject.getRun().getParent().getBuilds().subList(start, end)) {
     		if (b.isBuilding()) continue;
@@ -245,6 +246,7 @@ public String generateToolTip(CategoryDataset dataset, int row,
     }
 
     class ChartLabel implements Comparable<ChartLabel> {
+        // TODO allow use of a simplified label that does not force Run loading
     	TestResult o;
         String url;
         public ChartLabel(TestResult o) {

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

@@ -30,6 +30,7 @@
 import hudson.model.AbstractBuild;
 import hudson.model.Run;
 import hudson.remoting.VirtualChannel;
+import hudson.tasks.junit.storage.TestResultStorage;
 
 import java.io.IOException;
 import java.io.File;
@@ -102,36 +103,35 @@ public TestResult parseResult(String testResultLocations, Run<?,?> build, FilePa
     public TestResult parseResult(String testResultLocations, Run<?,?> build, PipelineTestDetails pipelineTestDetails,
                                   FilePath workspace, Launcher launcher, TaskListener listener)
             throws InterruptedException, IOException {
-        final long buildTime = build.getTimestamp().getTimeInMillis();
-        final long timeOnMaster = System.currentTimeMillis();
-
-        // [BUG 3123310] TODO - Test Result Refactor: review and fix TestDataPublisher/TestAction subsystem]
-        // also get code that deals with testDataPublishers from JUnitResultArchiver.perform
+        return workspace.act(new DirectParseResultCallable(testResultLocations, build, keepLongStdio, allowEmptyResults, pipelineTestDetails));
+    }
 
-        return workspace.act(new ParseResultCallable(testResultLocations, buildTime, timeOnMaster, keepLongStdio,
-                allowEmptyResults, pipelineTestDetails));
+    public TestResultSummary summarizeResult(String testResultLocations, Run<?,?> build, PipelineTestDetails pipelineTestDetails,
+                                  FilePath workspace, Launcher launcher, TaskListener listener, TestResultStorage storage)
+            throws InterruptedException, IOException {
+        return workspace.act(new StorageParseResultCallable(testResultLocations, build, keepLongStdio, allowEmptyResults, pipelineTestDetails, storage.createRemotePublisher(build), listener));
     }
 
-    private static final class ParseResultCallable extends MasterToSlaveFileCallable<TestResult> {
+    private static abstract class ParseResultCallable<T> extends MasterToSlaveFileCallable<T> {
         private final long buildTime;
         private final String testResults;
         private final long nowMaster;
         private final boolean keepLongStdio;
         private final boolean allowEmptyResults;
         private final PipelineTestDetails pipelineTestDetails;
 
-        private ParseResultCallable(String testResults, long buildTime, long nowMaster,
+        private ParseResultCallable(String testResults, Run<?,?> build,
                                     boolean keepLongStdio, boolean allowEmptyResults,
                                     PipelineTestDetails pipelineTestDetails) {
-            this.buildTime = buildTime;
+            this.buildTime = build.getTimestamp().getTimeInMillis();
             this.testResults = testResults;
-            this.nowMaster = nowMaster;
+            this.nowMaster = System.currentTimeMillis();
             this.keepLongStdio = keepLongStdio;
             this.allowEmptyResults = allowEmptyResults;
             this.pipelineTestDetails = pipelineTestDetails;
         }
 
-        public TestResult invoke(File ws, VirtualChannel channel) throws IOException {
+        public T invoke(File ws, VirtualChannel channel) throws IOException {
             final long nowSlave = System.currentTimeMillis();
 
             FileSet fs = Util.createFileSet(ws, testResults);
@@ -151,8 +151,43 @@ public TestResult invoke(File ws, VirtualChannel channel) throws IOException {
                     throw new AbortException(Messages.JUnitResultArchiver_NoTestReportFound());
                 }
             }
+            return handle(result);
+        }
+
+        protected abstract T handle(TestResult result) throws IOException;
+
+    }
+
+    private static final class DirectParseResultCallable extends ParseResultCallable<TestResult> {
+
+        DirectParseResultCallable(String testResults, Run<?,?> build, boolean keepLongStdio, boolean allowEmptyResults, PipelineTestDetails pipelineTestDetails) {
+            super(testResults, build, keepLongStdio, allowEmptyResults, pipelineTestDetails);
+        }
+
+        @Override
+        protected TestResult handle(TestResult result) throws IOException {
             return result;
         }
+
+    }
+
+    private static final class StorageParseResultCallable extends ParseResultCallable<TestResultSummary> {
+
+        private final TestResultStorage.RemotePublisher publisher;
+        private final TaskListener listener;
+
+        StorageParseResultCallable(String testResults, Run<?,?> build, boolean keepLongStdio, boolean allowEmptyResults, PipelineTestDetails pipelineTestDetails, TestResultStorage.RemotePublisher publisher, TaskListener listener) {
+            super(testResults, build, keepLongStdio, allowEmptyResults, pipelineTestDetails);
+            this.publisher = publisher;
+            this.listener = listener;
+        }
+
+        @Override
+        protected TestResultSummary handle(TestResult result) throws IOException {
+            publisher.publish(result, listener);
+            return new TestResultSummary(result);
+        }
+
     }
 
 }