Added requeue argument for basicNack. Reworked Reject tests to extract common functionality ready for the Nack tests

Author: Rob Harrop

src/com/rabbitmq/client/Channel.java

@@ -544,9 +544,12 @@ Queue.DeclareOk queueDeclare(String queue, boolean durable, boolean exclusive, b
      * @param multiple true to reject all messages up to and including
      * the supplied delivery tag; false to reject just the supplied
      * delivery tag.
+     * @param requeue true if the rejected message(s) should be requeued rather
+     * than discarded/dead-lettered
      * @throws java.io.IOException if an error is encountered
      */
-    void basicNack(long deliveryTag, boolean multiple) throws IOException;
+    void basicNack(long deliveryTag, boolean multiple, boolean requeue)
+            throws IOException;
 
     /**
      * Reject a message. Supply the deliveryTag from the {@link com.rabbitmq.client.AMQP.Basic.GetOk}

src/com/rabbitmq/client/impl/ChannelN.java

@@ -720,10 +720,10 @@ public void basicAck(long deliveryTag, boolean multiple)
     }
 
     /** Public API - {@inheritDoc} */
-    public void basicNack(long deliveryTag, boolean multiple)
+    public void basicNack(long deliveryTag, boolean multiple, boolean requeue)
         throws IOException
     {
-        transmit(new Basic.Nack(deliveryTag, multiple));
+        transmit(new Basic.Nack(deliveryTag, multiple, requeue));
     }
 
     /** Public API - {@inheritDoc} */

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

@@ -0,0 +1,87 @@
+//   The contents of this file are subject to the Mozilla Public License
+//   Version 1.1 (the "License"); you may not use this file except in
+//   compliance with the License. You may obtain a copy of the License at
+//   http://www.mozilla.org/MPL/
+//
+//   Software distributed under the License is distributed on an "AS IS"
+//   basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+//   License for the specific language governing rights and limitations
+//   under the License.
+//
+//   The Original Code is RabbitMQ.
+//
+//   The Initial Developers of the Original Code are LShift Ltd,
+//   Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
+//
+//   Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
+//   Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
+//   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
+//   Technologies LLC, and Rabbit Technologies Ltd.
+//
+//   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
+//   Ltd. Portions created by Cohesive Financial Technologies LLC are
+//   Copyright (C) 2007-2010 Cohesive Financial Technologies
+//   LLC. Portions created by Rabbit Technologies Ltd are Copyright
+//   (C) 2007-2010 Rabbit Technologies Ltd.
+//
+//   All Rights Reserved.
+//
+//   Contributor(s): ______________________________________.
+
+package com.rabbitmq.client.test.functional;
+
+import com.rabbitmq.client.Channel;
+import com.rabbitmq.client.Envelope;
+import com.rabbitmq.client.GetResponse;
+import com.rabbitmq.client.QueueingConsumer;
+import com.rabbitmq.client.test.BrokerTestCase;
+
+import java.io.IOException;
+import java.util.Arrays;
+
+abstract class AbstractRejectTest extends BrokerTestCase {
+
+    protected Channel secondaryChannel;
+
+    @Override
+    protected void setUp()
+        throws IOException
+    {
+        super.setUp();
+        secondaryChannel = connection.createChannel();
+
+    }
+
+    @Override
+    protected void tearDown()
+        throws IOException
+    {
+        if (secondaryChannel != null) {
+            secondaryChannel.abort();
+            secondaryChannel = null;
+        }
+        super.tearDown();
+    }
+
+    protected long checkDelivery(QueueingConsumer.Delivery d,
+                                 byte[] msg, boolean redelivered)
+    {
+        assertNotNull(d);
+        return checkDelivery(d.getEnvelope(), d.getBody(), msg, redelivered);
+    }
+
+    protected long checkDelivery(GetResponse r, byte[] msg, boolean redelivered)
+    {
+        assertNotNull(r);
+        return checkDelivery(r.getEnvelope(), r.getBody(), msg, redelivered);
+    }
+
+    protected long checkDelivery(Envelope e, byte[] m,
+                                 byte[] msg, boolean redelivered)
+    {
+        assertNotNull(e);
+        assertTrue(Arrays.equals(m, msg));
+        assertEquals(e.isRedeliver(), redelivered);
+        return e.getDeliveryTag();
+    }
+}

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

@@ -31,64 +31,13 @@
 
 package com.rabbitmq.client.test.functional;
 
-import com.rabbitmq.client.test.BrokerTestCase;
-
 import com.rabbitmq.client.AMQP;
-import com.rabbitmq.client.Channel;
-import com.rabbitmq.client.Envelope;
-import com.rabbitmq.client.GetResponse;
 import com.rabbitmq.client.QueueingConsumer;
-import com.rabbitmq.client.QueueingConsumer.Delivery;
 
 import java.io.IOException;
-import java.util.Arrays;
 
-public class Reject extends BrokerTestCase
+public class Reject extends AbstractRejectTest
 {
-
-    protected Channel secondaryChannel;
-
-    @Override
-    protected void setUp()
-        throws IOException
-    {
-        super.setUp();
-        secondaryChannel = connection.createChannel();
-
-    }
-
-    @Override
-    protected void tearDown()
-        throws IOException
-    {
-        if (secondaryChannel != null) {
-            secondaryChannel.abort();
-            secondaryChannel = null;
-        }
-        super.tearDown();
-    }
-
-    protected long checkDelivery(Delivery d, byte[] msg, boolean redelivered)
-    {
-        assertNotNull(d);
-        return checkDelivery(d.getEnvelope(), d.getBody(), msg, redelivered);
-    }
-
-    protected long checkDelivery(GetResponse r, byte[] msg, boolean redelivered)
-    {
-        assertNotNull(r);
-        return checkDelivery(r.getEnvelope(), r.getBody(), msg, redelivered);
-    }
-
-    protected long checkDelivery(Envelope e, byte[] m,
-                                 byte[] msg, boolean redelivered)
-    {
-        assertNotNull(e);
-        assertTrue(Arrays.equals(m, msg));
-        assertEquals(e.isRedeliver(), redelivered);
-        return e.getDeliveryTag();
-    }
-
     public void testReject()
         throws IOException, InterruptedException
     {