QPID-3977: tidy up chart generation.

Specifically:
- chart-summary.html now shows charts in deterministic order (dictated by the chart file names)
- We now only have one set of test definitions rather than maintaining both short and standard sets of files. We will use QPID-4103 to adjust the durations across the board.
- Charts have been given subtitles, and sloping CategoryLabelPositions to Plots that aren't CategoryPlots.  Also added test for statistical bar charts to ChartProductionTest.

Applied patch from Philip Harvey <phil@philharveyonline.com>

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1357682 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 37 insertions, 3 deletions

diff --git a/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartProductionTest.java b/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartProductionTest.java
index d2f988f7c8..2744e17404 100644
--- a/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartProductionTest.java
+++ b/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartProductionTest.java
@@ -109,12 +109,47 @@ public class ChartProductionTest extends TestCase
         ChartBuilder builder = ChartBuilderFactory.createChartBuilder(ChartType.LINE3D, new SampleSeriesBuilder());
         assertChartTitlesAndWriteToFile(builder);
     }
+
     public void testXYLineChart() throws Exception
     {
         ChartBuilder builder = ChartBuilderFactory.createChartBuilder(ChartType.XYLINE, new SampleSeriesBuilder());
         assertChartTitlesAndWriteToFile(builder);
     }
 
+    public void testStatiscticalBarChart() throws Exception
+    {
+        ChartBuilder builder = ChartBuilderFactory.createChartBuilder(
+                ChartType.STATISTICAL_BAR,
+                new SeriesBuilder()
+                {
+                    private SeriesBuilderCallback _dataPointCallback;
+
+                    @Override
+                    public void build(List<SeriesDefinition> seriesDefinitions)
+                    {
+                        for (Iterator<SeriesDefinition> iterator = seriesDefinitions.iterator(); iterator.hasNext();)
+                        {
+                            SeriesDefinition seriesDefinition = iterator.next();
+                            _dataPointCallback.beginSeries(seriesDefinition);
+                            _dataPointCallback.addDataPointToSeries(seriesDefinition, new Object[]{1d, 1d, 0.5d});
+                            _dataPointCallback.addDataPointToSeries(seriesDefinition, new Object[]{2d, 2d, 0.4d});
+                            _dataPointCallback.addDataPointToSeries(seriesDefinition, new Object[]{4d, 4d, 0.3d});
+                            _dataPointCallback.addDataPointToSeries(seriesDefinition, new Object[]{5d, 5d, 0.2d});
+                            _dataPointCallback.addDataPointToSeries(seriesDefinition, new Object[]{6d, 3d, 0.1d});
+                            _dataPointCallback.endSeries(seriesDefinition);
+                        }
+                    }
+
+                    @Override
+                    public void setSeriesBuilderCallback(SeriesBuilderCallback dataPointCallback)
+                    {
+                        _dataPointCallback = dataPointCallback;
+                    }
+                });
+
+        assertChartTitlesAndWriteToFile(builder);
+    }
+
     private void assertChartTitlesAndWriteToFile(ChartBuilder builder)
     {
         JFreeChart chart = builder.buildChart(_chartingDefinition);
@@ -141,8 +176,7 @@ public class ChartProductionTest extends TestCase
         @Override
         public void build(List<SeriesDefinition> seriesDefinitions)
         {
-            for (Iterator<SeriesDefinition> iterator = seriesDefinitions.iterator(); iterator
-                    .hasNext();)
+            for (Iterator<SeriesDefinition> iterator = seriesDefinitions.iterator(); iterator.hasNext();)
             {
                 SeriesDefinition seriesDefinition = iterator.next();
                 _dataPointCallback.beginSeries(seriesDefinition);
diff --git a/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/writer/ChartWriterTest.java b/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/writer/ChartWriterTest.java
index 472edd69a1..0e176d326b 100644
--- a/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/writer/ChartWriterTest.java
+++ b/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/writer/ChartWriterTest.java
@@ -73,8 +73,8 @@ public class ChartWriterTest extends TestCase
 
         writeDummyContentToSummaryFileToEnsureItGetsOverwritten(summaryFile);
 
-        _writer.writeChartToFileSystem(_chart1, "chart1");
         _writer.writeChartToFileSystem(_chart2, "chart2");
+        _writer.writeChartToFileSystem(_chart1, "chart1");
 
         _writer.writeHtmlSummaryToFileSystem();