QPID-4533: Modified perftests to support writing results to a database, and enhanced visualisation-jfc to allow it to read these results.

Previously only CSV output/input was supported by these modules respectively.
Also modified files in perftests/etc/ to allow convenient running of perftests.

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

3 files changed, 96 insertions, 20 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 96ec917932..fe9cb2aefe 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
@@ -31,6 +31,7 @@ import org.apache.qpid.disttest.charting.definition.ChartingDefinition;
 import org.apache.qpid.disttest.charting.definition.SeriesDefinition;
 import org.apache.qpid.disttest.charting.seriesbuilder.SeriesBuilderCallback;
 import org.apache.qpid.disttest.charting.seriesbuilder.SeriesBuilder;
+import org.apache.qpid.disttest.charting.seriesbuilder.SeriesRow;
 import org.apache.qpid.disttest.charting.writer.ChartWriter;
 import org.apache.qpid.test.utils.TestFileUtils;
 import org.jfree.chart.JFreeChart;
@@ -143,11 +144,11 @@ public class ChartProductionTest extends TestCase
                         {
                             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.addDataPointToSeries(seriesDefinition, new SeriesRow(1d, 1d, 0.5d));
+                            _dataPointCallback.addDataPointToSeries(seriesDefinition, new SeriesRow(2d, 2d, 0.4d));
+                            _dataPointCallback.addDataPointToSeries(seriesDefinition, new SeriesRow(4d, 4d, 0.3d));
+                            _dataPointCallback.addDataPointToSeries(seriesDefinition, new SeriesRow(5d, 5d, 0.2d));
+                            _dataPointCallback.addDataPointToSeries(seriesDefinition, new SeriesRow(6d, 3d, 0.1d));
                             _dataPointCallback.endSeries(seriesDefinition);
                         }
                     }
@@ -192,11 +193,11 @@ public class ChartProductionTest extends TestCase
             {
                 SeriesDefinition seriesDefinition = iterator.next();
                 _dataPointCallback.beginSeries(seriesDefinition);
-                _dataPointCallback.addDataPointToSeries(seriesDefinition, new Object[]{1d, 1d});
-                _dataPointCallback.addDataPointToSeries(seriesDefinition, new Object[]{2d, 2d});
-                _dataPointCallback.addDataPointToSeries(seriesDefinition, new Object[]{4d, 4d});
-                _dataPointCallback.addDataPointToSeries(seriesDefinition, new Object[]{5d, 5d});
-                _dataPointCallback.addDataPointToSeries(seriesDefinition, new Object[]{6d, 3d});
+                _dataPointCallback.addDataPointToSeries(seriesDefinition, new SeriesRow(1d, 1d));
+                _dataPointCallback.addDataPointToSeries(seriesDefinition, new SeriesRow(2d, 2d));
+                _dataPointCallback.addDataPointToSeries(seriesDefinition, new SeriesRow(4d, 4d));
+                _dataPointCallback.addDataPointToSeries(seriesDefinition, new SeriesRow(5d, 5d));
+                _dataPointCallback.addDataPointToSeries(seriesDefinition, new SeriesRow(6d, 3d));
                 _dataPointCallback.endSeries(seriesDefinition);
             }
         }
diff --git a/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/seriesbuilder/JdbcCsvSeriesBuilderTest.java b/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/seriesbuilder/JdbcSeriesBuilderTest.java
index dfe35ee199..bd66e8e888 100644
--- a/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/seriesbuilder/JdbcCsvSeriesBuilderTest.java
+++ b/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/seriesbuilder/JdbcSeriesBuilderTest.java
@@ -21,6 +21,7 @@ package org.apache.qpid.disttest.charting.seriesbuilder;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -31,9 +32,9 @@ import java.util.Collections;
 import junit.framework.TestCase;
 
 import org.apache.qpid.disttest.charting.definition.SeriesDefinition;
-import org.apache.qpid.disttest.charting.seriesbuilder.JdbcCsvSeriesBuilder;
+import org.apache.qpid.disttest.charting.seriesbuilder.JdbcSeriesBuilder;
 
-public class JdbcCsvSeriesBuilderTest extends TestCase
+public class JdbcSeriesBuilderTest extends TestCase
 {
     private static final String TEST_SERIES_1_SELECT_STATEMENT = "SELECT A, B FROM test";
     private static final String TEST_SERIES_1_LEGEND = "SERIES_1_LEGEND";
@@ -41,7 +42,6 @@ public class JdbcCsvSeriesBuilderTest extends TestCase
     private static final Integer TEST_SERIES1_STROKE_WIDTH = 3;
 
     private SeriesBuilderCallback _seriesWalkerCallback = mock(SeriesBuilderCallback.class);
-    private JdbcCsvSeriesBuilder _seriesBuilder = new JdbcCsvSeriesBuilder();
 
     private File _testTempDir;
 
@@ -49,21 +49,27 @@ public class JdbcCsvSeriesBuilderTest extends TestCase
     protected void setUp() throws Exception
     {
         super.setUp();
-        _seriesBuilder.setSeriesBuilderCallback(_seriesWalkerCallback);
+        when(_seriesWalkerCallback.getNumberOfDimensions()).thenReturn(2);
         _testTempDir = createTestTemporaryDirectory();
+        createTestCsvIn(_testTempDir);
     }
 
     public void testBuildOneSeries() throws Exception
     {
-        createTestCsvIn(_testTempDir);
         SeriesDefinition seriesDefinition = createTestSeriesDefinition();
 
-        _seriesBuilder.build(Collections.singletonList(seriesDefinition));
+        JdbcSeriesBuilder seriesBuilder = new JdbcSeriesBuilder(
+                "org.relique.jdbc.csv.CsvDriver",
+                "jdbc:relique:csv:" + _testTempDir.getAbsolutePath());
+
+        seriesBuilder.setSeriesBuilderCallback(_seriesWalkerCallback);
+
+        seriesBuilder.build(Collections.singletonList(seriesDefinition));
 
         verify(_seriesWalkerCallback).beginSeries(seriesDefinition);
-        verify(_seriesWalkerCallback).addDataPointToSeries(seriesDefinition, new Object[]{"elephant", "2"});
-        verify(_seriesWalkerCallback).addDataPointToSeries(seriesDefinition, new Object[]{"lion", "3"});
-        verify(_seriesWalkerCallback).addDataPointToSeries(seriesDefinition, new Object[]{"tiger", "4"});
+        verify(_seriesWalkerCallback).addDataPointToSeries(seriesDefinition, new SeriesRow("elephant", "2"));
+        verify(_seriesWalkerCallback).addDataPointToSeries(seriesDefinition, new SeriesRow("lion", "3"));
+        verify(_seriesWalkerCallback).addDataPointToSeries(seriesDefinition, new SeriesRow("tiger", "4"));
         verify(_seriesWalkerCallback).endSeries(seriesDefinition);
     }
 
@@ -81,7 +87,12 @@ public class JdbcCsvSeriesBuilderTest extends TestCase
 
     private SeriesDefinition createTestSeriesDefinition()
     {
-        SeriesDefinition definition = new SeriesDefinition(TEST_SERIES_1_SELECT_STATEMENT, TEST_SERIES_1_LEGEND, _testTempDir.getAbsolutePath(), TEST_SERIES1_COLOUR_NAME, TEST_SERIES1_STROKE_WIDTH);
+        SeriesDefinition definition = new SeriesDefinition(
+                TEST_SERIES_1_SELECT_STATEMENT,
+                TEST_SERIES_1_LEGEND,
+                _testTempDir.getAbsolutePath(),
+                TEST_SERIES1_COLOUR_NAME,
+                TEST_SERIES1_STROKE_WIDTH);
         return definition;
     }
 
diff --git a/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/seriesbuilder/SeriesRowTest.java b/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/seriesbuilder/SeriesRowTest.java
new file mode 100644
index 0000000000..645d443f13
--- /dev/null
+++ b/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/seriesbuilder/SeriesRowTest.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.qpid.disttest.charting.seriesbuilder;
+
+import junit.framework.TestCase;
+
+public class SeriesRowTest extends TestCase
+{
+    private static final Integer[] PAIR = new Integer[] {10, 11};
+
+    public void testValidSeriesRow()
+    {
+        assertEquals(11, SeriesRow.createValidSeriesRow(2, PAIR).dimension(1));
+    }
+
+    public void testValidSeriesRowThrowsExceptionIfArrayTooSmall()
+    {
+        try
+        {
+            SeriesRow.createValidSeriesRow(1, PAIR);
+            fail("Expected exception not thrown");
+        }
+        catch(IllegalArgumentException e)
+        {
+            // pass
+        }
+    }
+
+    public void testDimension()
+    {
+        SeriesRow seriesRow = new SeriesRow(10, 11);
+        assertEquals(10, seriesRow.dimension(0));
+        assertEquals(11, seriesRow.dimension(1));
+    }
+
+    public void testDimensionAsString()
+    {
+        SeriesRow seriesRow = new SeriesRow(10);
+        assertEquals("10", seriesRow.dimensionAsString(0));
+    }
+
+    public void testDimensionAsDouble()
+    {
+        SeriesRow seriesRow = new SeriesRow(10.1);
+        assertEquals(10.1, seriesRow.dimensionAsDouble(0), 0.0);
+    }
+
+}