merge bug20630 into v1_5

Author: tonyg

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

@@ -36,8 +36,12 @@
 import junit.framework.TestCase;
 
 import com.rabbitmq.client.Channel;
+import com.rabbitmq.client.Command;
 import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.ConnectionFactory;
+import com.rabbitmq.client.ShutdownSignalException;
+
+import com.rabbitmq.client.AMQP;
 
 public class BrokerTestCase extends TestCase
 {
@@ -120,4 +124,17 @@ public void closeChannel()
         }
     }
 
+    public void checkShutdownSignal(int expectedCode, IOException ioe) {
+        ShutdownSignalException sse = (ShutdownSignalException) ioe.getCause();
+        Command closeCommand = (Command) sse.getReason();
+        channel = null;
+        if (sse.isHardError()) {
+            connection = null;
+            AMQP.Connection.Close closeMethod = (AMQP.Connection.Close) closeCommand.getMethod();
+            assertEquals(expectedCode, closeMethod.getReplyCode());
+        } else {
+            AMQP.Channel.Close closeMethod = (AMQP.Channel.Close) closeCommand.getMethod();
+            assertEquals(expectedCode, closeMethod.getReplyCode());
+        }
+    }
 }

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

@@ -0,0 +1,70 @@
+//   The contents of this file are subject to the Mozilla Public License
+//   Version 1.1 (the "License"); you may not use this file except in
+//   compliance with the License. You may obtain a copy of the License at
+//   http://www.mozilla.org/MPL/
+//
+//   Software distributed under the License is distributed on an "AS IS"
+//   basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+//   License for the specific language governing rights and limitations
+//   under the License.
+//
+//   The Original Code is RabbitMQ.
+//
+//   The Initial Developers of the Original Code are LShift Ltd,
+//   Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
+//
+//   Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
+//   Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
+//   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
+//   Technologies LLC, and Rabbit Technologies Ltd.
+//
+//   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+//   Ltd. Portions created by Cohesive Financial Technologies LLC are
+//   Copyright (C) 2007-2009 Cohesive Financial Technologies
+//   LLC. Portions created by Rabbit Technologies Ltd are Copyright
+//   (C) 2007-2009 Rabbit Technologies Ltd.
+//
+//   All Rights Reserved.
+//
+//   Contributor(s): ______________________________________.
+//
+
+package com.rabbitmq.client.test.functional;
+
+import com.rabbitmq.client.AMQP;
+import com.rabbitmq.client.ShutdownSignalException;
+import java.io.IOException;
+
+public class DoubleDeletion extends BrokerTestCase
+{
+    protected static final String Q = "DoubleDeletionQueue";
+    protected static final String X = "DoubleDeletionExchange";
+
+    public void testDoubleDeletionQueue()
+        throws IOException
+    {
+        channel.queueDeclare(Q);
+	channel.queueDelete(Q);
+        try {
+            channel.queueDelete(Q);
+            fail("Expected exception from double deletion of queue");
+        } catch (IOException ee) {
+	    checkShutdownSignal(AMQP.NOT_FOUND, ee);
+            // Pass!
+        }
+    }
+
+    public void testDoubleDeletionExchange()
+        throws IOException
+    {
+        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!
+        }
+    }
+}

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

@@ -37,6 +37,7 @@
 public class FunctionalTests extends TestCase {
     public static TestSuite suite() {
         TestSuite suite = new TestSuite("functional");
+        suite.addTestSuite(DoubleDeletion.class);
         suite.addTestSuite(Routing.class);
         suite.addTestSuite(BindingLifecycle.class);
         suite.addTestSuite(Transactions.class);

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

@@ -165,21 +165,42 @@ public void testTopicRouting() throws Exception {
     }
 
     public void testUnbind() throws Exception {
-        AMQP.Queue.DeclareOk ok = channel.queueDeclare();
-        String queue = ok.getQueue();
 
-        String routingKey = "quay";
         String x = "amq.direct";
+        String q = "testUnbind";
+        String routingKey = "quay";
 
-        channel.queueBind(queue, x, routingKey);
+        AMQP.Queue.DeclareOk ok = channel.queueDeclare(q);
+        channel.queueBind(q, x, routingKey);
         channel.basicPublish(x, routingKey, null, "foobar".getBytes());
-        checkGet(queue, true);
+        checkGet(q, true);
+
+        String[][] tests = new String[][] {
+            new String[] {"unknown_queue", x, routingKey},
+            new String[] {q, "unknown_exchange", routingKey},
+            new String[] {"unknown_queue", "unknown_exchange", routingKey},
+            // see bug 20633
+            // new String[] {q, x, "unknown_rk"},
+            new String[] {"unknown_queue", "unknown_exchange", "unknown_rk"}
+        };
+
+        for (int i = 0; i < tests.length; i++) {
+
+            String[] test = tests[i];
+            try {
+                channel.queueUnbind(test[0], test[1], test[2]);
+                fail("expected not_found in test " + i);
+            } catch (IOException ee) {
+                checkShutdownSignal(AMQP.NOT_FOUND, ee);
+                openChannel();
+            }
+        }
 
-        channel.queueUnbind(queue, x, routingKey);
+        channel.queueUnbind(q, x, routingKey);
 
         channel.basicPublish(x, routingKey, null, "foobar".getBytes());
-        checkGet(queue, false);
+        checkGet(q, false);
 
-        channel.queueDelete(queue);
+        channel.queueDelete(q);
     }
 }