simplify PerQueueVsPerMessageTTL

Author: Tim Watson

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

@@ -21,7 +21,7 @@
 
 import java.io.IOException;
 
-public abstract class PerMessageTTL extends TTLHandling {
+public class PerMessageTTL extends TTLHandling {
 
     protected Object sessionTTL;
 

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

@@ -10,30 +10,33 @@ public class PerQueueVsPerMessageTTL extends PerMessageTTL {
 
     public void testSmallerPerQueueExpiryWins() throws IOException, InterruptedException {
         declareAndBindQueue(10);
+        this.sessionTTL = 1000;
 
-        sessionTTL = 1000;
         publish("message1");
 
-        Thread.sleep(10);
+        Thread.sleep(20);
 
         assertNull("per-queue ttl should have removed message after 10ms!", get());
     }
 
-    public void testSmallerPerMessageExpiryWins() throws IOException, InterruptedException {
-        declareAndBindQueue(5000);
-
-        sessionTTL = 10;
-        publish("message2");
-
-        Thread.sleep(1000);
-
-        assertNull("per-message ttl should have removed message after 10ms!", get());
-    }
-
     @Override
     protected AMQP.Queue.DeclareOk declareQueue(String name, Object ttlValue) throws IOException {
         this.sessionTTL = ttlValue;
-        Map<String, Object> argMap = Collections.singletonMap(PerQueueTTL.TTL_ARG, ttlValue);
+        Map<String, Object> argMap = Collections.singletonMap(PerQueueTTL.TTL_ARG,
+                                                             ((Object)(longValue(ttlValue) * 2)));
         return this.channel.queueDeclare(name, false, true, false, argMap);
     }
+
+    private Long longValue(final Object ttl) {
+        if (ttl instanceof Short) {
+            return ((Short)ttl).longValue();
+        } else if (ttl instanceof Integer) {
+            return ((Integer)ttl).longValue();
+        } else if (ttl instanceof Long) {
+            return (Long) ttl;
+        } else {
+            throw new IllegalArgumentException("ttl not of expected type");
+        }
+    }
+
 }

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

@@ -154,6 +154,10 @@ protected void expectBodyAndRemainingMessages(String body, int messagesLeft) thr
 
     protected void declareAndBindQueue(Object ttlValue) throws IOException {
         declareQueue(ttlValue);
+        bindQueue();
+    }
+
+    protected void bindQueue() throws IOException {
         this.channel.queueBind(TTL_QUEUE_NAME, TTL_EXCHANGE, TTL_QUEUE_NAME);
     }