From fb4e845bb1b914ebdc2941ad0adcb03fc47d0aeb Mon Sep 17 00:00:00 2001
From: Keith Wall <kwall@apache.org>
Date: Wed, 18 Jul 2012 16:58:39 +0000
Subject: QPID-4143: include baseline data in charts.

Applied patch from Philip Harvey <phil@philharveyonline.com>.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1363017 13f79535-47bb-0310-9956-ffa450edef68
---
 .../etc/testdefs/AcknowledgementModes.json         | 16 ++---
 qpid/java/perftests/etc/testdefs/MessageSize.json  | 79 +++++++++-------------
 2 files changed, 39 insertions(+), 56 deletions(-)

(limited to 'qpid/java/perftests/etc/testdefs')

diff --git a/qpid/java/perftests/etc/testdefs/AcknowledgementModes.json b/qpid/java/perftests/etc/testdefs/AcknowledgementModes.json
index e69f509056..071edf3f0e 100644
--- a/qpid/java/perftests/etc/testdefs/AcknowledgementModes.json
+++ b/qpid/java/perftests/etc/testdefs/AcknowledgementModes.json
@@ -5,13 +5,11 @@
       "_iterations":[
         {
           "_messageSize": 1024,
-          "_maximumDuration": 30000,
           "_acknowledgeMode": 1,
           "_deliveryMode": 1
         },
         {
           "_messageSize": 1024,
-          "_maximumDuration": 30000,
           "_acknowledgeMode": 0,
           "_deliveryMode": 1
         }
@@ -39,7 +37,8 @@
                   "_producers": [
                     {
                       "_name": "Producer1",
-                      "_destinationName": "direct://amq.direct//testQueue"
+                      "_destinationName": "direct://amq.direct//testQueue",
+                      "_maximumDuration": 30000
                     }
                   ]
                 }
@@ -59,7 +58,8 @@
                   "_consumers": [
                     {
                       "_name": "Consumer1",
-                      "_destinationName": "direct://amq.direct//testQueue"
+                      "_destinationName": "direct://amq.direct//testQueue",
+                      "_maximumDuration": 30000
                     }
                   ]
                 }
@@ -74,13 +74,11 @@
       "_iterations":[
         {
           "_messageSize": 1024,
-          "_maximumDuration": 30000,
           "_acknowledgeMode": 1,
           "_deliveryMode": 2
         },
         {
           "_messageSize": 1024,
-          "_maximumDuration": 30000,
           "_acknowledgeMode": 0,
           "_deliveryMode": 2
         }
@@ -104,7 +102,8 @@
                   "_producers": [
                     {
                       "_name": "Producer1",
-                      "_destinationName": "direct://amq.direct//testQueue?durable='true'"
+                      "_destinationName": "direct://amq.direct//testQueue?durable='true'",
+                      "_maximumDuration": 30000
                     }
                   ]
                 }
@@ -124,7 +123,8 @@
                   "_consumers": [
                     {
                       "_name": "Consumer1",
-                      "_destinationName": "direct://amq.direct//testQueue?durable='true'"
+                      "_destinationName": "direct://amq.direct//testQueue?durable='true'",
+                      "_maximumDuration": 30000
                     }
                   ]
                 }
diff --git a/qpid/java/perftests/etc/testdefs/MessageSize.json b/qpid/java/perftests/etc/testdefs/MessageSize.json
index 8fc8e33463..6d796bd824 100644
--- a/qpid/java/perftests/etc/testdefs/MessageSize.json
+++ b/qpid/java/perftests/etc/testdefs/MessageSize.json
@@ -4,48 +4,37 @@
       "_name": "Message Size - 1P-1C - TRANSIENT";
       "_iterations":[
         {
-          "_messageSize": 256,
-          "_maximumDuration": 30000
+          "_messageSize": 256
         },
         {
-          "_messageSize": 512,
-          "_maximumDuration": 30000
+          "_messageSize": 512
         },
         {
-          "_messageSize": 1024,
-          "_maximumDuration": 30000
+          "_messageSize": 1024
         },
         {
-          "_messageSize": 2048,
-          "_maximumDuration": 30000
+          "_messageSize": 2048
         },
         {
-          "_messageSize": 4096,
-          "_maximumDuration": 30000
+          "_messageSize": 4096
         },
         {
-          "_messageSize": 8192,
-          "_maximumDuration": 30000
+          "_messageSize": 8192
         },
         {
-          "_messageSize": 16384,
-          "_maximumDuration": 30000
+          "_messageSize": 16384
         },
         {
-          "_messageSize": 32768,
-          "_maximumDuration": 30000
+          "_messageSize": 32768
         },
         {
-          "_messageSize": 65536,
-          "_maximumDuration": 30000
+          "_messageSize": 65536
         },
         {
-          "_messageSize": 131072,
-          "_maximumDuration": 30000
+          "_messageSize": 131072
         },
         {
-          "_messageSize": 262144,
-          "_maximumDuration": 30000
+          "_messageSize": 262144
         }
       ],
       "_queues":[
@@ -73,7 +62,8 @@
                     {
                       "_name": "Producer1",
                       "_destinationName": "direct://amq.direct//messageSize",
-                      "_deliveryMode": 1
+                      "_deliveryMode": 1,
+                      "_maximumDuration": 30000
                     }
                   ]
                 }
@@ -94,7 +84,8 @@
                   "_consumers": [
                     {
                       "_name": "Consumer1",
-                      "_destinationName": "direct://amq.direct//messageSize"
+                      "_destinationName": "direct://amq.direct//messageSize",
+                      "_maximumDuration": 30000
                     }
                   ]
                 }
@@ -108,48 +99,37 @@
       "_name": "Message Size - 1P-1C - PERSISTENT";
       "_iterations":[
         {
-          "_messageSize": 256,
-          "_maximumDuration": 30000
+          "_messageSize": 256
         },
         {
-          "_messageSize": 512,
-          "_maximumDuration": 30000
+          "_messageSize": 512
         },
         {
-          "_messageSize": 1024,
-          "_maximumDuration": 30000
+          "_messageSize": 1024
         },
         {
-          "_messageSize": 2048,
-          "_maximumDuration": 30000
+          "_messageSize": 2048
         },
         {
-          "_messageSize": 4096,
-          "_maximumDuration": 30000
+          "_messageSize": 4096
         },
         {
-          "_messageSize": 8192,
-          "_maximumDuration": 30000
+          "_messageSize": 8192
         },
         {
-          "_messageSize": 16384,
-          "_maximumDuration": 30000
+          "_messageSize": 16384
         },
         {
-          "_messageSize": 32768,
-          "_maximumDuration": 30000
+          "_messageSize": 32768
         },
         {
-          "_messageSize": 65536,
-          "_maximumDuration": 30000
+          "_messageSize": 65536
         },
         {
-          "_messageSize": 131072,
-          "_maximumDuration": 30000
+          "_messageSize": 131072
         },
         {
-          "_messageSize": 262144,
-          "_maximumDuration": 30000
+          "_messageSize": 262144
         }
       ],
       "_queues":[
@@ -178,7 +158,9 @@
                     {
                       "_name": "Producer1",
                       "_destinationName": "direct://amq.direct//messageSize?durable='true'",
-                      "_deliveryMode": 2
+                      "_deliveryMode": 2,
+                      "_maximumDuration": 30000
+
                     }
                   ]
                 }
@@ -199,7 +181,8 @@
                   "_consumers": [
                     {
                       "_name": "Consumer1",
-                      "_destinationName": "direct://amq.direct//messageSize?durable='true'"
+                      "_destinationName": "direct://amq.direct//messageSize?durable='true'",
+                      "_maximumDuration": 30000
                     }
                   ]
                 }
-- 
cgit v1.2.1