Changed to use QpidTestCase

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

18 files changed, 71 insertions, 87 deletions

diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java
index f0dd02c3e2..6c23beffa7 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java
@@ -42,7 +42,6 @@ public class LargeMessageTest extends QpidTestCase
 
     private Destination _destination;
     private AMQSession _session;
-    public String _broker = "vm://:1";
 
     protected void setUp() throws Exception
     {
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/CloseWithBlockingReceiveTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/CloseWithBlockingReceiveTest.java
index 9600d1e9d3..c3be691f2d 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/CloseWithBlockingReceiveTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/CloseWithBlockingReceiveTest.java
@@ -29,31 +29,29 @@ import junit.framework.TestCase;
 import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQTopic;
 import org.apache.qpid.client.transport.TransportConnection;
+import org.apache.qpid.testutil.QpidTestCase;
 
 /**
  * @author Apache Software Foundation
  */
-public class CloseWithBlockingReceiveTest extends TestCase
+public class CloseWithBlockingReceiveTest extends QpidTestCase
 {
 
 
     protected void setUp() throws Exception
     {
         super.setUp();
-        TransportConnection.createVMBroker(1);
     }
 
     protected void tearDown() throws Exception
     {
         super.tearDown();
-        TransportConnection.killAllVMBrokers();
     }
 
 
     public void testReceiveReturnsNull() throws Exception
     {
-        final AMQConnection connection = new AMQConnection("vm://:1", "guest", "guest",
-                                                  "fred", "test");
+        final AMQConnection connection =  (AMQConnection) getConnection("guest", "guest");
         Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
         MessageConsumer consumer = session.createConsumer(new AMQTopic(connection, "banana"));
         connection.start();
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java
index 42a48b10bc..e115821755 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java
@@ -31,14 +31,12 @@ import javax.jms.MessageProducer;
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
-import junit.framework.TestCase;
-
 import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQQueue;
 import org.apache.qpid.client.AMQSession;
-import org.apache.qpid.client.transport.TransportConnection;
+import org.apache.qpid.testutil.QpidTestCase;
 
-public class ConnectionStartTest extends TestCase
+public class ConnectionStartTest extends QpidTestCase
 {
 
     String _broker = "vm://:1";
@@ -50,13 +48,11 @@ public class ConnectionStartTest extends TestCase
     protected void setUp() throws Exception
     {
         super.setUp();
-        TransportConnection.createVMBroker(1);
-
         try
         {
 
 
-            AMQConnection pubCon = new AMQConnection(_broker, "guest", "guest", "fred", "test");
+            AMQConnection pubCon = (AMQConnection) getConnection("guest", "guest");
 
             AMQQueue queue = new AMQQueue(pubCon,"ConnectionStartTest");
 
@@ -66,7 +62,7 @@ public class ConnectionStartTest extends TestCase
 
             pub.send(pubSess.createTextMessage("Initial Message"));
 
-            _connection = new AMQConnection(_broker, "guest", "guest", "fred", "test");
+            _connection = (AMQConnection) getConnection("guest", "guest");
 
             _consumerSess = _connection.createSession(false, AMQSession.AUTO_ACKNOWLEDGE);
 
@@ -77,6 +73,7 @@ public class ConnectionStartTest extends TestCase
         }
         catch (Exception e)
         {
+            e.printStackTrace();
             fail("Connection to " + _broker + " should succeed. Reason: " + e);
         }
     }
@@ -84,7 +81,6 @@ public class ConnectionStartTest extends TestCase
     protected void tearDown() throws Exception
     {
         _connection.close();
-        TransportConnection.killVMBroker(1);
     }
 
     public void testSimpleReceiveConnection()
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Client.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Client.java
index 19ef612bcc..445c6cf1a7 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Client.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Client.java
@@ -24,6 +24,7 @@ import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQQueue;
 import org.apache.qpid.client.AMQSession;
 import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.testutil.QpidTestCase;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -45,12 +46,17 @@ public class Client implements MessageListener
     private final AMQSession _session;
     private final int _expected;
     private int _count;
+    private static QpidTestCase _qct;
 
     Client(String broker, int expected) throws Exception
     {
         this(connect(broker), expected);
     }
 
+    public static void setQTC(QpidTestCase qtc)
+    {
+        _qct = qtc;
+    }
     Client(AMQConnection connection, int expected) throws Exception
     {
         _connection = connection;
@@ -100,7 +106,8 @@ public class Client implements MessageListener
 
     static AMQConnection connect(String broker) throws Exception
     {
-        return new AMQConnection(broker, "guest", "guest", "Client" + System.currentTimeMillis(), "test");
+        //return new AMQConnection(broker, "guest", "guest", "Client" + System.currentTimeMillis(), "test");
+         return (AMQConnection) _qct.getConnection("guest", "guest") ;
     }
 
     public static void main(String[] argv) throws Exception
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java
index 9cde24dd92..255e91545f 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java
@@ -20,8 +20,8 @@
  */
 package org.apache.qpid.test.unit.client.forwardall;
 
-import junit.framework.TestCase;
 import org.apache.qpid.testutil.VMBrokerSetup;
+import org.apache.qpid.testutil.QpidTestCase;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory;
  * Runs the Service's and Client parts of the test in the same process
  * as the broker
  */
-public class CombinedTest extends TestCase
+public class CombinedTest extends QpidTestCase
 {
     private static final Logger _logger = LoggerFactory.getLogger(CombinedTest.class);
     private int run = 0;
@@ -37,6 +37,8 @@ public class CombinedTest extends TestCase
     protected void setUp() throws Exception
     {
         super.setUp();
+        Service.setQTC(this);
+        Client.setQTC(this);
     }
 
     protected void tearDown() throws Exception
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Service.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Service.java
index 6593f7d86a..7fa38bad0d 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Service.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Service.java
@@ -28,6 +28,7 @@ import javax.jms.MessageListener;
 import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQQueue;
 import org.apache.qpid.client.AMQSession;
+import org.apache.qpid.testutil.QpidTestCase;
 
 /**
  * Declare a queue and bind it to amq.direct with a 'well known' routing key,
@@ -38,6 +39,13 @@ public class Service implements MessageListener
     private final AMQConnection _connection;
     private final AMQSession _session;
 
+    private static QpidTestCase _qct;
+     
+
+    public static void setQTC(QpidTestCase qtc)
+    {
+        _qct = qtc;
+    }
     Service(String broker) throws Exception
     {
         this(connect(broker));
@@ -73,7 +81,8 @@ public class Service implements MessageListener
 
     static AMQConnection connect(String broker) throws Exception
     {
-        return new AMQConnection(broker, "guest", "guest", "Client" + System.currentTimeMillis(), "test");
+        //return new AMQConnection(broker, "guest", "guest", "Client" + System.currentTimeMillis(), "test");
+          return (AMQConnection) _qct.getConnection("guest", "guest") ;
     }
 
 //    public static void main(String[] argv) throws Exception
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java
index cd03b523d1..347c0c43da 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java
@@ -20,13 +20,12 @@
  */
 package org.apache.qpid.test.unit.client.message;
 
-import junit.framework.TestCase;
-
 import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQDestination;
 import org.apache.qpid.client.AMQQueue;
 import org.apache.qpid.client.AMQSession;
 import org.apache.qpid.testutil.VMBrokerSetup;
+import org.apache.qpid.testutil.QpidTestCase;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -42,7 +41,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 
-public class ObjectMessageTest extends TestCase implements MessageListener
+public class ObjectMessageTest extends QpidTestCase implements MessageListener
 {
     private static final Logger _logger = LoggerFactory.getLogger(ObjectMessageTest.class);
 
@@ -60,7 +59,7 @@ public class ObjectMessageTest extends TestCase implements MessageListener
     protected void setUp() throws Exception
     {
         super.setUp();
-        connection = new AMQConnection(_broker, "guest", "guest", randomize("Client"), "test");
+        connection =  (AMQConnection) getConnection("guest", "guest");
         destination = new AMQQueue(connection, randomize("LatencyTest"), true);
         session = (AMQSession) connection.createSession(false, AMQSession.NO_ACKNOWLEDGE);
 
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/close/CloseBeforeAckTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/close/CloseBeforeAckTest.java
index 5a61480f6a..e78c295ce5 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/close/CloseBeforeAckTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/close/CloseBeforeAckTest.java
@@ -21,10 +21,10 @@
 package org.apache.qpid.test.unit.close;

 

 import junit.framework.Assert;

-import junit.framework.TestCase;

 

 import org.apache.qpid.client.AMQConnection;

 import org.apache.qpid.client.transport.TransportConnection;

+import org.apache.qpid.testutil.QpidTestCase;

 

 import org.slf4j.Logger;

 import org.slf4j.LoggerFactory;

@@ -45,7 +45,7 @@ import javax.jms.Session;
  * <p><table id="crc"><caption>CRC Card</caption> <tr><th> Responsibilities <th> Collaborations <tr><td> Check that

  * closing a connection whilst handling a message, blocks till completion of the handler. </table>

  */

-public class CloseBeforeAckTest extends TestCase

+public class CloseBeforeAckTest extends QpidTestCase

 {

     private static final Logger log = LoggerFactory.getLogger(CloseBeforeAckTest.class);

 

@@ -134,14 +134,11 @@ public class CloseBeforeAckTest extends TestCase
     protected void setUp() throws Exception

     {

         super.setUp();

-        TransportConnection.createVMBroker(1);

-

-        connection = new AMQConnection("vm://:1", "guest", "guest", getName(), "test");

+        connection =  getConnection("guest", "guest");

     }

 

     protected void tearDown() throws Exception

     {

         super.tearDown();

-        TransportConnection.killVMBroker(1);

     }

 }

diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java
index a297011acd..04e158bb17 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java
@@ -91,7 +91,6 @@ public class MessageRequeueTest extends TestCase
             conn.disconnect();
         }
 
-        TransportConnection.killVMBroker(1);
     }
 
     /**
@@ -100,7 +99,7 @@ public class MessageRequeueTest extends TestCase
      * @throws javax.jms.JMSException if a JMS problem occurs
      * @throws InterruptedException   on timeout
      */
-    public void testDrain() throws JMSException, InterruptedException
+    public void testDrain() throws Exception
     {
         QpidClientConnection conn = new QpidClientConnection(BROKER);
 
@@ -337,8 +336,10 @@ public class MessageRequeueTest extends TestCase
             String virtualHost = "/test";
             String brokerlist = BROKER;
             String brokerUrl = "amqp://guest:guest@" + virtualHost + "?brokerlist='" + brokerlist + "'";
+            QpidClientConnection qpc =      new QpidClientConnection(BROKER);
+            qpc.connect();
+            Connection conn = qpc. getConnection();
 
-            Connection conn = new AMQConnection(brokerUrl);
             Session session = conn.createSession(false, Session.CLIENT_ACKNOWLEDGE);
             Queue q = session.createQueue(queue);
 
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/close/TopicPublisherCloseTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/close/TopicPublisherCloseTest.java
index 5e2703d5a5..2535692b5e 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/close/TopicPublisherCloseTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/close/TopicPublisherCloseTest.java
@@ -29,31 +29,28 @@ import junit.framework.TestCase;
 import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQTopic;
 import org.apache.qpid.client.transport.TransportConnection;
+import org.apache.qpid.testutil.QpidTestCase;
 
 /**
  * @author Apache Software Foundation
  */
-public class TopicPublisherCloseTest extends TestCase
+public class TopicPublisherCloseTest extends QpidTestCase
 {
 
-    public String _connectionString = "vm://:1";
-
     protected void setUp() throws Exception
     {
         super.setUp();
-        TransportConnection.createVMBroker(1);
     }
 
 
     protected void tearDown() throws Exception
     {
         super.tearDown();
-        TransportConnection.killAllVMBrokers();
     }
 
     public void testAllMethodsThrowAfterConnectionClose() throws Exception
     {
-        AMQConnection connection = new AMQConnection(_connectionString, "guest", "guest", "Client", "test");
+        AMQConnection connection =   (AMQConnection) getConnection("guest", "guest");
 
         Topic destination1 = new AMQTopic(connection, "t1");
         TopicSession session1 = connection.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSDestinationTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSDestinationTest.java
index a1d9af558c..0b9d0bdc2d 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSDestinationTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSDestinationTest.java
@@ -21,13 +21,11 @@
 

 package org.apache.qpid.test.unit.message;

 

-import junit.framework.TestCase;

-

 import org.apache.qpid.client.AMQConnection;

 import org.apache.qpid.client.AMQQueue;

 import org.apache.qpid.client.AMQSession;

-import org.apache.qpid.client.transport.TransportConnection;

 import org.apache.qpid.framing.AMQShortString;

+import org.apache.qpid.testutil.QpidTestCase;

 

 import org.slf4j.Logger;

 import org.slf4j.LoggerFactory;

@@ -42,34 +40,31 @@ import javax.jms.TextMessage;
 /**

  * @author Apache Software Foundation

  */

-public class JMSDestinationTest extends TestCase

+public class JMSDestinationTest extends QpidTestCase

 {

     private static final Logger _logger = LoggerFactory.getLogger(JMSDestinationTest.class);

 

-    public String _connectionString = "vm://:1";

 

     protected void setUp() throws Exception

     {

         super.setUp();

-        TransportConnection.createVMBroker(1);

     }

 

     protected void tearDown() throws Exception

     {

         super.tearDown();

-        TransportConnection.killAllVMBrokers();

     }

 

     public void testJMSDestination() throws Exception

     {

-        AMQConnection con = new AMQConnection("vm://:1", "guest", "guest", "consumer1", "test");

+        AMQConnection con =  (AMQConnection) getConnection("guest", "guest");

         AMQSession consumerSession = (AMQSession) con.createSession(false, Session.CLIENT_ACKNOWLEDGE);

         Queue queue =

             new AMQQueue(con.getDefaultQueueExchangeName(), new AMQShortString("someQ"), new AMQShortString("someQ"), false,

                 true);

         MessageConsumer consumer = consumerSession.createConsumer(queue);

 

-        Connection con2 = new AMQConnection("vm://:1", "guest", "guest", "producer1", "test");

+        Connection con2 =  (AMQConnection) getConnection("guest", "guest");

         Session producerSession = con2.createSession(false, Session.CLIENT_ACKNOWLEDGE);

         MessageProducer producer = producerSession.createProducer(queue);

 

diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java
index 3012909daa..df1f003c4e 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java
@@ -28,6 +28,7 @@ import org.apache.qpid.client.AMQSession;
 import org.apache.qpid.client.message.NonQpidObjectMessage;
 import org.apache.qpid.client.transport.TransportConnection;
 import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.testutil.QpidTestCase;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -42,7 +43,7 @@ import javax.jms.Session;
 /**
  * @author Apache Software Foundation
  */
-public class JMSPropertiesTest extends TestCase
+public class JMSPropertiesTest extends QpidTestCase
 {
 
     private static final Logger _logger = LoggerFactory.getLogger(JMSPropertiesTest.class);
@@ -56,25 +57,23 @@ public class JMSPropertiesTest extends TestCase
     protected void setUp() throws Exception
     {
         super.setUp();
-        TransportConnection.createVMBroker(1);
     }
 
     protected void tearDown() throws Exception
     {
         super.tearDown();
-        TransportConnection.killAllVMBrokers();
     }
 
     public void testJMSProperties() throws Exception
     {
-        AMQConnection con = new AMQConnection("vm://:1", "guest", "guest", "consumer1", "test");
+        AMQConnection con = (AMQConnection) getConnection("guest", "guest");
         AMQSession consumerSession = (AMQSession) con.createSession(false, Session.CLIENT_ACKNOWLEDGE);
         Queue queue =
             new AMQQueue(con.getDefaultQueueExchangeName(), new AMQShortString("someQ"), new AMQShortString("someQ"), false,
                 true);
         MessageConsumer consumer = consumerSession.createConsumer(queue);
 
-        AMQConnection con2 = new AMQConnection("vm://:1", "guest", "guest", "producer1", "test");
+        AMQConnection con2 = (AMQConnection) getConnection("guest", "guest");
         Session producerSession = con2.createSession(false, Session.CLIENT_ACKNOWLEDGE);
         MessageProducer producer = producerSession.createProducer(queue);
         Destination JMS_REPLY_TO = new AMQQueue(con2, "my.replyto");
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java
index 9c4f2af107..94addd55dd 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java
@@ -20,18 +20,16 @@
  */
 package org.apache.qpid.test.unit.message;
 
-import junit.framework.TestCase;
-
 import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQHeadersExchange;
 import org.apache.qpid.client.AMQQueue;
 import org.apache.qpid.client.AMQSession;
-import org.apache.qpid.client.transport.TransportConnection;
 import org.apache.qpid.exchange.ExchangeDefaults;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.FieldTable;
 import org.apache.qpid.url.AMQBindingURL;
 import org.apache.qpid.url.BindingURL;
+import org.apache.qpid.testutil.QpidTestCase;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -49,7 +47,7 @@ import javax.jms.StreamMessage;
 /**
  * @author Apache Software Foundation
  */
-public class StreamMessageTest extends TestCase
+public class StreamMessageTest extends QpidTestCase
 {
 
     private static final Logger _logger = LoggerFactory.getLogger(StreamMessageTest.class);
@@ -59,18 +57,16 @@ public class StreamMessageTest extends TestCase
     protected void setUp() throws Exception
     {
         super.setUp();
-        TransportConnection.createVMBroker(1);
     }
 
     protected void tearDown() throws Exception
     {
         super.tearDown();
-        TransportConnection.killAllVMBrokers();
     }
 
     public void testStreamMessageEOF() throws Exception
     {
-        Connection con = new AMQConnection("vm://:1", "guest", "guest", "consumer1", "test");
+        Connection con = (AMQConnection) getConnection("guest", "guest");
         AMQSession consumerSession = (AMQSession) con.createSession(false, Session.CLIENT_ACKNOWLEDGE);
 
         AMQHeadersExchange queue =
@@ -87,7 +83,7 @@ public class StreamMessageTest extends TestCase
         // ((AMQSession) consumerSession).declareExchangeSynch(ExchangeDefaults.HEADERS_EXCHANGE_NAME, ExchangeDefaults.HEADERS_EXCHANGE_CLASS);
         // This is the default now
 
-        Connection con2 = new AMQConnection("vm://:1", "guest", "guest", "producer1", "test");
+        Connection con2 = (AMQConnection) getConnection("guest", "guest");
 
         AMQSession producerSession = (AMQSession) con2.createSession(false, Session.CLIENT_ACKNOWLEDGE);
 
@@ -125,7 +121,7 @@ public class StreamMessageTest extends TestCase
 
     public void testModifyReceivedMessageExpandsBuffer() throws Exception
     {
-        AMQConnection con = new AMQConnection("vm://:1", "guest", "guest", "consumer1", "test");
+        AMQConnection con = (AMQConnection) getConnection("guest", "guest");
         AMQSession consumerSession = (AMQSession) con.createSession(false, Session.CLIENT_ACKNOWLEDGE);
         AMQQueue queue = new AMQQueue(con.getDefaultQueueExchangeName(), new AMQShortString("testQ"));
         MessageConsumer consumer = consumerSession.createConsumer(queue);
@@ -148,7 +144,7 @@ public class StreamMessageTest extends TestCase
                 }
             });
 
-        Connection con2 = new AMQConnection("vm://:1", "guest", "guest", "producer1", "test");
+        Connection con2 = (AMQConnection) getConnection("guest", "guest");
         AMQSession producerSession = (AMQSession) con2.createSession(false, Session.CLIENT_ACKNOWLEDGE);
         MessageProducer mandatoryProducer = producerSession.createProducer(queue);
         con.start();
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/tests.properties b/java/client/src/test/java/org/apache/qpid/test/unit/tests.properties
index 250a9e5296..a20394a17d 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/tests.properties
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/tests.properties
@@ -23,17 +23,17 @@ java.naming.factory.initial = org.apache.qpid.jndi.PropertiesFileInitialContextF
 
 # register some connection factories
 # connectionfactory.[jndiname] = [ConnectionURL]
-connectionfactory.local = qpid:password=guest;username=guest;client_id=clientid;virtualhost=test@tcp:localhost:5672
-
+connectionfactory.local = qpid:password=guest;username=guest;client_id=clientid;virtualhost=test@tcp:127.0.0.1:5672
+                                                                     
 # register some queues in JNDI using the form
 # queue.[jndiName] = [physicalName]
-queue.MyQueue = example.MyQueue
+#queue.MyQueue = example.MyQueue
 
 # register some topics in JNDI using the form
 # topic.[jndiName] = [physicalName]
-topic.ibmStocks = stocks.nyse.ibm
+#topic.ibmStocks = stocks.nyse.ibm
 
 # Register an AMQP destination in JNDI
 #   NOTE: Qpid currently only supports direct,topics and headers
 # destination.[jniName] = [BindingURL]
-destination.direct = direct://amq.direct//directQueue
+#destination.direct = direct://amq.direct//directQueue
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
index c8d43a47a5..03b862abdd 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
@@ -23,6 +23,7 @@ package org.apache.qpid.test.unit.topic;
 import junit.framework.TestCase;
 
 import org.apache.qpid.AMQException;
+import org.apache.qpid.testutil.QpidTestCase;
 import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQSession;
 import org.apache.qpid.client.AMQTopic;
@@ -40,25 +41,23 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.jms.TopicSubscriber;
 
-public class DurableSubscriptionTest extends TestCase
+public class DurableSubscriptionTest extends QpidTestCase
 {
     private static final Logger _logger = LoggerFactory.getLogger(DurableSubscriptionTest.class);
 
     protected void setUp() throws Exception
     {
         super.setUp();
-        TransportConnection.createVMBroker(1);
     }
 
     protected void tearDown() throws Exception
     {
         super.tearDown();
-        TransportConnection.killAllVMBrokers();
     }
 
-    public void testUnsubscribe() throws AMQException, JMSException, URLSyntaxException
+    public void testUnsubscribe() throws Exception
     {
-        AMQConnection con = new AMQConnection("vm://:1", "guest", "guest", "test", "test");
+        AMQConnection con = (AMQConnection) getConnection("guest", "guest");
         AMQTopic topic = new AMQTopic(con, "MyTopic");
         _logger.info("Create Session 1");
         Session session1 = con.createSession(false, AMQSession.NO_ACKNOWLEDGE);
@@ -114,10 +113,10 @@ public class DurableSubscriptionTest extends TestCase
         con.close();
     }
 
-    public void testDurability() throws AMQException, JMSException, URLSyntaxException
+    public void testDurability() throws Exception
     {
 
-        AMQConnection con = new AMQConnection("vm://:1", "guest", "guest", "test", "test");
+        AMQConnection con = (AMQConnection) getConnection("guest", "guest");
         AMQTopic topic = new AMQTopic(con, "MyTopic");
         Session session1 = con.createSession(false, AMQSession.NO_ACKNOWLEDGE);
         MessageConsumer consumer1 = session1.createConsumer(topic);
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java
index 929e2799a9..4dfd4fdfea 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java
@@ -25,34 +25,30 @@ import javax.jms.TextMessage;
 import javax.jms.TopicPublisher;
 import javax.jms.TopicSession;
 
-import junit.framework.TestCase;
-
 import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQSession;
 import org.apache.qpid.client.AMQTopic;
-import org.apache.qpid.client.transport.TransportConnection;
+import org.apache.qpid.testutil.QpidTestCase;
 
 /**
  * @author Apache Software Foundation
  */
-public class TopicPublisherTest extends TestCase
+public class TopicPublisherTest extends QpidTestCase
 {
     protected void setUp() throws Exception
     {
         super.setUp();
-        TransportConnection.createVMBroker(1);
     }
 
     protected void tearDown() throws Exception
     {
         super.tearDown();
-        TransportConnection.killAllVMBrokers();
     }
 
     public void testUnidentifiedProducer() throws Exception
     {
 
-        AMQConnection con = new AMQConnection("vm://:1", "guest", "guest", "test", "test");
+        AMQConnection con =  (AMQConnection) getConnection("guest", "guest");
         AMQTopic topic = new AMQTopic(con,"MyTopic");
         TopicSession session1 = con.createTopicSession(false, AMQSession.NO_ACKNOWLEDGE);
         TopicPublisher publisher = session1.createPublisher(null);
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
index 58e3f19eed..94e8b1fe29 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
@@ -42,7 +42,6 @@ import org.apache.qpid.testutil.QpidTestCase;
 /** @author Apache Software Foundation */
 public class TopicSessionTest extends QpidTestCase
 {
-    private static final String BROKER = "vm://:1";
 
     protected void setUp() throws Exception
     {
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
index f9575b921c..fe7e79426d 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
@@ -20,12 +20,8 @@
  */
 package org.apache.qpid.test.unit.transacted;
 
-import junit.framework.TestCase;
-import org.apache.qpid.AMQException;
 import org.apache.qpid.testutil.QpidTestCase;
 import org.apache.qpid.client.AMQConnection;
-import org.apache.qpid.client.transport.TransportConnection;
-import org.apache.qpid.url.URLSyntaxException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -55,7 +51,6 @@ public class CommitRollbackTest extends QpidTestCase
     Queue _jmsQueue;
 
     private static final Logger _logger = LoggerFactory.getLogger(CommitRollbackTest.class);
-    private static final String BROKER = "vm://:1";
     private boolean _gotone = false;
     private boolean _gottwo = false;
     private boolean _gottwoRedelivered = false;