Merged bug25716 into default

Author: Emile Joubert

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

@@ -201,15 +201,9 @@ public void testUnbind() throws Exception {
         };
 
         for (int i = 0; i < tests.length; i++) {
-
             Binding test = tests[i];
-            try {
-                channel.queueUnbind(test.q, test.x, test.k);
-                fail("expected not_found in test " + i);
-            } catch (IOException ee) {
-                checkShutdownSignal(AMQP.NOT_FOUND, ee);
-                openChannel();
-            }
+            // check we can unbind all sorts of things that don't exist
+            channel.queueUnbind(test.q, test.x, test.k);
         }
 
         // success case

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

@@ -203,22 +203,6 @@ public void process(GetResponse getResponse) {
             });
     }
 
-    public void testDeadLetterExchangeDeleteTwice()
-        throws IOException
-    {
-        declareQueue(TEST_QUEUE_NAME, DLX, null, null, 1);
-        channel.queueBind(TEST_QUEUE_NAME, "amq.direct", "test");
-
-        publishN(MSG_COUNT_MANY);
-        channel.queueDelete(TEST_QUEUE_NAME);
-        try {
-            channel.queueDelete(TEST_QUEUE_NAME);
-            fail();
-        } catch (IOException ex) {
-            checkShutdownSignal(AMQP.NOT_FOUND, ex);
-        }
-    }
-
     public void testDeadLetterOnReject() throws Exception {
         rejectionTest(false);
     }

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

@@ -19,7 +19,6 @@
 
 import java.io.IOException;
 
-import com.rabbitmq.client.AMQP;
 import com.rabbitmq.client.test.BrokerTestCase;
 
 public class DoubleDeletion extends BrokerTestCase
@@ -30,28 +29,18 @@ public class DoubleDeletion extends BrokerTestCase
     public void testDoubleDeletionQueue()
         throws IOException
     {
-      channel.queueDeclare(Q, false, false, false, null);
-	channel.queueDelete(Q);
-        try {
-            channel.queueDelete(Q);
-            fail("Expected exception from double deletion of queue");
-        } catch (IOException ee) {
-	    checkShutdownSignal(AMQP.NOT_FOUND, ee);
-            // Pass!
-        }
+        channel.queueDelete(Q);
+        channel.queueDeclare(Q, false, false, false, null);
+        channel.queueDelete(Q);
+        channel.queueDelete(Q);
     }
 
     public void testDoubleDeletionExchange()
         throws IOException
     {
+        channel.exchangeDelete(X);
         channel.exchangeDeclare(X, "direct");
-	channel.exchangeDelete(X);
-        try {
-            channel.exchangeDelete(X);
-            fail("Expected exception from double deletion of exchange");
-        } catch (IOException ee) {
-	    checkShutdownSignal(AMQP.NOT_FOUND, ee);
-            // Pass!
-        }
+	    channel.exchangeDelete(X);
+        channel.exchangeDelete(X);
     }
 }

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

@@ -80,15 +80,11 @@ protected void consumeNoDuplicates(QueueingConsumer consumer)
     }
 
     public void testBindingCreationDeletion() throws IOException {
+        channel.exchangeUnbind("e2", "e1", "");
         channel.exchangeBind("e2", "e1", "");
         channel.exchangeBind("e2", "e1", "");
         channel.exchangeUnbind("e2", "e1", "");
-        try {
-            channel.exchangeUnbind("e2", "e1", "");
-            fail("expected not_found in testBindingCreationDeletion");
-        } catch (IOException e) {
-            checkShutdownSignal(AMQP.NOT_FOUND, e);
-        }
+        channel.exchangeUnbind("e2", "e1", "");
     }
 
     /* pre (eN --> qN) for N in [0..2]