check that dlx is set if dl-rk is set

Also, one of the other tests wouldn't have failed when it should have.

Also fixed some minor cosmetic whitespace issues.

Author: Alexandru Scvortov

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

@@ -58,7 +58,7 @@ public void testDeclareQueueWithInvalidDeadLetterExchangeArg()
         try {
             declareQueue(133);
             fail("x-dead-letter-exchange must be a valid exchange name");
-        } catch(IOException ex) {
+        } catch (IOException ex) {
             checkShutdownSignal(AMQP.PRECONDITION_FAILED, ex);
         }
     }
@@ -68,11 +68,27 @@ public void testDeclareQueueWithInvalidDeadLetterRoutingKeyArg()
     {
         try {
             declareQueue("foo", "amq.direct", 144, null);
-        } catch(IOException ex) {
+            fail("x-dead-letter-routink-key must be a string");
+        } catch (IOException ex) {
             checkShutdownSignal(AMQP.PRECONDITION_FAILED, ex);
         }
     }
 
+    public void testDeclareQueueWithRoutingKeyButNoDeadLetterExchange()
+        throws IOException
+    {
+        try {
+            Map<String, Object> args = new HashMap<String, Object>();
+            args.put(DLX_RK_ARG, "foo");
+
+            channel.queueDeclare("bar", false, true, false, args);
+            fail("dlx must be defined if dl-rk is set");
+        } catch (IOException ex) {
+            checkShutdownSignal(AMQP.PRECONDITION_FAILED, ex);
+        }
+
+    }
+
     public void testDeadLetterQueueTTLExpiredMessages() throws Exception {
         Map<String, Object> args = new HashMap<String, Object>();
         args.put("x-message-ttl", 1000);
@@ -325,7 +341,7 @@ public void process(GetResponse getResponse) {
     private void sleep(long millis) {
         try {
             Thread.sleep(millis);
-        } catch(InterruptedException ex) {
+        } catch (InterruptedException ex) {
             // whoosh
         }
     }