move testRedeliverAckedUncommitted to a better place

Author: rade

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

@@ -46,7 +46,6 @@ public static TestSuite suite() {
         suite.addTestSuite(BindingLifecycle.class);
         suite.addTestSuite(Recover.class);
         suite.addTestSuite(Reject.class);
-        suite.addTestSuite(TransactionalRecover.class);
         suite.addTestSuite(Transactions.class);
         suite.addTestSuite(PersistentTransactions.class);
         suite.addTestSuite(RequeueOnConnectionClose.class);

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

@@ -331,4 +331,24 @@ public void testNonTransactedRollback()
             checkShutdownSignal(AMQP.PRECONDITION_FAILED, e);
         }
     }
+
+    public void testRedeliverAckedUncommitted()
+        throws IOException, InterruptedException
+    {
+        openChannel();
+        txSelect();
+        basicPublish();
+        txCommit();
+        basicGet();
+        // Ack the message but do not commit the channel. The message
+        // should not get redelivered (see
+        // https://bugzilla.rabbitmq.com/show_bug.cgi?id=21845#c3)
+        basicAck();
+        channel.basicRecover(true);
+
+        assertNull("Acked uncommitted message redelivered",
+                   basicGet(true));
+        closeChannel();
+    }
+
 }