QPID-2632 : A couple of tests in Systests are actually InVM only tests but are not marked as so.

They only work InVM but require a client. These should be either updated to be broker tests and not need the client
or updated to not relay on the InVM transport.
Also updated the code in old_test to be in line with these changes.

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

2 files changed, 12 insertions, 9 deletions

diff --git a/java/systests/src/old_test/java/org/apache/qpid/server/queue/SendPerfTest.java b/java/systests/src/old_test/java/org/apache/qpid/server/queue/SendPerfTest.java
index 2c5712fd35..9784b2f671 100644
--- a/java/systests/src/old_test/java/org/apache/qpid/server/queue/SendPerfTest.java
+++ b/java/systests/src/old_test/java/org/apache/qpid/server/queue/SendPerfTest.java
@@ -20,6 +20,7 @@
  */
 package org.apache.qpid.server.queue;
 
+import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.codec.AMQCodecFactory;
 import org.apache.qpid.framing.BasicPublishBody;
@@ -28,6 +29,7 @@ import org.apache.qpid.framing.ContentHeaderBody;
 import org.apache.qpid.framing.FieldTable;
 import org.apache.qpid.server.AMQChannel;
 import org.apache.qpid.server.RequiredDeliveryException;
+import org.apache.qpid.server.configuration.ServerConfiguration;
 import org.apache.qpid.server.txn.TransactionalContext;
 import org.apache.qpid.server.txn.NonTransactionalContext;
 import org.apache.qpid.server.exchange.AbstractExchange;
@@ -84,7 +86,7 @@ public class SendPerfTest extends TimedRun
 
     public static void main(String[] argv) throws Exception
     {
-        ApplicationRegistry.initialise(new TestApplicationRegistry());
+        ApplicationRegistry.initialise(new TestApplicationRegistry(new ServerConfiguration(new PropertiesConfiguration())));
         int clients = Integer.parseInt(argv[0]);
         int messages = Integer.parseInt(argv[1]);
         int iterations = Integer.parseInt(argv[2]);
diff --git a/java/systests/src/old_test/java/org/apache/qpid/test/unit/ack/DisconnectAndRedeliverTest.java b/java/systests/src/old_test/java/org/apache/qpid/test/unit/ack/DisconnectAndRedeliverTest.java
index 3e35e3c85b..04b6bceb4f 100644
--- a/java/systests/src/old_test/java/org/apache/qpid/test/unit/ack/DisconnectAndRedeliverTest.java
+++ b/java/systests/src/old_test/java/org/apache/qpid/test/unit/ack/DisconnectAndRedeliverTest.java
@@ -33,7 +33,7 @@ import org.apache.qpid.server.util.TestApplicationRegistry;
 
 import javax.jms.*;
 
-public class DisconnectAndRedeliverTest extends TestCase
+public class DisconnectAndRedeliverTest extends InternalBrokerBaseCase
 {
     private static final Logger _logger = Logger.getLogger(DisconnectAndRedeliverTest.class);
 
@@ -49,17 +49,18 @@ public class DisconnectAndRedeliverTest extends TestCase
         DOMConfigurator.configure("../broker/etc/log4j.xml");
     }
 
-    protected void setUp() throws Exception
+    @Override
+    public void createBroker() throws Exception
     {
-        super.setUp();
-        TransportConnection.createVMBroker(1);
-        ApplicationRegistry.initialise(new TestApplicationRegistry(), 1);
+        super.createBroker();
+        TransportConnection.createVMBroker(ApplicationRegistry.DEFAULT_INSTANCE);
     }
 
-    protected void tearDown() throws Exception
+    @Override
+    public void stopBroker()
     {
-        super.tearDown();
-        TransportConnection.killAllVMBrokers();
+        TransportConnection.killVMBroker(ApplicationRegistry.DEFAULT_INSTANCE);
+        super.stopBroker();
     }
 
     /**