merge bug23029 into default

Author: rade

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

@@ -42,7 +42,8 @@
 import com.rabbitmq.client.GetResponse;
 import com.rabbitmq.client.MessageProperties;
 import com.rabbitmq.client.ShutdownSignalException;
-
+import com.rabbitmq.client.AlreadyClosedException;
+import com.rabbitmq.client.impl.ShutdownNotifierComponent;
 import com.rabbitmq.client.AMQP;
 
 public class BrokerTestCase extends TestCase
@@ -128,6 +129,16 @@ public void closeChannel()
 
     public void checkShutdownSignal(int expectedCode, IOException ioe) {
         ShutdownSignalException sse = (ShutdownSignalException) ioe.getCause();
+        checkShutdownSignal(expectedCode, sse);
+    }
+
+    public void checkShutdownSignal(int expectedCode, AlreadyClosedException ace) {
+        ShutdownNotifierComponent snc = (ShutdownNotifierComponent) ace.getReference();
+        ShutdownSignalException sse = snc.getCloseReason();
+        checkShutdownSignal(expectedCode, sse);
+    }
+
+    public void checkShutdownSignal(int expectedCode, ShutdownSignalException sse) {
         Command closeCommand = (Command) sse.getReason();
         channel = null;
         if (sse.isHardError()) {
@@ -140,6 +151,20 @@ public void checkShutdownSignal(int expectedCode, IOException ioe) {
         }
     }
 
+    public void expectChannelError(int error) {
+        try {
+            channel.basicQos(0);
+            fail("Expected channel error " + error);
+        } catch (IOException ioe) {
+            // If we get a channel close back when flushing it with the
+            // synchronous basicQos above.
+            checkShutdownSignal(error, ioe);
+        } catch (AlreadyClosedException ace) {
+            // If it has already closed of its own accord before we got there.
+            checkShutdownSignal(error, ace);
+        }
+    }
+
   protected void assertDelivered(String q, int count) throws IOException {
     assertDelivered(q, count, false);
   }

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

@@ -1,7 +1,6 @@
 package com.rabbitmq.client.test.functional;
 
 import com.rabbitmq.client.AMQP;
-import com.rabbitmq.client.GetResponse;
 import com.rabbitmq.client.test.BrokerTestCase;
 
 import java.io.IOException;
@@ -32,15 +31,6 @@ public void testDoubleAck()
         expectChannelError(AMQP.PRECONDITION_FAILED);
     }
 
-    private void expectChannelError(int error) {
-        try {
-            channel.queueDeclare();
-            fail("Expected channel error " + error);
-        } catch (IOException e) {
-            checkShutdownSignal(error, e);
-        }
-    }
-
     public void testCrazyAck()
         throws IOException
     {