moved ExchangeDeleteIfUnsued to functional tests

Author: Alexandru Scvortov

test/src/com/rabbitmq/client/test/server/ExchangeDeleteIfUnused.java renamed to test/src/com/rabbitmq/client/test/functional/ExchangeDeleteIfUnused.java

@@ -29,40 +29,38 @@
 //   Contributor(s): ______________________________________.
 //
 
-package com.rabbitmq.client.test.server;
+package com.rabbitmq.client.test.functional;
 
 import java.io.IOException;
 
 import com.rabbitmq.client.ShutdownSignalException;
 import com.rabbitmq.client.test.BrokerTestCase;
 
 public class ExchangeDeleteIfUnused extends BrokerTestCase {
-    private final static String ExchangeName = "xchg1";
-    private final static String QueueName = "myQueue";
-    private final static String RoutingKey = "something";
+    private final static String EXCHANGE_NAME = "xchg1";
+    private final static String ROUTING_KEY = "something";
 
     protected void createResources()
         throws IOException
     {
         super.createResources();
-        channel.exchangeDeclare(ExchangeName, "direct");
-        channel.queueDeclare(QueueName);
-        channel.queueBind(QueueName, ExchangeName, RoutingKey);
+        channel.exchangeDeclare(EXCHANGE_NAME, "direct");
+        String queueName = channel.queueDeclare().getQueue();
+        channel.queueBind(queueName, EXCHANGE_NAME, ROUTING_KEY);
     }
 
     protected void releaseResources()
         throws IOException
     {
-        channel.queueDelete(QueueName);
-        channel.exchangeDelete(ExchangeName);
+        channel.exchangeDelete(EXCHANGE_NAME);
         super.releaseResources();
     }
 
     public void testExchangeDelete() {
         try {
             // exchange.delete(ifUnused = true)
             // should throw a channel exception if the exchange is being used
-            channel.exchangeDelete(ExchangeName, true);
+            channel.exchangeDelete(EXCHANGE_NAME, true);
             fail("Exception expected if exchange in use");
         } catch (IOException e) {
             Throwable t = e.getCause();

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

@@ -51,6 +51,7 @@ public static TestSuite suite() {
         suite.addTestSuite(DurableOnTransient.class);
         suite.addTestSuite(NoRequeueOnCancel.class);
         suite.addTestSuite(Bug20004Test.class);
+        suite.addTestSuite(ExchangeDeleteIfUnused.class);
         suite.addTestSuite(QosTests.class);
         suite.addTestSuite(AlternateExchange.class);
         return suite;

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

@@ -40,7 +40,6 @@ public static TestSuite suite() {
         suite.addTestSuite(Permissions.class);
         suite.addTestSuite(DurableBindingLifecycle.class);
         suite.addTestSuite(EffectVisibilityCrossNodeTest.class);
-        suite.addTestSuite(ExchangeDeleteIfUnused.class);
         suite.addTest(PersisterRestartTests.suite());
         return suite;
     }