Remove redundant open/close(s) in Transactions test class

Author: Steve Powell

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

@@ -30,13 +30,6 @@ public class Transactions extends BrokerTestCase
 
     protected long latestTag = 0L;
 
-    protected void setUp()
-        throws IOException
-    {
-        super.setUp();
-        closeChannel();
-    }
-
     protected void createResources() throws IOException {
         channel.queueDeclare(Q, false, false, false, null);
     }
@@ -101,14 +94,12 @@ private void basicAck()
     public void testCommitPublish()
         throws IOException
     {
-        openChannel();
         txSelect();
         basicPublish();
         assertNull(basicGet());
         txCommit();
         assertNotNull(basicGet());
         txCommit();
-        closeChannel();
     }
 
     /*
@@ -117,12 +108,10 @@ public void testCommitPublish()
     public void testRollbackPublish()
         throws IOException
     {
-        openChannel();
         txSelect();
         basicPublish();
         txRollback();
         assertNull(basicGet());
-        closeChannel();
     }
 
     /*
@@ -131,13 +120,11 @@ public void testRollbackPublish()
     public void testRollbackPublishOnClose()
         throws IOException
     {
-        openChannel();
         txSelect();
         basicPublish();
         closeChannel();
         openChannel();
         assertNull(basicGet());
-        closeChannel();
     }
 
     /*
@@ -146,7 +133,6 @@ public void testRollbackPublishOnClose()
     public void testRequeueOnClose()
         throws IOException
     {
-        openChannel();
         basicPublish();
         basicPublish();
         txSelect();
@@ -159,7 +145,6 @@ public void testRequeueOnClose()
         basicAck();
         assertNotNull(basicGet());
         basicAck();
-        closeChannel();
     }
 
     /*
@@ -169,7 +154,6 @@ public void testRequeueOnClose()
     public void testCommitAcks()
         throws IOException
     {
-        openChannel();
         basicPublish();
         basicPublish();
         txSelect();
@@ -183,7 +167,6 @@ public void testCommitAcks()
         assertNotNull(basicGet());
         basicAck();
         assertNull(basicGet());
-        closeChannel();
     }
 
     /*
@@ -193,7 +176,6 @@ public void testCommitAcks()
     public void testRollbackAcksAndReAck()
         throws IOException
     {
-        openChannel();
         basicPublish();
         txSelect();
         basicGet();
@@ -205,7 +187,6 @@ public void testRollbackAcksAndReAck()
         openChannel();
         assertNotNull(basicGet());
         basicAck();
-        closeChannel();
     }
 
     /*
@@ -214,7 +195,6 @@ public void testRollbackAcksAndReAck()
     public void testUnknownTagAck()
         throws IOException
     {
-        openChannel();
         basicPublish();
         txSelect();
         basicGet();
@@ -223,7 +203,6 @@ public void testUnknownTagAck()
         // "On a transacted channel, this check MUST be done immediately and
         // not delayed until a Tx.Commit."
         expectError(AMQP.PRECONDITION_FAILED);
-        openChannel();
     }
 
     /*
@@ -232,7 +211,6 @@ public void testUnknownTagAck()
     public void testNoRequeueOnRollback()
         throws IOException
     {
-        openChannel();
         basicPublish();
         basicPublish();
         txSelect();
@@ -241,7 +219,6 @@ public void testNoRequeueOnRollback()
         basicGet();
         txRollback();
         assertNull(basicGet());
-        closeChannel();
     }
 
     /*
@@ -250,14 +227,12 @@ public void testNoRequeueOnRollback()
     public void testAutoAck()
         throws IOException
     {
-        openChannel();
         basicPublish();
         txSelect();
         basicGet(true);
         closeChannel();
         openChannel();
         assertNull(basicGet());
-        closeChannel();
     }
 
     /*
@@ -266,7 +241,6 @@ public void testAutoAck()
     public void testAckAll()
         throws IOException
     {
-        openChannel();
         basicPublish();
         basicPublish();
         txSelect();
@@ -277,13 +251,11 @@ public void testAckAll()
         closeChannel();
         openChannel();
         assertNull(basicGet());
-        closeChannel();
     }
 
     public void testNonTransactedCommit()
         throws IOException
     {
-        openChannel();
         try {
             txCommit();
             fail("Expected channel error");
@@ -295,7 +267,6 @@ public void testNonTransactedCommit()
     public void testNonTransactedRollback()
         throws IOException
     {
-        openChannel();
         try {
             txRollback();
             fail("Expected channel error");
@@ -307,7 +278,6 @@ public void testNonTransactedRollback()
     public void testRedeliverAckedUncommitted()
         throws IOException
     {
-        openChannel();
         txSelect();
         basicPublish();
         txCommit();
@@ -320,13 +290,11 @@ public void testRedeliverAckedUncommitted()
 
         assertNull("Acked uncommitted message redelivered",
                    basicGet(true));
-        closeChannel();
     }
 
     public void testCommitWithDeletedQueue()
         throws IOException
     {
-        openChannel();
         txSelect();
         basicPublish();
         releaseResources();
@@ -338,15 +306,13 @@ public void testCommitWithDeletedQueue()
             openChannel();
             fail("commit failed");
         } finally {
-            createResources();
-            closeChannel();
+            createResources(); // To allow teardown to function cleanly
         }
     }
 
     public void testShuffleAcksBeforeRollback()
         throws IOException
     {
-        openChannel();
         for (int i = 0; i < 3; i++) {
             basicPublish();
         }