Author: philharveyonline Date: Fri May 10 12:40:40 2013 New Revision: 1480995
URL: http://svn.apache.org/r1480995 Log: QPID-4827: now most chart definition settings can contain system property placeholders Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient-ByteSec.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/1003-MessageSize-Transient-MsgSec.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/1004-MessageSize-Persistent-MsgSec.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers-AutoAck.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers-AutoAck.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/1016-VaryingNumberOfConsumers-SessionTrans.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-Persistent.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transient.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/1030-BatchSize-Equal.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/1031-BatchSize-Unequal.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/1050-VaryingNumberOfProducerSessionsSingleConnection.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/1300-QueueConsumersWithNonOverlappingSelectors-Transient.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/1301-QueueConsumersWithNonOverlappingSelectors-Persistent.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/1302-QueueConsumersWithOverlappingSelectors-Transient.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/1303-QueueConsumersWithOverlappingSelectors-Persistent.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/1503-Topic-AckModes.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/2011-Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/2012-Latency-QueuesWithOverlappingSelectors-Transient.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/2021-Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/2022-Latency-QueuesWithOverlappingSelectors-Persistent.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/2041-Latency-QueueTypes.chartdef qpid/trunk/qpid/java/perftests/etc/visualisation.sh qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/ChartingDefinitionCreator.java qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/SeriesDefinitionCreator.java qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/ChartingDefinitionCreatorTest.java qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/SeriesDefinitionCreatorTest.java Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient-ByteSec.chartdef URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient-ByteSec.chartdef?rev=1480995&r1=1480994&r2=1480995&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient-ByteSec.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient-ByteSec.chartdef Fri May 10 12:40:40 2013 @@ -20,7 +20,7 @@ chartType=XYLINE chartTitle=Impact of Message Size Bytes/S chartSubtitle=Transient messages -chartDescription=1P 1C, transient, auto-ack, with message payload between 256-262144 bytes. +chartDescription=1P 1C, transient, auto-ack, with message payload between 256-262144 bytes ${baselineName}. xAxisTitle=Message Size (B) yAxisTitle=Throughput (KB/s) @@ -31,7 +31,7 @@ series.1.dir=${csvCurrentDir} series.1.colourName=red series.2.statement=SELECT payloadSizeB, throughputKbPerS FROM MessageSize WHERE testName like '%TRANSIENT' AND participantName = 'All' -series.2.legend=Baseline +series.2.legend=Baseline ${baselineName} series.2.dir=${csvBaselineDir} series.2.colourName=dark_red series.2.strokeWidth=-1 Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef?rev=1480995&r1=1480994&r2=1480995&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef Fri May 10 12:40:40 2013 @@ -31,7 +31,7 @@ series.1.dir=${csvCurrentDir} series.1.colourName=red series.2.statement=SELECT payloadSizeB, throughputKbPerS FROM MessageSize WHERE testName like '% PERSISTENT' AND participantName = 'All' -series.2.legend=Baseline +series.2.legend=Baseline ${baselineName} series.2.dir=${csvBaselineDir} series.2.colourName=dark_red series.2.strokeWidth=-1 Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/1003-MessageSize-Transient-MsgSec.chartdef URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1003-MessageSize-Transient-MsgSec.chartdef?rev=1480995&r1=1480994&r2=1480995&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/1003-MessageSize-Transient-MsgSec.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1003-MessageSize-Transient-MsgSec.chartdef Fri May 10 12:40:40 2013 @@ -31,7 +31,7 @@ series.1.dir=${csvCurrentDir} series.1.colourName=red series.2.statement=SELECT payloadSizeB, throughputMessagesPerS FROM MessageSize WHERE testName like '%TRANSIENT' AND participantName = 'All' -series.2.legend=Baseline +series.2.legend=Baseline ${baselineName} series.2.dir=${csvBaselineDir} series.2.colourName=dark_red series.2.strokeWidth=-1 Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/1004-MessageSize-Persistent-MsgSec.chartdef URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1004-MessageSize-Persistent-MsgSec.chartdef?rev=1480995&r1=1480994&r2=1480995&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/1004-MessageSize-Persistent-MsgSec.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1004-MessageSize-Persistent-MsgSec.chartdef Fri May 10 12:40:40 2013 @@ -31,7 +31,7 @@ series.1.dir=${csvCurrentDir} series.2.colourName=red series.2.statement=SELECT payloadSizeB, throughputMessagesPerS FROM MessageSize WHERE testName like '% PERSISTENT' AND participantName = 'All' -series.2.legend=Baseline +series.2.legend=Baseline ${baselineName} series.2.dir=${csvBaselineDir} series.2.colourName=dark_red series.2.strokeWidth=-1 Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers-AutoAck.chartdef URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers-AutoAck.chartdef?rev=1480995&r1=1480994&r2=1480995&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers-AutoAck.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers-AutoAck.chartdef Fri May 10 12:40:40 2013 @@ -41,7 +41,7 @@ series.3.dir=${csvCurrentDir} series.3.colourName=green series.4.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfConsumers = '1' and acknowledgeMode = '1' -series.4.legend=1 Consumer (baseline) +series.4.legend=1 Consumer (baseline ${baselineName}) series.4.dir=${csvBaselineDir} series.4.colourName=dark_red series.4.strokeWidth=-1 Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers-AutoAck.chartdef URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers-AutoAck.chartdef?rev=1480995&r1=1480994&r2=1480995&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers-AutoAck.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers-AutoAck.chartdef Fri May 10 12:40:40 2013 @@ -41,7 +41,7 @@ series.3.dir=${csvCurrentDir} series.3.colourName=red series.4.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfProducers = '10' and acknowledgeMode = '1' -series.4.legend=10 Producers (baseline) +series.4.legend=10 Producers (baseline ${baselineName}) series.4.dir=${csvBaselineDir} series.4.colourName=dark_red series.4.strokeWidth=-1 Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef?rev=1480995&r1=1480994&r2=1480995&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef Fri May 10 12:40:40 2013 @@ -41,7 +41,7 @@ series.3.dir=${csvCurrentDir} series.3.colourName=green series.4.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfConsumers = '1' and acknowledgeMode = '0' -series.4.legend=1 Consumer (baseline) +series.4.legend=1 Consumer (baseline ${baselineName}) series.4.dir=${csvBaselineDir} series.4.colourName=dark_red series.4.strokeWidth=-1 Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/1016-VaryingNumberOfConsumers-SessionTrans.chartdef URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1016-VaryingNumberOfConsumers-SessionTrans.chartdef?rev=1480995&r1=1480994&r2=1480995&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/1016-VaryingNumberOfConsumers-SessionTrans.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1016-VaryingNumberOfConsumers-SessionTrans.chartdef Fri May 10 12:40:40 2013 @@ -41,7 +41,7 @@ series.3.dir=${csvCurrentDir} series.3.colourName=red series.4.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfProducers = '10' and acknowledgeMode = '0' -series.4.legend=10 Producers (baseline) +series.4.legend=10 Producers (baseline ${baselineName}) series.4.dir=${csvBaselineDir} series.4.colourName=dark_red series.4.strokeWidth=-1 Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-Persistent.chartdef URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-Persistent.chartdef?rev=1480995&r1=1480994&r2=1480995&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-Persistent.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-Persistent.chartdef Fri May 10 12:40:40 2013 @@ -32,7 +32,7 @@ series.1.colourName=blue series.2.statement=SELECT acknowledgeMode, throughputMessagesPerS FROM AcknowledgementModes WHERE testName like 'Persistent%' AND participantName = 'All' ORDER BY acknowledgeMode -series.2.legend=Baseline +series.2.legend=Baseline ${baselineName} series.2.dir=${csvBaselineDir} series.2.colourName=dark_red Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transient.chartdef URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transient.chartdef?rev=1480995&r1=1480994&r2=1480995&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transient.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transient.chartdef Fri May 10 12:40:40 2013 @@ -31,6 +31,6 @@ series.1.dir=${csvCurrentDir} series.1.colourName=blue series.2.statement=SELECT acknowledgeMode, throughputMessagesPerS FROM AcknowledgementModes WHERE testName like 'Transient%' AND participantName = 'All' ORDER BY acknowledgeMode -series.2.legend=Baseline +series.2.legend=Baseline ${baselineName} series.2.dir=${csvBaselineDir} series.2.colourName=dark_red Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/1030-BatchSize-Equal.chartdef URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1030-BatchSize-Equal.chartdef?rev=1480995&r1=1480994&r2=1480995&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/1030-BatchSize-Equal.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1030-BatchSize-Equal.chartdef Fri May 10 12:40:40 2013 @@ -31,7 +31,7 @@ series.1.dir=${csvCurrentDir} series.1.colourName=red series.2.statement=SELECT batchSize, throughputMessagesPerS FROM BatchSize WHERE participantName = 'All' -series.2.legend=Equal Producer/Consumer (Baseline) +series.2.legend=Equal Producer/Consumer (Baseline ${baselineName}) series.2.dir=${csvBaselineDir} series.2.colourName=dark_red series.2.strokeWidth=-1 Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/1031-BatchSize-Unequal.chartdef URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1031-BatchSize-Unequal.chartdef?rev=1480995&r1=1480994&r2=1480995&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/1031-BatchSize-Unequal.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1031-BatchSize-Unequal.chartdef Fri May 10 12:40:40 2013 @@ -36,7 +36,7 @@ series.1.dir=${csvCurrentDir} series.1.colourName=red series.2.statement=SELECT testName, throughputMessagesPerS FROM BatchSizeProducerVaries WHERE participantName = 'All' -series.2.legend=Variable Producer, Fixed Consumer (Baseline) +series.2.legend=Variable Producer, Fixed Consumer (Baseline ${baselineName}) series.2.dir=${csvBaselineDir} series.2.colourName=dark_red series.2.strokeWidth=-1 @@ -47,7 +47,7 @@ series.3.dir=${csvCurrentDir} series.3.colourName=blue series.4.statement=SELECT testName, throughputMessagesPerS FROM BatchSizeConsumerVaries WHERE participantName = 'All' -series.4.legend=Fixed Producer, Variable Consumer (Baseline) +series.4.legend=Fixed Producer, Variable Consumer (Baseline ${baselineName}) series.4.dir=${csvBaselineDir} series.4.colourName=dark_blue series.4.strokeWidth=-1 Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef?rev=1480995&r1=1480994&r2=1480995&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef Fri May 10 12:40:40 2013 @@ -31,6 +31,6 @@ series.1.dir=${csvCurrentDir} series.1.colourName=blue series.2.statement=SELECT testName, throughputMessagesPerS FROM QueueTypes WHERE participantName = 'All' -series.2.legend=Baseline +series.2.legend=Baseline ${baselineName} series.2.dir=${csvBaselineDir} series.2.colourName=dark_red Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/1050-VaryingNumberOfProducerSessionsSingleConnection.chartdef URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1050-VaryingNumberOfProducerSessionsSingleConnection.chartdef?rev=1480995&r1=1480994&r2=1480995&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/1050-VaryingNumberOfProducerSessionsSingleConnection.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1050-VaryingNumberOfProducerSessionsSingleConnection.chartdef Fri May 10 12:40:40 2013 @@ -37,13 +37,13 @@ series.2.dir=${csvCurrentDir} series.2.colourName=blue series.3.statement=SELECT testName, throughputKbPerS FROM VaryingNumberOfProducerSessionsSingleConnection WHERE participantName = 'All' -series.3.legend=Baseline - End-to-end throughput +series.3.legend=Baseline ${baselineName} - End-to-end throughput series.3.dir=${csvBaselineDir} series.3.colourName=dark_red series.3.strokeWidth=-1 series.4.statement=SELECT testName, throughputKbPerS FROM VaryingNumberOfProducerSessionsSingleConnection WHERE participantName = 'All Producers' -series.4.legend=Baseline - Producer only throughput +series.4.legend=Baseline ${baselineName} - Producer only throughput series.4.dir=${csvBaselineDir} series.4.colourName=dark_blue series.4.strokeWidth=-1 Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/1300-QueueConsumersWithNonOverlappingSelectors-Transient.chartdef URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1300-QueueConsumersWithNonOverlappingSelectors-Transient.chartdef?rev=1480995&r1=1480994&r2=1480995&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/1300-QueueConsumersWithNonOverlappingSelectors-Transient.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1300-QueueConsumersWithNonOverlappingSelectors-Transient.chartdef Fri May 10 12:40:40 2013 @@ -30,7 +30,7 @@ series.1.dir=${csvCurrentDir} series.1.colourName=blue series.2.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM QueueConsumersWithNonOverlappingSelectors WHERE participantName = 'All' and testName like '%non overlapping - NON_PERSISTENT%' -series.2.legend=Baseline +series.2.legend=Baseline ${baselineName} series.2.dir=${csvBaselineDir} series.2.colourName=dark_red series.2.stokeWidth=-1 Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/1301-QueueConsumersWithNonOverlappingSelectors-Persistent.chartdef URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1301-QueueConsumersWithNonOverlappingSelectors-Persistent.chartdef?rev=1480995&r1=1480994&r2=1480995&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/1301-QueueConsumersWithNonOverlappingSelectors-Persistent.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1301-QueueConsumersWithNonOverlappingSelectors-Persistent.chartdef Fri May 10 12:40:40 2013 @@ -31,7 +31,7 @@ series.1.dir=${csvCurrentDir} series.1.colourName=blue series.2.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM QueueConsumersWithNonOverlappingSelectors WHERE participantName = 'All' and testName like '%non overlapping - PERSISTENT' -series.2.legend=Baseline +series.2.legend=Baseline ${baselineName} series.2.dir=${csvBaselineDir} series.2.colourName=dark_red series.2.stokeWidth=-1 Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/1302-QueueConsumersWithOverlappingSelectors-Transient.chartdef URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1302-QueueConsumersWithOverlappingSelectors-Transient.chartdef?rev=1480995&r1=1480994&r2=1480995&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/1302-QueueConsumersWithOverlappingSelectors-Transient.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1302-QueueConsumersWithOverlappingSelectors-Transient.chartdef Fri May 10 12:40:40 2013 @@ -30,7 +30,7 @@ series.1.dir=${csvCurrentDir} series.1.colourName=blue series.2.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM QueueConsumersWithOverlappingSelectors WHERE participantName = 'All' and testName like '%50_ overlapping - NON_PERSISTENT%' -series.2.legend=Baseline +series.2.legend=Baseline ${baselineName} series.2.dir=${csvBaselineDir} series.2.colourName=dark_red series.2.stokeWidth=-1 Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/1303-QueueConsumersWithOverlappingSelectors-Persistent.chartdef URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1303-QueueConsumersWithOverlappingSelectors-Persistent.chartdef?rev=1480995&r1=1480994&r2=1480995&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/1303-QueueConsumersWithOverlappingSelectors-Persistent.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1303-QueueConsumersWithOverlappingSelectors-Persistent.chartdef Fri May 10 12:40:40 2013 @@ -30,7 +30,7 @@ series.1.dir=${csvCurrentDir} series.1.colourName=blue series.2.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM QueueConsumersWithOverlappingSelectors WHERE participantName = 'All' and testName like '%50_ overlapping - PERSISTENT%' -series.2.legend=Baseline +series.2.legend=Baseline ${baselineName} series.2.dir=${csvBaselineDir} series.2.colourName=dark_red series.2.stokeWidth=-1 Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef?rev=1480995&r1=1480994&r2=1480995&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef Fri May 10 12:40:40 2013 @@ -31,7 +31,7 @@ series.1.dir=${csvCurrentDir} series.1.colourName=red series.2.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM Topic-NumberOfConsumers WHERE participantName = 'All' -series.2.legend=Baseline +series.2.legend=Baseline ${baselineName} series.2.dir=${csvBaselineDir} series.2.colourName=dark_red series.2.strokeWidth=-1 Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef?rev=1480995&r1=1480994&r2=1480995&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef Fri May 10 12:40:40 2013 @@ -31,7 +31,7 @@ series.1.dir=${csvCurrentDir} series.1.colourName=red series.2.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM Topic-NumberOfTopics WHERE participantName = 'All' -series.2.legend=Baseline +series.2.legend=Baseline ${baselineName} series.2.dir=${csvBaselineDir} series.2.colourName=dark_red series.2.strokeWidth=-1 Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef?rev=1480995&r1=1480994&r2=1480995&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef Fri May 10 12:40:40 2013 @@ -31,7 +31,7 @@ series.1.dir=${csvCurrentDir} series.1.colourName=blue series.2.statement=SELECT isDurableSubscription, throughputMessagesPerS FROM Topic-Persistence WHERE participantName = 'All Consumers' -series.2.legend=Baseline +series.2.legend=Baseline ${baselineName} series.2.dir=${csvBaselineDir} series.2.colourName=dark_red series.2.stokeWidth=2 Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/1503-Topic-AckModes.chartdef URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1503-Topic-AckModes.chartdef?rev=1480995&r1=1480994&r2=1480995&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/1503-Topic-AckModes.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1503-Topic-AckModes.chartdef Fri May 10 12:40:40 2013 @@ -31,7 +31,7 @@ series.1.dir=${csvCurrentDir} series.1.colourName=blue series.2.statement=SELECT acknowledgeMode, throughputMessagesPerS FROM Topic-AckModes WHERE participantName = 'All' -series.2.legend=Baseline +series.2.legend=Baseline ${baselineName} series.2.dir=${csvBaselineDir} series.2.colourName=dark_red series.2.stokeWidth=2 Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef?rev=1480995&r1=1480994&r2=1480995&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef Fri May 10 12:40:40 2013 @@ -36,7 +36,7 @@ series.2.dir=${csvCurrentDir} series.2.colourName=red series.3.statement=SELECT payloadSizeB, averageLatency,latencyStandardDeviation FROM Latency-MessageSize WHERE testName like '%TRANSIENT' AND participantName = 'All Consumers' -series.3.legend=Average latency (baseline) +series.3.legend=Average latency (baseline ${baselineName}) series.3.dir=${csvBaselineDir} series.3.colourName=dark_red Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef?rev=1480995&r1=1480994&r2=1480995&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef Fri May 10 12:40:40 2013 @@ -36,7 +36,7 @@ series.2.dir=${csvCurrentDir} series.2.colourName=red series.3.statement=SELECT payloadSizeB, averageLatency, latencyStandardDeviation FROM Latency-MessageSize WHERE testName like '%PERSISTENT' AND participantName = 'All Consumers' -series.3.legend=Average latency (baseline) +series.3.legend=Average latency (baseline ${baselineName}) series.3.dir=${csvBaselineDir} series.3.colourName=dark_red Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/2011-Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/2011-Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef?rev=1480995&r1=1480994&r2=1480995&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/2011-Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/2011-Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef Fri May 10 12:40:40 2013 @@ -36,7 +36,7 @@ series.2.dir=${csvCurrentDir} series.2.colourName=red series.3.statement=SELECT totalNumberOfConsumers, averageLatency,latencyStandardDeviation FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%non overlapping - NON_PERSISTENT%' -series.3.legend=Average latency (baseline) +series.3.legend=Average latency (baseline ${baselineName}) series.3.dir=${csvBaselineDir} series.3.colourName=dark_red Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/2012-Latency-QueuesWithOverlappingSelectors-Transient.chartdef URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/2012-Latency-QueuesWithOverlappingSelectors-Transient.chartdef?rev=1480995&r1=1480994&r2=1480995&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/2012-Latency-QueuesWithOverlappingSelectors-Transient.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/2012-Latency-QueuesWithOverlappingSelectors-Transient.chartdef Fri May 10 12:40:40 2013 @@ -36,7 +36,7 @@ series.2.dir=${csvCurrentDir} series.2.colourName=red series.3.statement=SELECT totalNumberOfConsumers, averageLatency,latencyStandardDeviation FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%overlapping 50% - NON_PERSISTENT%' -series.3.legend=Average latency (baseline) +series.3.legend=Average latency (baseline ${baselineName}) series.3.dir=${csvBaselineDir} series.3.colourName=dark_red Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/2021-Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/2021-Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef?rev=1480995&r1=1480994&r2=1480995&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/2021-Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/2021-Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef Fri May 10 12:40:40 2013 @@ -36,7 +36,7 @@ series.2.dir=${csvCurrentDir} series.2.colourName=red series.3.statement=SELECT totalNumberOfConsumers, averageLatency, latencyStandardDeviation FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%non overlapping - PERSISTENT' -series.3.legend=Average latency (baseline) +series.3.legend=Average latency (baseline ${baselineName}) series.3.dir=${csvBaselineDir} series.3.colourName=dark_red Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/2022-Latency-QueuesWithOverlappingSelectors-Persistent.chartdef URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/2022-Latency-QueuesWithOverlappingSelectors-Persistent.chartdef?rev=1480995&r1=1480994&r2=1480995&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/2022-Latency-QueuesWithOverlappingSelectors-Persistent.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/2022-Latency-QueuesWithOverlappingSelectors-Persistent.chartdef Fri May 10 12:40:40 2013 @@ -36,7 +36,7 @@ series.2.dir=${csvCurrentDir} series.2.colourName=red series.3.statement=SELECT totalNumberOfConsumers, averageLatency,latencyStandardDeviation FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%overlapping 50% - PERSISTENT%' -series.3.legend=Average latency (baseline) +series.3.legend=Average latency (baseline ${baselineName}) series.3.dir=${csvBaselineDir} series.3.colourName=dark_red Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef?rev=1480995&r1=1480994&r2=1480995&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef Fri May 10 12:40:40 2013 @@ -46,6 +46,6 @@ series.4.dir=${csvCurrentDir} series.4.colourName=red series.5.statement=SELECT totalNumberOfConsumers, averageLatency,latencyStandardDeviation FROM Latency-VaryingNumberOfParticipants WHERE participantName = 'All Consumers' and testName like '% - 10 producers - PERSISTENT' -series.5.legend=10 producers (baseline) +series.5.legend=10 producers (baseline ${baselineName}) series.5.dir=${csvBaselineDir} series.5.colourName=dark_red Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/2041-Latency-QueueTypes.chartdef URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/2041-Latency-QueueTypes.chartdef?rev=1480995&r1=1480994&r2=1480995&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/2041-Latency-QueueTypes.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/2041-Latency-QueueTypes.chartdef Fri May 10 12:40:40 2013 @@ -36,7 +36,7 @@ series.2.dir=${csvCurrentDir} series.2.colourName=red series.3.statement=SELECT testName, averageLatency,latencyStandardDeviation FROM Latency-QueueTypes WHERE participantName = 'All Consumers' -series.3.legend=Average Latency (baseline) +series.3.legend=Average Latency (baseline ${baselineName}) series.3.dir=${csvBaselineDir} series.3.colourName=dark_red Modified: qpid/trunk/qpid/java/perftests/etc/visualisation.sh URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/visualisation.sh?rev=1480995&r1=1480994&r2=1480995&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/visualisation.sh (original) +++ qpid/trunk/qpid/java/perftests/etc/visualisation.sh Fri May 10 12:40:40 2013 @@ -28,8 +28,9 @@ BASE_DIR=`dirname $0` java -cp "${BASE_DIR}:${BASE_DIR}/../../build/lib/*" \ -Djava.awt.headless=true -Dlog4j.configuration=file:log4j.properties \ - -DcsvCurrentDir=. \ - -DcsvBaselineDir=. \ + -DcsvCurrentDir=/home/V510279/tasks/_old/PerfTestDryRun/etc/ \ + -DcsvBaselineDir=/home/V510279/tasks/_old/PerfTestDryRun/etc/ \ + -DbaselineName=${BASELINE_NAME} \ org.apache.qpid.disttest.charting.ChartingUtil \ chart-defs=chartdefs \ ${JDBC_DRIVER} ${JDBC_URL} Modified: qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/ChartingDefinitionCreator.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/ChartingDefinitionCreator.java?rev=1480995&r1=1480994&r2=1480995&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/ChartingDefinitionCreator.java (original) +++ qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/ChartingDefinitionCreator.java Fri May 10 12:40:40 2013 @@ -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); Modified: qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/SeriesDefinitionCreator.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/SeriesDefinitionCreator.java?rev=1480995&r1=1480994&r2=1480995&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/SeriesDefinitionCreator.java (original) +++ qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/SeriesDefinitionCreator.java Fri May 10 12:40:40 2013 @@ -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))); Modified: qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/ChartingDefinitionCreatorTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/ChartingDefinitionCreatorTest.java?rev=1480995&r1=1480994&r2=1480995&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/ChartingDefinitionCreatorTest.java (original) +++ qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/ChartingDefinitionCreatorTest.java Fri May 10 12:40:40 2013 @@ -38,7 +38,7 @@ import org.apache.qpid.test.utils.QpidTe 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 ChartingDefinitionCreatorTe 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 ChartingDefinitionCreatorTe 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()); Modified: qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/SeriesDefinitionCreatorTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/SeriesDefinitionCreatorTest.java?rev=1480995&r1=1480994&r2=1480995&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/SeriesDefinitionCreatorTest.java (original) +++ qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/SeriesDefinitionCreatorTest.java Fri May 10 12:40:40 2013 @@ -32,13 +32,15 @@ import org.apache.qpid.test.utils.QpidTe 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 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 --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
