Merge with default

Author: Rob Harrop

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

@@ -111,16 +111,6 @@ protected void cleanup() throws IOException {
         }
     }
 
-    protected void publish(String key, boolean mandatory, boolean immediate)
-        throws IOException {
-        channel.basicPublish("x", key, mandatory, immediate, null,
-                             "ae-test".getBytes());
-    }
-
-    protected void publish(String key) throws IOException {
-        publish(key, false, false);
-    }
-
     /**
      * Perform an auto-acking 'basic.get' on each of the queues named
      * in {@link #resources} and check whether a message can be
@@ -161,7 +151,8 @@ protected void check(String key, boolean mandatory, boolean immediate,
         throws IOException {
 
         gotReturn.set(false);
-        publish(key, mandatory, immediate);
+        channel.basicPublish("x", key, mandatory, immediate, null,
+                             "ae-test".getBytes());
         checkGet(expected);
         assertEquals(ret, gotReturn.get());
     }
@@ -212,19 +203,6 @@ public void testAe() throws IOException {
             check(k, false, true, unrouted, true);
         }
 
-        //tx
-        channel.txSelect();
-        for (String k : keys) {
-            publish(k);
-            checkGet(unrouted);
-            channel.txRollback();
-            checkGet(unrouted);
-            publish(k);
-            checkGet(unrouted);
-            channel.txCommit();
-            checkGet(expected(k));
-        }
-
         cleanup();
     }
 

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

@@ -187,6 +187,7 @@ public void testBasicRecover()
     public void testSelect()
         throws IOException
     {
+        channel.confirmSelect();
         try {
             Channel ch = connection.createChannel();
             ch.confirmSelect();
@@ -203,9 +204,6 @@ public void testSelect()
         } catch (IOException ioe) {
             checkShutdownSignal(AMQP.PRECONDITION_FAILED, ioe);
         }
-        Channel ch = connection.createChannel();
-        ch.confirmSelect();
-        ch.confirmSelect();
     }
 
     /* Publish NUM_MESSAGES messages and wait for confirmations. */

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

@@ -33,7 +33,6 @@ public static TestSuite suite() {
         suite.addTestSuite(Recover.class);
         suite.addTestSuite(Reject.class);
         suite.addTestSuite(Transactions.class);
-        suite.addTestSuite(PersistentTransactions.class);
         suite.addTestSuite(RequeueOnConnectionClose.class);
         suite.addTestSuite(RequeueOnChannelClose.class);
         suite.addTestSuite(DurableOnTransient.class);