renamed getDiffServer to getListServer

jenkinsci · Jun 3, 2024 · f8e07a9 · f8e07a9
1 parent 1149cae
commit f8e07a9
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 8 deletions.
diff --git a/...-jtreg-lib/src/main/java/io/jenkins/plugins/report/jtreg/model/SuiteTestsWithResults.java b/...-jtreg-lib/src/main/java/io/jenkins/plugins/report/jtreg/model/SuiteTestsWithResults.java
@@ -84,7 +84,7 @@ public void setUrlsProvider(UrlsProvider urlsProvider) {
     }
 
     private String getDiffUrlStub() {
-        return urlsProvider.getDiffServer() + "?generated-part=+-view%3Dall-tests+++-view%3Dinfo-summary+++-view%3Dinfo-summary"
+        return urlsProvider.getListServer() + "?generated-part=+-view%3Dall-tests+++-view%3Dinfo-summary+++-view%3Dinfo-summary"
                 + "-suites+++-output"
                 + "%3Dhtml++&custom-part=";//+job+number //eg as above;
     }

diff --git a/report-jtreg-lib/src/main/java/io/jenkins/plugins/report/jtreg/model/UrlsProvider.java b/report-jtreg-lib/src/main/java/io/jenkins/plugins/report/jtreg/model/UrlsProvider.java
@@ -4,7 +4,9 @@
 
 public interface UrlsProvider extends Serializable {
 
-    String getDiffServer();
+    String getListServer();
     String getCompServer();
 
+    String getDiffServer();
+
 }
diff --git a/report-jtreg/src/main/java/io/jenkins/plugins/report/jtreg/BuildReportExtendedPlugin.java b/report-jtreg/src/main/java/io/jenkins/plugins/report/jtreg/BuildReportExtendedPlugin.java
@@ -159,7 +159,7 @@ private File getFile(ConfigItem item, String jenkinsHome) {
     }
 
     private String getDiffUrlStub(){
-        return urlsProvider.getDiffServer() + "?generated-part=+-view%3Ddiff-list+++-view%3Ddiff-summary+++-view%3Ddiff-summary-suites+++-view%3Dinfo-problems+++-view%3Dinfo-summary+++-output%3Dhtml++-fill++&custom-part=";//+job+numbers //eg as above;
+        return urlsProvider.getListServer() + "?generated-part=+-view%3Ddiff-list+++-view%3Ddiff-summary+++-view%3Ddiff-summary-suites+++-view%3Dinfo-problems+++-view%3Dinfo-summary+++-output%3Dhtml++-fill++&custom-part=";//+job+numbers //eg as above;
     }
 
     public String getLinkDiff() {
@@ -175,7 +175,7 @@ private int lowestBuildForFil() {
     }
 
     private String getTracesUrlStub() {
-        return urlsProvider.getDiffServer() + "?generated-part=+-view%3Dinfo+++-output%3Dhtml++&custom-part=";//+job+numbers //eg as above;
+        return urlsProvider.getListServer() + "?generated-part=+-view%3Dinfo+++-output%3Dhtml++&custom-part=";//+job+numbers //eg as above;
     }
 
     public String getCompUrlStub() {
@@ -191,7 +191,7 @@ public boolean isDiffTool() {
     }
 
     private String createDiffUrl() {
-        return urlsProvider.getDiffServer() + "?generated-part=+-view%3Dall-tests+++-output%3Dhtml++-fill++";
+        return urlsProvider.getListServer() + "?generated-part=+-view%3Dall-tests+++-output%3Dhtml++-fill++";
     }
 
     public String getTrackingUrl(Test test) {

diff --git a/report-jtreg/src/main/java/io/jenkins/plugins/report/jtreg/model/UrlsProviderPlugin.java b/report-jtreg/src/main/java/io/jenkins/plugins/report/jtreg/model/UrlsProviderPlugin.java
@@ -28,11 +28,16 @@
 public final class UrlsProviderPlugin implements UrlsProvider {
 
     @Override
-    public String getDiffServer() {
+    public String getListServer() {
         return JenkinsReportJckGlobalConfig.getGlobalDiffUrl()  + "/list.html";
     }
     @Override
     public  String getCompServer() {
         return JenkinsReportJckGlobalConfig.getGlobalDiffUrl()  + "/comp.html";
     }
- }
+
+    @Override
+    public String getDiffServer() {
+        return JenkinsReportJckGlobalConfig.getGlobalDiffUrl()  + "/diff.html";
+    }
+}
diff --git a/...rt-jtreg/src/test/java/io/jenkins/plugins/report/jtreg/BuildReportExtendedPluginTest.java b/...rt-jtreg/src/test/java/io/jenkins/plugins/report/jtreg/BuildReportExtendedPluginTest.java
@@ -19,14 +19,19 @@ public void getMatchedComparatorLinksGroupsTest() {
                 "tck-jp17-ojdk17~rpms-el8.aarch64-fastdebug.sdk-el8.aarch64.beaker-x11.defaultgc.fips.lnxagent.jfroff",
                 new UrlsProvider() {
                     @Override
-                    public String getDiffServer() {
+                    public String getListServer() {
                         return "http://mylocal/list.html";
                     }
 
                     @Override
                     public String getCompServer() {
                         return "http://mylocal/comp.html";
                     }
+
+                    @Override
+                    public String getDiffServer() {
+                        return "http://mylocal/diff.html";
+                    }
                 });
 
         // arguments without any wildcard