Updated perftests from M2

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

3 files changed, 99 insertions, 105 deletions

diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/ping/PingAsyncTestPerf.java b/qpid/java/perftests/src/test/java/org/apache/qpid/ping/PingAsyncTestPerf.java
index 0483a6f20a..a782058fd4 100644
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/ping/PingAsyncTestPerf.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/ping/PingAsyncTestPerf.java
@@ -57,10 +57,10 @@ public class PingAsyncTestPerf extends PingTestPerf implements TimingControllerA
     private static Logger _logger = Logger.getLogger(PingAsyncTestPerf.class);
 
     /** Holds the name of the property to get the test results logging batch size. */
-    public static final String TEST_RESULTS_BATCH_SIZE_PROPNAME = "BatchSize";
+    public static final String TEST_RESULTS_BATCH_SIZE_PROPNAME = "batchSize";
 
     /** Holds the default test results logging batch size. */
-    public static final int DEFAULT_TEST_RESULTS_BATCH_SIZE = 1000;
+    public static final int TEST_RESULTS_BATCH_SIZE_DEFAULT = 1000;
 
     /** Used to hold the timing controller passed from the test runner. */
     private TimingController _timingController;
@@ -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;
@@ -86,12 +86,12 @@ public class PingAsyncTestPerf extends PingTestPerf implements TimingControllerA
 
         // Sets up the test parameters with defaults.
         testParameters.setPropertyIfNull(TEST_RESULTS_BATCH_SIZE_PROPNAME,
-                                              Integer.toString(DEFAULT_TEST_RESULTS_BATCH_SIZE));
+                                         Integer.toString(TEST_RESULTS_BATCH_SIZE_DEFAULT));
     }
 
     /**
      * Compile all the tests into a test suite.
-     * @return The test suite to run. Should only contain testAsyncPingOk method. 
+     * @return The test suite to run. Should only contain testAsyncPingOk method.
      */
     public static Test suite()
     {
@@ -129,7 +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  
+     * @throws Exception pass all errors out to the test harness
      */
     public void testAsyncPingOk(int numPings) throws Exception
     {
@@ -246,9 +246,9 @@ public class PingAsyncTestPerf extends PingTestPerf implements TimingControllerA
                 // Extract the correlation id from the message.
                 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());
+                _logger.debug("public void onMessage(Message message, int remainingCount = " + remainingCount
+                              + "): 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.
@@ -268,7 +268,6 @@ public class PingAsyncTestPerf extends PingTestPerf implements TimingControllerA
                     // Register a test result for the correlation id.
                     try
                     {
-
                         tc.completeTest(true, receivedInBatch);
                     }
                     catch (InterruptedException e)
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/ping/PingTestPerf.java b/qpid/java/perftests/src/test/java/org/apache/qpid/ping/PingTestPerf.java
index 92acd18a38..6fb9d543a0 100644
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/ping/PingTestPerf.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/ping/PingTestPerf.java
@@ -66,50 +66,44 @@ 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 ParsedProperties(System.getProperties());

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

 

     public PingTestPerf(String name)

     {

         super(name);

 

         // Sets up the test parameters with defaults.

-        testParameters.setPropertyIfNull(PingPongProducer.COMMIT_BATCH_SIZE_PROPNAME,

-                                         Integer.toString(PingPongProducer.DEFAULT_TX_BATCH_SIZE));

-        testParameters.setPropertyIfNull(PingPongProducer.MESSAGE_SIZE_PROPNAME,

-                                         Integer.toString(PingPongProducer.DEFAULT_MESSAGE_SIZE));

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

+                                         PingPongProducer.PING_QUEUE_NAME_DEFAULT);

         testParameters.setPropertyIfNull(PingPongProducer.PERSISTENT_MODE_PROPNAME,

-                                         Boolean.toString(PingPongProducer.DEFAULT_PERSISTENT_MODE));

-        testParameters.setPropertyIfNull(PingPongProducer.TRANSACTED_PROPNAME,

-                                         Boolean.toString(PingPongProducer.DEFAULT_TRANSACTED));

-        testParameters.setPropertyIfNull(PingPongProducer.BROKER_PROPNAME, PingPongProducer.DEFAULT_BROKER);

-        testParameters.setPropertyIfNull(PingPongProducer.USERNAME_PROPNAME, PingPongProducer.DEFAULT_USERNAME);

-        testParameters.setPropertyIfNull(PingPongProducer.PASSWORD_PROPNAME, PingPongProducer.DEFAULT_PASSWORD);

-        testParameters.setPropertyIfNull(PingPongProducer.VIRTUAL_PATH_PROPNAME, PingPongProducer.DEFAULT_VIRTUAL_PATH);

-        testParameters.setPropertyIfNull(PingPongProducer.VERBOSE_OUTPUT_PROPNAME,

-                                         Boolean.toString(PingPongProducer.DEFAULT_VERBOSE));

-        testParameters.setPropertyIfNull(PingPongProducer.RATE_PROPNAME, Integer.toString(PingPongProducer.DEFAULT_RATE));

-        testParameters.setPropertyIfNull(PingPongProducer.IS_PUBSUB_PROPNAME,

-                                         Boolean.toString(PingPongProducer.DEFAULT_PUBSUB));

-        testParameters.setPropertyIfNull(PingPongProducer.COMMIT_BATCH_SIZE_PROPNAME,

-                                         Integer.toString(PingPongProducer.DEFAULT_TX_BATCH_SIZE));

-        testParameters.setPropertyIfNull(PingPongProducer.TIMEOUT_PROPNAME, Long.toString(PingPongProducer.DEFAULT_TIMEOUT));

-        testParameters.setPropertyIfNull(PingPongProducer.PING_DESTINATION_COUNT_PROPNAME,

-                                         Integer.toString(PingPongProducer.DEFAULT_DESTINATION_COUNT));

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

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

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

+        testParameters.setPropertyIfNull(PingPongProducer.VERBOSE_PROPNAME, PingPongProducer.VERBOSE_DEFAULT);

+        testParameters.setPropertyIfNull(PingPongProducer.RATE_PROPNAME, PingPongProducer.RATE_DEFAULT);

+        testParameters.setPropertyIfNull(PingPongProducer.PUBSUB_PROPNAME, PingPongProducer.PUBSUB_DEFAULT);

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

         testParameters.setPropertyIfNull(PingPongProducer.FAIL_AFTER_COMMIT_PROPNAME,

-                                         PingPongProducer.DEFAULT_FAIL_AFTER_COMMIT);

+                                         PingPongProducer.FAIL_AFTER_COMMIT_DEFAULT);

         testParameters.setPropertyIfNull(PingPongProducer.FAIL_BEFORE_COMMIT_PROPNAME,

-                                         PingPongProducer.DEFAULT_FAIL_BEFORE_COMMIT);

+                                         PingPongProducer.FAIL_BEFORE_COMMIT_DEFAULT);

         testParameters.setPropertyIfNull(PingPongProducer.FAIL_AFTER_SEND_PROPNAME,

-                                         PingPongProducer.DEFAULT_FAIL_AFTER_SEND);

+                                         PingPongProducer.FAIL_AFTER_SEND_DEFAULT);

         testParameters.setPropertyIfNull(PingPongProducer.FAIL_BEFORE_SEND_PROPNAME,

-                                         PingPongProducer.DEFAULT_FAIL_BEFORE_SEND);

-        testParameters.setPropertyIfNull(PingPongProducer.FAIL_ONCE_PROPNAME, PingPongProducer.DEFAULT_FAIL_ONCE);

-        testParameters.setPropertyIfNull(PingPongProducer.UNIQUE_PROPNAME, PingPongProducer.DEFAULT_UNIQUE);

-        testParameters.setSysPropertyIfNull(PingPongProducer.ACK_MODE_PROPNAME,

-                                              Integer.toString(PingPongProducer.DEFAULT_ACK_MODE));

-        testParameters.setSysPropertyIfNull(PingPongProducer.PAUSE_AFTER_BATCH_PROPNAME, 0l);

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

     }

 

     /**

@@ -144,11 +138,11 @@ 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));

@@ -177,28 +171,28 @@ public class PingTestPerf extends AsymptoticTestCase implements TestThreadAware
             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_PATH_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_OUTPUT_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.IS_PUBSUB_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.COMMIT_BATCH_SIZE_PROPNAME);

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

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

-            boolean unique = testParameters.getPropertyAsBoolean(PingPongProducer.UNIQUE_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.PING_DESTINATION_COUNT_PROPNAME));

+                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.

@@ -208,8 +202,8 @@ public class PingTestPerf extends AsymptoticTestCase implements TestThreadAware
                 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);

+                                                            failOnce, batchSize, destinationscount, rate, pubsub, unique,

+                                                            ackMode, pausetime);

             }

             // Start the client connection

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

diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/requestreply/PingPongTestPerf.java b/qpid/java/perftests/src/test/java/org/apache/qpid/requestreply/PingPongTestPerf.java
index d2e0367bba..a75cbf7e19 100644
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/requestreply/PingPongTestPerf.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/requestreply/PingPongTestPerf.java
@@ -30,6 +30,7 @@ import org.apache.log4j.Logger;
 

 import uk.co.thebadgerset.junit.extensions.AsymptoticTestCase;

 import uk.co.thebadgerset.junit.extensions.util.ParsedProperties;

+import uk.co.thebadgerset.junit.extensions.util.TestContextProperties;

 

 /**

  * PingPongTestPerf is a full round trip ping test, that has been written with the intention of being scaled up to run

@@ -67,53 +68,53 @@ public class PingPongTestPerf extends AsymptoticTestCase
     // Set up a property reader to extract the test parameters from. Once ContextualProperties is available in

     // 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 ParsedProperties(System.getProperties());

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

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

 

     public PingPongTestPerf(String name)

     {

         super(name);

 

         // Sets up the test parameters with defaults.

-        ParsedProperties.setSysPropertyIfNull(PingPongProducer.COMMIT_BATCH_SIZE_PROPNAME,

-                                              Integer.toString(PingPongProducer.DEFAULT_TX_BATCH_SIZE));

-        ParsedProperties.setSysPropertyIfNull(PingPongProducer.MESSAGE_SIZE_PROPNAME,

-                                              Integer.toString(PingPongProducer.DEFAULT_MESSAGE_SIZE));

-        ParsedProperties.setSysPropertyIfNull(PingPongProducer.PING_QUEUE_NAME_PROPNAME,

-                                              PingPongProducer.DEFAULT_PING_DESTINATION_NAME);

-        ParsedProperties.setSysPropertyIfNull(PingPongProducer.PERSISTENT_MODE_PROPNAME,

-                                              Boolean.toString(PingPongProducer.DEFAULT_PERSISTENT_MODE));

-        ParsedProperties.setSysPropertyIfNull(PingPongProducer.TRANSACTED_PROPNAME,

-                                              Boolean.toString(PingPongProducer.DEFAULT_TRANSACTED));

-        ParsedProperties.setSysPropertyIfNull(PingPongProducer.BROKER_PROPNAME, PingPongProducer.DEFAULT_BROKER);

-        ParsedProperties.setSysPropertyIfNull(PingPongProducer.USERNAME_PROPNAME, PingPongProducer.DEFAULT_USERNAME);

-        ParsedProperties.setSysPropertyIfNull(PingPongProducer.PASSWORD_PROPNAME, PingPongProducer.DEFAULT_PASSWORD);

-        ParsedProperties.setSysPropertyIfNull(PingPongProducer.VIRTUAL_PATH_PROPNAME, PingPongProducer.DEFAULT_VIRTUAL_PATH);

-        ParsedProperties.setSysPropertyIfNull(PingPongProducer.VERBOSE_OUTPUT_PROPNAME,

-                                              Boolean.toString(PingPongProducer.DEFAULT_VERBOSE));

-        ParsedProperties.setSysPropertyIfNull(PingPongProducer.RATE_PROPNAME,

-                                              Integer.toString(PingPongProducer.DEFAULT_RATE));

-        ParsedProperties.setSysPropertyIfNull(PingPongProducer.IS_PUBSUB_PROPNAME,

-                                              Boolean.toString(PingPongProducer.DEFAULT_PUBSUB));

-        ParsedProperties.setSysPropertyIfNull(PingPongProducer.COMMIT_BATCH_SIZE_PROPNAME,

-                                              Integer.toString(PingPongProducer.DEFAULT_TX_BATCH_SIZE));

-        ParsedProperties.setSysPropertyIfNull(PingPongProducer.TIMEOUT_PROPNAME,

-                                              Long.toString(PingPongProducer.DEFAULT_TIMEOUT));

-        ParsedProperties.setSysPropertyIfNull(PingPongProducer.PING_DESTINATION_COUNT_PROPNAME,

-                                              Integer.toString(PingPongProducer.DEFAULT_DESTINATION_COUNT));

-        ParsedProperties.setSysPropertyIfNull(PingPongProducer.FAIL_AFTER_COMMIT_PROPNAME,

-                                              PingPongProducer.DEFAULT_FAIL_AFTER_COMMIT);

-        ParsedProperties.setSysPropertyIfNull(PingPongProducer.FAIL_BEFORE_COMMIT_PROPNAME,

-                                              PingPongProducer.DEFAULT_FAIL_BEFORE_COMMIT);

-        ParsedProperties.setSysPropertyIfNull(PingPongProducer.FAIL_AFTER_SEND_PROPNAME,

-                                              PingPongProducer.DEFAULT_FAIL_AFTER_SEND);

-        ParsedProperties.setSysPropertyIfNull(PingPongProducer.FAIL_BEFORE_SEND_PROPNAME,

-                                              PingPongProducer.DEFAULT_FAIL_BEFORE_SEND);

-        ParsedProperties.setSysPropertyIfNull(PingPongProducer.FAIL_ONCE_PROPNAME, PingPongProducer.DEFAULT_FAIL_ONCE);

-        ParsedProperties.setSysPropertyIfNull(PingPongProducer.UNIQUE_PROPNAME, Boolean.toString(PingPongProducer.DEFAULT_UNIQUE));

-        ParsedProperties.setSysPropertyIfNull(PingPongProducer.ACK_MODE_PROPNAME,

-                                              Integer.toString(PingPongProducer.DEFAULT_ACK_MODE));

-        ParsedProperties.setSysPropertyIfNull(PingPongProducer.PAUSE_AFTER_BATCH_PROPNAME, 0l);

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

+        testParameters.setPropertyIfNull(PingPongProducer.PING_QUEUE_NAME_PROPNAME,

+                                         PingPongProducer.PING_QUEUE_NAME_DEFAULT);

+        testParameters.setPropertyIfNull(PingPongProducer.PERSISTENT_MODE_PROPNAME,

+                                         Boolean.toString(PingPongProducer.PERSISTENT_MODE_DEFAULT));

+        testParameters.setPropertyIfNull(PingPongProducer.TRANSACTED_PROPNAME,

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

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

+        testParameters.setPropertyIfNull(PingPongProducer.PUBSUB_PROPNAME,

+                                         Boolean.toString(PingPongProducer.PUBSUB_DEFAULT));

+        testParameters.setPropertyIfNull(PingPongProducer.TX_BATCH_SIZE_PROPNAME,

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

+        testParameters.setPropertyIfNull(PingPongProducer.FAIL_AFTER_COMMIT_PROPNAME,

+                                         PingPongProducer.FAIL_AFTER_COMMIT_DEFAULT);

+        testParameters.setPropertyIfNull(PingPongProducer.FAIL_BEFORE_COMMIT_PROPNAME,

+                                         PingPongProducer.FAIL_BEFORE_COMMIT_DEFAULT);

+        testParameters.setPropertyIfNull(PingPongProducer.FAIL_AFTER_SEND_PROPNAME,

+                                         PingPongProducer.FAIL_AFTER_SEND_DEFAULT);

+        testParameters.setPropertyIfNull(PingPongProducer.FAIL_BEFORE_SEND_PROPNAME,

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

+        testParameters.setPropertyIfNull(PingPongProducer.ACK_MODE_PROPNAME,

+                                         Integer.toString(PingPongProducer.ACK_MODE_DEFAULT));

+        testParameters.setPropertyIfNull(PingPongProducer.PAUSE_AFTER_BATCH_PROPNAME,

+                                         PingPongProducer.PAUSE_AFTER_BATCH_DEFAULT);

     }

 

     /**

@@ -153,7 +154,7 @@ public class PingPongTestPerf extends AsymptoticTestCase
 

         // Send the message and wait for a reply.

         int numReplies =

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

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

 

         // Fail the test if the timeout was exceeded.

         if (numReplies != numPings)

@@ -175,22 +176,22 @@ public class PingPongTestPerf extends AsymptoticTestCase
             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_PATH_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_OUTPUT_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.IS_PUBSUB_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.COMMIT_BATCH_SIZE_PROPNAME);

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

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

-            boolean unique = testParameters.getPropertyAsBoolean(PingPongProducer.UNIQUE_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);

 

@@ -210,8 +211,8 @@ public class PingPongTestPerf extends AsymptoticTestCase
                                                                         destinationName, selector, transacted, persistent,

                                                                         messageSize, verbose, failAfterCommit,

                                                                         failBeforeCommit, failAfterSend, failBeforeSend,

-                                                                        failOnce, batchSize, 0, rate, pubsub,

-                                                                        unique, ackMode, pause);

+                                                                        failOnce, batchSize, 0, rate, pubsub, unique,

+                                                                        ackMode, pause);

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

             }

 

@@ -240,7 +241,7 @@ public class PingPongTestPerf extends AsymptoticTestCase
             synchronized (this)

             {

                 perThreadSetup._testPingProducer.close();

-                //perThreadSetup._testPingBouncer.close();

+                // perThreadSetup._testPingBouncer.close();

             }

 

             // Ensure the per thread fixture is reclaimed.