Tests enhanced for fanout style tests with many consumers per destination.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@567006 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 4 insertions, 9 deletions

diff --git a/java/perftests/src/main/java/org/apache/qpid/ping/PingClient.java b/java/perftests/src/main/java/org/apache/qpid/ping/PingClient.java
index 984b994c05..ac12436951 100644
--- a/java/perftests/src/main/java/org/apache/qpid/ping/PingClient.java
+++ b/java/perftests/src/main/java/org/apache/qpid/ping/PingClient.java
@@ -95,13 +95,13 @@ public class PingClient extends PingPongProducer
         {

             log.debug("1 consumer per destination.");

 

-            return 1;

+            return _noOfConsumers;

         }

         else

         {

             log.debug(_pingClientCount + " consumers per destination.");

 

-            return _pingClientCount;

+            return _pingClientCount * _noOfConsumers;

         }

     }

 }

diff --git a/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java b/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java
index 660c0b6523..08e155615b 100644
--- a/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java
+++ b/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java
@@ -132,6 +132,7 @@ import java.util.concurrent.atomic.AtomicLong;
  */

 public class PingPongProducer implements Runnable /*, MessageListener*/, ExceptionListener

 {

+    /** Used for debugging. */

     private static final Logger log = Logger.getLogger(PingPongProducer.class);

 

     /** Holds the name of the property to get the test message size from. */

@@ -451,12 +452,6 @@ public class PingPongProducer implements Runnable /*, MessageListener*/, Excepti
     /** Holds the message consumer to receive the ping replies through. */

     protected MessageConsumer[] _consumer;

 

-    /**

-     * Holds the number of consumers that will be attached to each destination in the test. Each pings will result in

-     * a message being received by each of these clients in a pub/sub tests, and by only one at a time in a p2p test.

-     */

-    static int _consumersPerDestination = 1;

-

     /** The prompt to display when asking the user to kill the broker for failover testing. */

     private static final String KILL_BROKER_PROMPT = "Kill broker now, then press Return.";

     private String _clientID;

@@ -1488,7 +1483,7 @@ public class PingPongProducer implements Runnable /*, MessageListener*/, Excepti
      */

     public int getConsumersPerDestination()

     {

-        return _consumersPerDestination;

+        return _noOfConsumers;

     }

 

     /**