added checks for shutdown signals

Author: Alexandru Scvortov

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

@@ -35,6 +35,7 @@
 import java.util.HashMap;
 import java.io.IOException;
 
+import com.rabbitmq.client.AMQP;
 import com.rabbitmq.client.Channel;
 
 import com.rabbitmq.client.test.BrokerTestCase;
@@ -57,14 +58,15 @@ public static void verifyEquivalent(Channel channel, String name,
     }
 
     // Note: this will close the channel
-    public static void verifyNotEquivalent(Channel channel, String name,
+    public void verifyNotEquivalent(Channel channel, String name,
             String type, boolean durable, boolean autoDelete,
             Map<String, Object> args) throws IOException {
         channel.exchangeDeclarePassive(name);
         try {
             channel.exchangeDeclare(name, type, durable, autoDelete, args);
             fail("Exchange was supposed to be not equivalent");
         } catch (IOException ioe) {
+            checkShutdownSignal(AMQP.NOT_ALLOWED, ioe);
             return;
         }
     }

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

@@ -34,6 +34,7 @@
 import java.io.IOException;
 import java.util.HashMap;
 
+import com.rabbitmq.client.AMQP;
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.QueueingConsumer;
@@ -66,6 +67,7 @@ public void testQueueExclusiveForPassiveDeclare() throws Exception {
         try {
             channel.queueDeclarePassive(q);
         } catch (IOException ioe) {
+            checkShutdownSignal(AMQP.RESOURCE_LOCKED, ioe);
             return;
         }
         fail("Passive queue declaration of an exclusive queue from another connection should fail");
@@ -77,6 +79,7 @@ public void testQueueExclusiveForDeclare() throws Exception {
         try {
             channel.queueDeclare(q, false, true, false, noArgs);
         } catch (IOException ioe) {
+            checkShutdownSignal(AMQP.RESOURCE_LOCKED, ioe);
             return;
         }
         fail("Active queue declaration of an exclusive queue from another connection should fail");
@@ -87,6 +90,7 @@ public void testQueueExclusiveForConsume() throws Exception {
         try {
             channel.basicConsume(q, c);
         } catch (IOException ioe) {
+            checkShutdownSignal(AMQP.RESOURCE_LOCKED, ioe);
             return;
         }
         fail("Exclusive queue should be locked for basic consume from another connection");
@@ -96,6 +100,7 @@ public void testQueueExclusiveForPurge() throws Exception {
         try {
             channel.queuePurge(q);
         } catch (IOException ioe) {
+            checkShutdownSignal(AMQP.RESOURCE_LOCKED, ioe);
             return;
         }
         fail("Exclusive queue should be locked for queue purge from another connection");
@@ -105,6 +110,7 @@ public void testQueueExclusiveForDelete() throws Exception {
         try {
             channel.queueDelete(q);
         } catch (IOException ioe) {
+            checkShutdownSignal(AMQP.RESOURCE_LOCKED, ioe);
             return;
         }
         fail("Exclusive queue should be locked for queue delete from another connection");
@@ -114,6 +120,7 @@ public void testQueueExclusiveForBind() throws Exception {
         try {
             channel.queueBind(q, "", ""); // NB uses default exchange
         } catch (IOException ioe) {
+            checkShutdownSignal(AMQP.INTERNAL_ERROR, ioe);
             return;
         }
         fail("Exclusive queue should be locked for queue bind from another connection");
@@ -131,6 +138,7 @@ public void testQueueExclusiveForUnbind() throws Exception {
         try {
             channel.queueUnbind(q, "", "");
         } catch (IOException ioe) {
+            checkShutdownSignal(AMQP.INTERNAL_ERROR, ioe);
             return;
         }
         fail("Exclusive queue should be locked for queue unbind from another connection");
@@ -140,6 +148,7 @@ public void testQueueExclusiveForGet() throws Exception {
         try {
             channel.basicGet(q, true);
         } catch (IOException ioe) {
+            checkShutdownSignal(AMQP.RESOURCE_LOCKED, ioe);
             return;
         }
         fail("Exclusive queue should be locked for basic get from another connection");

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

@@ -35,6 +35,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import com.rabbitmq.client.AMQP;
 import com.rabbitmq.client.QueueingConsumer;
 import com.rabbitmq.client.test.BrokerTestCase;
 
@@ -81,6 +82,10 @@ void verifyNotEquivalent(boolean durable, boolean exclusive,
         try {
             verifyQueue(q, durable, exclusive, autoDelete, null);
         } catch (IOException ioe) {
+            if (exclusive)
+                checkShutdownSignal(AMQP.RESOURCE_LOCKED, ioe);
+            else
+                checkShutdownSignal(AMQP.NOT_ALLOWED, ioe);
             return;
         }
         fail("Queue.declare should have been rejected as not equivalent");