Add UI tests for trend chart in project action with custom ID

Author: uhafner

ui-tests/src/main/java/io/jenkins/plugins/analysis/warnings/IssuesRecorder.java

@@ -1,11 +1,11 @@
 package io.jenkins.plugins.analysis.warnings;
 
+import org.openqa.selenium.WebElement;
+
 import java.util.List;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
-import org.openqa.selenium.WebElement;
-
 import org.jenkinsci.test.acceptance.po.AbstractStep;
 import org.jenkinsci.test.acceptance.po.Control;
 import org.jenkinsci.test.acceptance.po.Describable;
@@ -676,6 +676,7 @@ public static class StaticAnalysisTool extends PageAreaImpl {
         private final Control highThreshold = control("tool/highThreshold");
         private final Control id = control("tool/id");
         private final Control name = control("tool/name");
+        private final Control icon = control("tool/icon");
         private final Control analysisModelId = control("tool/analysisModelId");
         private final Control skipSymbolicLinks = control("tool/skipSymbolicLinks");
 
@@ -724,6 +725,20 @@ public StaticAnalysisTool setName(final String name) {
             return this;
         }
 
+        /**
+         * Sets the custom name of the tool.
+         *
+         * @param icon
+         *         the icon
+         *
+         * @return this
+         */
+        public StaticAnalysisTool setIcon(final String icon) {
+            this.icon.set(icon);
+
+            return this;
+        }
+
         /**
          * Sets the pattern of the files to parse.
          *

ui-tests/src/test/java/io/jenkins/plugins/analysis/warnings/TrendChartsUiTest.java

@@ -1,6 +1,7 @@
 package io.jenkins.plugins.analysis.warnings;
 
 import org.junit.Test;
+import org.openqa.selenium.By;
 
 import org.jenkinsci.test.acceptance.junit.WithPlugins;
 import org.jenkinsci.test.acceptance.po.Build;
@@ -45,19 +46,59 @@ public void shouldDisplayDifferentTrendChartsOnClick() {
         assertThat(analysisResultPage.trendChartIsDisplayed(NEW_VERSUS_FIXED_TREND_CHART)).isTrue();
     }
 
-    /** Verifies all Charts after a series of 2 builds. */
+    /** Verifies the charts after a series of 2 builds. */
     @Test
     public void shouldShowTrendChartsWithCorrectResults() {
-        Build build = buildFreeStyleJobTwiceWithJavacIssues();
-        AnalysisResult analysisResultPage = new AnalysisResult(build, "java");
+        FreeStyleJob job = createFreeStyleJob(SOURCE_VIEW_FOLDER + "build_01");
+        job.addPublisher(IssuesRecorder.class,
+                recorder -> recorder.setToolWithPattern(JAVA_COMPILER, "**/*.txt")
+        );
+        job.save();
+
+        verifyTrendCharts(job, JAVA_ID, "java.svg");
+    }
+
+    /** Verifies the charts with a custom ID after a series of 2 builds. */
+    @Test
+    public void shouldShowTrendChartsWithCustomId() {
+        FreeStyleJob job = createFreeStyleJob(SOURCE_VIEW_FOLDER + "build_01");
+        var id = "custom-id";
+        var icon = "plugin/warnings-ng/icons/checkstyle.svg";
+        job.addPublisher(IssuesRecorder.class, recorder ->
+                recorder.setTool(JAVA_COMPILER, "**/*.txt")
+                        .setName("custom-name")
+                        .setIcon(icon)
+                        .setId(id)
+        );
+        job.save();
+
+        verifyTrendCharts(job, id, icon);
+    }
+
+    private void verifyTrendCharts(final FreeStyleJob job, final String id, final String icon) {
+        buildSuccessfully(job);
+
+        assertThat(job.all(By.className("echarts-trend"))).isEmpty();
+
+        reconfigureJobWithResource(job);
+        Build build = buildSuccessfully(job);
+
+        job.open();
+        assertThat(job.all(By.className("echarts-trend"))).hasSize(1)
+                .first().satisfies(c -> assertThat(c.getDomAttribute("tool")).isEqualTo(id));
+        assertThat(job.all(By.className("task-icon-link")))
+                .anyMatch(c ->
+                        !c.findElements(By.xpath(".//img[contains(@src, '" + icon + "')]")).isEmpty());
+
+        AnalysisResult analysisResultPage = new AnalysisResult(build, id);
         analysisResultPage.open();
 
         String severitiesTrendChart = analysisResultPage.getTrendChartById(SEVERITIES_TREND_CHART);
         String toolsTrendChart = analysisResultPage.getTrendChartById(TOOLS_TREND_CHART);
         String newVersusFixedTrendChart = analysisResultPage.getTrendChartById(NEW_VERSUS_FIXED_TREND_CHART);
 
         verifySeveritiesChart(severitiesTrendChart);
-        verifyToolsChart(toolsTrendChart);
+        verifyToolsChart(toolsTrendChart, id);
         verifyNewVersusFixedChart(newVersusFixedTrendChart);
     }
 
@@ -93,20 +134,14 @@ private void verifySeveritiesChart(final String severitiesTrendChart) {
                 );
     }
 
-    /**
-     * Verifies Tools Chart after a series of 2 builds.
-     *
-     * @param toolsTrendChart
-     *         JSONString with values from Severities Tools TrendChart
-     */
-    private void verifyToolsChart(final String toolsTrendChart) {
+    private void verifyToolsChart(final String toolsTrendChart, final String id) {
         assertThatJson(toolsTrendChart)
                 .inPath("$.xAxis[*].data[*]")
                 .isArray()
                 .hasSize(2);
 
         assertThatJson(toolsTrendChart)
-               .node("series[0].name").isEqualTo("java");
+               .node("series[0].name").isEqualTo(id);
 
         assertThatJson(toolsTrendChart)
                 .node("series[0].data")
@@ -145,13 +180,4 @@ private void verifyNewVersusFixedChart(final String newVersusFixedTrendChart) {
     private void reconfigureJobWithResource(final FreeStyleJob job) {
         job.configure(() -> job.copyResource("/" + SOURCE_VIEW_FOLDER + "build_02"));
     }
-
-    private Build buildFreeStyleJobTwiceWithJavacIssues() {
-        FreeStyleJob job = createFreeStyleJob(SOURCE_VIEW_FOLDER + "build_01");
-        job.addPublisher(IssuesRecorder.class, recorder -> recorder.setToolWithPattern(JAVA_COMPILER, "**/*.txt"));
-        job.save();
-        buildSuccessfully(job);
-        reconfigureJobWithResource(job);
-        return buildSuccessfully(job);
-    }
 }