merge bug22956 into default

Author: Alexandru Scvortov

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

@@ -137,8 +137,8 @@ public void testExchangeIfUnused() throws IOException {
         try {
             channel.exchangeDelete(binding.x, true);
         }
-        catch (Exception e) {
-            // do nothing, this is the correct behaviour
+        catch (IOException e) {
+            checkShutdownSignal(AMQP.PRECONDITION_FAILED, e);
             openChannel();
             deleteExchangeAndQueue(binding);
             return;
@@ -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/functional/BindingLifecycleBase.java

@@ -31,6 +31,7 @@
 
 package com.rabbitmq.client.test.functional;
 
+import com.rabbitmq.client.AMQP;
 import com.rabbitmq.client.GetResponse;
 import com.rabbitmq.client.QueueingConsumer;
 import java.io.IOException;
@@ -104,8 +105,8 @@ protected void doAutoDelete(boolean durable, int queues) throws IOException {
       channel.queueBind(binding.q, binding.x, binding.k);
       sendRoutable(binding);
     }
-    catch (Exception e) {
-      // do nothing, this is the correct behaviour
+    catch (IOException e) {
+      checkShutdownSignal(AMQP.NOT_FOUND, e);
       channel = null;
       return;
     }

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

@@ -139,6 +139,7 @@ public void testQueueAutoDelete() throws IOException {
         try {
             verifyQueueExists(name);
         } catch (IOException ioe) {
+            checkShutdownSignal(AMQP.NOT_FOUND, ioe);
             return;
         }
         fail("Queue should have been auto-deleted after we removed its only consumer");

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

@@ -248,8 +248,9 @@ public void testUnknownTagAck()
             txCommit();
             fail("expected exception");
         }
-        catch (IOException e) {}
-        catch (AlreadyClosedException e) {}
+        catch (IOException e) {
+            checkShutdownSignal(AMQP.PRECONDITION_FAILED, e);
+        }
         connection = null;
         openConnection();
     }

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

@@ -374,19 +374,9 @@ protected void runTest(boolean exp, String name, WithName test)
             test.with(name);
             assertTrue(msg, exp);
         } catch (IOException e) {
-            assertFalse(msg, exp);
-            Throwable t = e.getCause();
-            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.ACCESS_REFUSED,
-                         ((AMQP.Channel.Close)m).getReplyCode());
-            //This fails due to bug 20296
-            //openChannel();
-            channel = connection.createChannel(channel.getChannelNumber() + 1);
+            checkShutdownSignal(AMQP.ACCESS_REFUSED, e);
+            openConnection();
+            openChannel();
         }
     }