QPID-4533: Java Performance Tests - addressed bug in JdbcSeriesBuilder that caused it to ignore the CSV series directory.

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

2 files changed, 85 insertions, 3 deletions

diff --git a/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/seriesbuilder/JdbcSeriesBuilderTest.java b/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/seriesbuilder/JdbcSeriesBuilderTest.java
index bd66e8e888..20d5082448 100644
--- a/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/seriesbuilder/JdbcSeriesBuilderTest.java
+++ b/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/seriesbuilder/JdbcSeriesBuilderTest.java
@@ -58,9 +58,7 @@ public class JdbcSeriesBuilderTest extends TestCase
     {
         SeriesDefinition seriesDefinition = createTestSeriesDefinition();
 
-        JdbcSeriesBuilder seriesBuilder = new JdbcSeriesBuilder(
-                "org.relique.jdbc.csv.CsvDriver",
-                "jdbc:relique:csv:" + _testTempDir.getAbsolutePath());
+        JdbcSeriesBuilder seriesBuilder = new JdbcSeriesBuilder("org.relique.jdbc.csv.CsvDriver", null);
 
         seriesBuilder.setSeriesBuilderCallback(_seriesWalkerCallback);
 
diff --git a/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/seriesbuilder/JdbcUrlGeneratorTest.java b/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/seriesbuilder/JdbcUrlGeneratorTest.java
new file mode 100644
index 0000000000..353fc718d3
--- /dev/null
+++ b/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/seriesbuilder/JdbcUrlGeneratorTest.java
@@ -0,0 +1,84 @@
+/*
+ * 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 org.apache.qpid.disttest.charting.definition.SeriesDefinition;
+import static org.mockito.Mockito.*;
+
+import junit.framework.TestCase;
+
+public class JdbcUrlGeneratorTest extends TestCase
+{
+    public void testGetJdbcUrlWithoutProvidingAUrlReturnsCsvUrlWithCorrectDirectory()
+    {
+        JdbcUrlGenerator jdbcUrlGenerator = new JdbcUrlGenerator(null);
+        SeriesDefinition seriesDefinition = mock(SeriesDefinition.class);
+        when(seriesDefinition.getSeriesDirectory()).thenReturn("mydir");
+
+        String jdbcUrl = jdbcUrlGenerator.getJdbcUrl(seriesDefinition);
+
+        assertEquals("jdbc:relique:csv:mydir", jdbcUrl);
+    }
+
+    public void testGetJdbcUrlReturnsProvidedUrl()
+    {
+        String urlTemplate = "urlTemplate";
+        JdbcUrlGenerator jdbcUrlGenerator = new JdbcUrlGenerator(urlTemplate);
+        SeriesDefinition seriesDefinition = mock(SeriesDefinition.class);
+
+        String jdbcUrl = jdbcUrlGenerator.getJdbcUrl(seriesDefinition);
+
+        assertEquals(urlTemplate, jdbcUrl);
+    }
+
+    public void testGetJdbcUrlThrowsExceptionIfUrlProvidedAndSeriesDirectorySpecified()
+    {
+        String urlTemplate = "urlTemplate";
+        JdbcUrlGenerator jdbcUrlGenerator = new JdbcUrlGenerator(urlTemplate);
+        SeriesDefinition seriesDefinition = mock(SeriesDefinition.class);
+        when(seriesDefinition.getSeriesDirectory()).thenReturn("mydir");
+
+        try
+        {
+            jdbcUrlGenerator.getJdbcUrl(seriesDefinition);
+            fail("Expected exception not thrown");
+        }
+        catch (IllegalArgumentException e)
+        {
+            // pass
+        }
+    }
+
+    public void testGetJdbcUrlThrowsExceptionWithoutAProvidedUrlOrSeriesDirectory()
+    {
+        JdbcUrlGenerator jdbcUrlGenerator = new JdbcUrlGenerator(null);
+        SeriesDefinition seriesDefinition = mock(SeriesDefinition.class);
+        when(seriesDefinition.getSeriesDirectory()).thenReturn(null);
+
+        try
+        {
+            jdbcUrlGenerator.getJdbcUrl(seriesDefinition);
+            fail("Expected exception not thrown");
+        }
+        catch (IllegalArgumentException e)
+        {
+            // pass
+        }
+    }
+}