Merged bug25545 into stable

Author: Emile Joubert

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

@@ -22,6 +22,8 @@
 import java.util.Map;
 
 import com.rabbitmq.client.AMQP;
+import com.rabbitmq.client.Consumer;
+import com.rabbitmq.client.DefaultConsumer;
 import com.rabbitmq.client.test.BrokerTestCase;
 
 public class QueueLease extends BrokerTestCase {
@@ -178,6 +180,33 @@ public void testPassiveQueueDeclareExtendsLease()
         }
     }
 
+    public void testExpiresWithConsumers()
+            throws InterruptedException, IOException {
+        Map<String, Object> args = new HashMap<String, Object>();
+        args.put("x-expires", QUEUE_EXPIRES);
+        channel.queueDeclare(TEST_EXPIRE_QUEUE, false, false, false, args);
+
+        Consumer consumer = new DefaultConsumer(channel);
+        String consumerTag = channel.basicConsume(TEST_EXPIRE_QUEUE, consumer);
+
+        Thread.sleep(SHOULD_EXPIRE_WITHIN);
+        try {
+            channel.queueDeclarePassive(TEST_EXPIRE_QUEUE);
+        } catch (IOException e) {
+            checkShutdownSignal(AMQP.NOT_FOUND, e);
+            fail("Queue expired before before passive re-declaration.");
+        }
+
+        channel.basicCancel(consumerTag);
+        Thread.sleep(SHOULD_EXPIRE_WITHIN);
+        try {
+            channel.queueDeclarePassive(TEST_EXPIRE_QUEUE);
+            fail("Queue should have been expired by now.");
+        } catch (IOException e) {
+            checkShutdownSignal(AMQP.NOT_FOUND, e);
+        }
+    }
+
     void verifyQueueExpires(String name, boolean expire) throws IOException,
             InterruptedException {
         Map<String, Object> args = new HashMap<String, Object>();