Various cleanups:

  - ChannelN exchangeDeclares now flow through most general sibling method.
  - InternalExchange functional test renamed for consistency.
  - InternalExchange functional test now uses auto-delete and exclusive queues
    and an auto-delete exchange to obviate test's need to explicitly
    release resources.
  - Spurious isOpen() check on channel in InternalExchange removed.

Author: Jerry Kuch

src/com/rabbitmq/client/impl/ChannelN.java

@@ -515,10 +515,9 @@ public Exchange.DeclareOk exchangeDeclare(String exchange, String type,
                                               Map<String, Object> arguments)
         throws IOException
     {
-        return (Exchange.DeclareOk)
-            exnWrappingRpc(new Exchange.Declare(TICKET, exchange, type,
-                                                false, durable, autoDelete,
-                                                false, false, arguments)).getMethod();
+        return exchangeDeclare(exchange, type,
+                               durable, autoDelete, false,
+                               arguments);
     }
 
     /** Public API - {@inheritDoc} */

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

@@ -70,7 +70,7 @@ public static TestSuite suite() {
         suite.addTestSuite(Confirm.class);
         suite.addTestSuite(UnexpectedFrames.class);
         suite.addTestSuite(PerQueueTTL.class);
-        suite.addTestSuite(InternalExchangeTest.class);
+        suite.addTestSuite(InternalExchange.class);
         return suite;
     }
 }

test/src/com/rabbitmq/client/test/functional/InternalExchangeTest.java renamed to test/src/com/rabbitmq/client/test/functional/InternalExchange.java

@@ -56,23 +56,25 @@
 // turn is bound to a queue.  A client should be able to publish to e0, but
 // not to e1, and publications to e0 should be delivered into q1.
 //
-public class InternalExchangeTest extends BrokerTestCase
+public class InternalExchange extends BrokerTestCase
 {
     private final String[] queues = new String[] { "q1" };
     private final String[] exchanges = new String[] { "e0", "e1" };
 
     protected void createResources() throws IOException
     {
+        // The queues and exchange we create here are all auto-delete, so we
+        // don't need to override releaseResources() with their deletions...
         for (String q : queues)
         {
-            channel.queueDeclare(q, false, false, false, null);
+            channel.queueDeclare(q, false, true, true, null);
         }
 
         // The second exchange, "e1", will be an 'internal' one.
         for ( String e : exchanges )
         {
             channel.exchangeDeclare(e, "direct",
-                                    false, false,
+                                    false, true,
                                     !e.equals("e0"),
                                     null);
         }
@@ -81,19 +83,6 @@ protected void createResources() throws IOException
         channel.queueBind("q1", "e1", "");
     }
 
-    @Override
-    protected void releaseResources() throws IOException
-    {
-        for (String q : queues)
-        {
-            channel.queueDelete(q);
-        }
-        for (String e : exchanges)
-        {
-            channel.exchangeDelete(e);
-        }
-    }
-
 
     public void testTryPublishingToInternalExchange()
             throws IOException
@@ -103,7 +92,6 @@ public void testTryPublishingToInternalExchange()
         // We should be able to publish to the non-internal exchange as usual
         // and see our message land in the queue...
         channel.basicPublish("e0", "", null, testDataBody);
-        assertTrue(channel.isOpen());
         GetResponse r = channel.basicGet("q1", true);
         assertTrue(Arrays.equals(r.getBody(), testDataBody));