QPID-1079: Updated ...test.client tests for using QpidTestCase + move QpidTestCase in main so it is visible form systests

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

14 files changed, 110 insertions, 88 deletions

diff --git a/java/010ExcludeList b/java/010ExcludeList
index 8a38aeaad5..13ae556017 100644
--- a/java/010ExcludeList
+++ b/java/010ExcludeList
@@ -30,4 +30,18 @@ org.apache.qpid.test.client.QueueBrowserNoAckTest#testFailoverWithQueueBrowser
 org.apache.qpid.test.client.QueueBrowserPreAckTest#testFailoverAsQueueBrowserCreated
 org.apache.qpid.test.client.QueueBrowserPreAckTest#testFailoverWithQueueBrowser
 org.apache.qpid.test.client.QueueBrowserTransactedTest#testFailoverAsQueueBrowserCreated
-org.apache.qpid.test.client.QueueBrowserTransactedTest#testFailoverWithQueueBrowser
\ No newline at end of file
+org.apache.qpid.test.client.QueueBrowserTransactedTest#testFailoverWithQueueBrowser
+org.apache.qpid.test.testcases.FailoverTest#*
+// Those tests are testing 0.8 specific semantics
+org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedNoTxP2P
+org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedTxP2P
+org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteNoTxP2P
+org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteTxP2P
+org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedNoTxPubSub
+org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedTxPubSub
+org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteNoTxPubSub
+org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteTxPubSub
+org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteNoTxP2P
+org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteTxP2P
+org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteNoTxPubSub
+org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteTxPubSub
\ No newline at end of file
diff --git a/java/010ExcludeList-store b/java/010ExcludeList-store
index 8b3a9129bf..94777dc44b 100644
--- a/java/010ExcludeList-store
+++ b/java/010ExcludeList-store
@@ -25,4 +25,18 @@ org.apache.qpid.test.client.QueueBrowserNoAckTest#testFailoverWithQueueBrowser
 org.apache.qpid.test.client.QueueBrowserPreAckTest#testFailoverAsQueueBrowserCreated
 org.apache.qpid.test.client.QueueBrowserPreAckTest#testFailoverWithQueueBrowser
 org.apache.qpid.test.client.QueueBrowserTransactedTest#testFailoverAsQueueBrowserCreated
-org.apache.qpid.test.client.QueueBrowserTransactedTest#testFailoverWithQueueBrowser
\ No newline at end of file
+org.apache.qpid.test.client.QueueBrowserTransactedTest#testFailoverWithQueueBrowser
+org.apache.qpid.test.testcases.FailoverTest#*
+// Those tests are testing 0.8 specific semantics
+org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedNoTxP2P
+org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedTxP2P
+org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteNoTxP2P
+org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteTxP2P
+org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedNoTxPubSub
+org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedTxPubSub
+org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteNoTxPubSub
+org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteTxPubSub
+org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteNoTxP2P
+org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteTxP2P
+org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteNoTxPubSub
+org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteTxPubSub
\ No newline at end of file
diff --git a/java/08ExcludeList b/java/08ExcludeList
index 3541387b17..c97c968816 100644
--- a/java/08ExcludeList
+++ b/java/08ExcludeList
@@ -1,6 +1,6 @@
 org.apache.qpid.test.unit.xa.QueueTest#*
 org.apache.qpid.test.unit.xa.TopicTest#*
 org.apache.qpid.test.unit.ct.DurableSubscriberTests#*
-// This test is not finished 
+// Those tests are not finished
 org.apache.qpid.test.testcases.TTLTest#*
-
+org.apache.qpid.test.testcases.FailoverTest#*
diff --git a/java/client/src/test/java/org/apache/qpid/testutil/QpidTestCase.java b/java/client/src/main/java/org/apache/qpid/testutil/QpidTestCase.java
index 36278f890b..1fe9a3ae51 100644
--- a/java/client/src/test/java/org/apache/qpid/testutil/QpidTestCase.java
+++ b/java/client/src/main/java/org/apache/qpid/testutil/QpidTestCase.java
@@ -128,6 +128,16 @@ public class QpidTestCase extends TestCase
     // the connections created for a given test
     protected List<Connection> _connections = new ArrayList<Connection>();
 
+    public QpidTestCase(String name)
+    {
+        super(name);
+    }
+
+    public QpidTestCase()
+       {
+           super("QpidTestCase");
+       }
+
     public void runBare() throws Throwable
     {
         String name = getClass().getSimpleName() + "." + getName();
diff --git a/java/perftests/src/main/java/org/apache/qpid/test/testcases/MessageThroughputPerf.java b/java/perftests/src/main/java/org/apache/qpid/test/testcases/MessageThroughputPerf.java
index 0fcb0a8538..9397db82c9 100644
--- a/java/perftests/src/main/java/org/apache/qpid/test/testcases/MessageThroughputPerf.java
+++ b/java/perftests/src/main/java/org/apache/qpid/test/testcases/MessageThroughputPerf.java
@@ -156,7 +156,7 @@ public class MessageThroughputPerf extends FrameworkBaseCase implements TimingCo
         CircuitFactory circuitFactory = getCircuitFactory();
 
         // Create the test circuit. This projects the circuit onto the available test nodes and connects it up.
-        Circuit testCircuit = circuitFactory.createCircuit(testProps);
+        Circuit testCircuit = circuitFactory.createCircuit(null, testProps);
 
         // Store the test configuration for the thread.
         PerThreadSetup setup = new PerThreadSetup();
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkBaseCase.java b/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkBaseCase.java
index 1050baaca6..082f3f29bd 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkBaseCase.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkBaseCase.java
@@ -23,16 +23,14 @@ package org.apache.qpid.test.framework;
 import org.apache.log4j.Logger;
 import org.apache.log4j.NDC;
 
-import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.test.framework.BrokerLifecycleAware;
 import org.apache.qpid.test.framework.sequencers.CircuitFactory;
 
-import org.apache.qpid.client.transport.TransportConnection;
-import org.apache.qpid.junit.extensions.AsymptoticTestCase;
 import org.apache.qpid.junit.extensions.SetupTaskAware;
 import org.apache.qpid.junit.extensions.SetupTaskHandler;
 import org.apache.qpid.junit.extensions.util.ParsedProperties;
 import org.apache.qpid.junit.extensions.util.TestContextProperties;
+import org.apache.qpid.testutil.QpidTestCase;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -49,7 +47,7 @@ import java.util.List;
  * <tr><td> Convert failed assertions to error messages.
  * </table>
  */
-public class FrameworkBaseCase extends AsymptoticTestCase implements FrameworkTestContext, SetupTaskAware,
+public class FrameworkBaseCase extends QpidTestCase implements FrameworkTestContext, SetupTaskAware,
     BrokerLifecycleAware
 {
     /** Used for debugging purposes. */
@@ -194,10 +192,6 @@ public class FrameworkBaseCase extends AsymptoticTestCase implements FrameworkTe
         NDC.push(getName());
 
         testProps = TestContextProperties.getInstance(MessagingTestConfigProperties.defaults);
-
-        // Process all optional setup tasks. This may include in-vm broker creation, if a decorator has added it.
-        TransportConnection.createVMBroker(1);
-        taskHandler.runSetupTasks();
     }
 
     /**
@@ -208,8 +202,6 @@ public class FrameworkBaseCase extends AsymptoticTestCase implements FrameworkTe
         NDC.pop();
 
         // Process all optional tear down tasks. This may include in-vm broker clean up, if a decorator has added it.
-        TransportConnection.killVMBroker(1);
-        ApplicationRegistry.remove(1);
         taskHandler.runTearDownTasks();
     }
 
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/LocalCircuitFactory.java b/java/systests/src/main/java/org/apache/qpid/test/framework/LocalCircuitFactory.java
index 84dd735d0d..41766b9fae 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/LocalCircuitFactory.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/LocalCircuitFactory.java
@@ -81,7 +81,7 @@ public class LocalCircuitFactory implements CircuitFactory
      *
      * @return A test circuit.
      */
-    public Circuit createCircuit(ParsedProperties testProperties)
+    public Circuit createCircuit(Connection connection, ParsedProperties testProperties)
     {
         Circuit result;
 
@@ -94,9 +94,6 @@ public class LocalCircuitFactory implements CircuitFactory
             // Get a unique offset to append to destination names to make them unique to the connection.
             long uniqueId = uniqueDestsId.incrementAndGet();
 
-            // Set up the connection.
-            Connection connection = TestUtils.createConnection(testProperties);
-
             // Add the connection exception listener to assert on exception conditions with.
             // ExceptionMonitor exceptionMonitor = new ExceptionMonitor();
             // connection.setExceptionListener(exceptionMonitor);
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/CircuitFactory.java b/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/CircuitFactory.java
index fff617c583..0a48d66981 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/CircuitFactory.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/CircuitFactory.java
@@ -27,6 +27,7 @@ import org.apache.qpid.util.ConversationFactory;
 
 import org.apache.qpid.junit.extensions.util.ParsedProperties;
 
+import javax.jms.Connection;
 import java.util.List;
 import java.util.Properties;
 
@@ -62,7 +63,7 @@ public interface CircuitFactory
      *
      * @return A test circuit.
      */
-    public Circuit createCircuit(ParsedProperties testProperties);
+    public Circuit createCircuit(Connection connection, ParsedProperties testProperties);
 
     /**
      * Sets the sender test client to coordinate the test with.
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/FanOutCircuitFactory.java b/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/FanOutCircuitFactory.java
index d1c39ff3ff..7f8a821c69 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/FanOutCircuitFactory.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/FanOutCircuitFactory.java
@@ -31,10 +31,7 @@ import org.apache.qpid.util.ConversationFactory;
 
 import org.apache.qpid.junit.extensions.util.ParsedProperties;
 
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.Session;
+import javax.jms.*;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -74,7 +71,7 @@ public class FanOutCircuitFactory extends BaseCircuitFactory
      * @param testProperties The test parameters.
      * @return A test circuit.
      */
-    public Circuit createCircuit(ParsedProperties testProperties)
+    public Circuit createCircuit(Connection connection, ParsedProperties testProperties)
     {
         log.debug("public Circuit createCircuit(ParsedProperties testProperties): called");
 
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/InteropCircuitFactory.java b/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/InteropCircuitFactory.java
index feb87e7b9c..8604dd7800 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/InteropCircuitFactory.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/InteropCircuitFactory.java
@@ -31,10 +31,7 @@ import org.apache.qpid.util.ConversationFactory;
 
 import org.apache.qpid.junit.extensions.util.ParsedProperties;
 
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.Session;
+import javax.jms.*;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -67,7 +64,7 @@ public class InteropCircuitFactory extends BaseCircuitFactory
      * @param testProperties The test parameters.
      * @return A test circuit.
      */
-    public Circuit createCircuit(ParsedProperties testProperties)
+    public Circuit createCircuit(Connection connection, ParsedProperties testProperties)
     {
         log.debug("public Circuit createCircuit(ParsedProperties testProperties): called");
 
diff --git a/java/systests/src/main/java/org/apache/qpid/test/testcases/FailoverTest.java b/java/systests/src/main/java/org/apache/qpid/test/testcases/FailoverTest.java
index 5f41a07949..a0a8894874 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/testcases/FailoverTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/testcases/FailoverTest.java
@@ -73,7 +73,7 @@ public class FailoverTest extends FrameworkBaseCase
      *
      * @throws JMSException Allowed to fall through and fail test.
      */
-    public void testTxP2PFailover() throws JMSException
+    public void testTxP2PFailover() throws Exception
     {
         // Set up the test properties to match the test cases requirements.
         testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, true);
@@ -84,7 +84,7 @@ public class FailoverTest extends FrameworkBaseCase
 
         // Create the test circuit from the test configuration parameters.
         CircuitFactory circuitFactory = getCircuitFactory();
-        Circuit testCircuit = circuitFactory.createCircuit(testProps);
+        Circuit testCircuit = circuitFactory.createCircuit(getConnection(), testProps);
 
         // Create an assertion that all messages are received.
         Assertion allMessagesReceived = testCircuit.getReceiver().allMessagesReceivedAssertion(testProps);
diff --git a/java/systests/src/main/java/org/apache/qpid/test/testcases/ImmediateMessageTest.java b/java/systests/src/main/java/org/apache/qpid/test/testcases/ImmediateMessageTest.java
index 767871e25a..69aa6a52ae 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/testcases/ImmediateMessageTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/testcases/ImmediateMessageTest.java
@@ -75,7 +75,7 @@ public class ImmediateMessageTest extends FrameworkBaseCase
     }
 
     /** Check that an immediate message is sent succesfully not using transactions when a consumer is connected. */
-    public void test_QPID_517_ImmediateOkNoTxP2P()
+    public void test_QPID_517_ImmediateOkNoTxP2P() throws Exception
     {
         // Ensure transactional sessions are off.
         testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, false);
@@ -83,13 +83,13 @@ public class ImmediateMessageTest extends FrameworkBaseCase
 
         // Run the default test sequence over the test circuit checking for no errors.
         CircuitFactory circuitFactory = getCircuitFactory();
-        Circuit testCircuit = circuitFactory.createCircuit(testProps);
+        Circuit testCircuit = circuitFactory.createCircuit(getConnection(), testProps);
 
         assertNoFailures(testCircuit.test(1, assertionList(testCircuit.getPublisher().noExceptionsAssertion(testProps))));
     }
 
     /** Check that an immediate message is committed succesfully in a transaction when a consumer is connected. */
-    public void test_QPID_517_ImmediateOkTxP2P()
+    public void test_QPID_517_ImmediateOkTxP2P() throws Exception
     {
         // Ensure transactional sessions are off.
         testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, true);
@@ -97,13 +97,13 @@ public class ImmediateMessageTest extends FrameworkBaseCase
 
         // Send one message with no errors.
         CircuitFactory circuitFactory = getCircuitFactory();
-        Circuit testCircuit = circuitFactory.createCircuit(testProps);
+        Circuit testCircuit = circuitFactory.createCircuit(getConnection(), testProps);
 
         assertNoFailures(testCircuit.test(1, assertionList(testCircuit.getPublisher().noExceptionsAssertion(testProps))));
     }
 
     /** Check that an immediate message results in no consumers code, not using transactions, when a consumer is disconnected. */
-    public void test_QPID_517_ImmediateFailsConsumerDisconnectedNoTxP2P()
+    public void test_QPID_517_ImmediateFailsConsumerDisconnectedNoTxP2P() throws Exception
     {
         // Ensure transactional sessions are off.
         testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, false);
@@ -113,7 +113,7 @@ public class ImmediateMessageTest extends FrameworkBaseCase
         testProps.setProperty(RECEIVER_CONSUMER_ACTIVE_PROPNAME, false);
 
         CircuitFactory circuitFactory = getCircuitFactory();
-        Circuit testCircuit = circuitFactory.createCircuit(testProps);
+        Circuit testCircuit = circuitFactory.createCircuit(getConnection(), testProps);
 
         // Send one message and get a linked no consumers exception.
         assertNoFailures(testCircuit.test(1,
@@ -121,7 +121,7 @@ public class ImmediateMessageTest extends FrameworkBaseCase
     }
 
     /** Check that an immediate message results in no consumers code, in a transaction, when a consumer is disconnected. */
-    public void test_QPID_517_ImmediateFailsConsumerDisconnectedTxP2P()
+    public void test_QPID_517_ImmediateFailsConsumerDisconnectedTxP2P() throws Exception
     {
         // Ensure transactional sessions are on.
         testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, true);
@@ -131,7 +131,7 @@ public class ImmediateMessageTest extends FrameworkBaseCase
         testProps.setProperty(RECEIVER_CONSUMER_ACTIVE_PROPNAME, false);
 
         CircuitFactory circuitFactory = getCircuitFactory();
-        Circuit testCircuit = circuitFactory.createCircuit(testProps);
+        Circuit testCircuit = circuitFactory.createCircuit(getConnection(),  testProps);
 
         // Send one message and get a linked no consumers exception.
         assertNoFailures(testCircuit.test(1,
@@ -139,7 +139,7 @@ public class ImmediateMessageTest extends FrameworkBaseCase
     }
 
     /** Check that an immediate message results in no route code, not using transactions, when no outgoing route is connected. */
-    public void test_QPID_517_ImmediateFailsNoRouteNoTxP2P()
+    public void test_QPID_517_ImmediateFailsNoRouteNoTxP2P() throws Exception
     {
         // Ensure transactional sessions are off.
         testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, false);
@@ -151,14 +151,14 @@ public class ImmediateMessageTest extends FrameworkBaseCase
 
         // Send one message and get a linked no route exception.
         CircuitFactory circuitFactory = getCircuitFactory();
-        Circuit testCircuit = circuitFactory.createCircuit(testProps);
+        Circuit testCircuit = circuitFactory.createCircuit(getConnection(), testProps);
 
         assertNoFailures(testCircuit.test(1,
                 assertionList(((AMQPPublisher) testCircuit.getPublisher()).noRouteAssertion(testProps))));
     }
 
     /** Check that an immediate message results in no route code, upon transaction commit, when no outgoing route is connected. */
-    public void test_QPID_517_ImmediateFailsNoRouteTxP2P()
+    public void test_QPID_517_ImmediateFailsNoRouteTxP2P() throws Exception
     {
         // Ensure transactional sessions are on.
         testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, true);
@@ -170,14 +170,14 @@ public class ImmediateMessageTest extends FrameworkBaseCase
 
         // Send one message and get a linked no route exception.
         CircuitFactory circuitFactory = getCircuitFactory();
-        Circuit testCircuit = circuitFactory.createCircuit(testProps);
+        Circuit testCircuit = circuitFactory.createCircuit(getConnection(), testProps);
 
         assertNoFailures(testCircuit.test(1,
                 assertionList(((AMQPPublisher) testCircuit.getPublisher()).noRouteAssertion(testProps))));
     }
 
     /** Check that an immediate message is sent succesfully not using transactions when a consumer is connected. */
-    public void test_QPID_517_ImmediateOkNoTxPubSub()
+    public void test_QPID_517_ImmediateOkNoTxPubSub() throws Exception
     {
         // Ensure transactional sessions are off.
         testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, false);
@@ -185,14 +185,14 @@ public class ImmediateMessageTest extends FrameworkBaseCase
 
         // Send one message with no errors.
         CircuitFactory circuitFactory = getCircuitFactory();
-        Circuit testCircuit = circuitFactory.createCircuit(testProps);
+        Circuit testCircuit = circuitFactory.createCircuit(getConnection(), testProps);
 
         assertNoFailures(testCircuit.test(1,
                 assertionList(((AMQPPublisher) testCircuit.getPublisher()).noExceptionsAssertion(testProps))));
     }
 
     /** Check that an immediate message is committed succesfully in a transaction when a consumer is connected. */
-    public void test_QPID_517_ImmediateOkTxPubSub()
+    public void test_QPID_517_ImmediateOkTxPubSub() throws Exception
     {
         // Ensure transactional sessions are off.
         testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, true);
@@ -200,14 +200,14 @@ public class ImmediateMessageTest extends FrameworkBaseCase
 
         // Send one message with no errors.
         CircuitFactory circuitFactory = getCircuitFactory();
-        Circuit testCircuit = circuitFactory.createCircuit(testProps);
+        Circuit testCircuit = circuitFactory.createCircuit(getConnection(), testProps);
 
         assertNoFailures(testCircuit.test(1,
                 assertionList(((AMQPPublisher) testCircuit.getPublisher()).noExceptionsAssertion(testProps))));
     }
 
     /** Check that an immediate message results in no consumers code, not using transactions, when a consumer is disconnected. */
-    public void test_QPID_517_ImmediateFailsConsumerDisconnectedNoTxPubSub()
+    public void test_QPID_517_ImmediateFailsConsumerDisconnectedNoTxPubSub() throws Exception
     {
         // Ensure transactional sessions are off.
         testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, false);
@@ -220,7 +220,7 @@ public class ImmediateMessageTest extends FrameworkBaseCase
         testProps.setProperty(RECEIVER_CONSUMER_ACTIVE_PROPNAME, false);
 
         CircuitFactory circuitFactory = getCircuitFactory();
-        Circuit testCircuit = circuitFactory.createCircuit(testProps);
+        Circuit testCircuit = circuitFactory.createCircuit(getConnection(), testProps);
 
         // Send one message and get a linked no consumers exception.
         assertNoFailures(testCircuit.test(1,
@@ -228,7 +228,7 @@ public class ImmediateMessageTest extends FrameworkBaseCase
     }
 
     /** Check that an immediate message results in no consumers code, in a transaction, when a consumer is disconnected. */
-    public void test_QPID_517_ImmediateFailsConsumerDisconnectedTxPubSub()
+    public void test_QPID_517_ImmediateFailsConsumerDisconnectedTxPubSub() throws Exception
     {
         // Ensure transactional sessions are on.
         testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, true);
@@ -241,7 +241,7 @@ public class ImmediateMessageTest extends FrameworkBaseCase
         testProps.setProperty(RECEIVER_CONSUMER_ACTIVE_PROPNAME, false);
 
         CircuitFactory circuitFactory = getCircuitFactory();
-        Circuit testCircuit = circuitFactory.createCircuit(testProps);
+        Circuit testCircuit = circuitFactory.createCircuit(getConnection(), testProps);
 
         // Send one message and get a linked no consumers exception.
         assertNoFailures(testCircuit.test(1,
@@ -249,7 +249,7 @@ public class ImmediateMessageTest extends FrameworkBaseCase
     }
 
     /** Check that an immediate message results in no route code, not using transactions, when no outgoing route is connected. */
-    public void test_QPID_517_ImmediateFailsNoRouteNoTxPubSub()
+    public void test_QPID_517_ImmediateFailsNoRouteNoTxPubSub() throws Exception
     {
         // Ensure transactional sessions are off.
         testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, false);
@@ -261,14 +261,14 @@ public class ImmediateMessageTest extends FrameworkBaseCase
 
         // Send one message and get a linked no route exception.
         CircuitFactory circuitFactory = getCircuitFactory();
-        Circuit testCircuit = circuitFactory.createCircuit(testProps);
+        Circuit testCircuit = circuitFactory.createCircuit(getConnection(), testProps);
 
         assertNoFailures(testCircuit.test(1,
                 assertionList(((AMQPPublisher) testCircuit.getPublisher()).noRouteAssertion(testProps))));
     }
 
     /** Check that an immediate message results in no route code, upon transaction commit, when no outgoing route is connected. */
-    public void test_QPID_517_ImmediateFailsNoRouteTxPubSub()
+    public void test_QPID_517_ImmediateFailsNoRouteTxPubSub() throws Exception
     {
         // Ensure transactional sessions are on.
         testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, true);
@@ -280,7 +280,7 @@ public class ImmediateMessageTest extends FrameworkBaseCase
 
         // Send one message and get a linked no route exception.
         CircuitFactory circuitFactory = getCircuitFactory();
-        Circuit testCircuit = circuitFactory.createCircuit(testProps);
+        Circuit testCircuit = circuitFactory.createCircuit(getConnection(), testProps);
 
         assertNoFailures(testCircuit.test(1,
                 assertionList(((AMQPPublisher) testCircuit.getPublisher()).noRouteAssertion(testProps))));
diff --git a/java/systests/src/main/java/org/apache/qpid/test/testcases/MandatoryMessageTest.java b/java/systests/src/main/java/org/apache/qpid/test/testcases/MandatoryMessageTest.java
index d46a866b93..b4c4eb91b4 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/testcases/MandatoryMessageTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/testcases/MandatoryMessageTest.java
@@ -79,7 +79,7 @@ public class MandatoryMessageTest extends FrameworkBaseCase
     }
 
     /** Check that an mandatory message is sent succesfully not using transactions when a consumer is connected. */
-    public void test_QPID_508_MandatoryOkNoTxP2P()
+    public void test_QPID_508_MandatoryOkNoTxP2P() throws Exception
     {
         // Ensure transactional sessions are off.
         testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, false);
@@ -87,14 +87,14 @@ public class MandatoryMessageTest extends FrameworkBaseCase
 
         // Run the default test sequence over the test circuit checking for no errors.
         CircuitFactory circuitFactory = getCircuitFactory();
-        Circuit testCircuit = circuitFactory.createCircuit(testProps);
+        Circuit testCircuit = circuitFactory.createCircuit(getConnection(), testProps);
 
         assertNoFailures(testCircuit.test(1,
                 assertionList(((AMQPPublisher) testCircuit.getPublisher()).noExceptionsAssertion(testProps))));
     }
 
     /** Check that an mandatory message is committed succesfully in a transaction when a consumer is connected. */
-    public void test_QPID_508_MandatoryOkTxP2P()
+    public void test_QPID_508_MandatoryOkTxP2P() throws Exception
     {
         // Ensure transactional sessions are off.
         testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, true);
@@ -102,7 +102,7 @@ public class MandatoryMessageTest extends FrameworkBaseCase
 
         // Run the default test sequence over the test circuit checking for no errors.
         CircuitFactory circuitFactory = getCircuitFactory();
-        Circuit testCircuit = circuitFactory.createCircuit(testProps);
+        Circuit testCircuit = circuitFactory.createCircuit(getConnection(), testProps);
 
         assertNoFailures(testCircuit.test(1,
                 assertionList(((AMQPPublisher) testCircuit.getPublisher()).noExceptionsAssertion(testProps))));
@@ -112,7 +112,7 @@ public class MandatoryMessageTest extends FrameworkBaseCase
      * Check that a mandatory message is sent succesfully, not using transactions, when a consumer is disconnected but
      * the route exists.
      */
-    public void test_QPID_517_MandatoryOkConsumerDisconnectedNoTxP2P()
+    public void test_QPID_517_MandatoryOkConsumerDisconnectedNoTxP2P() throws Exception
     {
         // Ensure transactional sessions are off.
         testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, false);
@@ -122,7 +122,7 @@ public class MandatoryMessageTest extends FrameworkBaseCase
         testProps.setProperty(RECEIVER_CONSUMER_ACTIVE_PROPNAME, false);
 
         CircuitFactory circuitFactory = getCircuitFactory();
-        Circuit testCircuit = circuitFactory.createCircuit(testProps);
+        Circuit testCircuit = circuitFactory.createCircuit(getConnection(), testProps);
 
         // Send one message with no errors.
         assertNoFailures(testCircuit.test(1,
@@ -133,7 +133,7 @@ public class MandatoryMessageTest extends FrameworkBaseCase
      * Check that a mandatory message is sent succesfully, in a transaction, when a consumer is disconnected but
      * the route exists.
      */
-    public void test_QPID_517_MandatoryOkConsumerDisconnectedTxP2P()
+    public void test_QPID_517_MandatoryOkConsumerDisconnectedTxP2P() throws Exception
     {
         // Ensure transactional sessions are on.
         testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, true);
@@ -143,7 +143,7 @@ public class MandatoryMessageTest extends FrameworkBaseCase
         testProps.setProperty(RECEIVER_CONSUMER_ACTIVE_PROPNAME, false);
 
         CircuitFactory circuitFactory = getCircuitFactory();
-        Circuit testCircuit = circuitFactory.createCircuit(testProps);
+        Circuit testCircuit = circuitFactory.createCircuit(getConnection(), testProps);
 
         // Send one message with no errors.
         assertNoFailures(testCircuit.test(1,
@@ -151,7 +151,7 @@ public class MandatoryMessageTest extends FrameworkBaseCase
     }
 
     /** Check that an mandatory message results in no route code, not using transactions, when no consumer is connected. */
-    public void test_QPID_508_MandatoryFailsNoRouteNoTxP2P()
+    public void test_QPID_508_MandatoryFailsNoRouteNoTxP2P() throws Exception
     {
         // Ensure transactional sessions are off.
         testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, false);
@@ -163,14 +163,14 @@ public class MandatoryMessageTest extends FrameworkBaseCase
 
         // Send one message and get a linked no route exception.
         CircuitFactory circuitFactory = getCircuitFactory();
-        Circuit testCircuit = circuitFactory.createCircuit(testProps);
+        Circuit testCircuit = circuitFactory.createCircuit(getConnection(), testProps);
 
         assertNoFailures(testCircuit.test(1,
                 assertionList(((AMQPPublisher) testCircuit.getPublisher()).noRouteAssertion(testProps))));
     }
 
     /** Check that an mandatory message results in no route code, upon transaction commit, when a consumer is connected. */
-    public void test_QPID_508_MandatoryFailsNoRouteTxP2P()
+    public void test_QPID_508_MandatoryFailsNoRouteTxP2P() throws Exception
     {
         // Ensure transactional sessions are on.
         testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, true);
@@ -182,14 +182,14 @@ public class MandatoryMessageTest extends FrameworkBaseCase
 
         // Send one message and get a linked no route exception.
         CircuitFactory circuitFactory = getCircuitFactory();
-        Circuit testCircuit = circuitFactory.createCircuit(testProps);
+        Circuit testCircuit = circuitFactory.createCircuit(getConnection(), testProps);
 
         assertNoFailures(testCircuit.test(1,
                 assertionList(((AMQPPublisher) testCircuit.getPublisher()).noRouteAssertion(testProps))));
     }
 
     /** Check that an mandatory message is sent succesfully not using transactions when a consumer is connected. */
-    public void test_QPID_508_MandatoryOkNoTxPubSub()
+    public void test_QPID_508_MandatoryOkNoTxPubSub() throws Exception
     {
         // Ensure transactional sessions are off.
         testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, false);
@@ -197,14 +197,14 @@ public class MandatoryMessageTest extends FrameworkBaseCase
 
         // Run the default test sequence over the test circuit checking for no errors.
         CircuitFactory circuitFactory = getCircuitFactory();
-        Circuit testCircuit = circuitFactory.createCircuit(testProps);
+        Circuit testCircuit = circuitFactory.createCircuit(getConnection(), testProps);
 
         assertNoFailures(testCircuit.test(1,
                 assertionList(((AMQPPublisher) testCircuit.getPublisher()).noExceptionsAssertion(testProps))));
     }
 
     /** Check that an mandatory message is committed succesfully in a transaction when a consumer is connected. */
-    public void test_QPID_508_MandatoryOkTxPubSub()
+    public void test_QPID_508_MandatoryOkTxPubSub() throws Exception
     {
         // Ensure transactional sessions are on.
         testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, true);
@@ -212,7 +212,7 @@ public class MandatoryMessageTest extends FrameworkBaseCase
 
         // Run the default test sequence over the test circuit checking for no errors.
         CircuitFactory circuitFactory = getCircuitFactory();
-        Circuit testCircuit = circuitFactory.createCircuit(testProps);
+        Circuit testCircuit = circuitFactory.createCircuit(getConnection(), testProps);
 
         assertNoFailures(testCircuit.test(1,
                 assertionList(((AMQPPublisher) testCircuit.getPublisher()).noExceptionsAssertion(testProps))));
@@ -222,7 +222,7 @@ public class MandatoryMessageTest extends FrameworkBaseCase
      * Check that a mandatory message is sent succesfully, not using transactions, when a consumer is disconnected but
      * the route exists.
      */
-    public void test_QPID_517_MandatoryOkConsumerDisconnectedNoTxPubSub()
+    public void test_QPID_517_MandatoryOkConsumerDisconnectedNoTxPubSub()  throws Exception
     {
         // Ensure transactional sessions are off.
         testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, false);
@@ -235,7 +235,7 @@ public class MandatoryMessageTest extends FrameworkBaseCase
         testProps.setProperty(RECEIVER_CONSUMER_ACTIVE_PROPNAME, false);
 
         CircuitFactory circuitFactory = getCircuitFactory();
-        Circuit testCircuit = circuitFactory.createCircuit(testProps);
+        Circuit testCircuit = circuitFactory.createCircuit(getConnection(), testProps);
 
         // Send one message with no errors.
         assertNoFailures(testCircuit.test(1,
@@ -246,7 +246,7 @@ public class MandatoryMessageTest extends FrameworkBaseCase
      * Check that a mandatory message is sent succesfully, in a transaction, when a consumer is disconnected but
      * the route exists.
      */
-    public void test_QPID_517_MandatoryOkConsumerDisconnectedTxPubSub()
+    public void test_QPID_517_MandatoryOkConsumerDisconnectedTxPubSub() throws Exception
     {
         // Ensure transactional sessions are on.
         testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, true);
@@ -259,7 +259,7 @@ public class MandatoryMessageTest extends FrameworkBaseCase
         testProps.setProperty(RECEIVER_CONSUMER_ACTIVE_PROPNAME, false);
 
         CircuitFactory circuitFactory = getCircuitFactory();
-        Circuit testCircuit = circuitFactory.createCircuit(testProps);
+        Circuit testCircuit = circuitFactory.createCircuit(getConnection(), testProps);
 
         // Send one message with no errors.
         assertNoFailures(testCircuit.test(1,
@@ -267,7 +267,7 @@ public class MandatoryMessageTest extends FrameworkBaseCase
     }
 
     /** Check that an mandatory message results in no route code, not using transactions, when no consumer is connected. */
-    public void test_QPID_508_MandatoryFailsNoRouteNoTxPubSub()
+    public void test_QPID_508_MandatoryFailsNoRouteNoTxPubSub() throws Exception
     {
         // Ensure transactional sessions are off.
         testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, false);
@@ -279,14 +279,14 @@ public class MandatoryMessageTest extends FrameworkBaseCase
 
         // Send one message and get a linked no route exception.
         CircuitFactory circuitFactory = getCircuitFactory();
-        Circuit testCircuit = circuitFactory.createCircuit(testProps);
+        Circuit testCircuit = circuitFactory.createCircuit(getConnection(), testProps);
 
         assertNoFailures(testCircuit.test(1,
                 assertionList(((AMQPPublisher) testCircuit.getPublisher()).noRouteAssertion(testProps))));
     }
 
     /** Check that an mandatory message results in no route code, upon transaction commit, when a consumer is connected. */
-    public void test_QPID_508_MandatoryFailsNoRouteTxPubSub()
+    public void test_QPID_508_MandatoryFailsNoRouteTxPubSub() throws Exception
     {
         // Ensure transactional sessions are on.
         testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, true);
@@ -298,7 +298,7 @@ public class MandatoryMessageTest extends FrameworkBaseCase
 
         // Send one message and get a linked no route exception.
         CircuitFactory circuitFactory = getCircuitFactory();
-        Circuit testCircuit = circuitFactory.createCircuit(testProps);
+        Circuit testCircuit = circuitFactory.createCircuit(getConnection(), testProps);
 
         assertNoFailures(testCircuit.test(1,
                 assertionList(((AMQPPublisher) testCircuit.getPublisher()).noRouteAssertion(testProps))));
diff --git a/java/systests/src/main/java/org/apache/qpid/test/testcases/RollbackTest.java b/java/systests/src/main/java/org/apache/qpid/test/testcases/RollbackTest.java
index c1a484b2aa..5c8012e700 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/testcases/RollbackTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/testcases/RollbackTest.java
@@ -55,7 +55,7 @@ public class RollbackTest extends FrameworkBaseCase
     }
 
     /** Check messages sent but rolled back are never received. */
-    public void testRolledbackMessageNotDelivered()
+    public void testRolledbackMessageNotDelivered() throws Exception
     {
         // Ensure transactional sessions are on.
         testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, true);
@@ -63,7 +63,7 @@ public class RollbackTest extends FrameworkBaseCase
 
         // Run the default test sequence over the test circuit checking for no errors.
         CircuitFactory circuitFactory = getCircuitFactory();
-        Circuit testCircuit = circuitFactory.createCircuit(testProps);
+        Circuit testCircuit = circuitFactory.createCircuit(getConnection(), testProps);
 
         assertNoFailures(testCircuit.test(1,
                 assertionList(testCircuit.getPublisher().noExceptionsAssertion(testProps),
@@ -71,7 +71,7 @@ public class RollbackTest extends FrameworkBaseCase
     }
 
     /** Check messages received but rolled back are redelivered on subsequent receives. */
-    public void testRolledbackMessagesSubsequentlyReceived()
+    public void testRolledbackMessagesSubsequentlyReceived() throws Exception
     {
         // Ensure transactional sessions are on.
         testProps.setProperty(TRANSACTED_RECEIVER_PROPNAME, true);
@@ -79,7 +79,7 @@ public class RollbackTest extends FrameworkBaseCase
 
         // Run the default test sequence over the test circuit checking for no errors.
         CircuitFactory circuitFactory = getCircuitFactory();
-        Circuit testCircuit = circuitFactory.createCircuit(testProps);
+        Circuit testCircuit = circuitFactory.createCircuit(getConnection(), testProps);
 
         assertNoFailures(testCircuit.test(1,
                 assertionList(testCircuit.getPublisher().noExceptionsAssertion(testProps),
@@ -87,7 +87,7 @@ public class RollbackTest extends FrameworkBaseCase
     }
 
     /** Attempting to rollback outside of a transaction results in an IllegalStateException. */
-    public void testRollbackUnavailableOutsideTransactionPublisher()
+    public void testRollbackUnavailableOutsideTransactionPublisher() throws Exception
     {
         // Ensure transactional sessions are on.
         testProps.setProperty(TRANSACTED_PUBLISHER_PROPNAME, false);
@@ -95,13 +95,13 @@ public class RollbackTest extends FrameworkBaseCase
 
         // Run the default test sequence over the test circuit checking for no errors.
         CircuitFactory circuitFactory = getCircuitFactory();
-        Circuit testCircuit = circuitFactory.createCircuit(testProps);
+        Circuit testCircuit = circuitFactory.createCircuit(getConnection(), testProps);
 
         assertNoFailures(testCircuit.test(1, assertionList(testCircuit.getPublisher().channelClosedAssertion(testProps))));
     }
 
     /** Attempting to rollback outside of a transaction results in an IllegalStateException. */
-    public void testRollbackUnavailableOutsideTransactionReceiver()
+    public void testRollbackUnavailableOutsideTransactionReceiver() throws Exception
     {
         // Ensure transactional sessions are on.
         testProps.setProperty(TRANSACTED_RECEIVER_PROPNAME, false);
@@ -109,7 +109,7 @@ public class RollbackTest extends FrameworkBaseCase
 
         // Run the default test sequence over the test circuit checking for no errors.
         CircuitFactory circuitFactory = getCircuitFactory();
-        Circuit testCircuit = circuitFactory.createCircuit(testProps);
+        Circuit testCircuit = circuitFactory.createCircuit(getConnection(), testProps);
 
         assertNoFailures(testCircuit.test(1, assertionList(testCircuit.getReceiver().channelClosedAssertion(testProps))));
     }