NO-JIRA: correct some test descriptions and make it explicit which acknowledgement mode is in use within the associated test definition

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

12 files changed, 15 insertions, 9 deletions

diff --git a/qpid/java/perftests/etc/chartdefs/1050-VaryingNumberOfProducerSessionsSingleConnection.chartdef b/qpid/java/perftests/etc/chartdefs/1050-VaryingNumberOfProducerSessionsSingleConnection.chartdef
index 86b5496973..29998c89dd 100644
--- a/qpid/java/perftests/etc/chartdefs/1050-VaryingNumberOfProducerSessionsSingleConnection.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/1050-VaryingNumberOfProducerSessionsSingleConnection.chartdef
@@ -20,7 +20,7 @@
 chartType=XYLINE
 chartTitle=Varying number of producer sessions on single connection
 chartSubtitle=Persistent messages (1024b)
-chartDescription=1-80P on single connection, 20C on separate connections, persistent, transacted with message payload 1KB.
+chartDescription=1-80P transacted on single connection, 20C auto-ack on separate connections, persistent, message payload 1KB.
 
 xAxisTitle=Number of producer sessions
 yAxisTitle=Throughput (KB/s)
diff --git a/qpid/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef b/qpid/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef
index 78fb37fe56..073cee810d 100644
--- a/qpid/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef
@@ -20,7 +20,7 @@
 chartType=XYLINE
 chartTitle=Number of topic consumers
 chartSubtitle=Transient 1KB messages
-chartDescription=1P 1-100C transient, auto-ack with message payload 1KB.
+chartDescription=1P 1-100C transient, transacted, with message payload 1KB.
 
 xAxisTitle=Numer of consumers
 yAxisTitle=Throughput (messages/s)
diff --git a/qpid/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef b/qpid/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef
index b6235b912c..b32f43d0c2 100644
--- a/qpid/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef
@@ -20,7 +20,7 @@
 chartType=XYLINE
 chartTitle=Number of topics
 chartSubtitle=Transient 1KB messages
-chartDescription=1,10,50,100 PC, transient, auto-ack, with each PC pair having own topic, message payload 1KB.
+chartDescription=1,10,50,100 PC, transient, transacted, with each PC pair having own topic, message payload 1KB.
 
 xAxisTitle=Numer of topics
 yAxisTitle=Throughput (messages/s)
diff --git a/qpid/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef b/qpid/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef
index 90e3c58b9c..5fd905ab4f 100644
--- a/qpid/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef
@@ -20,7 +20,7 @@
 chartType=BAR
 chartTitle=Topic transient/durable subscriptions
 chartSubtitle=1KB messages
-chartDescription=1P 10C, auto-ack, message payload 1KB, transient messages on non-durable sub, persistent messages on durable sub
+chartDescription=1P 10C, transacted, message payload 1KB, transient messages on non-durable sub, persistent messages on durable sub
 
 xAxisTitle=Subscription type (true durable, false non durable)
 yAxisTitle=Throughput (messages/s)
diff --git a/qpid/java/perftests/etc/chartdefs/2011-Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef b/qpid/java/perftests/etc/chartdefs/2011-Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef
index af79634abd..663912b622 100644
--- a/qpid/java/perftests/etc/chartdefs/2011-Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/2011-Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef
@@ -20,7 +20,7 @@
 chartType=STATISTICAL_BAR
 chartTitle=Latency with consumers having non-overlapping selectors
 chartSubtitle=Transient 1KB messages
-chartDescription=1P 1-10C, transient, auto-ack, with message payload between 1KB.
+chartDescription=1P 1-10C, transient, auto-ack, with message payload 1KB.
 
 xAxisTitle=Consumers
 yAxisTitle=Latency (millis)
diff --git a/qpid/java/perftests/etc/chartdefs/2012-Latency-QueuesWithOverlappingSelectors-Transient.chartdef b/qpid/java/perftests/etc/chartdefs/2012-Latency-QueuesWithOverlappingSelectors-Transient.chartdef
index 2dcc150911..3b9e207e10 100644
--- a/qpid/java/perftests/etc/chartdefs/2012-Latency-QueuesWithOverlappingSelectors-Transient.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/2012-Latency-QueuesWithOverlappingSelectors-Transient.chartdef
@@ -20,7 +20,7 @@
 chartType=STATISTICAL_BAR
 chartTitle=Latency with consumers having 50%-overlapping selectors
 chartSubtitle=Transient 1KB messages
-chartDescription=1P 1-10C, transient, auto-ack, with message payload between 1KB.
+chartDescription=1P 1-10C, transient, auto-ack, with message payload 1KB.
 
 xAxisTitle=Consumers
 yAxisTitle=Latency (millis)
diff --git a/qpid/java/perftests/etc/chartdefs/2021-Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef b/qpid/java/perftests/etc/chartdefs/2021-Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef
index 64da668425..296d115d3f 100644
--- a/qpid/java/perftests/etc/chartdefs/2021-Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/2021-Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef
@@ -20,7 +20,7 @@
 chartType=STATISTICAL_BAR
 chartTitle=Latency with consumers having non-overlapping selectors
 chartSubtitle=Persistent 1KB messages
-chartDescription=1P 1-10C, persistent, auto-ack, with message payload between 1KB.
+chartDescription=1P 1-10C, persistent, auto-ack, with message payload 1KB.
 
 xAxisTitle=Consumers
 yAxisTitle=Latency (millis)
diff --git a/qpid/java/perftests/etc/chartdefs/2022-Latency-QueuesWithOverlappingSelectors-Persistent.chartdef b/qpid/java/perftests/etc/chartdefs/2022-Latency-QueuesWithOverlappingSelectors-Persistent.chartdef
index 856d47a569..65be60b5e5 100644
--- a/qpid/java/perftests/etc/chartdefs/2022-Latency-QueuesWithOverlappingSelectors-Persistent.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/2022-Latency-QueuesWithOverlappingSelectors-Persistent.chartdef
@@ -20,7 +20,7 @@
 chartType=STATISTICAL_BAR
 chartTitle=Latency with consumers having 50%-overlapping selectors
 chartSubtitle=Persistent 1KB messages
-chartDescription=1P 1-10C, persistent, auto-ack, with message payload between 1KB.
+chartDescription=1P 1-10C, persistent, auto-ack, with message payload 1KB.
 
 xAxisTitle=Consumers
 yAxisTitle=Latency (millis)
diff --git a/qpid/java/perftests/etc/chartdefs/2041-Latency-QueueTypes.chartdef b/qpid/java/perftests/etc/chartdefs/2041-Latency-QueueTypes.chartdef
index 9698ad4b30..dac8a52f89 100644
--- a/qpid/java/perftests/etc/chartdefs/2041-Latency-QueueTypes.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/2041-Latency-QueueTypes.chartdef
@@ -20,7 +20,7 @@
 chartType=STATISTICAL_BAR
 chartTitle=Latency on different queues
 chartSubtitle=Persistent 1KB messages
-chartDescription=1P 1C, persistent, auto-ack with message payload 1KB. Sorted queue - 400 random keys, Priority - 200 random priorities.
+chartDescription=1P 1C, persistent, auto-ack with message payload 1KB. Sorted queue - 400 varied keys, Priority - 200 varied priorities.
 
 xAxisTitle=Queue type
 yAxisTitle=Latency (millis)
diff --git a/qpid/java/perftests/etc/testdefs/Topic-NumberOfConsumers.js b/qpid/java/perftests/etc/testdefs/Topic-NumberOfConsumers.js
index c0e29e165d..1d38ff08e5 100644
--- a/qpid/java/perftests/etc/testdefs/Topic-NumberOfConsumers.js
+++ b/qpid/java/perftests/etc/testdefs/Topic-NumberOfConsumers.js
@@ -42,6 +42,7 @@ for(i=0; i < numbersOfConsumers.length ; i++)
               "_sessions": [
                 {
                   "_sessionName": "session1",
+                  "_acknowledgeMode": 0,
                   "_producers": [
                     {
                       "_name": "Producer1",
@@ -67,6 +68,7 @@ for(i=0; i < numbersOfConsumers.length ; i++)
               "_sessions": [
                 {
                   "_sessionName": "session1",
+                  "_acknowledgeMode": 0,
                   "_consumers": [
                     {
                       "_name": "Consumer-__INDEX",
diff --git a/qpid/java/perftests/etc/testdefs/Topic-NumberOfTopics.js b/qpid/java/perftests/etc/testdefs/Topic-NumberOfTopics.js
index 6658b3c519..811f8e3a07 100644
--- a/qpid/java/perftests/etc/testdefs/Topic-NumberOfTopics.js
+++ b/qpid/java/perftests/etc/testdefs/Topic-NumberOfTopics.js
@@ -45,6 +45,7 @@ for(i=0; i < numbersOfTopics.length ; i++)
                   "_sessions": [
                     {
                       "_sessionName": "session1",
+                      "_acknowledgeMode": 0,
                       "_producers": [
                         {
                           "_name": "Producer-__INDEX",
@@ -72,6 +73,7 @@ for(i=0; i < numbersOfTopics.length ; i++)
                   "_sessions": [
                     {
                       "_sessionName": "session1",
+                      "_acknowledgeMode": 0,
                       "_consumers": [
                         {
                           "_name": "Consumer-__INDEX",
diff --git a/qpid/java/perftests/etc/testdefs/Topic-Persistence.js b/qpid/java/perftests/etc/testdefs/Topic-Persistence.js
index 696a1ad435..96872b6c55 100644
--- a/qpid/java/perftests/etc/testdefs/Topic-Persistence.js
+++ b/qpid/java/perftests/etc/testdefs/Topic-Persistence.js
@@ -48,6 +48,7 @@ var jsonObject = {
               "_sessions": [
                 {
                   "_sessionName": "session1",
+                  "_acknowledgeMode": 0,
                   "_producers": [
                     {
                       "_name": "Producer",
@@ -73,6 +74,7 @@ var jsonObject = {
               "_sessions": [
                 {
                   "_sessionName": "session1",
+                  "_acknowledgeMode": 0,
                   "_consumers": [
                     {
                       "_name": "Consumer-__INDEX",