Author: kwall Date: Thu Jul 5 15:28:54 2012 New Revision: 1357682 URL: http://svn.apache.org/viewvc?rev=1357682&view=rev Log: 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 <[email protected]> Added: qpid/trunk/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient.chartdef - copied, changed from r1357650, qpid/trunk/qpid/java/perftests/etc/chartdefs/MessageSizeNonPersistent.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent.chartdef - copied, changed from r1357650, qpid/trunk/qpid/java/perftests/etc/chartdefs/MessageSizePersistent.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers.chartdef - copied, changed from r1357650, qpid/trunk/qpid/java/perftests/etc/chartdefs/VaryingNumberOfProducers.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers.chartdef - copied, changed from r1357650, qpid/trunk/qpid/java/perftests/etc/chartdefs/VaryingNumberOfConsumers.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-AutoAck.chartdef - copied, changed from r1357650, qpid/trunk/qpid/java/perftests/etc/chartdefs/AcknowledgementModesAutoAck.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transacted.chartdef - copied, changed from r1357650, qpid/trunk/qpid/java/perftests/etc/chartdefs/AcknowledgementModesTransacted.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/1030-BatchSize.chartdef - copied, changed from r1357650, qpid/trunk/qpid/java/perftests/etc/chartdefs/BatchSize.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef - copied, changed from r1357650, qpid/trunk/qpid/java/perftests/etc/chartdefs/QueueTypes.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef - copied, changed from r1357650, qpid/trunk/qpid/java/perftests/etc/chartdefs/Latency-MessageSize-Transient.chardef qpid/trunk/qpid/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef - copied, changed from r1357650, qpid/trunk/qpid/java/perftests/etc/chartdefs/Latency-MessageSize-Persistent.chardef qpid/trunk/qpid/java/perftests/etc/chartdefs/2011-Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef - copied, changed from r1357650, qpid/trunk/qpid/java/perftests/etc/chartdefs/Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/2012-Latency-QueuesWithOverlappingSelectors-Transient.chartdef - copied, changed from r1357650, qpid/trunk/qpid/java/perftests/etc/chartdefs/Latency-QueuesWithOverlappingSelectors-Transient.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/2021-Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef - copied, changed from r1357650, qpid/trunk/qpid/java/perftests/etc/chartdefs/Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/2022-Latency-QueuesWithOverlappingSelectors-Persistent.chartdef - copied, changed from r1357650, qpid/trunk/qpid/java/perftests/etc/chartdefs/Latency-QueuesWithOverlappingSelectors-Persistent.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef - copied, changed from r1357650, qpid/trunk/qpid/java/perftests/etc/chartdefs/Latency-VaryingNumberOfParticipants.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/2041-Latency-QueueTypes.chartdef - copied, changed from r1357650, qpid/trunk/qpid/java/perftests/etc/chartdefs/Latency-QueueTypes.chardef qpid/trunk/qpid/java/perftests/etc/testdefs/AcknowledgementModes.json - copied, changed from r1357650, qpid/trunk/qpid/java/perftests/etc/testdefs/short/AcknowledgementModes.json qpid/trunk/qpid/java/perftests/etc/testdefs/BatchSize.json - copied, changed from r1357650, qpid/trunk/qpid/java/perftests/etc/testdefs/short/BatchSize.json qpid/trunk/qpid/java/perftests/etc/testdefs/Latency-MessageSize.json - copied, changed from r1357650, qpid/trunk/qpid/java/perftests/etc/testdefs/short/Latency-MessageSize.json qpid/trunk/qpid/java/perftests/etc/testdefs/Latency-QueueTypes.json - copied, changed from r1357650, qpid/trunk/qpid/java/perftests/etc/testdefs/short/Latency-QueueTypes.json qpid/trunk/qpid/java/perftests/etc/testdefs/Latency-QueuesWithSelectors.json - copied, changed from r1357650, qpid/trunk/qpid/java/perftests/etc/testdefs/short/Latency-QueuesWithSelectors.json qpid/trunk/qpid/java/perftests/etc/testdefs/Latency-VaryingNumberOfParticipants.json - copied, changed from r1357650, qpid/trunk/qpid/java/perftests/etc/testdefs/short/Latency-VaryingNumberOfParticipants.json qpid/trunk/qpid/java/perftests/etc/testdefs/MessageSize.json - copied, changed from r1357650, qpid/trunk/qpid/java/perftests/etc/testdefs/short/MessageSize.json qpid/trunk/qpid/java/perftests/etc/testdefs/QueueTypes.json - copied, changed from r1357650, qpid/trunk/qpid/java/perftests/etc/testdefs/short/QueueTypes.json qpid/trunk/qpid/java/perftests/etc/testdefs/VaryingNumberOfParticipants.json - copied, changed from r1357650, qpid/trunk/qpid/java/perftests/etc/testdefs/short/VaryingNumberOfParticipants.json Removed: qpid/trunk/qpid/java/perftests/etc/chartdefs/AcknowledgementModesAutoAck.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/AcknowledgementModesTransacted.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/BatchSize.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/Latency-MessageSize-Persistent.chardef qpid/trunk/qpid/java/perftests/etc/chartdefs/Latency-MessageSize-Transient.chardef qpid/trunk/qpid/java/perftests/etc/chartdefs/Latency-QueueTypes.chardef qpid/trunk/qpid/java/perftests/etc/chartdefs/Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/Latency-QueuesWithOverlappingSelectors-Persistent.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/Latency-QueuesWithOverlappingSelectors-Transient.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/Latency-VaryingNumberOfParticipants.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/MessageSizeNonPersistent.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/MessageSizePersistent.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/QueueTypes.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/VaryingNumberOfConsumers.chartdef qpid/trunk/qpid/java/perftests/etc/chartdefs/VaryingNumberOfProducers.chartdef qpid/trunk/qpid/java/perftests/etc/testdefs/short/AcknowledgementModes.json qpid/trunk/qpid/java/perftests/etc/testdefs/short/BatchSize.json qpid/trunk/qpid/java/perftests/etc/testdefs/short/Latency-MessageSize.json qpid/trunk/qpid/java/perftests/etc/testdefs/short/Latency-QueueTypes.json qpid/trunk/qpid/java/perftests/etc/testdefs/short/Latency-QueuesWithSelectors.json qpid/trunk/qpid/java/perftests/etc/testdefs/short/Latency-VaryingNumberOfParticipants.json qpid/trunk/qpid/java/perftests/etc/testdefs/short/MessageSize.json qpid/trunk/qpid/java/perftests/etc/testdefs/short/QueueTypes.json qpid/trunk/qpid/java/perftests/etc/testdefs/short/VaryingNumberOfParticipants.json qpid/trunk/qpid/java/perftests/etc/testdefs/standard/AcknowledgementModes.json qpid/trunk/qpid/java/perftests/etc/testdefs/standard/BatchSize.json qpid/trunk/qpid/java/perftests/etc/testdefs/standard/Latency-MessageSize.json qpid/trunk/qpid/java/perftests/etc/testdefs/standard/Latency-QueueTypes.json qpid/trunk/qpid/java/perftests/etc/testdefs/standard/Latency-QueuesWithSelectors.json qpid/trunk/qpid/java/perftests/etc/testdefs/standard/Latency-VaryingNumberOfParticipants.json qpid/trunk/qpid/java/perftests/etc/testdefs/standard/MessageSize.json qpid/trunk/qpid/java/perftests/etc/testdefs/standard/QueueTypes.json qpid/trunk/qpid/java/perftests/etc/testdefs/standard/QueuesWithSelectors.json qpid/trunk/qpid/java/perftests/etc/testdefs/standard/VaryingNumberOfParticipants.json Modified: qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/CategoryDataSetBasedChartBuilder.java qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/StatisticalBarCharBuilder.java qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/XYDataSetBasedChartBuilder.java qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/writer/ChartWriter.java qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartProductionTest.java qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/writer/ChartWriterTest.java Copied: qpid/trunk/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient.chartdef (from r1357650, qpid/trunk/qpid/java/perftests/etc/chartdefs/MessageSizeNonPersistent.chartdef) URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient.chartdef?p2=qpid/trunk/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient.chartdef&p1=qpid/trunk/qpid/java/perftests/etc/chartdefs/MessageSizeNonPersistent.chartdef&r1=1357650&r2=1357682&rev=1357682&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/MessageSizeNonPersistent.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient.chartdef Thu Jul 5 15:28:54 2012 @@ -18,10 +18,11 @@ # chartType=LINE -chartTitle=Impact of Message Size (Non-Persistent) +chartTitle=Impact of Message Size +chartSubtitle=Transient messages xAxisTitle=Message Size (B) yAxisTitle=Throughput (KB/s) -series.1.statement=SELECT payloadSizeB, throughputKbPerS FROM MessageSize WHERE testName like '%NON_PERSISTENT' AND participantName = 'All' +series.1.statement=SELECT payloadSizeB, throughputKbPerS FROM MessageSize WHERE testName like '%TRANSIENT' AND participantName = 'All' series.1.legend=Current series.1.dir=${csvCurrentDir} Copied: qpid/trunk/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent.chartdef (from r1357650, qpid/trunk/qpid/java/perftests/etc/chartdefs/MessageSizePersistent.chartdef) URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent.chartdef?p2=qpid/trunk/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent.chartdef&p1=qpid/trunk/qpid/java/perftests/etc/chartdefs/MessageSizePersistent.chartdef&r1=1357650&r2=1357682&rev=1357682&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/MessageSizePersistent.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent.chartdef Thu Jul 5 15:28:54 2012 @@ -18,7 +18,8 @@ # chartType=LINE -chartTitle=Impact of Message Size (Persistent) +chartTitle=Impact of Message Size +chartSubtitle=Persistent messages xAxisTitle=Message Size (B) yAxisTitle=Throughput (KB/s) Copied: qpid/trunk/qpid/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers.chartdef (from r1357650, qpid/trunk/qpid/java/perftests/etc/chartdefs/VaryingNumberOfProducers.chartdef) URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers.chartdef?p2=qpid/trunk/qpid/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers.chartdef&p1=qpid/trunk/qpid/java/perftests/etc/chartdefs/VaryingNumberOfProducers.chartdef&r1=1357650&r2=1357682&rev=1357682&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/VaryingNumberOfProducers.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers.chartdef Thu Jul 5 15:28:54 2012 @@ -19,6 +19,7 @@ chartType=LINE chartTitle=Varying number of producers +chartSubtitle=Persistent 1KB messages xAxisTitle=Producers yAxisTitle=Throughput (KB/s) Copied: qpid/trunk/qpid/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers.chartdef (from r1357650, qpid/trunk/qpid/java/perftests/etc/chartdefs/VaryingNumberOfConsumers.chartdef) URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers.chartdef?p2=qpid/trunk/qpid/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers.chartdef&p1=qpid/trunk/qpid/java/perftests/etc/chartdefs/VaryingNumberOfConsumers.chartdef&r1=1357650&r2=1357682&rev=1357682&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/VaryingNumberOfConsumers.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers.chartdef Thu Jul 5 15:28:54 2012 @@ -19,6 +19,7 @@ chartType=LINE chartTitle=Varying number of consumers +chartSubtitle=Persistent 1KB messages xAxisTitle=Consumers yAxisTitle=Throughput (KB/s) Copied: qpid/trunk/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-AutoAck.chartdef (from r1357650, qpid/trunk/qpid/java/perftests/etc/chartdefs/AcknowledgementModesAutoAck.chartdef) URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-AutoAck.chartdef?p2=qpid/trunk/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-AutoAck.chartdef&p1=qpid/trunk/qpid/java/perftests/etc/chartdefs/AcknowledgementModesAutoAck.chartdef&r1=1357650&r2=1357682&rev=1357682&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/AcknowledgementModesAutoAck.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-AutoAck.chartdef Thu Jul 5 15:28:54 2012 @@ -18,7 +18,8 @@ # chartType=BAR -chartTitle=Performance of acknowledgement modes (Auto-acknowledgement) +chartTitle=Performance of acknowledgement modes +chartSubtitle=Auto-acknowledge xAxisTitle=Persistence yAxisTitle=Throughput (KB/s) Copied: qpid/trunk/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transacted.chartdef (from r1357650, qpid/trunk/qpid/java/perftests/etc/chartdefs/AcknowledgementModesTransacted.chartdef) URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transacted.chartdef?p2=qpid/trunk/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transacted.chartdef&p1=qpid/trunk/qpid/java/perftests/etc/chartdefs/AcknowledgementModesTransacted.chartdef&r1=1357650&r2=1357682&rev=1357682&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/AcknowledgementModesTransacted.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transacted.chartdef Thu Jul 5 15:28:54 2012 @@ -18,7 +18,8 @@ # chartType=BAR -chartTitle=Performance of acknowledgement modes (Transacted) +chartTitle=Performance of acknowledgement modes +chartSubtitle=Transacted xAxisTitle=Persistence yAxisTitle=Throughput (KB/s) Copied: qpid/trunk/qpid/java/perftests/etc/chartdefs/1030-BatchSize.chartdef (from r1357650, qpid/trunk/qpid/java/perftests/etc/chartdefs/BatchSize.chartdef) URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1030-BatchSize.chartdef?p2=qpid/trunk/qpid/java/perftests/etc/chartdefs/1030-BatchSize.chartdef&p1=qpid/trunk/qpid/java/perftests/etc/chartdefs/BatchSize.chartdef&r1=1357650&r2=1357682&rev=1357682&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/BatchSize.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1030-BatchSize.chartdef Thu Jul 5 15:28:54 2012 @@ -19,6 +19,7 @@ chartType=LINE chartTitle=Transaction Batch Size +chartSubtitle=Persistent 1KB messages xAxisTitle=Batch Size yAxisTitle=Throughput (KB/s) Copied: qpid/trunk/qpid/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef (from r1357650, qpid/trunk/qpid/java/perftests/etc/chartdefs/QueueTypes.chartdef) URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef?p2=qpid/trunk/qpid/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef&p1=qpid/trunk/qpid/java/perftests/etc/chartdefs/QueueTypes.chartdef&r1=1357650&r2=1357682&rev=1357682&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/QueueTypes.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef Thu Jul 5 15:28:54 2012 @@ -19,6 +19,7 @@ chartType=BAR chartTitle=Queue Types +chartSubtitle=Persistent 1KB messages xAxisTitle=Queue Types yAxisTitle=Throughput (KB/s) Copied: qpid/trunk/qpid/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef (from r1357650, qpid/trunk/qpid/java/perftests/etc/chartdefs/Latency-MessageSize-Transient.chardef) URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef?p2=qpid/trunk/qpid/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef&p1=qpid/trunk/qpid/java/perftests/etc/chartdefs/Latency-MessageSize-Transient.chardef&r1=1357650&r2=1357682&rev=1357682&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/Latency-MessageSize-Transient.chardef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef Thu Jul 5 15:28:54 2012 @@ -18,7 +18,8 @@ # chartType=STATISTICAL_BAR -chartTitle=Impact of transient message size on latency +chartTitle=Impact of message size on latency +chartSubtitle=Transient messages xAxisTitle=Message Size (B) yAxisTitle=Latency (millis) Copied: qpid/trunk/qpid/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef (from r1357650, qpid/trunk/qpid/java/perftests/etc/chartdefs/Latency-MessageSize-Persistent.chardef) URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef?p2=qpid/trunk/qpid/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef&p1=qpid/trunk/qpid/java/perftests/etc/chartdefs/Latency-MessageSize-Persistent.chardef&r1=1357650&r2=1357682&rev=1357682&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/Latency-MessageSize-Persistent.chardef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef Thu Jul 5 15:28:54 2012 @@ -18,7 +18,8 @@ # chartType=STATISTICAL_BAR -chartTitle=Impact of persistent message size on latency +chartTitle=Impact of message size on latency +chartSubtitle=Persistent messages xAxisTitle=Message Size (B) yAxisTitle=Latency (millis) Copied: qpid/trunk/qpid/java/perftests/etc/chartdefs/2011-Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef (from r1357650, qpid/trunk/qpid/java/perftests/etc/chartdefs/Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef) URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/2011-Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef?p2=qpid/trunk/qpid/java/perftests/etc/chartdefs/2011-Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef&p1=qpid/trunk/qpid/java/perftests/etc/chartdefs/Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef&r1=1357650&r2=1357682&rev=1357682&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/2011-Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef Thu Jul 5 15:28:54 2012 @@ -18,7 +18,8 @@ # chartType=STATISTICAL_BAR -chartTitle=Latency with consumers having non-overlapping selectors, transient, message size 1KB +chartTitle=Latency with consumers having non-overlapping selectors +chartSubtitle=Transient 1KB messages xAxisTitle=Consumers yAxisTitle=Latency (millis) Copied: qpid/trunk/qpid/java/perftests/etc/chartdefs/2012-Latency-QueuesWithOverlappingSelectors-Transient.chartdef (from r1357650, qpid/trunk/qpid/java/perftests/etc/chartdefs/Latency-QueuesWithOverlappingSelectors-Transient.chartdef) URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/2012-Latency-QueuesWithOverlappingSelectors-Transient.chartdef?p2=qpid/trunk/qpid/java/perftests/etc/chartdefs/2012-Latency-QueuesWithOverlappingSelectors-Transient.chartdef&p1=qpid/trunk/qpid/java/perftests/etc/chartdefs/Latency-QueuesWithOverlappingSelectors-Transient.chartdef&r1=1357650&r2=1357682&rev=1357682&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/Latency-QueuesWithOverlappingSelectors-Transient.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/2012-Latency-QueuesWithOverlappingSelectors-Transient.chartdef Thu Jul 5 15:28:54 2012 @@ -18,7 +18,8 @@ # chartType=STATISTICAL_BAR -chartTitle=Latency with consumers having 50%-overlapping selectors, transient, message size 1KB +chartTitle=Latency with consumers having 50%-overlapping selectors +chartSubtitle=Transient 1KB messages xAxisTitle=Consumers yAxisTitle=Latency (millis) Copied: qpid/trunk/qpid/java/perftests/etc/chartdefs/2021-Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef (from r1357650, qpid/trunk/qpid/java/perftests/etc/chartdefs/Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef) URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/2021-Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef?p2=qpid/trunk/qpid/java/perftests/etc/chartdefs/2021-Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef&p1=qpid/trunk/qpid/java/perftests/etc/chartdefs/Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef&r1=1357650&r2=1357682&rev=1357682&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/2021-Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef Thu Jul 5 15:28:54 2012 @@ -18,7 +18,8 @@ # chartType=STATISTICAL_BAR -chartTitle=Latency with consumers having non-overlapping selectors, persistent, message size 1KB +chartTitle=Latency with consumers having non-overlapping selectors +chartSubtitle=Persistent 1KB messages xAxisTitle=Consumers yAxisTitle=Latency (millis) Copied: qpid/trunk/qpid/java/perftests/etc/chartdefs/2022-Latency-QueuesWithOverlappingSelectors-Persistent.chartdef (from r1357650, qpid/trunk/qpid/java/perftests/etc/chartdefs/Latency-QueuesWithOverlappingSelectors-Persistent.chartdef) URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/2022-Latency-QueuesWithOverlappingSelectors-Persistent.chartdef?p2=qpid/trunk/qpid/java/perftests/etc/chartdefs/2022-Latency-QueuesWithOverlappingSelectors-Persistent.chartdef&p1=qpid/trunk/qpid/java/perftests/etc/chartdefs/Latency-QueuesWithOverlappingSelectors-Persistent.chartdef&r1=1357650&r2=1357682&rev=1357682&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/Latency-QueuesWithOverlappingSelectors-Persistent.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/2022-Latency-QueuesWithOverlappingSelectors-Persistent.chartdef Thu Jul 5 15:28:54 2012 @@ -18,7 +18,8 @@ # chartType=STATISTICAL_BAR -chartTitle=Latency with consumers having 50%-overlapping selectors, persistent, message size 1KB +chartTitle=Latency with consumers having 50%-overlapping selectors +chartSubtitle=Persistent 1KB messages xAxisTitle=Consumers yAxisTitle=Latency (millis) Copied: qpid/trunk/qpid/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef (from r1357650, qpid/trunk/qpid/java/perftests/etc/chartdefs/Latency-VaryingNumberOfParticipants.chartdef) URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef?p2=qpid/trunk/qpid/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef&p1=qpid/trunk/qpid/java/perftests/etc/chartdefs/Latency-VaryingNumberOfParticipants.chartdef&r1=1357650&r2=1357682&rev=1357682&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/Latency-VaryingNumberOfParticipants.chartdef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef Thu Jul 5 15:28:54 2012 @@ -18,7 +18,8 @@ # chartType=STATISTICAL_BAR -chartTitle=Latency, Varying number of participants, persistent, message size 1K +chartTitle=Latency, varying number of participants +chartSubtitle=Persistent 1KB messages xAxisTitle=Consumers yAxisTitle=Latency (millis) Copied: qpid/trunk/qpid/java/perftests/etc/chartdefs/2041-Latency-QueueTypes.chartdef (from r1357650, qpid/trunk/qpid/java/perftests/etc/chartdefs/Latency-QueueTypes.chardef) URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/2041-Latency-QueueTypes.chartdef?p2=qpid/trunk/qpid/java/perftests/etc/chartdefs/2041-Latency-QueueTypes.chartdef&p1=qpid/trunk/qpid/java/perftests/etc/chartdefs/Latency-QueueTypes.chardef&r1=1357650&r2=1357682&rev=1357682&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/chartdefs/Latency-QueueTypes.chardef (original) +++ qpid/trunk/qpid/java/perftests/etc/chartdefs/2041-Latency-QueueTypes.chartdef Thu Jul 5 15:28:54 2012 @@ -18,8 +18,9 @@ # chartType=STATISTICAL_BAR -chartTitle=Latency on different queues, message size 1KB -xAxisTitle=Queue types +chartTitle=Latency on different queues +chartSubtitle=Persistent 1KB messages +xAxisTitle=Queue type yAxisTitle=Latency (millis) series.1.statement=SELECT testName, maxLatency,0 FROM Latency-QueueTypes WHERE participantName = 'All Consumers' Copied: qpid/trunk/qpid/java/perftests/etc/testdefs/AcknowledgementModes.json (from r1357650, qpid/trunk/qpid/java/perftests/etc/testdefs/short/AcknowledgementModes.json) URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/testdefs/AcknowledgementModes.json?p2=qpid/trunk/qpid/java/perftests/etc/testdefs/AcknowledgementModes.json&p1=qpid/trunk/qpid/java/perftests/etc/testdefs/short/AcknowledgementModes.json&r1=1357650&r2=1357682&rev=1357682&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/testdefs/short/AcknowledgementModes.json (original) +++ qpid/trunk/qpid/java/perftests/etc/testdefs/AcknowledgementModes.json Thu Jul 5 15:28:54 2012 @@ -1,7 +1,7 @@ { "_tests":[ { - "_name": "Acknowledgement Modes - NON_PERSISTENT"; + "_name": "Transient Ack Modes"; "_iterations":[ { "_messageSize": 1024, @@ -70,7 +70,7 @@ ] }, { - "_name": "Acknowledgement Modes - PERSISTENT"; + "_name": "Persistent Ack Modes"; "_iterations":[ { "_messageSize": 1024, Copied: qpid/trunk/qpid/java/perftests/etc/testdefs/BatchSize.json (from r1357650, qpid/trunk/qpid/java/perftests/etc/testdefs/short/BatchSize.json) URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/testdefs/BatchSize.json?p2=qpid/trunk/qpid/java/perftests/etc/testdefs/BatchSize.json&p1=qpid/trunk/qpid/java/perftests/etc/testdefs/short/BatchSize.json&r1=1357650&r2=1357682&rev=1357682&view=diff ============================================================================== (empty) Copied: qpid/trunk/qpid/java/perftests/etc/testdefs/Latency-MessageSize.json (from r1357650, qpid/trunk/qpid/java/perftests/etc/testdefs/short/Latency-MessageSize.json) URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/testdefs/Latency-MessageSize.json?p2=qpid/trunk/qpid/java/perftests/etc/testdefs/Latency-MessageSize.json&p1=qpid/trunk/qpid/java/perftests/etc/testdefs/short/Latency-MessageSize.json&r1=1357650&r2=1357682&rev=1357682&view=diff ============================================================================== (empty) Copied: qpid/trunk/qpid/java/perftests/etc/testdefs/Latency-QueueTypes.json (from r1357650, qpid/trunk/qpid/java/perftests/etc/testdefs/short/Latency-QueueTypes.json) URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/testdefs/Latency-QueueTypes.json?p2=qpid/trunk/qpid/java/perftests/etc/testdefs/Latency-QueueTypes.json&p1=qpid/trunk/qpid/java/perftests/etc/testdefs/short/Latency-QueueTypes.json&r1=1357650&r2=1357682&rev=1357682&view=diff ============================================================================== (empty) Copied: qpid/trunk/qpid/java/perftests/etc/testdefs/Latency-QueuesWithSelectors.json (from r1357650, qpid/trunk/qpid/java/perftests/etc/testdefs/short/Latency-QueuesWithSelectors.json) URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/testdefs/Latency-QueuesWithSelectors.json?p2=qpid/trunk/qpid/java/perftests/etc/testdefs/Latency-QueuesWithSelectors.json&p1=qpid/trunk/qpid/java/perftests/etc/testdefs/short/Latency-QueuesWithSelectors.json&r1=1357650&r2=1357682&rev=1357682&view=diff ============================================================================== (empty) Copied: qpid/trunk/qpid/java/perftests/etc/testdefs/Latency-VaryingNumberOfParticipants.json (from r1357650, qpid/trunk/qpid/java/perftests/etc/testdefs/short/Latency-VaryingNumberOfParticipants.json) URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/testdefs/Latency-VaryingNumberOfParticipants.json?p2=qpid/trunk/qpid/java/perftests/etc/testdefs/Latency-VaryingNumberOfParticipants.json&p1=qpid/trunk/qpid/java/perftests/etc/testdefs/short/Latency-VaryingNumberOfParticipants.json&r1=1357650&r2=1357682&rev=1357682&view=diff ============================================================================== (empty) Copied: qpid/trunk/qpid/java/perftests/etc/testdefs/MessageSize.json (from r1357650, qpid/trunk/qpid/java/perftests/etc/testdefs/short/MessageSize.json) URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/testdefs/MessageSize.json?p2=qpid/trunk/qpid/java/perftests/etc/testdefs/MessageSize.json&p1=qpid/trunk/qpid/java/perftests/etc/testdefs/short/MessageSize.json&r1=1357650&r2=1357682&rev=1357682&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/etc/testdefs/short/MessageSize.json (original) +++ qpid/trunk/qpid/java/perftests/etc/testdefs/MessageSize.json Thu Jul 5 15:28:54 2012 @@ -1,7 +1,7 @@ { "_tests":[ { - "_name": "Message Size - 1P-1C - NON_PERSISTENT"; + "_name": "Message Size - 1P-1C - TRANSIENT"; "_iterations":[ { "_messageSize": 256, Copied: qpid/trunk/qpid/java/perftests/etc/testdefs/QueueTypes.json (from r1357650, qpid/trunk/qpid/java/perftests/etc/testdefs/short/QueueTypes.json) URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/testdefs/QueueTypes.json?p2=qpid/trunk/qpid/java/perftests/etc/testdefs/QueueTypes.json&p1=qpid/trunk/qpid/java/perftests/etc/testdefs/short/QueueTypes.json&r1=1357650&r2=1357682&rev=1357682&view=diff ============================================================================== (empty) Copied: qpid/trunk/qpid/java/perftests/etc/testdefs/VaryingNumberOfParticipants.json (from r1357650, qpid/trunk/qpid/java/perftests/etc/testdefs/short/VaryingNumberOfParticipants.json) URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/testdefs/VaryingNumberOfParticipants.json?p2=qpid/trunk/qpid/java/perftests/etc/testdefs/VaryingNumberOfParticipants.json&p1=qpid/trunk/qpid/java/perftests/etc/testdefs/short/VaryingNumberOfParticipants.json&r1=1357650&r2=1357682&rev=1357682&view=diff ============================================================================== (empty) Modified: qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/CategoryDataSetBasedChartBuilder.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/CategoryDataSetBasedChartBuilder.java?rev=1357682&r1=1357681&r2=1357682&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/CategoryDataSetBasedChartBuilder.java (original) +++ qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/CategoryDataSetBasedChartBuilder.java Thu Jul 5 15:28:54 2012 @@ -25,6 +25,7 @@ import org.apache.qpid.disttest.charting import org.apache.qpid.disttest.charting.seriesbuilder.SeriesBuilderCallback; import org.apache.qpid.disttest.charting.seriesbuilder.SeriesBuilder; import org.jfree.chart.JFreeChart; +import org.jfree.chart.axis.CategoryLabelPositions; import org.jfree.data.category.DefaultCategoryDataset; public abstract class CategoryDataSetBasedChartBuilder extends BaseChartBuilder @@ -74,6 +75,8 @@ public abstract class CategoryDataSetBas JFreeChart chart = createChartImpl(title, xAxisTitle, yAxisTitle, dataset, PLOT_ORIENTATION, SHOW_LEGEND, SHOW_TOOL_TIPS, SHOW_URLS); + chart.getCategoryPlot().getDomainAxis().setCategoryLabelPositions(CategoryLabelPositions.UP_45); + addCommonChartAttributes(chart, chartingDefinition); return chart; Modified: qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/StatisticalBarCharBuilder.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/StatisticalBarCharBuilder.java?rev=1357682&r1=1357681&r2=1357682&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/StatisticalBarCharBuilder.java (original) +++ qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/StatisticalBarCharBuilder.java Thu Jul 5 15:28:54 2012 @@ -28,6 +28,7 @@ import org.apache.qpid.disttest.charting import org.apache.qpid.disttest.charting.seriesbuilder.SeriesBuilderCallback; import org.jfree.chart.JFreeChart; import org.jfree.chart.axis.CategoryAxis; +import org.jfree.chart.axis.CategoryLabelPositions; import org.jfree.chart.axis.NumberAxis; import org.jfree.chart.axis.ValueAxis; import org.jfree.chart.plot.CategoryPlot; @@ -86,6 +87,8 @@ public class StatisticalBarCharBuilder e JFreeChart chart = createChartImpl(title, xAxisTitle, yAxisTitle, dataset, PLOT_ORIENTATION, SHOW_LEGEND, SHOW_TOOL_TIPS, SHOW_URLS); + chart.getCategoryPlot().getDomainAxis().setCategoryLabelPositions(CategoryLabelPositions.UP_45); + addCommonChartAttributes(chart, chartingDefinition); return chart; Modified: qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/XYDataSetBasedChartBuilder.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/XYDataSetBasedChartBuilder.java?rev=1357682&r1=1357681&r2=1357682&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/XYDataSetBasedChartBuilder.java (original) +++ qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/XYDataSetBasedChartBuilder.java Thu Jul 5 15:28:54 2012 @@ -28,6 +28,7 @@ import org.apache.qpid.disttest.charting import org.apache.qpid.disttest.charting.seriesbuilder.SeriesBuilderCallback; import org.apache.qpid.disttest.charting.seriesbuilder.SeriesBuilder; import org.jfree.chart.JFreeChart; +import org.jfree.chart.axis.CategoryLabelPositions; import org.jfree.data.xy.DefaultXYDataset; Modified: qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/writer/ChartWriter.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/writer/ChartWriter.java?rev=1357682&r1=1357681&r2=1357682&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/writer/ChartWriter.java (original) +++ qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/writer/ChartWriter.java Thu Jul 5 15:28:54 2012 @@ -26,8 +26,8 @@ import java.io.FileOutputStream; import java.io.FileWriter; import java.io.IOException; import java.io.OutputStream; -import java.util.ArrayList; -import java.util.List; +import java.util.SortedSet; +import java.util.TreeSet; import org.apache.qpid.disttest.charting.ChartingException; import org.jfree.chart.ChartUtilities; @@ -42,14 +42,13 @@ public class ChartWriter static final String SUMMARY_FILE_NAME = "chart-summary.html"; private File _chartDirectory = new File("."); - private List<File> _chartFiles = new ArrayList<File>(); + private SortedSet<File> _chartFiles = new TreeSet<File>(); public void writeChartToFileSystem(JFreeChart chart, String chartStemName) { OutputStream pngOutputStream = null; try { - File pngFile = new File(_chartDirectory, chartStemName + ".png"); pngOutputStream = new BufferedOutputStream(new FileOutputStream(pngFile)); ChartUtilities.writeChartAsPNG(pngOutputStream, chart, 600, 400, true, 0); Modified: qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartProductionTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartProductionTest.java?rev=1357682&r1=1357681&r2=1357682&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartProductionTest.java (original) +++ qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartProductionTest.java Thu Jul 5 15:28:54 2012 @@ -109,12 +109,47 @@ public class ChartProductionTest extends 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 @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); Modified: qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/writer/ChartWriterTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/writer/ChartWriterTest.java?rev=1357682&r1=1357681&r2=1357682&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/writer/ChartWriterTest.java (original) +++ qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/writer/ChartWriterTest.java Thu Jul 5 15:28:54 2012 @@ -73,8 +73,8 @@ public class ChartWriterTest extends Tes writeDummyContentToSummaryFileToEnsureItGetsOverwritten(summaryFile); - _writer.writeChartToFileSystem(_chart1, "chart1"); _writer.writeChartToFileSystem(_chart2, "chart2"); + _writer.writeChartToFileSystem(_chart1, "chart1"); _writer.writeHtmlSummaryToFileSystem(); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
