Merged revisions 522994-523245 via svnmerge from

https://svn.apache.org/repos/asf/incubator/qpid/branches/M2

........
  r522994 | rgreig | 2007-03-27 17:48:23 +0100 (Tue, 27 Mar 2007) | 1 line
  
  Test added for durability of messages under broker failure.
........
  r523245 | rgreig | 2007-03-28 10:30:49 +0100 (Wed, 28 Mar 2007) | 1 line
  
  Reversed accidental replacing of the word 'initialize' in comments to 'establishConnection' through a method refactoring.
........


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

4 files changed, 54 insertions, 98 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 a782058fd4..3b8e670f8f 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
@@ -86,7 +86,7 @@ public class PingAsyncTestPerf extends PingTestPerf implements TimingControllerA
 
         // Sets up the test parameters with defaults.
         testParameters.setPropertyIfNull(TEST_RESULTS_BATCH_SIZE_PROPNAME,
-                                         Integer.toString(TEST_RESULTS_BATCH_SIZE_DEFAULT));
+            Integer.toString(TEST_RESULTS_BATCH_SIZE_DEFAULT));
     }
 
     /**
@@ -159,7 +159,7 @@ public class PingAsyncTestPerf extends PingTestPerf implements TimingControllerA
 
         // 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(numPings, timeout, perThreadSetup._correlationId);
+        int numReplies = pingClient.pingAndWaitForReply(null, numPings, timeout, perThreadSetup._correlationId);
 
         // Check that all the replies were received and log a fail if they were not.
         if (numReplies < perCorrelationId._expectedCount)
@@ -247,8 +247,8 @@ public class PingAsyncTestPerf extends PingTestPerf implements TimingControllerA
                 String correlationId = message.getJMSCorrelationID();
 
                 _logger.debug("public void onMessage(Message message, int remainingCount = " + remainingCount
-                              + "): called on batch boundary for message id: " + correlationId + " with thread id: "
-                              + Thread.currentThread().getId());
+                    + "): called on batch boundary for message id: " + correlationId + " with thread id: "
+                    + Thread.currentThread().getId());
 
                 // Get the details for the correlation id and check that they are not null. They can become null
                 // if a test times out.
diff --git a/java/perftests/src/test/java/org/apache/qpid/ping/PingLatencyTestPerf.java b/java/perftests/src/test/java/org/apache/qpid/ping/PingLatencyTestPerf.java
index 620ddd13f7..b303e16d2c 100644
--- a/java/perftests/src/test/java/org/apache/qpid/ping/PingLatencyTestPerf.java
+++ b/java/perftests/src/test/java/org/apache/qpid/ping/PingLatencyTestPerf.java
@@ -175,7 +175,7 @@ public class PingLatencyTestPerf extends PingTestPerf implements TimingControlle
 

         // 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);

+        int numReplies = pingClient.pingAndWaitForReply(msg, numPings, timeout, null);

 

         // Check that all the replies were received and log a fail if they were not.

         if (numReplies < numPings)

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 6fb9d543a0..fd3bc3ff23 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
@@ -66,19 +66,22 @@ public class PingTestPerf extends AsymptoticTestCase implements TestThreadAware
     ThreadLocal<PerThreadSetup> threadSetup = new ThreadLocal<PerThreadSetup>();

 

     /** Holds a property reader to extract the test parameters from. */

-    protected ParsedProperties testParameters = new TestContextProperties(System.getProperties());

+    protected ParsedProperties testParameters =

+        TestContextProperties.getInstance(PingPongProducer.defaults /*System.getProperties()*/);

 

     public PingTestPerf(String name)

     {

         super(name);

 

+        _logger.debug("testParameters = " + testParameters);

+

         // Sets up the test parameters with defaults.

-        testParameters.setPropertyIfNull(PingPongProducer.TX_BATCH_SIZE_PROPNAME, PingPongProducer.TX_BATCH_SIZE_DEFAULT);

+        /*testParameters.setPropertyIfNull(PingPongProducer.TX_BATCH_SIZE_PROPNAME, PingPongProducer.TX_BATCH_SIZE_DEFAULT);

         testParameters.setPropertyIfNull(PingPongProducer.MESSAGE_SIZE_PROPNAME, PingPongProducer.MESSAGE_SIZE_DEAFULT);

         testParameters.setPropertyIfNull(PingPongProducer.PING_QUEUE_NAME_PROPNAME,

-                                         PingPongProducer.PING_QUEUE_NAME_DEFAULT);

+            PingPongProducer.PING_QUEUE_NAME_DEFAULT);

         testParameters.setPropertyIfNull(PingPongProducer.PERSISTENT_MODE_PROPNAME,

-                                         PingPongProducer.PERSISTENT_MODE_DEFAULT);

+            PingPongProducer.PERSISTENT_MODE_DEFAULT);

         testParameters.setPropertyIfNull(PingPongProducer.TRANSACTED_PROPNAME, PingPongProducer.TRANSACTED_DEFAULT);

         testParameters.setPropertyIfNull(PingPongProducer.BROKER_PROPNAME, PingPongProducer.BROKER_DEFAULT);

         testParameters.setPropertyIfNull(PingPongProducer.USERNAME_PROPNAME, PingPongProducer.USERNAME_DEFAULT);

@@ -90,20 +93,20 @@ public class PingTestPerf extends AsymptoticTestCase implements TestThreadAware
         testParameters.setPropertyIfNull(PingPongProducer.TX_BATCH_SIZE_PROPNAME, PingPongProducer.TX_BATCH_SIZE_DEFAULT);

         testParameters.setPropertyIfNull(PingPongProducer.TIMEOUT_PROPNAME, PingPongProducer.TIMEOUT_DEFAULT);

         testParameters.setPropertyIfNull(PingPongProducer.DESTINATION_COUNT_PROPNAME,

-                                         PingPongProducer.DESTINATION_COUNT_DEFAULT);

+            PingPongProducer.DESTINATION_COUNT_DEFAULT);

         testParameters.setPropertyIfNull(PingPongProducer.FAIL_AFTER_COMMIT_PROPNAME,

-                                         PingPongProducer.FAIL_AFTER_COMMIT_DEFAULT);

+            PingPongProducer.FAIL_AFTER_COMMIT_DEFAULT);

         testParameters.setPropertyIfNull(PingPongProducer.FAIL_BEFORE_COMMIT_PROPNAME,

-                                         PingPongProducer.FAIL_BEFORE_COMMIT_DEFAULT);

+            PingPongProducer.FAIL_BEFORE_COMMIT_DEFAULT);

         testParameters.setPropertyIfNull(PingPongProducer.FAIL_AFTER_SEND_PROPNAME,

-                                         PingPongProducer.FAIL_AFTER_SEND_DEFAULT);

+            PingPongProducer.FAIL_AFTER_SEND_DEFAULT);

         testParameters.setPropertyIfNull(PingPongProducer.FAIL_BEFORE_SEND_PROPNAME,

-                                         PingPongProducer.FAIL_BEFORE_SEND_DEFAULT);

+            PingPongProducer.FAIL_BEFORE_SEND_DEFAULT);

         testParameters.setPropertyIfNull(PingPongProducer.FAIL_ONCE_PROPNAME, PingPongProducer.FAIL_ONCE_DEFAULT);

         testParameters.setPropertyIfNull(PingPongProducer.UNIQUE_DESTS_PROPNAME, PingPongProducer.UNIQUE_DESTS_DEFAULT);

         testParameters.setPropertyIfNull(PingPongProducer.ACK_MODE_PROPNAME, PingPongProducer.ACK_MODE_DEFAULT);

         testParameters.setPropertyIfNull(PingPongProducer.PAUSE_AFTER_BATCH_PROPNAME,

-                                         PingPongProducer.PAUSE_AFTER_BATCH_DEFAULT);

+            PingPongProducer.PAUSE_AFTER_BATCH_DEFAULT);*/

     }

 

     /**

@@ -139,20 +142,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));

+                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);

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

 

         // Fail the test if the timeout was exceeded.

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

         {

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

-                        + numReplies);

+                + numReplies);

         }

     }

 

@@ -167,43 +168,13 @@ public class PingTestPerf extends AsymptoticTestCase implements TestThreadAware
         {

             PerThreadSetup perThreadSetup = new PerThreadSetup();

 

-            // Extract the test set up paramaeters.

-            String brokerDetails = testParameters.getProperty(PingPongProducer.BROKER_PROPNAME);

-            String username = testParameters.getProperty(PingPongProducer.USERNAME_PROPNAME);

-            String password = testParameters.getProperty(PingPongProducer.PASSWORD_PROPNAME);

-            String virtualPath = testParameters.getProperty(PingPongProducer.VIRTUAL_HOST_PROPNAME);

-            String destinationName = testParameters.getProperty(PingPongProducer.PING_QUEUE_NAME_PROPNAME);

-            boolean persistent = testParameters.getPropertyAsBoolean(PingPongProducer.PERSISTENT_MODE_PROPNAME);

-            boolean transacted = testParameters.getPropertyAsBoolean(PingPongProducer.TRANSACTED_PROPNAME);

-            String selector = testParameters.getProperty(PingPongProducer.SELECTOR_PROPNAME);

-            boolean verbose = testParameters.getPropertyAsBoolean(PingPongProducer.VERBOSE_PROPNAME);

-            int messageSize = testParameters.getPropertyAsInteger(PingPongProducer.MESSAGE_SIZE_PROPNAME);

-            int rate = testParameters.getPropertyAsInteger(PingPongProducer.RATE_PROPNAME);

-            boolean pubsub = testParameters.getPropertyAsBoolean(PingPongProducer.PUBSUB_PROPNAME);

-            boolean failAfterCommit = testParameters.getPropertyAsBoolean(PingPongProducer.FAIL_AFTER_COMMIT_PROPNAME);

-            boolean failBeforeCommit = testParameters.getPropertyAsBoolean(PingPongProducer.FAIL_BEFORE_COMMIT_PROPNAME);

-            boolean failAfterSend = testParameters.getPropertyAsBoolean(PingPongProducer.FAIL_AFTER_SEND_PROPNAME);

-            boolean failBeforeSend = testParameters.getPropertyAsBoolean(PingPongProducer.FAIL_BEFORE_SEND_PROPNAME);

-            int batchSize = testParameters.getPropertyAsInteger(PingPongProducer.TX_BATCH_SIZE_PROPNAME);

-            Boolean failOnce = testParameters.getPropertyAsBoolean(PingPongProducer.FAIL_ONCE_PROPNAME);

-            boolean unique = testParameters.getPropertyAsBoolean(PingPongProducer.UNIQUE_DESTS_PROPNAME);

-            int ackMode = testParameters.getPropertyAsInteger(PingPongProducer.ACK_MODE_PROPNAME);

-            int pausetime = testParameters.getPropertyAsInteger(PingPongProducer.PAUSE_AFTER_BATCH_PROPNAME);

-

-            // Extract the test set up paramaeters.

-            int destinationscount =

-                Integer.parseInt(testParameters.getProperty(PingPongProducer.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.

             synchronized (this)

             {

                 // Establish a client to ping a Destination and listen the reply back from same Destination

-                perThreadSetup._pingClient = new PingClient(brokerDetails, username, password, virtualPath, destinationName,

-                                                            selector, transacted, persistent, messageSize, verbose,

-                                                            failAfterCommit, failBeforeCommit, failAfterSend, failBeforeSend,

-                                                            failOnce, batchSize, destinationscount, rate, pubsub, unique,

-                                                            ackMode, pausetime);

+                perThreadSetup._pingClient = new PingClient(testParameters);

+                perThreadSetup._pingClient.establishConnection(true, true);

             }

             // Start the client connection

             perThreadSetup._pingClient.getConnection().start();

diff --git a/java/perftests/src/test/java/org/apache/qpid/requestreply/PingPongTestPerf.java b/java/perftests/src/test/java/org/apache/qpid/requestreply/PingPongTestPerf.java
index a75cbf7e19..a09324b568 100644
--- a/java/perftests/src/test/java/org/apache/qpid/requestreply/PingPongTestPerf.java
+++ b/java/perftests/src/test/java/org/apache/qpid/requestreply/PingPongTestPerf.java
@@ -69,52 +69,55 @@ public class PingPongTestPerf extends AsymptoticTestCase
     // the project dependencies, use it to get property overrides for configurable tests and to notify the test runner

     // of the test parameters to log with the results. It also providers some basic type parsing convenience methods.

     // private Properties testParameters = System.getProperties();

-    private ParsedProperties testParameters = new TestContextProperties(System.getProperties());

+    private ParsedProperties testParameters =

+        TestContextProperties.getInstance(PingPongProducer.defaults /*System.getProperties()*/);

 

     public PingPongTestPerf(String name)

     {

         super(name);

 

+        _logger.debug(testParameters);

+

         // Sets up the test parameters with defaults.

-        testParameters.setPropertyIfNull(PingPongProducer.TX_BATCH_SIZE_PROPNAME,

-                                         Integer.toString(PingPongProducer.TX_BATCH_SIZE_DEFAULT));

+        /*testParameters.setPropertyIfNull(PingPongProducer.TX_BATCH_SIZE_PROPNAME,

+            Integer.toString(PingPongProducer.TX_BATCH_SIZE_DEFAULT));

         testParameters.setPropertyIfNull(PingPongProducer.MESSAGE_SIZE_PROPNAME,

-                                         Integer.toString(PingPongProducer.MESSAGE_SIZE_DEAFULT));

+            Integer.toString(PingPongProducer.MESSAGE_SIZE_DEAFULT));

         testParameters.setPropertyIfNull(PingPongProducer.PING_QUEUE_NAME_PROPNAME,

-                                         PingPongProducer.PING_QUEUE_NAME_DEFAULT);

+            PingPongProducer.PING_QUEUE_NAME_DEFAULT);

         testParameters.setPropertyIfNull(PingPongProducer.PERSISTENT_MODE_PROPNAME,

-                                         Boolean.toString(PingPongProducer.PERSISTENT_MODE_DEFAULT));

+            Boolean.toString(PingPongProducer.PERSISTENT_MODE_DEFAULT));

         testParameters.setPropertyIfNull(PingPongProducer.TRANSACTED_PROPNAME,

-                                         Boolean.toString(PingPongProducer.TRANSACTED_DEFAULT));

+            Boolean.toString(PingPongProducer.TRANSACTED_DEFAULT));

         testParameters.setPropertyIfNull(PingPongProducer.BROKER_PROPNAME, PingPongProducer.BROKER_DEFAULT);

         testParameters.setPropertyIfNull(PingPongProducer.USERNAME_PROPNAME, PingPongProducer.USERNAME_DEFAULT);

         testParameters.setPropertyIfNull(PingPongProducer.PASSWORD_PROPNAME, PingPongProducer.PASSWORD_DEFAULT);

         testParameters.setPropertyIfNull(PingPongProducer.VIRTUAL_HOST_PROPNAME, PingPongProducer.VIRTUAL_HOST_DEFAULT);

         testParameters.setPropertyIfNull(PingPongProducer.VERBOSE_PROPNAME,

-                                         Boolean.toString(PingPongProducer.VERBOSE_DEFAULT));

+            Boolean.toString(PingPongProducer.VERBOSE_DEFAULT));

         testParameters.setPropertyIfNull(PingPongProducer.RATE_PROPNAME, Integer.toString(PingPongProducer.RATE_DEFAULT));

         testParameters.setPropertyIfNull(PingPongProducer.PUBSUB_PROPNAME,

-                                         Boolean.toString(PingPongProducer.PUBSUB_DEFAULT));

+            Boolean.toString(PingPongProducer.PUBSUB_DEFAULT));

         testParameters.setPropertyIfNull(PingPongProducer.TX_BATCH_SIZE_PROPNAME,

-                                         Integer.toString(PingPongProducer.TX_BATCH_SIZE_DEFAULT));

+            Integer.toString(PingPongProducer.TX_BATCH_SIZE_DEFAULT));

         testParameters.setPropertyIfNull(PingPongProducer.TIMEOUT_PROPNAME, Long.toString(PingPongProducer.TIMEOUT_DEFAULT));

         testParameters.setPropertyIfNull(PingPongProducer.DESTINATION_COUNT_PROPNAME,

-                                         Integer.toString(PingPongProducer.DESTINATION_COUNT_DEFAULT));

+            Integer.toString(PingPongProducer.DESTINATION_COUNT_DEFAULT));

         testParameters.setPropertyIfNull(PingPongProducer.FAIL_AFTER_COMMIT_PROPNAME,

-                                         PingPongProducer.FAIL_AFTER_COMMIT_DEFAULT);

+            PingPongProducer.FAIL_AFTER_COMMIT_DEFAULT);

         testParameters.setPropertyIfNull(PingPongProducer.FAIL_BEFORE_COMMIT_PROPNAME,

-                                         PingPongProducer.FAIL_BEFORE_COMMIT_DEFAULT);

+            PingPongProducer.FAIL_BEFORE_COMMIT_DEFAULT);

         testParameters.setPropertyIfNull(PingPongProducer.FAIL_AFTER_SEND_PROPNAME,

-                                         PingPongProducer.FAIL_AFTER_SEND_DEFAULT);

+            PingPongProducer.FAIL_AFTER_SEND_DEFAULT);

         testParameters.setPropertyIfNull(PingPongProducer.FAIL_BEFORE_SEND_PROPNAME,

-                                         PingPongProducer.FAIL_BEFORE_SEND_DEFAULT);

+            PingPongProducer.FAIL_BEFORE_SEND_DEFAULT);

         testParameters.setPropertyIfNull(PingPongProducer.FAIL_ONCE_PROPNAME, PingPongProducer.FAIL_ONCE_DEFAULT);

         testParameters.setPropertyIfNull(PingPongProducer.UNIQUE_DESTS_PROPNAME,

-                                         Boolean.toString(PingPongProducer.UNIQUE_DESTS_DEFAULT));

+            Boolean.toString(PingPongProducer.UNIQUE_DESTS_DEFAULT));

         testParameters.setPropertyIfNull(PingPongProducer.ACK_MODE_PROPNAME,

-                                         Integer.toString(PingPongProducer.ACK_MODE_DEFAULT));

+            Integer.toString(PingPongProducer.ACK_MODE_DEFAULT));

         testParameters.setPropertyIfNull(PingPongProducer.PAUSE_AFTER_BATCH_PROPNAME,

-                                         PingPongProducer.PAUSE_AFTER_BATCH_DEFAULT);

+            PingPongProducer.PAUSE_AFTER_BATCH_DEFAULT);*/

     }

 

     /**

@@ -147,14 +150,12 @@ public class PingPongTestPerf extends AsymptoticTestCase
         // Generate a sample message. This message is already time stamped and has its reply-to destination set.

         ObjectMessage msg =

             perThreadSetup._testPingProducer.getTestMessage(perThreadSetup._testPingProducer.getReplyDestinations().get(0),

-                                                            testParameters.getPropertyAsInteger(

-                                                                PingPongProducer.MESSAGE_SIZE_PROPNAME),

-                                                            testParameters.getPropertyAsBoolean(

-                                                                PingPongProducer.PERSISTENT_MODE_PROPNAME));

+                testParameters.getPropertyAsInteger(PingPongProducer.MESSAGE_SIZE_PROPNAME),

+                testParameters.getPropertyAsBoolean(PingPongProducer.PERSISTENT_MODE_PROPNAME));

 

         // Send the message and wait for a reply.

         int numReplies =

-            perThreadSetup._testPingProducer.pingAndWaitForReply(msg, numPings, PingPongProducer.TIMEOUT_DEFAULT);

+            perThreadSetup._testPingProducer.pingAndWaitForReply(msg, numPings, PingPongProducer.TIMEOUT_DEFAULT, null);

 

         // Fail the test if the timeout was exceeded.

         if (numReplies != numPings)

@@ -182,37 +183,21 @@ public class PingPongTestPerf extends AsymptoticTestCase
             boolean transacted = testParameters.getPropertyAsBoolean(PingPongProducer.TRANSACTED_PROPNAME);

             String selector = testParameters.getProperty(PingPongProducer.SELECTOR_PROPNAME);

             boolean verbose = testParameters.getPropertyAsBoolean(PingPongProducer.VERBOSE_PROPNAME);

-            int messageSize = testParameters.getPropertyAsInteger(PingPongProducer.MESSAGE_SIZE_PROPNAME);

-            int rate = testParameters.getPropertyAsInteger(PingPongProducer.RATE_PROPNAME);

             boolean pubsub = testParameters.getPropertyAsBoolean(PingPongProducer.PUBSUB_PROPNAME);

-            boolean failAfterCommit = testParameters.getPropertyAsBoolean(PingPongProducer.FAIL_AFTER_COMMIT_PROPNAME);

-            boolean failBeforeCommit = testParameters.getPropertyAsBoolean(PingPongProducer.FAIL_BEFORE_COMMIT_PROPNAME);

-            boolean failAfterSend = testParameters.getPropertyAsBoolean(PingPongProducer.FAIL_AFTER_SEND_PROPNAME);

-            boolean failBeforeSend = testParameters.getPropertyAsBoolean(PingPongProducer.FAIL_BEFORE_SEND_PROPNAME);

-            int batchSize = testParameters.getPropertyAsInteger(PingPongProducer.TX_BATCH_SIZE_PROPNAME);

-            Boolean failOnce = testParameters.getPropertyAsBoolean(PingPongProducer.FAIL_ONCE_PROPNAME);

-            boolean unique = testParameters.getPropertyAsBoolean(PingPongProducer.UNIQUE_DESTS_PROPNAME);

-            int ackMode = testParameters.getPropertyAsInteger(PingPongProducer.ACK_MODE_PROPNAME);

-            long pause = testParameters.getPropertyAsInteger(PingPongProducer.PAUSE_AFTER_BATCH_PROPNAME);

 

             synchronized (this)

             {

                 // Establish a bounce back client on the ping queue to bounce back the pings.

-                perThreadSetup._testPingBouncer = new PingPongBouncer(brokerDetails, username, password, virtualPath,

-                                                                      destinationName, persistent, transacted, selector,

-                                                                      verbose, pubsub);

+                perThreadSetup._testPingBouncer =

+                    new PingPongBouncer(brokerDetails, username, password, virtualPath, destinationName, persistent,

+                        transacted, selector, verbose, pubsub);

 

                 // Start the connections for client and producer running.

                 perThreadSetup._testPingBouncer.getConnection().start();

 

-                // Establish a ping-pong client on the ping queue to send the pings with.

-

-                perThreadSetup._testPingProducer = new PingPongProducer(brokerDetails, username, password, virtualPath,

-                                                                        destinationName, selector, transacted, persistent,

-                                                                        messageSize, verbose, failAfterCommit,

-                                                                        failBeforeCommit, failAfterSend, failBeforeSend,

-                                                                        failOnce, batchSize, 0, rate, pubsub, unique,

-                                                                        ackMode, pause);

+                // Establish a ping-pong client on the ping queue to send the pings and receive replies with.

+                perThreadSetup._testPingProducer = new PingPongProducer(testParameters);

+                perThreadSetup._testPingProducer.establishConnection(true, true);

                 perThreadSetup._testPingProducer.getConnection().start();

             }