QPID-4341: ensure the Topic perftests actually use Topic destinations

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

11 files changed, 34 insertions, 19 deletions

diff --git a/qpid/java/perftests/etc/testdefs/Topic-AckModes.js b/qpid/java/perftests/etc/testdefs/Topic-AckModes.js
index 31da633695..3f7eb5d3a7 100644
--- a/qpid/java/perftests/etc/testdefs/Topic-AckModes.js
+++ b/qpid/java/perftests/etc/testdefs/Topic-AckModes.js
@@ -47,6 +47,7 @@ var jsonObject = {
                     {
                       "_name": "Producer",
                       "_destinationName": topicName,
+                      "_isTopic": true,
                       "_deliveryMode": 1,
                       "_maximumDuration": duration,
                       "_startDelay": 2000 // gives the consumers time to implicitly create the topic
@@ -72,6 +73,7 @@ var jsonObject = {
                     {
                       "_name": "Consumer-__INDEX",
                       "_destinationName": topicName,
+                      "_isTopic": true,
                       "_maximumDuration": duration,
                     }
                   ]
diff --git a/qpid/java/perftests/etc/testdefs/Topic-NumberOfConsumers.js b/qpid/java/perftests/etc/testdefs/Topic-NumberOfConsumers.js
index 58ae2f5862..c0e29e165d 100644
--- a/qpid/java/perftests/etc/testdefs/Topic-NumberOfConsumers.js
+++ b/qpid/java/perftests/etc/testdefs/Topic-NumberOfConsumers.js
@@ -46,6 +46,7 @@ for(i=0; i < numbersOfConsumers.length ; i++)
                     {
                       "_name": "Producer1",
                       "_destinationName": topicName,
+                      "_isTopic": true,
                       "_deliveryMode": 1,
                       "_maximumDuration": duration,
                       "_startDelay": 2000 // gives the consumers time to implicitly create the topic
@@ -70,6 +71,7 @@ for(i=0; i < numbersOfConsumers.length ; i++)
                     {
                       "_name": "Consumer-__INDEX",
                       "_destinationName": topicName,
+                      "_isTopic": true,
                       "_maximumDuration": duration
                     }
                   ]
diff --git a/qpid/java/perftests/etc/testdefs/Topic-NumberOfTopics.js b/qpid/java/perftests/etc/testdefs/Topic-NumberOfTopics.js
index d31dd36c76..6658b3c519 100644
--- a/qpid/java/perftests/etc/testdefs/Topic-NumberOfTopics.js
+++ b/qpid/java/perftests/etc/testdefs/Topic-NumberOfTopics.js
@@ -49,6 +49,7 @@ for(i=0; i < numbersOfTopics.length ; i++)
                         {
                           "_name": "Producer-__INDEX",
                           "_destinationName": topicName,
+                          "_isTopic": true,
                           "_deliveryMode": 1,
                           "_maximumDuration": duration,
                           "_startDelay": 2000 // gives the consumers time to implicitly create the topic
@@ -75,6 +76,7 @@ for(i=0; i < numbersOfTopics.length ; i++)
                         {
                           "_name": "Consumer-__INDEX",
                           "_destinationName": topicName,
+                          "_isTopic": true,
                           "_maximumDuration": duration
                         }
                       ]
diff --git a/qpid/java/perftests/etc/testdefs/Topic-Persistence.js b/qpid/java/perftests/etc/testdefs/Topic-Persistence.js
index 4456d96ac2..696a1ad435 100644
--- a/qpid/java/perftests/etc/testdefs/Topic-Persistence.js
+++ b/qpid/java/perftests/etc/testdefs/Topic-Persistence.js
@@ -52,6 +52,7 @@ var jsonObject = {
                     {
                       "_name": "Producer",
                       "_destinationName": topicName,
+                      "_isTopic": true,
                       "_maximumDuration": duration,
                       "_startDelay": 2000 // gives the consumers time to implicitly create the topic
                     }
diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ConsumerConfig.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ConsumerConfig.java
index 110de8a4ea..dcccccdd5f 100644
--- a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ConsumerConfig.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ConsumerConfig.java
@@ -24,7 +24,6 @@ import org.apache.qpid.disttest.message.CreateConsumerCommand;
 
 public class ConsumerConfig extends ParticipantConfig
 {
-    private boolean _isTopic;
     private boolean _isDurableSubscription;
     private boolean _isBrowsingSubscription;
     private String _selector;
@@ -35,7 +34,6 @@ public class ConsumerConfig extends ParticipantConfig
     // For Gson
     public ConsumerConfig()
     {
-        _isTopic = false;
         _isDurableSubscription = false;
         _isBrowsingSubscription = false;
         _selector = null;
@@ -56,9 +54,8 @@ public class ConsumerConfig extends ParticipantConfig
             boolean noLocal,
             boolean synchronous)
     {
-        super(consumerName, destinationName, numberOfMessages, batchSize, maximumDuration);
+        super(consumerName, destinationName, isTopic, numberOfMessages, batchSize, maximumDuration);
 
-        _isTopic = isTopic;
         _isDurableSubscription = isDurableSubscription;
         _isBrowsingSubscription = isBrowsingSubscription;
         _selector = selector;
@@ -73,7 +70,6 @@ public class ConsumerConfig extends ParticipantConfig
         setParticipantProperties(createConsumerCommand);
 
         createConsumerCommand.setSessionName(sessionName);
-        createConsumerCommand.setTopic(_isTopic);
         createConsumerCommand.setDurableSubscription(_isDurableSubscription);
         createConsumerCommand.setBrowsingSubscription(_isBrowsingSubscription);
         createConsumerCommand.setSelector(_selector);
diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ParticipantConfig.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ParticipantConfig.java
index 16f7b0d18d..99ae4b7426 100644
--- a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ParticipantConfig.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ParticipantConfig.java
@@ -33,6 +33,7 @@ public abstract class ParticipantConfig
     private boolean _alreadyLoggedAboutOverriddenDuration;
 
     private String _destinationName;
+    private boolean _isTopic;
     private long _numberOfMessages;
     private String _name;
     private int _batchSize;
@@ -51,12 +52,14 @@ public abstract class ParticipantConfig
     public ParticipantConfig(
             String name,
             String destinationName,
+            boolean isTopic,
             long numberOfMessages,
             int batchSize,
             long maximumDuration)
     {
         _name = name;
         _destinationName = destinationName;
+        _isTopic = isTopic;
         _numberOfMessages = numberOfMessages;
         _batchSize = batchSize;
         _maximumDuration = maximumDuration;
@@ -66,6 +69,7 @@ public abstract class ParticipantConfig
     {
         createParticipantCommand.setParticipantName(_name);
         createParticipantCommand.setDestinationName(_destinationName);
+        createParticipantCommand.setTopic(_isTopic);
         createParticipantCommand.setNumberOfMessages(_numberOfMessages);
         createParticipantCommand.setBatchSize(_batchSize);
 
diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ProducerConfig.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ProducerConfig.java
index f2369ed671..88c188d3ac 100644
--- a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ProducerConfig.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ProducerConfig.java
@@ -59,7 +59,7 @@ public class ProducerConfig extends ParticipantConfig
             long startDelay,
             String messageProviderName)
     {
-        super(producerName, destinationName, numberOfMessages, batchSize, maximumDuration);
+        super(producerName, destinationName, false, numberOfMessages, batchSize, maximumDuration);
 
         _deliveryMode = deliveryMode;
         _messageSize = messageSize;
diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/ClientJmsDelegate.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/ClientJmsDelegate.java
index a177770a30..f242111dc5 100644
--- a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/ClientJmsDelegate.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/ClientJmsDelegate.java
@@ -218,7 +218,15 @@ public class ClientJmsDelegate
 
             synchronized(session)
             {
-                final Destination destination = session.createQueue(command.getDestinationName());
+                final Destination destination;
+                if(command.isTopic())
+                {
+                    destination = session.createTopic(command.getDestinationName());
+                }
+                else
+                {
+                    destination = session.createQueue(command.getDestinationName());
+                }
 
                 final MessageProducer jmsProducer = session.createProducer(destination);
 
diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateConsumerCommand.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateConsumerCommand.java
index 68c21fbf83..07a60504c8 100644
--- a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateConsumerCommand.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateConsumerCommand.java
@@ -21,7 +21,6 @@ package org.apache.qpid.disttest.message;
 
 public class CreateConsumerCommand extends CreateParticpantCommand
 {
-    private boolean _isTopic;
     private boolean _isDurableSubscription;
     private boolean _isBrowsingSubscription;
     private String _selector;
@@ -75,16 +74,6 @@ public class CreateConsumerCommand extends CreateParticpantCommand
         this._noLocal = noLocal;
     }
 
-    public boolean isTopic()
-    {
-        return _isTopic;
-    }
-
-    public void setTopic(boolean isTopic)
-    {
-        this._isTopic = isTopic;
-    }
-
     public boolean isSynchronous()
     {
         return _synchronous;
diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateParticpantCommand.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateParticpantCommand.java
index b1caa6ef75..e7349bf795 100644
--- a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateParticpantCommand.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateParticpantCommand.java
@@ -23,6 +23,7 @@ import org.apache.commons.lang.builder.ToStringBuilder;
 
 public abstract class CreateParticpantCommand extends Command
 {
+    private boolean _isTopic;
     private String _participantName;
     private String _sessionName;
     private String _destinationName;
@@ -65,6 +66,16 @@ public abstract class CreateParticpantCommand extends Command
         _destinationName = destinationName;
     }
 
+    public boolean isTopic()
+    {
+        return _isTopic;
+    }
+
+    public void setTopic(boolean isTopic)
+    {
+        _isTopic = isTopic;
+    }
+
     public long getNumberOfMessages()
     {
         return _numberOfMessages;
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ParticipantConfigTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ParticipantConfigTest.java
index f58cc628a4..b6efd68cbd 100644
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ParticipantConfigTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ParticipantConfigTest.java
@@ -32,7 +32,7 @@ public class ParticipantConfigTest extends QpidTestCase
         setTestSystemProperty(ParticipantConfig.DURATION_OVERRIDE_SYSTEM_PROPERTY, String.valueOf(overriddenDuration));
 
         CreateParticpantCommand createParticipantCommand = mock(CreateParticpantCommand.class);
-        ParticipantConfig participantConfig = new ParticipantConfig("name", "destinationName", 1, 2, 5000)
+        ParticipantConfig participantConfig = new ParticipantConfig("name", "destinationName", false, 1, 2, 5000)
         {
         };