test dead-lettering for x-message-ttl=0

Author: rade

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

@@ -84,14 +84,11 @@ public void testDeclareQueueWithRoutingKeyButNoDeadLetterExchange()
     }
 
     public void testDeadLetterQueueTTLExpiredMessages() throws Exception {
-        Map<String, Object> args = new HashMap<String, Object>();
-        args.put("x-message-ttl", 1000);
+        ttlTest(1000);
+    }
 
-        deadLetterTest(new Runnable() {
-                public void run() {
-                    sleep(2000);
-                }
-            }, args, "expired");
+    public void testDeadLetterQueueZeroTTLExpiredMessages() throws Exception {
+        ttlTest(0);
     }
 
     public void testDeadLetterDeletedDLX() throws Exception {
@@ -309,6 +306,14 @@ public void process(GetResponse getResponse) {
             });
     }
 
+    private void ttlTest(final long ttl) throws Exception {
+        Map<String, Object> args = new HashMap<String, Object>();
+        args.put("x-message-ttl", ttl);
+        deadLetterTest(new Runnable() {
+                public void run() { sleep(ttl + 1000); }
+            }, args, "expired");
+    }
+
     private void sleep(long millis) {
         try {
             Thread.sleep(millis);