Merging bug 22862 onto default

Author: Matthew Sackman

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");
     }
-
 }