merge bug20650 into v1_5

Author: Matthias Radestock

test/src/com/rabbitmq/client/test/AllTest.java

@@ -43,7 +43,6 @@ public static TestSuite suite() {
         suite.addTest(AMQConnectionTest.suite());
         suite.addTest(ValueOrExceptionTest.suite());
         suite.addTest(BrokenFramesTest.suite());
-        suite.addTestSuite(Bug20004Test.class);
         return suite;
     }
 }

test/src/com/rabbitmq/client/test/Bug20004Test.java renamed to test/src/com/rabbitmq/client/test/functional/Bug20004Test.java

@@ -28,15 +28,15 @@
 //
 //   Contributor(s): ______________________________________.
 //
-package com.rabbitmq.client.test;
+package com.rabbitmq.client.test.functional;
 
 import java.io.IOException;
 
-import com.rabbitmq.client.test.functional.BrokerTestCase;
-
 /**
  * Test for bug 20004 - deadlock through internal synchronization on
- * the channel object.
+ * the channel object. This is more properly a unit test, but since it
+ * requires a connection to a broker, it's grouped with the functional
+ * tests.
  */
 public class Bug20004Test extends BrokerTestCase {
     public Exception caughtException = null;

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

@@ -46,6 +46,7 @@ public static TestSuite suite() {
         suite.addTestSuite(RequeueOnChannelClose.class);
         suite.addTestSuite(DurableOnTransient.class);
         suite.addTestSuite(NoRequeueOnCancel.class);
+        suite.addTestSuite(Bug20004Test.class);
         return suite;
     }
 }