Merge bug24606

Author: Simon MacMullen

test/src/com/rabbitmq/client/test/server/PersistenceGuarantees.java

@@ -0,0 +1,43 @@
+package com.rabbitmq.client.test.server;
+
+import com.rabbitmq.client.MessageProperties;
+import com.rabbitmq.client.test.BrokerTestCase;
+
+import java.io.IOException;
+
+public class PersistenceGuarantees extends BrokerTestCase {
+    private static final int COUNT = 10000;
+    private String queue;
+
+    protected void declareQueue() throws IOException {
+        queue = channel.queueDeclare("", true, false, false, null).getQueue();
+    }
+
+    public void testTxPersistence() throws Exception {
+        declareQueue();
+        channel.txSelect();
+        publish();
+        channel.txCommit();
+        restart();
+        assertPersisted();
+    }
+
+    public void testConfirmPersistence() throws Exception {
+        declareQueue();
+        channel.confirmSelect();
+        publish();
+        channel.waitForConfirms();
+        restart();
+        assertPersisted();
+    }
+
+    private void assertPersisted() throws IOException {
+        assertEquals(COUNT, channel.queueDelete(queue).getMessageCount());
+    }
+
+    private void publish() throws IOException {
+        for (int i = 0; i < COUNT; i++) {
+            channel.basicPublish("", queue, false, false, MessageProperties.PERSISTENT_BASIC, "".getBytes());
+        }
+    }
+}

test/src/com/rabbitmq/client/test/server/ServerTests.java

@@ -31,6 +31,7 @@ public static TestSuite suite() {
         suite.addTestSuite(MemoryAlarms.class);
         suite.addTestSuite(MessageRecovery.class);
         suite.addTestSuite(Firehose.class);
+        suite.addTestSuite(PersistenceGuarantees.class);
         return suite;
     }
 }