merge default into bug20654

Author: Matthias Radestock

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

@@ -269,18 +269,20 @@ protected void runTest(boolean expC, boolean expW, boolean expR,
     protected void runTest(boolean exp, String name, WithName test)
         throws IOException
     {
+        String msg = "'" + name + "' -> " + exp;
         try {
             test.with(name);
-            assertTrue(exp);
+            assertTrue(msg, exp);
         } catch (IOException e) {
-            assertFalse(exp);
+            assertFalse(msg, exp);
             Throwable t = e.getCause();
-            assertTrue(t instanceof ShutdownSignalException);
+            assertTrue(msg, t instanceof ShutdownSignalException);
             Object r = ((ShutdownSignalException)t).getReason();
-            assertTrue(r instanceof Command);
+            assertTrue(msg, r instanceof Command);
             Method m = ((Command)r).getMethod();
-            assertTrue(m instanceof AMQP.Channel.Close);
-            assertEquals(AMQP.ACCESS_REFUSED,
+            assertTrue(msg, m instanceof AMQP.Channel.Close);
+            assertEquals(msg,
+                         AMQP.ACCESS_REFUSED,
                          ((AMQP.Channel.Close)m).getReplyCode());
             //This fails due to bug 20296
             //openChannel();