QPID-4827: now most chart definition settings can contain system property placeholders

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

4 files changed, 27 insertions, 19 deletions

diff --git a/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/ChartingDefinitionCreator.java b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/ChartingDefinitionCreator.java
index 1988f561b6..e0f43cb34a 100644
--- a/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/ChartingDefinitionCreator.java
+++ b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/ChartingDefinitionCreator.java
@@ -19,6 +19,8 @@
  */
 package org.apache.qpid.disttest.charting.definition;
 
+import static org.apache.commons.lang.text.StrSubstitutor.replaceSystemProperties;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileFilter;
@@ -80,12 +82,12 @@ public class ChartingDefinitionCreator
 
             final String chartStemName = getStemNameFrom(file);
 
-            final ChartType chartType = ChartType.valueOf(props.getProperty(CHART_TYPE_KEY));
-            final String chartTitle = props.getProperty(CHART_TITLE_KEY);
-            final String chartSubtitle = props.getProperty(CHART_SUBTITLE_KEY);
-            final String chartDescription = props.getProperty(CHART_DESCRIPTION_KEY);
-            final String xAxisTitle = props.getProperty(XAXIS_TITLE_KEY);
-            final String yAxisTitle = props.getProperty(YAXIS_TITLE_KEY);
+            final ChartType chartType = ChartType.valueOf(replaceSystemProperties(props.getProperty(CHART_TYPE_KEY)));
+            final String chartTitle = replaceSystemProperties(props.getProperty(CHART_TITLE_KEY));
+            final String chartSubtitle = replaceSystemProperties(props.getProperty(CHART_SUBTITLE_KEY));
+            final String chartDescription = replaceSystemProperties(props.getProperty(CHART_DESCRIPTION_KEY));
+            final String xAxisTitle = replaceSystemProperties(props.getProperty(XAXIS_TITLE_KEY));
+            final String yAxisTitle = replaceSystemProperties(props.getProperty(YAXIS_TITLE_KEY));
 
             final List<SeriesDefinition> seriesDefinitions = createSeriesDefinitions(props);
 
diff --git a/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/SeriesDefinitionCreator.java b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/SeriesDefinitionCreator.java
index d47e7488e1..e7d828bdcc 100644
--- a/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/SeriesDefinitionCreator.java
+++ b/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/SeriesDefinitionCreator.java
@@ -19,12 +19,12 @@
  */
 package org.apache.qpid.disttest.charting.definition;
 
+import static org.apache.commons.lang.text.StrSubstitutor.replaceSystemProperties;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 
-import org.apache.commons.lang.text.StrSubstitutor;
-
 public class SeriesDefinitionCreator
 {
     public static final String SERIES_STATEMENT_KEY_FORMAT = "series.%d.statement";
@@ -41,10 +41,10 @@ public class SeriesDefinitionCreator
         boolean moreSeriesDefinitions = true;
         while(moreSeriesDefinitions)
         {
-            String seriesStatement = properties.getProperty(String.format(SERIES_STATEMENT_KEY_FORMAT, index));
-            String seriesLegend = properties.getProperty(String.format(SERIES_LEGEND_KEY_FORMAT, index));
-            String seriesDir = StrSubstitutor.replaceSystemProperties(properties.getProperty(String.format(SERIES_DIRECTORY_KEY_FORMAT, index)));
-            String seriesColourName = properties.getProperty(String.format(SERIES_COLOUR_NAME_FORMAT, index));
+            String seriesStatement = replaceSystemProperties(properties.getProperty(String.format(SERIES_STATEMENT_KEY_FORMAT, index)));
+            String seriesLegend = replaceSystemProperties(properties.getProperty(String.format(SERIES_LEGEND_KEY_FORMAT, index)));
+            String seriesDir = replaceSystemProperties(properties.getProperty(String.format(SERIES_DIRECTORY_KEY_FORMAT, index)));
+            String seriesColourName = replaceSystemProperties(properties.getProperty(String.format(SERIES_COLOUR_NAME_FORMAT, index)));
             Integer seriesStrokeWidth = properties.getProperty(String.format(SERIES_STROKE_WIDTH_FORMAT, index)) == null
                     ? null : Integer.parseInt(properties.getProperty(String.format(SERIES_STROKE_WIDTH_FORMAT, index)));
 
diff --git a/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/ChartingDefinitionCreatorTest.java b/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/ChartingDefinitionCreatorTest.java
index e4b4d4d272..47eee43002 100644
--- a/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/ChartingDefinitionCreatorTest.java
+++ b/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/ChartingDefinitionCreatorTest.java
@@ -38,7 +38,7 @@ import org.apache.qpid.test.utils.QpidTestCase;
 
 public class ChartingDefinitionCreatorTest extends QpidTestCase
 {
-    private static final String TEST_CHART_TITLE = "CHART_TITLE";
+    private static final String TEST_CHART_TITLE = "CHART_TITLE ${ChartingDefinitionSysProp}";
     private static final String TEST_CHART_SUBTITLE = "CHART_SUBTITLE";
     private static final String TEST_CHART_DESCRIPTION = "CHART_DESCRIPTION";
     private static final String TEST_XAXIS_TITLE = "XAXIS_TITLE";
@@ -47,6 +47,8 @@ public class ChartingDefinitionCreatorTest extends QpidTestCase
 
     private static final String TEST_SERIES_SELECT_STATEMENT = "SERIES_SELECT_STATEMENT";
 
+    private static final String SYSTEM_PROPERTY_NAME = "ChartingDefinitionSysProp";
+
     private ChartingDefinitionCreator _chartingDefinitionLoader = new ChartingDefinitionCreator();
     private File _testTempDir;
 
@@ -79,13 +81,14 @@ public class ChartingDefinitionCreatorTest extends QpidTestCase
 
     public void testDefinitionsProperties() throws Exception
     {
+        setTestSystemProperty(SYSTEM_PROPERTY_NAME, "propValue");
         File testDefFile = createTestDefinitionWithin(_testTempDir);
 
         List<ChartingDefinition> definitions = _chartingDefinitionLoader.createFromFileOrDirectory(testDefFile.getAbsolutePath());
         assertEquals(1, definitions.size());
 
         ChartingDefinition definition1 = definitions.get(0);
-        assertEquals(TEST_CHART_TITLE, definition1.getChartTitle());
+        assertEquals("CHART_TITLE propValue", definition1.getChartTitle());
         assertEquals(TEST_CHART_SUBTITLE, definition1.getChartSubtitle());
         assertEquals(TEST_CHART_DESCRIPTION, definition1.getChartDescription());
         assertEquals(TEST_XAXIS_TITLE, definition1.getXAxisTitle());
diff --git a/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/SeriesDefinitionCreatorTest.java b/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/SeriesDefinitionCreatorTest.java
index ef605024cc..e937e80108 100644
--- a/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/SeriesDefinitionCreatorTest.java
+++ b/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/SeriesDefinitionCreatorTest.java
@@ -32,13 +32,15 @@ import org.apache.qpid.test.utils.QpidTestCase;
 
 public class SeriesDefinitionCreatorTest extends QpidTestCase
 {
+    private static final String SYSTEM_PROPERTY_NAME = "SeriesDefinitionProp";
     private static final String TEST_SERIES_1_SELECT_STATEMENT = "SERIES_1_SELECT_STATEMENT";
     private static final String TEST_SERIES_1_LEGEND = "SERIES_1_LEGEND";
+    private static final String TEST_SERIES_1_LEGEND_WITH_SYSPROP = "SERIES_1_LEGEND ${SeriesDefinitionProp}";
     private static final String TEST_SERIES_1_DIR = "SERIES_1_DIR";
     private static final String TEST_SERIES_1_COLOUR_NAME = "seriesColourName";
     private static final Integer TEST_SERIES_1_STROKE_WIDTH = 1;;
 
-    private static final String TEST_SERIES_1_DIR_WITH_SYSPROP = "${java.io.tmpdir}/mydir";
+    private static final String TEST_SERIES_1_DIR_WITH_SYSPROP = "${SeriesDefinitionProp}/mydir";
 
     private static final String TEST_SERIES_2_SELECT_STATEMENT = "SERIES_2_SELECT_STATEMENT";
     private static final String TEST_SERIES_2_LEGEND = "SERIES_2_LEGEND";
@@ -97,16 +99,17 @@ public class SeriesDefinitionCreatorTest extends QpidTestCase
         assertEquals(1, definitions.size());
     }
 
-    public void testSeriesDirectorySubstitution() throws Exception
+    public void testSeriesDirectoryAndNameSubstitution() throws Exception
     {
-        final String tmpDir = System.getProperty("java.io.tmpdir");
-        createTestProperties(1, TEST_SERIES_1_SELECT_STATEMENT, TEST_SERIES_1_LEGEND, TEST_SERIES_1_DIR_WITH_SYSPROP, null, null);
+        setTestSystemProperty(SYSTEM_PROPERTY_NAME, "propValue");
+        createTestProperties(1, TEST_SERIES_1_SELECT_STATEMENT, TEST_SERIES_1_LEGEND_WITH_SYSPROP, TEST_SERIES_1_DIR_WITH_SYSPROP, null, null);
 
         List<SeriesDefinition> definitions = _seriesDefinitionLoader.createFromProperties(_properties);
         assertEquals(1, definitions.size());
 
         SeriesDefinition seriesDefinition1 = definitions.get(0);
-        assertTrue(seriesDefinition1.getSeriesDirectory().startsWith(tmpDir));
+        assertEquals("propValue/mydir", seriesDefinition1.getSeriesDirectory());
+        assertEquals("SERIES_1_LEGEND propValue", seriesDefinition1.getSeriesLegend());
     }
 
     private void createTestProperties(int index, String selectStatement, String seriesLegend, String seriesDir, String seriesColourName, Integer seriesStrokeWidth) throws Exception