Add more uses of checkShutdownSignal().

Author: Simon MacMullen

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

@@ -193,17 +193,7 @@ public void testExchangePassiveDeclare() throws IOException {
             fail("Passive declare of an unknown exchange should fail");
         }
         catch (IOException ioe) {
-            Throwable t = ioe.getCause();
-            String msg = "Passive declare of an unknown exchange should send a 404";
-            assertTrue(msg, t instanceof ShutdownSignalException);
-            Object r = ((ShutdownSignalException)t).getReason();
-            assertTrue(msg, r instanceof Command);
-            Method m = ((Command)r).getMethod();
-            assertTrue(msg, m instanceof AMQP.Channel.Close);
-            assertEquals(msg,
-                         AMQP.NOT_FOUND,
-                         ((AMQP.Channel.Close)m).getReplyCode());
-            return;
+            checkShutdownSignal(AMQP.NOT_FOUND, ioe);
         }
     }
 

test/src/com/rabbitmq/client/test/server/ExclusiveQueueDurability.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.ConnectionFactory;
@@ -55,7 +56,7 @@ void verifyQueueMissing(Channel channel, String queueName)
         try {
             channel.queueDeclare(queueName, false, false, false, null);
         } catch (IOException ioe) {
-            // FIXME check that it's specifically resource locked
+            checkShutdownSignal(AMQP.RESOURCE_LOCKED, ioe);
             fail("Declaring the queue resulted in a channel exception, probably meaning that it already exists");
         }
     }

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

@@ -148,8 +148,7 @@ public void testAuth()
             unAuthFactory.newConnection();
             fail("Exception expected if password is wrong");
         } catch (IOException e) {
-            String msg = e.getMessage();
-            assertTrue("Exception message should contain auth", msg.toLowerCase().contains("auth"));
+            checkShutdownSignal(AMQP.NOT_ALLOWED, e);
         }
     }