Fixes for tests that depend on pre-existing queues

Author: michaelklishin

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

@@ -96,7 +96,9 @@ protected void releaseResources() throws IOException {
     {
         declareQueue("inequivalent_dlx_name", "dlx_foo", null, null);
         try {
-            declareQueue("inequivalent_dlx_name", "dlx_bar", null, null);
+            Map<String, Object> args = new HashMap<>();
+            args.put(DLX_ARG, "dlx_bar");
+            channel.queueDeclare("inequivalent_dlx_name", true, false, false, args);
             fail("x-dead-letter-exchange must be a valid exchange name " +
                     "and must not change in subsequent declarations");
         } catch (IOException ex) {
@@ -118,7 +120,10 @@ protected void releaseResources() throws IOException {
     {
         declareQueue("inequivalent_dlx_rk", "amq.direct", "dlx_rk", null);
         try {
-            declareQueue("inequivalent_dlx_rk", "amq.direct", "dlx_rk2", null);
+            Map<String, Object> args = new HashMap<>();
+            args.put(DLX_ARG, "amq.direct");
+            args.put(DLX_RK_ARG, "dlx_rk2");
+            channel.queueDeclare("inequivalent_dlx_rk", true, false, false, args);
             fail("x-dead-letter-routing-key must be a string and must not " +
                     "change in subsequent declarations");
         } catch (IOException ex) {