Pull up setUp and tearDown. Use abort() where possible instead of

close() (see also bug 19676). Introduce abstract methods
createResources and releaseResources on BrokerTestCase, which help
keep things clean independent of any channel or connection
exceptions. Use fail() in DurableOnTransient instead of a flag. Remove
redundant channelOpen and channelClose methods from TransactionsBase.

Author: tonyg

test/src/com/rabbitmq/client/test/Bug19219Test.java

@@ -63,17 +63,8 @@ public class Bug19219Test extends BrokerTestCase {
     private static final Semaphore init = new Semaphore(0);
     private static final CountDownLatch resume = new CountDownLatch(1);
 
-    @Override protected void setUp() throws Exception {
-        super.setUp();
-        openConnection();
-        openChannel();
-    }
-
-    @Override protected void tearDown() throws Exception {
-        closeChannel();
-        closeConnection();
-        super.tearDown();
-    }
+    protected void createResources() throws IOException {}
+    protected void releaseResources() throws IOException {}
 
     public static TestSuite suite() {
         TestSuite suite = new TestSuite("Bug19219");

test/src/com/rabbitmq/client/test/functional/BrokerTestCase.java

@@ -29,18 +29,59 @@
 
 import junit.framework.TestCase;
 
+import com.rabbitmq.client.AlreadyClosedException;
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.ConnectionFactory;
 
-public class BrokerTestCase extends TestCase
+public abstract class BrokerTestCase extends TestCase
 {
     public ConnectionFactory connectionFactory = new ConnectionFactory();
 
     public Connection connection;
     public Channel channel;
     public int ticket;
 
+    protected void setUp()
+        throws IOException
+    {
+        openConnection();
+        openChannel();
+
+        createResources();
+    }
+
+    protected void tearDown()
+        throws IOException
+    {
+        closeChannel();
+        closeConnection();
+
+        openConnection();
+        openChannel();
+        releaseResources();
+        closeChannel();
+        closeConnection();
+    }
+
+    /**
+     * Should create any AMQP resources needed by the test. Will be
+     * called by BrokerTestCase's implementation of setUp, after the
+     * connection and channel have been opened.
+     */
+    protected abstract void createResources()
+        throws IOException;
+
+    /**
+     * Should destroy any AMQP resources that were created by the
+     * test. Will be called by BrokerTestCase's implementation of
+     * tearDown, after the connection and channel have been closed and
+     * reopened specifically for this method. After this method
+     * completes, the connection and channel will be closed again.
+     */
+    protected abstract void releaseResources()
+        throws IOException;
+
     public void openConnection()
         throws IOException
     {
@@ -53,7 +94,7 @@ public void closeConnection()
         throws IOException
     {
         if (connection != null) {
-            connection.close();
+            connection.abort();
             connection = null;
         }
     }
@@ -69,7 +110,12 @@ public void closeChannel()
         throws IOException
     {
         if (channel != null) {
-            channel.close();
+            try {
+                channel.close();
+            } catch (AlreadyClosedException ace) {
+                // The API is broken so we have to catch this here.
+                // See bug 19676.
+            }
             channel = null;
         }
     }

test/src/com/rabbitmq/client/test/functional/DurableOnTransient.java

@@ -32,24 +32,9 @@
 
 public class DurableOnTransient extends BrokerTestCase
 {
-
     protected static final String Q = "DurableQueue";
     protected static final String X = "TransientExchange";
 
-    protected void setUp()
-        throws IOException
-    {
-        openConnection();
-        openChannel();
-    }
-
-    protected void tearDown()
-        throws IOException
-    {
-        closeChannel();
-        closeConnection();
-    }
-
     private GetResponse basicGet()
         throws IOException
     {
@@ -64,30 +49,26 @@ private void basicPublish()
                              "persistent message".getBytes());
     }
 
-    public void testBind()
-        throws IOException, Exception
-    {
-      boolean B = false;
+    protected void createResources() throws IOException {
         // Transient exchange
         channel.exchangeDeclare(ticket, X, "direct", false);
         // durable queue
         channel.queueDeclare(ticket, Q, true);
-        // The following should raise an exception
+    }
+
+    protected void releaseResources() throws IOException {
+        channel.queueDelete(ticket, Q);
+        channel.exchangeDelete(ticket, X);
+    }
+
+    public void testBind()
+        throws IOException
+    {
         try {
             channel.queueBind(ticket, Q, X, "");
+            fail("Expected exception from queueBind");
         } catch (IOException ee) {
-            // Channel and connection have been closed.  We need to
-            // delete the queue below and therefore need to reconnect.
-            super.connection=null;
-            setUp();
-            // Say that the expected behaviour is Ok
-            B = true; 
+            // Pass!
         }
-        channel.queueDelete(ticket, Q);
-        channel.exchangeDelete(ticket, X);
-
-        assertTrue(B);
-
     }
-
 }

test/src/com/rabbitmq/client/test/functional/NoRequeueOnCancel.java

@@ -33,20 +33,12 @@ public class NoRequeueOnCancel extends BrokerTestCase
 {
     protected final String Q = "NoRequeueOnCancel";
 
-    protected void setUp()
-        throws IOException
-    {
-        openConnection();
-        openChannel();
+    protected void createResources() throws IOException {
         channel.queueDeclare(ticket, Q);
     }
 
-    protected void tearDown()
-        throws IOException
-    {
+    protected void releaseResources() throws IOException {
         channel.queueDelete(ticket, Q);
-        closeChannel();
-        closeConnection();
     }
 
     public void testNoRequeueOnCancel()

test/src/com/rabbitmq/client/test/functional/PersisterRestartBase.java

@@ -48,19 +48,8 @@ public class PersisterRestartBase extends BrokerTestCase
     // rabbit_persister.erl
     protected final int PERSISTER_SNAPSHOT_THRESHOLD = 500;
 
-    protected void setUp()
-        throws IOException
-    {
-        openConnection();
-        openChannel();
-    }
-
-    protected void tearDown()
-        throws IOException
-    {
-        closeChannel();
-        closeConnection();
-    }
+    protected void createResources() throws IOException {}
+    protected void releaseResources() throws IOException {}
 
     protected void restart()
         throws IOException

test/src/com/rabbitmq/client/test/functional/RequeueOnClose.java

@@ -42,6 +42,21 @@ public abstract class RequeueOnClose
 
     protected abstract void close() throws IOException;
 
+    protected void setUp()
+        throws IOException
+    {
+        // Override to disable the default behaviour from BrokerTestCase.
+    }
+
+    protected void tearDown()
+        throws IOException
+    {
+        // Override to disable the default behaviour from BrokerTestCase.
+    }
+
+    protected void createResources() throws IOException {}
+    protected void releaseResources() throws IOException {}
+
     public void injectMessage()
         throws IOException
     {

test/src/com/rabbitmq/client/test/functional/Routing.java

@@ -37,24 +37,16 @@ public class Routing extends BrokerTestCase
     protected final String Q1 = "foo";
     protected final String Q2 = "bar";
 
-    protected void setUp()
-        throws IOException
-    {
-        openConnection();
-        openChannel();
+    protected void createResources() throws IOException {
         channel.exchangeDeclare(ticket, E, "direct");
         channel.queueDeclare(ticket, Q1);
         channel.queueDeclare(ticket, Q2);
     }
 
-    protected void tearDown()
-        throws IOException
-    {
+    protected void releaseResources() throws IOException {
         channel.queueDelete(ticket, Q1);
         channel.queueDelete(ticket, Q2);
         channel.exchangeDelete(ticket, E);
-        closeChannel();
-        closeConnection();
     }
 
     private void bind(String queue, String routingKey)