Merging heads

Author: Matthew Sackman

nexus-upload.sh

@@ -9,6 +9,9 @@ set -e
 #   GNUPG_PATH -- the path to the home directory for gnupg
 
 NEXUS_ROOT="http://$CREDS@oss.sonatype.org/service/local/staging/deploy/maven2/com/rabbitmq/amqp-client/$VERSION"
+unset http_proxy
+unset https_proxy
+unset no_proxy
 
 for artifact in $@; do
   echo "Uploading $artifact"

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

@@ -0,0 +1,72 @@
+//   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-2010 LShift
+//   Ltd. Portions created by Cohesive Financial Technologies LLC are
+//   Copyright (C) 2007-2010 Cohesive Financial Technologies
+//   LLC. Portions created by Rabbit Technologies Ltd are Copyright
+//   (C) 2007-2010 Rabbit Technologies Ltd.
+//
+//   All Rights Reserved.
+//
+//   Contributor(s): ______________________________________.
+//
+
+package com.rabbitmq.client.test.functional;
+
+import java.io.IOException;
+
+import com.rabbitmq.client.AMQP;
+import com.rabbitmq.client.ShutdownSignalException;
+import com.rabbitmq.client.test.BrokerTestCase;
+
+/* Declare an exchange, bind a queue to it, then try to delete it,
+ * setting if-unused to true.  This should throw an exception. */
+public class ExchangeDeleteIfUnused extends BrokerTestCase {
+    private final static String EXCHANGE_NAME = "xchg1";
+    private final static String ROUTING_KEY = "something";
+
+    protected void createResources()
+        throws IOException
+    {
+        super.createResources();
+        channel.exchangeDeclare(EXCHANGE_NAME, "direct");
+        String queueName = channel.queueDeclare().getQueue();
+        channel.queueBind(queueName, EXCHANGE_NAME, ROUTING_KEY);
+    }
+
+    protected void releaseResources()
+        throws IOException
+    {
+        channel.exchangeDelete(EXCHANGE_NAME);
+        super.releaseResources();
+    }
+
+    /* Attempt to Exchange.Delete(ifUnused = true) a used exchange.
+     * Should throw an exception. */
+    public void testExchangeDelete() {
+        try {
+            channel.exchangeDelete(EXCHANGE_NAME, true);
+            fail("Exception expected if exchange in use");
+        } catch (IOException e) {
+            checkShutdownSignal(AMQP.PRECONDITION_FAILED, e);
+        }
+    }
+}

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

@@ -50,6 +50,7 @@ public static TestSuite suite() {
         suite.addTestSuite(DurableOnTransient.class);
         suite.addTestSuite(NoRequeueOnCancel.class);
         suite.addTestSuite(Bug20004Test.class);
+        suite.addTestSuite(ExchangeDeleteIfUnused.class);
         suite.addTestSuite(QosTests.class);
         suite.addTestSuite(AlternateExchange.class);
         suite.addTestSuite(ExchangeDeclare.class);

test/src/com/rabbitmq/client/test/server/ExclusiveQueueDurability.java

@@ -35,12 +35,18 @@
 import java.util.HashMap;
 
 import com.rabbitmq.client.Channel;
+import com.rabbitmq.client.Connection;
+import com.rabbitmq.client.ConnectionFactory;
+import com.rabbitmq.client.test.BrokerTestCase;
+import com.rabbitmq.tools.Host;
 
 /**
  * This tests whether exclusive, durable queues are deleted when appropriate
  * (following the scenarios given in bug 20578).
  */
-public class ExclusiveQueueDurability extends RestartBase {
+public class ExclusiveQueueDurability extends BrokerTestCase {
+    private Channel secondaryChannel;
+    private Connection secondaryConnection;
 
 	HashMap<String, Object> noArgs = new HashMap<String, Object>();
 
@@ -54,12 +60,47 @@ void verifyQueueMissing(Channel channel, String queueName)
         }
     }
 
+    @Override
+    protected void createResources() throws IOException {
+        super.createResources();
+        openChannel();
+
+    }
+
+    // TODO extract some commonality between this and DurableBindingLifecycle
+    public void openChannel()
+        throws IOException
+    {
+        ConnectionFactory cf2 = connectionFactory.clone();
+        cf2.setHost("localhost");
+        cf2.setPort(5673);
+        secondaryConnection = cf2.newConnection();
+        secondaryChannel = secondaryConnection.createChannel();
+    }
+
+    @Override
+    protected void releaseResources() throws IOException {
+        secondaryChannel.abort();
+        secondaryChannel = null;
+        secondaryConnection.abort();
+        secondaryConnection = null;
+        super.releaseResources();
+    }
+
     // 1) connection and queue are on same node, node restarts -> queue
     // should no longer exist
     public void testConnectionQueueSameNode() throws Exception {
-        channel.queueDeclare("scenario1", true, true, false, noArgs);
+        secondaryChannel.queueDeclare("scenario1", true, true, false, noArgs);
         restartAbruptly();
-        verifyQueueMissing(channel, "scenario1");
+        verifyQueueMissing(secondaryChannel, "scenario1");
+    }
+
+    protected void restartAbruptly() throws IOException {
+        secondaryConnection.abort();
+        secondaryConnection = null;
+        secondaryChannel = null;
+        Host.executeCommand("cd ../rabbitmq-test; make restart-secondary-node");
+        openChannel();
     }
 
     /*

test/src/com/rabbitmq/client/test/server/RestartBase.java

@@ -35,27 +35,10 @@
 
 import java.io.IOException;
 
-import com.rabbitmq.client.GetResponse;
-import com.rabbitmq.client.MessageProperties;
 import com.rabbitmq.tools.Host;
 
 public class RestartBase extends BrokerTestCase
 {
-
-    // The time in ms the RabbitMQ persister waits before flushing the
-    // persister log
-    //
-    // This matches the value of LOG_BUNDLE_DELAY in
-    // rabbit_persister.erl
-    protected static final int PERSISTER_DELAY = 5;
-
-    // The number of entries that the RabbitMQ persister needs to
-    // write before it takes a snapshot.
-    //
-    // This matches the value of MAX_WRAP_ENTRIES in
-    // rabbit_persister.erl
-    protected final int PERSISTER_SNAPSHOT_THRESHOLD = 500;
-
     protected void restart()
         throws IOException
     {
@@ -64,19 +47,9 @@ protected void restart()
         setUp();
     }
 
-  protected void restartAbruptly()
-        throws IOException
-    {
-        Host.executeCommand("cd ../rabbitmq-test; make restart-node");
-        // we do this so that setUp will reconnect
-        connection = null;
-        setUp();
-    }
-
     protected void forceSnapshot()
         throws IOException, InterruptedException
     {
         Host.executeCommand("cd ../rabbitmq-test; make force-snapshot");
     }
-
 }