merge default into bug24725

Author: rade

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

@@ -63,15 +63,18 @@ protected void setUp() throws IOException {
                           "confirm-multiple-queues");
     }
 
-    public void testTransient()
-        throws IOException, InterruptedException {
-        confirmTest("", "confirm-test", false, false, false);
-    }
-
-    public void testPersistentSimple()
+    public void testPersistentMandatoryImmediateCombinations()
         throws IOException, InterruptedException
     {
-        confirmTest("", "confirm-test", true, false, false);
+        boolean b[] = { false, true };
+        for (boolean persistent : b) {
+            for (boolean mandatory : b) {
+                for (boolean immediate : b) {
+                    confirmTest("", "confirm-test",
+                                persistent, mandatory, immediate);
+                        }
+            }
+        }
     }
 
     public void testNonDurable()
@@ -80,28 +83,18 @@ public void testNonDurable()
         confirmTest("", "confirm-test-nondurable", true, false, false);
     }
 
-    public void testPersistentImmediate()
-        throws IOException, InterruptedException
-    {
-        confirmTest("", "confirm-test", true, false, true);
-    }
-
-    public void testPersistentImmediateNoConsumer()
-        throws IOException, InterruptedException
-    {
-        confirmTest("", "confirm-test-noconsumer", true, false, true);
-    }
-
-    public void testPersistentMandatory()
+    public void testImmediateNoConsumer()
         throws IOException, InterruptedException
     {
-        confirmTest("", "confirm-test", true, true, false);
+        confirmTest("", "confirm-test-noconsumer", false, false, true);
+        confirmTest("", "confirm-test-noconsumer",  true, false, true);
     }
 
-    public void testPersistentMandatoryReturn()
+    public void testMandatoryNoRoute()
         throws IOException, InterruptedException
     {
-        confirmTest("", "confirm-test-doesnotexist", true, true, false);
+        confirmTest("", "confirm-test-doesnotexist", false, true, false);
+        confirmTest("", "confirm-test-doesnotexist",  true, true, false);
     }
 
     public void testMultipleQueues()

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

@@ -385,7 +385,7 @@ private void assertDeathReason(List<Object> death, int num,
         assertEquals(exchange, deathHeader.get("exchange").toString());
 
         List<String> deathRKs = new ArrayList<String>();
-        for (Object rk : (ArrayList)deathHeader.get("routing-keys")) {
+        for (Object rk : (ArrayList<?>)deathHeader.get("routing-keys")) {
             deathRKs.add(rk.toString());
         }
         Collections.sort(deathRKs);