Merged bug23494 into default

Author: Emile Joubert

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

@@ -23,7 +23,7 @@ public void verifyNotEquivalent(String name,
             channel.exchangeDeclare(name, type, durable, autoDelete, args);
             fail("Exchange was supposed to be not equivalent");
         } catch (IOException ioe) {
-            checkShutdownSignal(AMQP.NOT_ALLOWED, ioe);
+            checkShutdownSignal(AMQP.PRECONDITION_FAILED, ioe);
             return;
         }
     }

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

@@ -142,7 +142,7 @@ public void testQueueRedeclareEquivalence() throws IOException {
                     false, args2);
             fail("Able to redeclare queue with mismatching expire flags.");
         } catch (IOException e) {
-            checkShutdownSignal(AMQP.NOT_ALLOWED, e);
+            checkShutdownSignal(AMQP.PRECONDITION_FAILED, e);
         }
     }
 

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

@@ -85,7 +85,7 @@ void verifyNotEquivalent(boolean durable, boolean exclusive,
             if (exclusive)
                 checkShutdownSignal(AMQP.RESOURCE_LOCKED, ioe);
             else
-                checkShutdownSignal(AMQP.NOT_ALLOWED, ioe);
+                checkShutdownSignal(AMQP.PRECONDITION_FAILED, ioe);
             return;
         }
         fail("Queue.declare should have been rejected as not equivalent");