merge bug25686 into stable

Author: rade

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

@@ -237,6 +237,17 @@ public void testAltExchConfiguration()
                 createAltExchConfigTest("configure-and-read-me"));
     }
 
+    public void testDLXConfiguration()
+            throws IOException
+    {
+        runTest(false, false, false, false,
+                createDLXConfigTest("configure-me"));
+        runTest(false, false, false, false,
+                createDLXConfigTest("configure-and-write-me"));
+        runTest(false, true, false, false,
+                createDLXConfigTest("configure-and-read-me"));
+    }
+
     public void testNoAccess()
         throws IOException, InterruptedException
     {
@@ -319,6 +330,18 @@ public void with(String ae) throws IOException {
             }};
     }
 
+    protected WithName createDLXConfigTest(final String queue)
+            throws IOException
+    {
+        return new WithName() {
+            public void with(String dlx) throws IOException {
+                Map<String, Object> args = new HashMap<String, Object>();
+                args.put("x-dead-letter-exchange", dlx);
+                channel.queueDeclare(queue, false, false, false, args);
+                channel.queueDelete(queue);
+            }};
+    }
+
     protected void runConfigureTest(WithName test)
         throws IOException
     {