From 8a0032c9ee8abb2e3fbf35650c746a40ca4e5b8c Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 30 Dec 2006 22:46:14 +0000 Subject: [PATCH] test result chart is now clickable. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@1569 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/model/Project.java | 34 ++++++++++----- .../tasks/test/AbstractTestResultAction.java | 41 ++++++++++++++++--- core/src/main/java/hudson/util/ChartUtil.java | 2 +- .../resources/hudson/model/Project/main.jelly | 2 +- 4 files changed, 61 insertions(+), 18 deletions(-) diff --git a/core/src/main/java/hudson/model/Project.java b/core/src/main/java/hudson/model/Project.java index 87740fb00f..70fd447637 100644 --- a/core/src/main/java/hudson/model/Project.java +++ b/core/src/main/java/hudson/model/Project.java @@ -708,21 +708,35 @@ public class Project extends Job { } } + private AbstractTestResultAction getLastTestResultAction() { + Build b = getLastSuccessfulBuild(); + if(b!=null) { + AbstractTestResultAction a = b.getTestResultAction(); + if(a!=null) return a; + } + return null; + } + /** * Display the test result trend. */ public void doTestResultTrend( StaplerRequest req, StaplerResponse rsp ) throws IOException, ServletException { - Build b = getLastSuccessfulBuild(); - if(b!=null) { - AbstractTestResultAction a = b.getTestResultAction(); - if(a!=null) { - a.doGraph(req,rsp); - return; - } - } + AbstractTestResultAction a = getLastTestResultAction(); + if(a!=null) + a.doGraph(req,rsp); + else + rsp.setStatus(HttpServletResponse.SC_NOT_FOUND); + } - // error - rsp.setStatus(HttpServletResponse.SC_NOT_FOUND); + /** + * Generates the clickable map HTML fragment for {@link #doTestResultTrend(StaplerRequest, StaplerResponse)}. + */ + public void doTestResultTrendMap( StaplerRequest req, StaplerResponse rsp ) throws IOException, ServletException { + AbstractTestResultAction a = getLastTestResultAction(); + if(a!=null) + a.doGraphMap(req,rsp); + else + rsp.setStatus(HttpServletResponse.SC_NOT_FOUND); } /** diff --git a/core/src/main/java/hudson/tasks/test/AbstractTestResultAction.java b/core/src/main/java/hudson/tasks/test/AbstractTestResultAction.java index d6ac46ec8a..2b39401363 100644 --- a/core/src/main/java/hudson/tasks/test/AbstractTestResultAction.java +++ b/core/src/main/java/hudson/tasks/test/AbstractTestResultAction.java @@ -1,6 +1,7 @@ package hudson.tasks.test; import hudson.Functions; +import hudson.Util; import hudson.model.Action; import hudson.model.Build; import hudson.model.Project; @@ -10,6 +11,7 @@ import hudson.util.ChartUtil.NumberOnlyBuildLabel; import hudson.util.ColorPalette; import hudson.util.DataSetBuilder; import hudson.util.ShiftedCategoryAxis; +import hudson.util.StackedAreaRenderer2; import org.jfree.chart.ChartFactory; import org.jfree.chart.JFreeChart; import org.jfree.chart.axis.CategoryAxis; @@ -17,8 +19,7 @@ import org.jfree.chart.axis.CategoryLabelPositions; import org.jfree.chart.axis.NumberAxis; import org.jfree.chart.plot.CategoryPlot; import org.jfree.chart.plot.PlotOrientation; -import org.jfree.chart.renderer.AreaRendererEndType; -import org.jfree.chart.renderer.category.AreaRenderer; +import org.jfree.chart.renderer.category.StackedAreaRenderer; import org.jfree.data.category.CategoryDataset; import org.jfree.ui.RectangleInsets; import org.kohsuke.stapler.StaplerRequest; @@ -109,6 +110,19 @@ public abstract class AbstractTestResultAction dsb = new DataSetBuilder(); @@ -118,8 +132,7 @@ public abstract class AbstractTestResultAction { - private final Build build; + public final Build build; public NumberOnlyBuildLabel(Build build) { this.build = build; diff --git a/core/src/main/resources/hudson/model/Project/main.jelly b/core/src/main/resources/hudson/model/Project/main.jelly index eb83532a1a..269f204689 100644 --- a/core/src/main/resources/hudson/model/Project/main.jelly +++ b/core/src/main/resources/hudson/model/Project/main.jelly @@ -26,7 +26,7 @@ Test Result Trend
- +