merge default into bug18776

Author: tonyg

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

@@ -63,18 +63,6 @@ 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 IOException {
-        super.setUp();
-        openConnection();
-        openChannel();
-    }
-
-    @Override protected void tearDown() throws IOException {
-        closeChannel();
-        closeConnection();
-        super.tearDown();
-    }
-
     public static TestSuite suite() {
         TestSuite suite = new TestSuite("Bug19219");
         suite.addTestSuite(Bug19219Test.class);

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

@@ -29,6 +29,7 @@
 
 import junit.framework.TestCase;
 
+import com.rabbitmq.client.AlreadyClosedException;
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.ConnectionFactory;
@@ -42,6 +43,48 @@ public class BrokerTestCase extends TestCase
     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 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 void releaseResources()
+        throws IOException
+    {}
+
     public void openConnection()
         throws IOException
     {
@@ -54,7 +97,7 @@ public void closeConnection()
         throws IOException
     {
         if (connection != null) {
-            connection.close();
+            connection.abort();
             connection = null;
         }
     }
@@ -70,37 +113,13 @@ 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;
         }
     }
-
-    public void restart()
-        throws IOException
-    {
-        tearDown();
-        Host.executeCommand("cd ../rabbitmq-test; make restart-on-node");
-        setUp();
-    }
-
-    public void forceSnapshot()
-        throws IOException, InterruptedException
-    {
-        Host.executeCommand("cd ../rabbitmq-test; make force-snapshot");
-    }
-
-    protected void setUp()
-        throws IOException
-    {
-        openConnection();
-        openChannel();
-    }
-
-    protected void tearDown()
-        throws IOException
-    {
-        closeChannel();
-        closeConnection();
-    }
-
 }

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

@@ -32,7 +32,6 @@
 
 public class DurableOnTransient extends BrokerTestCase
 {
-
     protected static final String Q = "DurableQueue";
     protected static final String X = "TransientExchange";
 
@@ -50,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,18 +33,12 @@ public class NoRequeueOnCancel extends BrokerTestCase
 {
     protected final String Q = "NoRequeueOnCancel";
 
-    protected void setUp()
-        throws IOException
-    {
-        super.setUp();
+    protected void createResources() throws IOException {
         channel.queueDeclare(ticket, Q);
     }
 
-    protected void tearDown()
-        throws IOException
-    {
+    protected void releaseResources() throws IOException {
         channel.queueDelete(ticket, Q);
-        super.tearDown();
     }
 
     public void testNoRequeueOnCancel()

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

@@ -48,6 +48,20 @@ public class PersisterRestartBase extends BrokerTestCase
     // rabbit_persister.erl
     protected final int PERSISTER_SNAPSHOT_THRESHOLD = 500;
 
+    protected void restart()
+        throws IOException
+    {
+        tearDown();
+        Host.executeCommand("cd ../rabbitmq-test; make restart-on-node");
+        setUp();
+    }
+
+    protected void forceSnapshot()
+        throws IOException, InterruptedException
+    {
+        Host.executeCommand("cd ../rabbitmq-test; make force-snapshot");
+    }
+
     protected void declareDurableTopicExchange(String x)
         throws IOException
     {

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

@@ -38,14 +38,22 @@ public abstract class RequeueOnClose
     public static final int GRATUITOUS_DELAY = 100;
     public static final int MESSAGE_COUNT = 2000;
 
-    protected void setUp() throws IOException {}
-
-    protected void tearDown() throws IOException {}
-    
     protected abstract void open() throws IOException;
 
     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.
+    }
+
     public void injectMessage()
         throws IOException
     {

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

@@ -39,22 +39,16 @@ public class Routing extends BrokerTestCase
     protected final String Q1 = "foo";
     protected final String Q2 = "bar";
 
-    protected void setUp()
-        throws IOException
-    {
-        super.setUp();
+    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);
-        super.tearDown();
     }
 
     private void bind(String queue, String routingKey)