Merge bug24234

Author: Simon MacMullen

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

@@ -329,4 +329,127 @@ public void testShuffleAcksBeforeRollback()
         basicAck(tags[2], false);
         txCommit();
     }
+
+    private abstract class NackMethod {
+        abstract public void nack(long tag, boolean requeue)
+            throws IOException;
+
+        public void nack(boolean requeue)
+            throws IOException
+        {
+            nack(latestTag, requeue);
+        }
+
+        public void nack()
+            throws IOException
+        {
+            nack(latestTag, true);
+        }
+    }
+
+    private NackMethod basicNack = new NackMethod() {
+            public void nack(long tag, boolean requeue)
+                throws IOException
+            {
+                channel.basicNack(tag, false, requeue);
+            }
+        };
+
+    private NackMethod basicReject = new NackMethod() {
+            public void nack(long tag, boolean requeue)
+                throws IOException
+            {
+                channel.basicReject(tag, requeue);
+            }
+        };
+
+    /*
+      messages with nacks get requeued after the transaction commit.
+      messages with nacks with requeue = false are not requeued.
+    */
+    public void commitNacks(NackMethod method)
+        throws IOException
+    {
+        basicPublish();
+        basicPublish();
+        txSelect();
+        basicGet();
+        method.nack();
+        basicGet();
+        method.nack(false);
+        assertNull(basicGet());
+        txCommit();
+        assertNotNull(basicGet());
+        assertNull(basicGet());
+    }
+
+    public void rollbackNacks(NackMethod method)
+        throws IOException
+    {
+        basicPublish();
+        txSelect();
+        basicGet();
+        method.nack(true);
+        txRollback();
+        assertNull(basicGet());
+    }
+
+    public void commitAcksAndNacks(NackMethod method)
+        throws IOException
+    {
+        for (int i = 0; i < 3; i++) {
+            basicPublish();
+        }
+        txSelect();
+        long tags[] = new long[3];
+        for (int i = 0; i < 3; i++) {
+            tags[i] = basicGet().getEnvelope().getDeliveryTag();
+        }
+        basicAck(tags[1], false);
+        basicAck(tags[0], false);
+        method.nack(tags[2], false);
+        txRollback();
+        basicAck(tags[2], false);
+        method.nack(tags[0], true);
+        method.nack(tags[1], false);
+        txCommit();
+        assertNotNull(basicGet());
+        assertNull(basicGet());
+    }
+
+    public void testCommitNacks()
+        throws IOException
+    {
+        commitNacks(basicNack);
+    }
+
+    public void testRollbackNacks()
+        throws IOException
+    {
+        rollbackNacks(basicNack);
+    }
+
+    public void testCommitAcksAndNacks()
+        throws IOException
+    {
+        commitAcksAndNacks(basicNack);
+    }
+
+    public void testCommitRejects()
+        throws IOException
+    {
+        commitNacks(basicReject);
+    }
+
+    public void testRollbackRejects()
+        throws IOException
+    {
+        rollbackNacks(basicReject);
+    }
+
+    public void testCommitAcksAndRejects()
+        throws IOException
+    {
+        commitAcksAndNacks(basicReject);
+    }
 }