Refactored interop tests into general distributed test framework. Moved framework under systests from integrationtests.

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

3 files changed, 19 insertions, 19 deletions

diff --git a/java/perftests/src/main/java/org/apache/qpid/ping/PingDurableClient.java b/java/perftests/src/main/java/org/apache/qpid/ping/PingDurableClient.java
index 2765986868..c5f71b4774 100644
--- a/java/perftests/src/main/java/org/apache/qpid/ping/PingDurableClient.java
+++ b/java/perftests/src/main/java/org/apache/qpid/ping/PingDurableClient.java
@@ -20,18 +20,6 @@
  */

 package org.apache.qpid.ping;

 

-import java.io.BufferedReader;

-import java.io.IOException;

-import java.io.InputStreamReader;

-import java.util.List;

-import java.util.Properties;

-import java.util.concurrent.atomic.AtomicInteger;

-

-import javax.jms.Destination;

-import javax.jms.ExceptionListener;

-import javax.jms.JMSException;

-import javax.jms.Message;

-

 import org.apache.log4j.Logger;

 

 import org.apache.qpid.requestreply.PingPongProducer;

@@ -40,6 +28,18 @@ import org.apache.qpid.util.CommandLineParser;
 import uk.co.thebadgerset.junit.extensions.util.MathUtils;

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

 

+import javax.jms.Destination;

+import javax.jms.ExceptionListener;

+import javax.jms.JMSException;

+import javax.jms.Message;

+

+import java.io.BufferedReader;

+import java.io.IOException;

+import java.io.InputStreamReader;

+import java.util.List;

+import java.util.Properties;

+import java.util.concurrent.atomic.AtomicInteger;

+

 /**

  * PingDurableClient is a variation of the {@link PingPongProducer} ping tool. Instead of sending its pings and

  * receiving replies to them at the same time, this tool sends pings until it is signalled by some 'event' to stop

@@ -167,7 +167,8 @@ public class PingDurableClient extends PingPongProducer implements ExceptionList
         try

         {

             // Create a ping producer overriding its defaults with all options passed on the command line.

-            Properties options = CommandLineParser.processCommandLine(args, new CommandLineParser(new String[][] {}));

+            Properties options =

+                CommandLineParser.processCommandLine(args, new CommandLineParser(new String[][] {}), System.getProperties());

             PingDurableClient pingProducer = new PingDurableClient(options);

 

             // Create a shutdown hook to terminate the ping-pong producer.

diff --git a/java/perftests/src/main/java/org/apache/qpid/ping/PingSendOnlyClient.java b/java/perftests/src/main/java/org/apache/qpid/ping/PingSendOnlyClient.java
index bbe337ca0a..2879f0c322 100644
--- a/java/perftests/src/main/java/org/apache/qpid/ping/PingSendOnlyClient.java
+++ b/java/perftests/src/main/java/org/apache/qpid/ping/PingSendOnlyClient.java
@@ -57,7 +57,7 @@ public class PingSendOnlyClient extends PingDurableClient
         try

         {

             // Create a ping producer overriding its defaults with all options passed on the command line.

-            Properties options = CommandLineParser.processCommandLine(args, new CommandLineParser(new String[][] {}));

+            Properties options = CommandLineParser.processCommandLine(args, new CommandLineParser(new String[][] {}), System.getProperties());

             PingSendOnlyClient pingProducer = new PingSendOnlyClient(options);

 

             // Create a shutdown hook to terminate the ping-pong producer.

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 5d3df1d9ec..03f5f0549d 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
@@ -44,9 +44,7 @@ import java.net.InetAddress;
 import java.text.DateFormat;

 import java.text.SimpleDateFormat;

 import java.util.*;

-import java.util.concurrent.BrokenBarrierException;

 import java.util.concurrent.CountDownLatch;

-import java.util.concurrent.CyclicBarrier;

 import java.util.concurrent.TimeUnit;

 import java.util.concurrent.atomic.AtomicInteger;

 import java.util.concurrent.atomic.AtomicLong;

@@ -89,7 +87,7 @@ import java.util.concurrent.atomic.AtomicLong;
  * <tr><td> destinationCount <td> 1        <td> The number of receivers listening to the pings.

  * <tr><td> timeout          <td> 30000    <td> In milliseconds. The timeout to stop waiting for replies.

  * <tr><td> commitBatchSize  <td> 1        <td> The number of messages per transaction in transactional mode.

- * <tr><td> uniqueDests      <td> true     <td> Whether each receiver only listens to one ping destination or all.

+ * <tr><td> uniqueDests      <td> true     <td> Whether each receivers only listens to one ping destination or all.

  * <tr><td> durableDests     <td> false    <td> Whether or not durable destinations are used.

  * <tr><td> ackMode          <td> AUTO_ACK <td> The message acknowledgement mode. Possible values are:

  *                                               0 - SESSION_TRANSACTED

@@ -373,7 +371,7 @@ public class PingPongProducer implements Runnable, MessageListener, ExceptionLis
     protected int _maxPendingSize;

 

     /**

-     * Holds a monitor which is used to synchronize sender and receiver threads, where the sender has elected

+     * Holds a monitor which is used to synchronize sender and receivers threads, where the sender has elected

      * to wait until the number of unreceived message is reduced before continuing to send.

      */

     protected Object _sendPauseMonitor = new Object();

@@ -570,7 +568,8 @@ public class PingPongProducer implements Runnable, MessageListener, ExceptionLis
     {

         try

         {

-            Properties options = CommandLineParser.processCommandLine(args, new CommandLineParser(new String[][] {}));

+            Properties options =

+                CommandLineParser.processCommandLine(args, new CommandLineParser(new String[][] {}), System.getProperties());

 

             // Create a ping producer overriding its defaults with all options passed on the command line.

             PingPongProducer pingProducer = new PingPongProducer(options);