Make trend charts theme-aware (#529)

Author: uhafner

pom.xml

@@ -15,7 +15,8 @@
     <properties>
         <changelist>999999-SNAPSHOT</changelist>
         <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
-        <jenkins.version>2.361.4</jenkins.version>
+        <jenkins.baseline>2.387</jenkins.baseline>
+        <jenkins.version>${jenkins.baseline}.1</jenkins.version>
         <no-test-jar>false</no-test-jar>
     </properties>
     <licenses>
@@ -198,7 +199,7 @@
         <dependencies>
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-2.361.x</artifactId>
+                <artifactId>bom-${jenkins.baseline}.x</artifactId>
                 <version>2102.v854b_fec19c92</version>
                 <scope>import</scope>
                 <type>pom</type>

src/main/java/hudson/tasks/test/TestResultDurationChart.java

@@ -4,8 +4,9 @@
 import edu.hm.hafner.echarts.LineSeries;
 import edu.hm.hafner.echarts.LinesChartModel;
 import edu.hm.hafner.echarts.LinesDataSet;
-import edu.hm.hafner.echarts.Palette;
 import hudson.tasks.junit.TestDurationResultSummary;
+import io.jenkins.plugins.echarts.JenkinsPalette;
+
 import java.util.List;
 
 import static hudson.tasks.test.TestDurationTrendSeriesBuilder.SECONDS;
@@ -30,7 +31,7 @@ public LinesChartModel create(final Iterable results,
     private LinesChartModel getLinesChartModel(LinesDataSet dataSet) {
         LinesChartModel model = new LinesChartModel(dataSet);
 
-        LineSeries duration = new LineSeries(SECONDS, Palette.GREEN.getNormal(),
+        LineSeries duration = new LineSeries(SECONDS, JenkinsPalette.GREEN.normal(),
                 LineSeries.StackedMode.STACKED, LineSeries.FilledMode.FILLED);
         duration.addAll(dataSet.getSeries(SECONDS));
         model.addSeries(duration);

src/main/java/hudson/tasks/test/TestResultTrendChart.java

@@ -6,10 +6,10 @@
 import edu.hm.hafner.echarts.LineSeries;
 import edu.hm.hafner.echarts.LinesChartModel;
 import edu.hm.hafner.echarts.LinesDataSet;
-import edu.hm.hafner.echarts.Palette;
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 import hudson.tasks.junit.TrendTestResultSummary;
+import io.jenkins.plugins.echarts.JenkinsPalette;
 
 import static hudson.tasks.test.TestResultTrendSeriesBuilder.*;
 
@@ -56,17 +56,17 @@ private LinesChartModel getLinesChartModel(final LinesDataSet dataSet, final Pas
         LinesChartModel model = new LinesChartModel(dataSet);
 
         LineSeries passed = new LineSeries("Passed",
-                passedColor == PassedColor.BLUE ? Palette.BLUE.getNormal() : Palette.GREEN.getNormal(),
+                passedColor == PassedColor.BLUE ? JenkinsPalette.BLUE.normal() : JenkinsPalette.GREEN.normal(),
                 LineSeries.StackedMode.STACKED, LineSeries.FilledMode.FILLED);
         passed.addAll(dataSet.getSeries(PASSED_KEY));
         model.addSeries(passed);
 
-        LineSeries skipped = new LineSeries("Skipped", Palette.GRAY.getNormal(),
+        LineSeries skipped = new LineSeries("Skipped", JenkinsPalette.GREY.normal(),
                 LineSeries.StackedMode.STACKED, LineSeries.FilledMode.FILLED);
         skipped.addAll(dataSet.getSeries(SKIPPED_KEY));
         model.addSeries(skipped);
 
-        LineSeries failed = new LineSeries("Failed", Palette.RED.getNormal(),
+        LineSeries failed = new LineSeries("Failed", JenkinsPalette.RED.normal(),
                 LineSeries.StackedMode.STACKED, LineSeries.FilledMode.FILLED);
         failed.addAll(dataSet.getSeries(FAILED_KEY));
         model.addSeries(failed);

src/test/java/hudson/tasks/test/TestResultTrendChartTest.java

@@ -0,0 +1,37 @@
+package hudson.tasks.test;
+
+import edu.hm.hafner.echarts.LineSeries;
+import hudson.tasks.junit.TrendTestResultSummary;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+class TestResultTrendChartTest {
+    @Test
+    void shouldUseCssColorsInChars() {
+        var chart = new TestResultTrendChart();
+
+        var summary = mock(TrendTestResultSummary.class);
+
+        when(summary.getBuildNumber()).thenReturn(1);
+        when(summary.getDisplayName()).thenReturn("test");
+        when(summary.toMap()).thenReturn(Map.of("passed", 1, "failed", 2, "skipped", 3, "total", 6));
+
+        var greenModel = chart.create(List.of(summary), TestResultTrendChart.PassedColor.GREEN);
+        verifyColors(greenModel.getSeries(), "--green");
+
+        var blueModel = chart.create(List.of(summary), TestResultTrendChart.PassedColor.BLUE);
+        verifyColors(blueModel.getSeries(), "--blue");
+    }
+
+    private void verifyColors(List<LineSeries> series, String passed) {
+        assertEquals(passed, series.get(0).getItemStyle().getColor());
+        assertEquals("--medium-grey", series.get(1).getItemStyle().getColor());
+        assertEquals("--red", series.get(2).getItemStyle().getColor());
+    }
+}