Restore compatiblity with junit-sql-storage (#630)

jenkinsci · Jul 29, 2024 · 310a78b · 310a78b
1 parent 72cf99b
commit 310a78b
Show file tree

Hide file tree

Showing 6 changed files with 150 additions and 156 deletions.
diff --git a/src/main/java/hudson/tasks/junit/History.java b/src/main/java/hudson/tasks/junit/History.java
diff --git a/src/main/java/hudson/tasks/junit/HistoryTestResultSummary.java b/src/main/java/hudson/tasks/junit/HistoryTestResultSummary.java
@@ -2,6 +2,8 @@
 
 import hudson.Util;
 import hudson.model.Run;
+import hudson.tasks.test.AbstractTestResultAction;
+import hudson.tasks.test.TestResult;
 
 public class HistoryTestResultSummary {
 
@@ -11,21 +13,19 @@ public class HistoryTestResultSummary {
     private final int skipCount;
     private final int passCount;
     private final String description;
-    private final hudson.tasks.test.TestResult resultInRun;
 
-    public HistoryTestResultSummary(Run<?, ?> run, hudson.tasks.test.TestResult resultInRun,
+    public HistoryTestResultSummary(Run<?, ?> run,
     float duration, int failCount, int skipCount, int passCount) {
-        this(run, resultInRun, duration, failCount, skipCount, passCount, null);
+        this(run, duration, failCount, skipCount, passCount, null);
     }
 
-    public HistoryTestResultSummary(Run<?, ?> run, hudson.tasks.test.TestResult resultInRun, float duration, int failCount, int skipCount, int passCount, String description) {
+    public HistoryTestResultSummary(Run<?, ?> run, float duration, int failCount, int skipCount, int passCount, String description) {
         this.run = run;
         this.duration = duration;
         this.failCount = failCount;
         this.skipCount = skipCount;
         this.passCount = passCount;
         this.description = description;
-        this.resultInRun = resultInRun;
     }
 
     public String getDescription() {
@@ -36,6 +36,10 @@ public String getDescription() {
         return run;
     }
 
+    public float getDuration() {
+        return duration;
+    }
+
     public String getDurationString() {
         return Util.getTimeSpanString((long) (duration * 1000));
     }
@@ -65,10 +69,9 @@ public String getFullDisplayName() {
     }
 
     public String getUrl() {
-        return resultInRun.getUrl();
-    }
+        AbstractTestResultAction<?> action = run.getAction(AbstractTestResultAction.class);
 
-    public hudson.tasks.test.TestResult getResultInRun() {
-        return resultInRun;
+        // TODO pass id to end of url
+        return getRun().getUrl() + action.getUrlName() + "/";
     }
 }
diff --git a/src/main/java/hudson/tasks/junit/TestResult.java b/src/main/java/hudson/tasks/junit/TestResult.java
@@ -693,10 +693,11 @@ public int getFailCount() {
         if (impl != null) {
             return impl.getFailCount();
         }
-        if(failedTests==null)
+        if(failedTests==null) {
             return 0;
-        else
-        return failedTests.size();
+        } else {
+            return failedTests.size();
+        }
     }
 
     @Exported(visibility=999)

diff --git a/src/main/resources/hudson/tasks/junit/History/history.js b/src/main/resources/hudson/tasks/junit/History/history.js
@@ -31,7 +31,12 @@ function onBuildIntervalChange(selectObj) {
         interval = dataEl.getAttribute("data-interval")
         let trendChartJsonStr = dataEl.innerHTML
         trendChartJson = JSON.parse(trendChartJsonStr)
-        appRootUrl = dataEl.getAttribute("data-appRootUrl")
+        const rootUrl = document.head.dataset.rooturl
+        if (!rootUrl.endsWith("/")) {
+            appRootUrl = `${rootUrl}/`
+        } else {
+            appRootUrl = rootUrl
+        }
         testObjectUrl = dataEl.getAttribute("data-testObjectUrl")
 
         trendChartJsonStr = null
@@ -390,7 +395,7 @@ function onBuildIntervalChange(selectObj) {
             renderTrendChart(trendChartId, trendChartJson, trendConfigurationDialogId,
                 function (buildDisplayName) {
                     if (trendChartJson.buildMap[buildDisplayName]) {
-                        window.open(rootUrl + trendChartJson.buildMap[buildDisplayName].url);
+                        window.open(appRootUrl + trendChartJson.buildMap[buildDisplayName].url);
                     }
                 });
             renderDistributionChart('test-distribution-chart', trendChartJson, trendConfigurationDialogId, null);

diff --git a/src/main/resources/hudson/tasks/junit/History/index.jelly b/src/main/resources/hudson/tasks/junit/History/index.jelly
@@ -44,7 +44,6 @@ THE SOFTWARE.
         data-end="${end}"
         data-count="${count}"
         data-interval="${interval}"
-        data-appRootUrl="${app.rootUrl}"
         data-testObjectUrl="${it.testObject.url}"
         type="application/json"
       >${historySummary.trendChartJson}</script>

diff --git a/src/test/java/io/jenkins/plugins/junit/storage/TestResultStorageJunitTest.java b/src/test/java/io/jenkins/plugins/junit/storage/TestResultStorageJunitTest.java
@@ -476,7 +476,7 @@ public List<HistoryTestResultSummary> getHistorySummary(int offset) {
                                     Job<?, ?> theJob = Jenkins.get().getItemByFullName(getJobName(), Job.class);
                                     if (theJob != null) {
                                         Run<?, ?> run = theJob.getBuildByNumber(buildNumber);
-                                        historyTestResultSummaries.add(new HistoryTestResultSummary(run, null, duration, failed, skipped, passed));
+                                        historyTestResultSummaries.add(new HistoryTestResultSummary(run, duration, failed, skipped, passed));
                                     }
                                 }
                                 return historyTestResultSummaries;