RabbitMQ main disables non-exclusive non-durable queues by default

so adapt the tests.

Author: michaelklishin

src/test/java/com/rabbitmq/client/AbstractJsonRpcTest.java

@@ -41,7 +41,8 @@ public void init() throws Exception {
         clientChannel = clientConnection.createChannel();
         serverConnection = TestUtils.connectionFactory().newConnection();
         serverChannel = serverConnection.createChannel();
-        serverChannel.queueDeclare(queue, false, false, false, null);
+        serverChannel.queueDelete(queue);
+        serverChannel.queueDeclare(queue, true, false, false, null);
         server = new JsonRpcServer(serverChannel, queue, RpcService.class, new DefaultRpcservice(), createMapper());
         new Thread(() -> {
             try {

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

@@ -257,12 +257,14 @@ protected void declareDurableQueue(String q) throws IOException {
         channel.queueDeclare(q, true, false, false, null);
     }
 
-    protected void declareTransientQueue(String q) throws IOException {
-        channel.queueDeclare(q, false, false, false, null);
+    protected void deleteAndDeclareQueue(String q) throws IOException {
+        channel.queueDelete(q);
+        channel.queueDeclare(q, true, false, false, null);
     }
 
-    protected void declareTransientQueue(String q, Map<String, Object> args) throws IOException {
-        channel.queueDeclare(q, false, false, false, args);
+    protected void deleteAndDeclareQueue(String q, Map<String, Object> args) throws IOException {
+        channel.queueDelete(q);
+        channel.queueDeclare(q, true, false, false, args);
     }
 
     protected void declareDurableTopicExchange(String x) throws IOException {

src/test/java/com/rabbitmq/client/test/Bug20004Test.java

@@ -50,7 +50,8 @@ public void bug20004() throws InterruptedException {
             () -> {
               try {
                 synchronized (channel) {
-                  channel.queueDeclare("Bug20004Test", false, false, false, null);
+                  channel.queueDelete("Bug20004Test");
+                  channel.queueDeclare("Bug20004Test", true, false, false, null);
                   testInstance.created = true;
                 }
               } catch (Exception e) {

src/test/java/com/rabbitmq/client/test/CloseInMainLoop.java

@@ -110,7 +110,8 @@ public void closeWithFaultyConsumer() throws Exception {
     SpecialConnection connection = new SpecialConnection();
     Channel channel = connection.createChannel();
     channel.exchangeDeclare(x, "direct");
-    channel.queueDeclare(q, false, false, false, null);
+    channel.queueDelete(q);
+    channel.queueDeclare(q, true, false, false, null);
     channel.queueBind(q, x, "k");
 
     channel.basicConsume(
@@ -128,5 +129,10 @@ public void handleDelivery(
 
     assertTrue(closeLatch.await(1000, TimeUnit.MILLISECONDS));
     assertTrue(connection.hadValidShutdown());
+
+    Channel cleanupCh = this.connection.createChannel();
+    cleanupCh.queueDelete(q);
+    cleanupCh.exchangeDelete(x);
+    cleanupCh.close();
   }
 }

src/test/java/com/rabbitmq/client/test/MaxInboundMessageSizeTest.java

@@ -45,7 +45,7 @@ private static void safeClose(Connection c) {
   @Override
   protected void createResources() throws IOException, TimeoutException {
     q = generateQueueName();
-    declareTransientQueue(q);
+    deleteAndDeclareQueue(q);
     super.createResources();
   }
 

src/test/java/com/rabbitmq/client/test/MultiThreadedChannel.java

@@ -15,6 +15,7 @@
 
 package com.rabbitmq.client.test;
 
+import java.io.IOException;
 import java.util.concurrent.atomic.AtomicReference;
 
 import org.junit.jupiter.api.Test;
@@ -28,15 +29,22 @@ public class MultiThreadedChannel extends BrokerTestCase {
 
     private static final String DUMMY_EXCHANGE_NAME = "dummy.exchange";
 
+    @Override
+    protected void releaseResources() throws IOException {
+        channel.queueDelete(DUMMY_QUEUE_NAME);
+        channel.exchangeDelete(DUMMY_EXCHANGE_NAME);
+    }
+
     @Test public void interleavedRpcs() throws Throwable {
+        channel.queueDelete(DUMMY_QUEUE_NAME);
 
         final AtomicReference<Throwable> throwableRef = new AtomicReference<Throwable>(null);
 
         Thread queueDeclare = new Thread(new Runnable() {
             public void run() {
                 try {
                     for (int x = 0; x < 100; x++) {
-                        channel.queueDeclare(DUMMY_QUEUE_NAME, false, false, true, null);
+                        channel.queueDeclare(DUMMY_QUEUE_NAME, true, false, true, null);
                     }
                 } catch (Throwable e) {
                     throwableRef.set(e);

src/test/java/com/rabbitmq/client/test/NoAutoRecoveryWhenTcpWindowIsFullTest.java

@@ -78,6 +78,7 @@ public class NoAutoRecoveryWhenTcpWindowIsFullTest {
     private AutorecoveringChannel consumingChannel;
 
     private CountDownLatch consumerOkLatch;
+    private String testQueue;
 
     @BeforeEach
     public void setUp() throws Exception {
@@ -115,16 +116,22 @@ public void configure(Socket socket) throws IOException {
     }
 
     @AfterEach
-    public void tearDown() throws IOException {
+    public void tearDown() throws Exception {
         closeConnectionIfOpen(consumingConnection);
         closeConnectionIfOpen(producingConnection);
-
+        if (testQueue != null) {
+            ConnectionFactory cf = TestUtils.connectionFactory();
+            try (Connection c = cf.newConnection(); Channel ch = c.createChannel()) {
+                ch.queueDelete(testQueue);
+            }
+        }
         executorService.shutdownNow();
     }
 
     @Test
     public void failureAndRecovery() throws IOException, InterruptedException {
         final String queue = UUID.randomUUID().toString();
+        this.testQueue = queue;
 
         final CountDownLatch recoveryLatch = new CountDownLatch(1);
 
@@ -161,7 +168,8 @@ private void closeConnectionIfOpen(Connection connection) throws IOException {
 
     private void declareQueue(final Channel channel, final String queue) throws IOException {
         final Map<String, Object> queueArguments = new HashMap<String, Object>();
-        channel.queueDeclare(queue, false, false, false, queueArguments);
+        channel.queueDelete(queue);
+        channel.queueDeclare(queue, true, false, false, queueArguments);
     }
 
     private void produceMessagesInBackground(final Channel channel, final String queue) throws IOException {

src/test/java/com/rabbitmq/client/test/RpcTest.java

@@ -55,7 +55,8 @@ public void init() throws Exception {
         clientChannel = clientConnection.createChannel();
         serverConnection = TestUtils.connectionFactory().newConnection();
         serverChannel = serverConnection.createChannel();
-        serverChannel.queueDeclare(queue, false, false, false, null);
+        serverChannel.queueDelete(queue);
+        serverChannel.queueDeclare(queue, true, false, false, null);
     }
 
     @AfterEach

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

@@ -79,7 +79,8 @@ public void handleReturn(int replyCode,
 
     @Override protected void createResources() throws IOException {
         for (String q : resources) {
-          channel.queueDeclare(q, false, false, false, null);
+          channel.queueDelete(q);
+          channel.queueDeclare(q, true, false, false, null);
         }
     }
 

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

@@ -60,7 +60,8 @@ protected static String randomString() {
 
   protected void createQueueAndBindToExchange(Binding binding, boolean durable) throws IOException {
     channel.exchangeDeclare(binding.x, "direct", durable);
-    channel.queueDeclare(binding.q, durable, false, false, null);
+    channel.queueDelete(binding.q);
+    channel.queueDeclare(binding.q, true, false, false, null);
     channel.queueBind(binding.q, binding.x, binding.k);
   }