reduce duplication again; test choice of ttl between per-queue and per-message

Author: Tim Watson

test/src/com/rabbitmq/client/test/BrokerTestCase.java

@@ -203,7 +203,7 @@ protected void basicPublishVolatile(byte[] msg, String x, String routingKey) thr
         basicPublishVolatile(msg, x, routingKey, MessageProperties.TEXT_PLAIN);
     }
 
-    protected void basicPublishVolatile(byte[] msg, String x, String routingKey,
+    public void basicPublishVolatile(byte[] msg, String x, String routingKey,
                                         AMQP.BasicProperties properties) throws IOException {
         channel.basicPublish(x, routingKey, properties, msg);
     }

test/src/com/rabbitmq/client/test/functional/PerMessageTTL.java renamed to test/src/com/rabbitmq/client/test/functional/PerMessageTTLHandling.java

@@ -21,27 +21,9 @@
 
 import java.io.IOException;
 
-public class PerMessageTTL extends TTLHandling {
+public abstract class PerMessageTTLHandling extends TTLHandling {
 
-    private Object sessionTTL;
-
-    @Override
-    public void testInvalidTypeUsedInTTL() throws Exception {
-        try {
-            super.testInvalidTypeUsedInTTL();
-        } catch (IOException e) {
-            checkShutdownSignal(AMQP.INTERNAL_ERROR, e);
-        }
-    }
-
-    @Override
-    public void testTTLMustBePositive() throws Exception {
-        try {
-            super.testTTLMustBePositive();
-        } catch (IOException e) {
-            checkShutdownSignal(AMQP.INTERNAL_ERROR, e);
-        }
-    }
+    protected Object sessionTTL;
 
     @Override
     protected void publish(String msg) throws IOException {
@@ -57,4 +39,5 @@ protected AMQP.Queue.DeclareOk declareQueue(String name, Object ttlValue) throws
         this.sessionTTL = ttlValue;
         return this.channel.queueDeclare(name, false, true, false, null);
     }
+
 }

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

@@ -18,28 +18,29 @@
 package com.rabbitmq.client.test.functional;
 
 import com.rabbitmq.client.AMQP;
+import com.rabbitmq.client.MessageProperties;
 
 import java.io.IOException;
 import java.util.Collections;
 import java.util.Map;
 
 public class PerQueueTTL extends TTLHandling {
 
-    private static final String TTL_ARG = "x-message-ttl";
+    protected static final String TTL_ARG = "x-message-ttl";
 
-    @Override
     public void testInvalidTypeUsedInTTL() throws Exception {
         try {
-            super.testInvalidTypeUsedInTTL();
+            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);
         }
     }
 
-    @Override
     public void testTTLMustBePositive() throws Exception {
         try {
-            super.testTTLMustBePositive();
+            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);
         }
@@ -78,4 +79,11 @@ public void testQueueReDeclareSemanticNonEquivalence() throws Exception {
         }
     }
 
+    protected void publishWithExpiration(String msg, Object sessionTTL) throws IOException {
+        basicPublishVolatile(msg.getBytes(), TTL_EXCHANGE, TTL_QUEUE_NAME,
+                MessageProperties.TEXT_PLAIN
+                        .builder()
+                        .expiration(String.valueOf(sessionTTL))
+                        .build());
+    }
 }

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

@@ -0,0 +1,39 @@
+package com.rabbitmq.client.test.functional;
+
+import com.rabbitmq.client.AMQP;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Map;
+
+public class PerQueueVsPerMessageTTL extends PerMessageTTLHandling {
+
+    public void testSmallerPerQueueExpiryWins() throws IOException, InterruptedException {
+        declareAndBindQueue(10);
+
+        sessionTTL = 1000;
+        publish("message1");
+
+        Thread.sleep(10);
+
+        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);
+        return this.channel.queueDeclare(name, false, true, false, argMap);
+    }
+}

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

@@ -6,8 +6,6 @@
 import com.rabbitmq.client.test.BrokerTestCase;
 
 import java.io.IOException;
-import java.util.Collections;
-import java.util.Map;
 
 public abstract class TTLHandling extends BrokerTestCase {
 
@@ -49,18 +47,6 @@ public void testTTLAllowZero() throws Exception {
         }
     }
 
-    public void testInvalidTypeUsedInTTL() throws Exception {
-        declareQueue(TTL_INVALID_QUEUE_NAME, "foobar");
-        publishAndSync(MSG[0]);
-        fail("Should not be able to use a non-long value for ttl");
-    }
-
-    public void testTTLMustBePositive() throws Exception {
-        declareQueue(TTL_INVALID_QUEUE_NAME, -10);
-        publishAndSync(MSG[0]);
-        fail("Should not be able to use negative values for ttl");
-    }
-
     public void testMessagesExpireWhenUsingBasicGet() throws Exception {
         declareAndBindQueue(200);
         publish(MSG[0]);