merge default into bug20154

Author: tonyg

src/com/rabbitmq/client/impl/LongString.java

@@ -36,7 +36,7 @@
 
 /**
  * An object providing access to a LongString.
- * This might be implemeted to read directly from connection
+ * This might be implemented to read directly from connection
  * socket, depending on the size of the content to be read -
  * long strings may contain up to 4Gb of content.
  */

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

@@ -31,6 +31,8 @@
 
 package com.rabbitmq.client.test.functional;
 
+import com.rabbitmq.client.Channel;
+import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.GetResponse;
 import com.rabbitmq.client.QueueingConsumer;
 
@@ -53,6 +55,29 @@ public class BindingLifecycle extends PersisterRestartBase {
     protected static final String X = "X-" + System.currentTimeMillis();
     protected static final String K = "K-" + System.currentTimeMillis();
 
+    /**
+     * Create a durable queue on secondary node, if possible, falling
+     * back on the primary node if necessary.
+     */
+    @Override protected void declareDurableQueue(String q)
+        throws IOException
+    {
+        Connection connection;
+        try {
+            connection = connectionFactory.newConnection("localhost", 5673);
+        } catch (IOException e) {
+            super.declareDurableQueue(q);
+            return;
+        }
+
+        Channel channel = connection.createChannel();
+
+        channel.queueDeclare(q, true);
+
+        channel.abort();
+        connection.abort();
+    }
+
     /**
      *   Tests whether durable bindings are correctly recovered.
      */
@@ -112,7 +137,7 @@ public void testDurableBindingsDeletion() throws IOException {
 
 
     /**
-     * This tests whether the default bindings for persistent queues
+     * This tests whether the default bindings for durable queues
      * are recovered properly.
      *
      * The idea is to create a durable queue, nuke the server and then

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

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

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

@@ -89,7 +89,7 @@ protected void declareDurableQueue(String q)
     protected void declareAndBindDurableQueue(String q, String x, String r)
         throws IOException
     {
-        channel.queueDeclare(q, true);
+        declareDurableQueue(q);
         channel.queueBind(q, x, r);
     }
 

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

@@ -218,21 +218,42 @@ public void testHeadersRouting() 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);
     }
 }