Update to performance testing to allow the use of shared destinations. This allows topics to have multiple consumers and the total message counts updated correctly.

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

2 files changed, 17 insertions, 14 deletions

diff --git a/java/perftests/src/test/java/org/apache/qpid/ping/PingAsyncTestPerf.java b/java/perftests/src/test/java/org/apache/qpid/ping/PingAsyncTestPerf.java
index c01987cfc0..347031ff51 100644
--- a/java/perftests/src/test/java/org/apache/qpid/ping/PingAsyncTestPerf.java
+++ b/java/perftests/src/test/java/org/apache/qpid/ping/PingAsyncTestPerf.java
@@ -70,7 +70,7 @@ public class PingAsyncTestPerf extends PingTestPerf implements TimingControllerA
 
     /** Holds test specifics by correlation id. This consists of the expected number of messages and the timing controler. */
     private Map<String, PerCorrelationId> perCorrelationIds =
-        Collections.synchronizedMap(new HashMap<String, PerCorrelationId>());
+            Collections.synchronizedMap(new HashMap<String, PerCorrelationId>());
 
     /** Holds the batched results listener, that does logging on batch boundaries. */
     private BatchedResultsListener batchedResultsListener = null;
@@ -91,6 +91,7 @@ public class PingAsyncTestPerf extends PingTestPerf implements TimingControllerA
 
     /**
      * Compile all the tests into a test suite.
+     * @return The test suite to run. Should only contain testAsyncPingOk method. 
      */
     public static Test suite()
     {
@@ -128,6 +129,7 @@ public class PingAsyncTestPerf extends PingTestPerf implements TimingControllerA
      * all replies have been received or a time out occurs before exiting this method.
      *
      * @param numPings The number of pings to send.
+     * @throws Exception pass all errors out to the test harness  
      */
     public void testAsyncPingOk(int numPings) throws Exception
     {
@@ -151,7 +153,7 @@ public class PingAsyncTestPerf extends PingTestPerf implements TimingControllerA
         PerCorrelationId perCorrelationId = new PerCorrelationId();
         TimingController tc = getTimingController().getControllerForCurrentThread();
         perCorrelationId._tc = tc;
-        perCorrelationId._expectedCount = numPings;
+        perCorrelationId._expectedCount = pingClient.getExpectedNumPings(numPings);
         perCorrelationIds.put(messageCorrelationId, perCorrelationId);
 
         // Attach the chained message listener to the ping producer to listen asynchronously for the replies to these
@@ -160,18 +162,18 @@ public class PingAsyncTestPerf extends PingTestPerf implements TimingControllerA
 
         // Generate a sample message of the specified size.
         ObjectMessage msg =
-            pingClient.getTestMessage(perThreadSetup._pingClient.getReplyDestinations().get(0),
-                                      testParameters.getPropertyAsInteger(PingPongProducer.MESSAGE_SIZE_PROPNAME),
-                                      testParameters.getPropertyAsBoolean(PingPongProducer.PERSISTENT_MODE_PROPNAME));
+                pingClient.getTestMessage(perThreadSetup._pingClient.getReplyDestinations().get(0),
+                                          testParameters.getPropertyAsInteger(PingPongProducer.MESSAGE_SIZE_PROPNAME),
+                                          testParameters.getPropertyAsBoolean(PingPongProducer.PERSISTENT_MODE_PROPNAME));
 
         // Send the requested number of messages, and wait until they have all been received.
         long timeout = Long.parseLong(testParameters.getProperty(PingPongProducer.TIMEOUT_PROPNAME));
         int numReplies = pingClient.pingAndWaitForReply(msg, numPings, timeout, messageCorrelationId);
 
         // Check that all the replies were received and log a fail if they were not.
-        if (numReplies < numPings)
+        if (numReplies < perCorrelationId._expectedCount)
         {
-            tc.completeTest(false, numPings - numReplies);
+            tc.completeTest(false, numPings - perCorrelationId._expectedCount);
         }
 
         // Remove the chained message listener from the ping producer.
diff --git a/java/perftests/src/test/java/org/apache/qpid/ping/PingTestPerf.java b/java/perftests/src/test/java/org/apache/qpid/ping/PingTestPerf.java
index 0d0df0128e..07d7fad471 100644
--- a/java/perftests/src/test/java/org/apache/qpid/ping/PingTestPerf.java
+++ b/java/perftests/src/test/java/org/apache/qpid/ping/PingTestPerf.java
@@ -110,6 +110,7 @@ public class PingTestPerf extends AsymptoticTestCase implements TestThreadAware
 

     /**

      * Compile all the tests into a test suite.

+     * @return The test method testPingOk.

      */

     public static Test suite()

     {

@@ -139,18 +140,18 @@ public class PingTestPerf extends AsymptoticTestCase implements TestThreadAware
 

         // Generate a sample message. This message is already time stamped and has its reply-to destination set.

         ObjectMessage msg =

-            perThreadSetup._pingClient.getTestMessage(perThreadSetup._pingClient.getReplyDestinations().get(0),

-                                                      testParameters.getPropertyAsInteger(

-                                                          PingPongProducer.MESSAGE_SIZE_PROPNAME),

-                                                      testParameters.getPropertyAsBoolean(

-                                                          PingPongProducer.PERSISTENT_MODE_PROPNAME));

+                perThreadSetup._pingClient.getTestMessage(perThreadSetup._pingClient.getReplyDestinations().get(0),

+                                                          testParameters.getPropertyAsInteger(

+                                                                  PingPongProducer.MESSAGE_SIZE_PROPNAME),

+                                                          testParameters.getPropertyAsBoolean(

+                                                                  PingPongProducer.PERSISTENT_MODE_PROPNAME));

 

         // start the test

         long timeout = Long.parseLong(testParameters.getProperty(PingPongProducer.TIMEOUT_PROPNAME));

         int numReplies = perThreadSetup._pingClient.pingAndWaitForReply(msg, numPings, timeout);

 

         // Fail the test if the timeout was exceeded.

-        if (numReplies != numPings)

+        if (numReplies != perThreadSetup._pingClient.getExpectedNumPings(numPings))

         {

             Assert.fail("The ping timed out after " + timeout + " ms. Messages Sent = " + numPings + ", MessagesReceived = "

                         + numReplies);

@@ -191,7 +192,7 @@ public class PingTestPerf extends AsymptoticTestCase implements TestThreadAware
 

             // Extract the test set up paramaeters.

             int destinationscount =

-                Integer.parseInt(testParameters.getProperty(PingPongProducer.PING_DESTINATION_COUNT_PROPNAME));

+                    Integer.parseInt(testParameters.getProperty(PingPongProducer.PING_DESTINATION_COUNT_PROPNAME));

 

             // This is synchronized because there is a race condition, which causes one connection to sleep if

             // all threads try to create connection concurrently.