Test all durable/nondurable/persistent/mandatory/immediate combinations.

Author: Steve Powell

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

@@ -76,67 +76,32 @@ private void declareBindQueue(String queueName, boolean durable)
         channel.queueBind(queueName, "amq.direct", "confirm-multiple-queues");
     }
 
-    public void testTransient()
-    throws Exception
+    public void testPersistentMandatoryImmediateDurable() throws Exception
     {
         declareConsumeQueue("confirm-test", true);
-        confirmTest("", "confirm-test", false, false, false);
-    }
-
-    public void testPersistentSimple()
-        throws Exception
-    {
-        declareConsumeQueue("confirm-test", true);
-        confirmTest("", "confirm-test", true, false, false);
-    }
-
-    public void testTransientMandatory()
-        throws Exception
-    {
-        declareConsumeQueue("confirm-test", true);
-        confirmTest("", "confirm-test", false, true, false);
-    }
-
-    public void testPersistentMandatory()
-        throws Exception
-    {
-        declareConsumeQueue("confirm-test", true);
-        confirmTest("", "confirm-test", true, true, false);
-    }
-
-    public void testTransientImmediate()
-        throws Exception
-    {
-        declareConsumeQueue("confirm-test", true);
-        confirmTest("", "confirm-test", false, false, true);
-    }
-
-    public void testPersistentImmediate()
-        throws Exception
-    {
-        declareConsumeQueue("confirm-test", true);
-        confirmTest("", "confirm-test", true, false, true);
-    }
-
-    public void testTransientMandatoryImmediate()
-        throws Exception
-    {
-        declareConsumeQueue("confirm-test", true);
-        confirmTest("", "confirm-test", false, true, 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.");
+        }
     }
 
-    public void testPersistentMandatoryImmediate()
-        throws Exception
+    public void testPersistentMandatoryImmediateNondurable() throws Exception
     {
-        declareConsumeQueue("confirm-test", true);
-        confirmTest("", "confirm-test", true, true, true);
+        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.");
+        }
     }
 
-    public void testNonDurable()
-        throws Exception
+    private void confirmTestByFlags(String exchangeName, String queueName, int flags) throws Exception
     {
-        declareConsumeQueue("confirm-test-nondurable", false);
-        confirmTest("", "confirm-test-nondurable", true, false, false);
+        boolean persistent = (flags & 4)!=0;
+        boolean mandatory  = (flags & 2)!=0;
+        boolean immediate  = (flags & 1)!=0;
+        confirmTest(exchangeName, queueName, persistent, mandatory, immediate);
     }
 
     public void testPersistentImmediateNoConsumer()