increase test coverage

Author: Tim Watson

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

@@ -17,7 +17,8 @@
 
 package com.rabbitmq.client.test.functional;
 
-import com.rabbitmq.client.*;
+import com.rabbitmq.client.AMQP;
+import com.rabbitmq.client.MessageProperties;
 
 import java.io.IOException;
 

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

@@ -28,24 +28,6 @@ public class PerQueueTTL extends TTLHandling {
 
     protected static final String TTL_ARG = "x-message-ttl";
 
-    public void testInvalidTypeUsedInTTL() throws Exception {
-        try {
-            declareQueue(TTL_INVALID_QUEUE_NAME, "foobar");
-            fail("Should not be able to use a non-long value for x-message-ttl");
-        } catch (IOException e) {
-            checkShutdownSignal(AMQP.PRECONDITION_FAILED, e);
-        }
-    }
-
-    public void testTTLMustBePositive() throws Exception {
-        try {
-            declareQueue(TTL_INVALID_QUEUE_NAME, -10);
-            fail("Should not be able to use negative values for x-message-ttl");
-        } catch (IOException e) {
-            checkShutdownSignal(AMQP.PRECONDITION_FAILED, e);
-        }
-    }
-
     @Override
     protected AMQP.Queue.DeclareOk declareQueue(String name, Object ttlValue) throws IOException {
         Map<String, Object> argMap = Collections.singletonMap(TTL_ARG, ttlValue);

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

@@ -21,9 +21,11 @@ public void testSmallerPerQueueExpiryWins() throws IOException, InterruptedExcep
 
     @Override
     protected AMQP.Queue.DeclareOk declareQueue(String name, Object ttlValue) throws IOException {
+        final Object mappedTTL = (ttlValue instanceof String &&
+                                    ((String) ttlValue).contains("foobar")) ?
+                                    ttlValue : longValue(ttlValue) * 2;
         this.sessionTTL = ttlValue;
-        Map<String, Object> argMap = Collections.singletonMap(PerQueueTTL.TTL_ARG,
-                                                             ((Object)(longValue(ttlValue) * 2)));
+        Map<String, Object> argMap = Collections.singletonMap(PerQueueTTL.TTL_ARG, mappedTTL);
         return this.channel.queueDeclare(name, false, true, false, argMap);
     }
 

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

@@ -38,6 +38,36 @@ public void testMultipleTTLTypes() throws IOException {
         }
     }
 
+    public void testInvalidTypeUsedInTTL() throws Exception {
+        try {
+            declareAndBindQueue("foobar");
+            publishAndSync(MSG[0]);
+            fail("Should not be able to set TTL using non-numeric values");
+        } catch (IOException e) {
+            checkShutdownSignal(AMQP.PRECONDITION_FAILED, e);
+        }
+    }
+
+    public void testTrailingCharsUsedInTTL() throws Exception {
+        try {
+            declareAndBindQueue("10000foobar");
+            publishAndSync(MSG[0]);
+            fail("Should not be able to set TTL using non-numeric values");
+        } catch (IOException e) {
+            checkShutdownSignal(AMQP.PRECONDITION_FAILED, e);
+        }
+    }
+
+    public void testTTLMustBePositive() throws Exception {
+        try {
+            declareAndBindQueue(-10);
+            publishAndSync(MSG[0]);
+            fail("Should not be able to set TTL using negative values");
+        } catch (IOException e) {
+            checkShutdownSignal(AMQP.PRECONDITION_FAILED, e);
+        }
+    }
+
     public void testTTLAllowZero() throws Exception {
         try {
             declareQueue(0);