Merged bug21846 into default

Author: Emile Joubert

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

@@ -55,6 +55,8 @@ public static TestSuite suite() {
         suite.addTestSuite(ExchangeDeclare.class);
         suite.addTestSuite(QueueLifecycle.class);
         suite.addTestSuite(QueueExclusivity.class);
+        suite.addTestSuite(InvalidAcks.class);
+        suite.addTestSuite(InvalidAcksTx.class);
         return suite;
     }
 }

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

@@ -0,0 +1,9 @@
+package com.rabbitmq.client.test.functional;
+
+import java.io.IOException;
+
+public class InvalidAcks extends InvalidAcksBase {
+    protected void select() throws IOException {}
+    protected void commit() throws IOException {}
+}
+

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

@@ -0,0 +1,51 @@
+package com.rabbitmq.client.test.functional;
+
+import com.rabbitmq.client.AMQP;
+import com.rabbitmq.client.GetResponse;
+import com.rabbitmq.client.test.BrokerTestCase;
+
+import java.io.IOException;
+
+/**
+ * See bug 21846:
+ * Basic.Ack is now required to signal a channel error immediately upon
+ * detecting an invalid deliveryTag, even if the channel is (Tx-)transacted.
+ *
+ * Specifically, a client MUST not acknowledge the same message more than once.
+ */
+public abstract class InvalidAcksBase extends BrokerTestCase {
+    protected abstract void select() throws IOException;
+    protected abstract void commit() throws IOException;
+
+    public void testDoubleAck()
+        throws IOException
+    {
+        select();
+        String q = channel.queueDeclare().getQueue();
+        basicPublishVolatile(q);
+        commit();
+
+        long tag = channel.basicGet(q, false).getEnvelope().getDeliveryTag();
+        channel.basicAck(tag, false);
+        channel.basicAck(tag, false);
+
+        expectChannelError(AMQP.NOT_FOUND);
+    }
+
+    private void expectChannelError(int error) {
+        try {
+            channel.queueDeclare();
+            fail("Expected channel error " + error);
+        } catch (IOException e) {
+            checkShutdownSignal(error, e);
+        }
+    }
+
+    public void testCrazyAck()
+        throws IOException
+    {
+        select();
+        channel.basicAck(123456, false);
+        expectChannelError(AMQP.NOT_FOUND);
+    }
+}

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

@@ -0,0 +1,13 @@
+package com.rabbitmq.client.test.functional;
+
+import java.io.IOException;
+
+public class InvalidAcksTx extends InvalidAcksBase {
+    protected void select() throws IOException {
+        channel.txSelect();
+    }
+
+    protected void commit() throws IOException {
+        channel.txCommit();
+    }
+}

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

@@ -228,22 +228,6 @@ public void testRollbackAcksAndReAck()
         closeChannel();
     }
 
-    /*
-      it is legal to ack the same message twice
-    */
-    public void testDuplicateAck()
-        throws IOException
-    {
-        openChannel();
-        basicPublish();
-        txSelect();
-        basicGet();
-        basicAck();
-        basicAck();
-        txCommit();
-        closeChannel();
-    }
-
     /*
       it is illegal to ack with an unknown delivery tag
     */