Add close reason Exception to IOException cause thrown by waitForConfirmsOrDie();

ConfirmBase.waitForConfirms() takes optional String testTitle to report on fail();
ConfirmBase.waitForConfirms() properly reports assertion failures thrown in waiter thread but propagates ShutdownSignalException;
Confirm tests check all persistent/mandatory/immediate combinations for durable and non-durable queues;
Confirm tests announce combination on failure as assertion string;
Confirm tests use of bit/int flags hack encapsulated to one procedure.

Author: Steve Powell

src/com/rabbitmq/client/impl/ChannelN.java

@@ -182,7 +182,7 @@ public void waitForConfirmsOrDie()
     {
         if (!waitForConfirms()) {
             close(AMQP.REPLY_SUCCESS, "NACKS RECEIVED", true, null, false);
-            throw new IOException("nacks received");
+            throw new IOException("nacks received", getCloseReason());
         }
     }
 

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

@@ -25,9 +25,15 @@
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.TimeUnit;
 
+import junit.framework.AssertionFailedError;
+
 public class ConfirmBase extends BrokerTestCase {
-    protected void waitForConfirms()
-        throws InterruptedException, TimeoutException
+    protected void waitForConfirms() throws Exception
+    {
+        waitForConfirms("ConfirmBase.waitForConfirms");
+    }
+
+    protected void waitForConfirms(final String testTitle) throws Exception
     {
         try {
             FutureTask<?> waiter = new FutureTask<Object>(new Runnable() {
@@ -36,15 +42,20 @@ public void run() {
                             channel.waitForConfirmsOrDie();
                         } catch (IOException e) {
                             throw (ShutdownSignalException)e.getCause();
-                        } catch (InterruptedException e) {
-                            fail("test interrupted");
+                        } catch (InterruptedException _) {
+                            fail(testTitle + ": interrupted");
                         }
                     }
                 }, null);
             (Executors.newSingleThreadExecutor()).execute(waiter);
             waiter.get(10, TimeUnit.SECONDS);
-        } catch (ExecutionException e) {
-            throw (ShutdownSignalException)e.getCause();
+        } catch (ExecutionException ee) {
+            Throwable t = ee.getCause();
+            if (t instanceof ShutdownSignalException) throw (ShutdownSignalException) t;
+            if (t instanceof AssertionFailedError) throw (AssertionFailedError) t;
+            throw (Exception)t;
+        } catch (TimeoutException _) {
+            fail(testTitle + ": timeout");
         }
     }
 }

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

@@ -76,32 +76,26 @@ private void declareBindQueue(String queueName, boolean durable)
         channel.queueBind(queueName, "amq.direct", "confirm-multiple-queues");
     }
 
-    public void testPersistentMandatoryImmediateDurable() throws Exception
+    public void testAllFlagsDurable() throws Exception
     {
         declareConsumeQueue("confirm-test", true);
-        for (int flags=0; flags<8; ++flags) {
-            System.out.print("Confirm durable (persistent&mandatory&immediate) = ("+flags+")");
-            confirmTestByFlags("", "confirm-test", flags);
-            System.out.println(" succeeded.");
-        }
+        confirmTestAllFlags("", "confirm-test");
     }
 
-    public void testPersistentMandatoryImmediateNondurable() throws Exception
+    public void testAllFlagsNondurable() throws Exception
     {
         declareConsumeQueue("confirm-test-nondurable", false);
-        for (int flags=0; flags<8; ++flags) {
-            System.out.print("Confirm nondurable (persistent&mandatory&immediate) = ("+flags+")");
-            confirmTestByFlags("", "confirm-test-nondurable", flags);
-            System.out.println(" succeeded.");
-        }
+        confirmTestAllFlags("", "confirm-test-nondurable");
     }
 
-    private void confirmTestByFlags(String exchangeName, String queueName, int flags) throws Exception
+    private void confirmTestAllFlags(String exchangeName, String queueName) throws Exception
     {
-        boolean persistent = (flags & 4)!=0;
-        boolean mandatory  = (flags & 2)!=0;
-        boolean immediate  = (flags & 1)!=0;
-        confirmTest(exchangeName, queueName, persistent, mandatory, immediate);
+        for (int flags=0; flags<8; ++flags) {
+            boolean persistent = (flags & 4)!=0;
+            boolean mandatory  = (flags & 2)!=0;
+            boolean immediate  = (flags & 1)!=0;
+            confirmTest(exchangeName, queueName, persistent, mandatory, immediate);
+        }
     }
 
     public void testPersistentImmediateNoConsumer()
@@ -311,7 +305,11 @@ private void confirmTest(String exchange, String queueName,
     {
         publishN(exchange, queueName, persistent, mandatory, immediate);
 
-        waitForConfirms();
+        waitForConfirms("confirmTest(exchange='" + exchange
+                + "', queue='" + queueName
+                + "', persistent=" + persistent
+                + ", mandatory=" + mandatory
+                + ", immediate=" + immediate + ")");
     }
 
     private void publishN(String exchangeName, String queueName,