Generate resource names for each test method

Author: acogoluegnes

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

@@ -30,6 +30,7 @@
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.GetResponse;
 import com.rabbitmq.client.QueueingConsumer;
+import org.junit.jupiter.api.BeforeEach;
 
 /**
  * This tests whether bindings are created and nuked properly.
@@ -41,12 +42,18 @@
  *
  */
 public class BindingLifecycleBase extends ClusteredTestBase {
-  protected static final String K = "K-" + System.currentTimeMillis();
   protected static final int N = 1;
-  protected static final String Q = "Q-" + System.currentTimeMillis();
-  protected static final String X = "X-" + System.currentTimeMillis();
   protected static final byte[] payload = ("" + System.currentTimeMillis()).getBytes();
 
+  protected String q, x, k;
+
+  @BeforeEach
+  void initNames() {
+    this.q = generateQueueName();
+    this.x = generateExchangeName();
+    this.k = "K-" + System.currentTimeMillis();
+  }
+
   protected static String randomString() {
     return "-" + System.nanoTime();
   }

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

@@ -64,28 +64,28 @@ private void restartPrimary() throws IOException, TimeoutException {
      *   Tests whether durable bindings are correctly recovered.
      */
     @Test public void durableBindingRecovery() throws IOException, TimeoutException {
-        declareDurableTopicExchange(X);
-        declareAndBindDurableQueue(Q, X, K);
+        declareDurableTopicExchange(x);
+        declareAndBindDurableQueue(q, x, k);
 
         restart();
 
         for (int i = 0; i < N; i++) {
-            basicPublishVolatile(X, K);
+            basicPublishVolatile(x, k);
         }
 
         AtomicInteger receivedCount = new AtomicInteger(0);
         waitAtMost(() -> {
             GetResponse r;
-            r = basicGet(Q);
+            r = basicGet(q);
             if (r != null) {
                 assertThat(r.getEnvelope().isRedeliver()).isFalse();
                 receivedCount.incrementAndGet();
             }
             return receivedCount.get() == N;
         });
 
-        deleteQueue(Q);
-        deleteExchange(X);
+        deleteQueue(q);
+        deleteExchange(x);
     }
 
     /**
@@ -106,24 +106,24 @@ private void restartPrimary() throws IOException, TimeoutException {
      * verify that the durable routes have been turfed.
      */
     @Test public void durableBindingsDeletion() throws IOException, TimeoutException {
-        declareDurableTopicExchange(X);
-        declareAndBindDurableQueue(Q, X, K);
+        declareDurableTopicExchange(x);
+        declareAndBindDurableQueue(q, x, k);
 
-        deleteExchange(X);
+        deleteExchange(x);
 
         restart();
 
-        declareDurableTopicExchange(X);
+        declareDurableTopicExchange(x);
 
         for (int i = 0; i < N; i++) {
-            basicPublishVolatile(X, K);
+            basicPublishVolatile(x, k);
         }
 
-        GetResponse response = channel.basicGet(Q, true);
+        GetResponse response = channel.basicGet(q, true);
         assertNull(response, "The initial response SHOULD BE null");
 
-        deleteQueue(Q);
-        deleteExchange(X);
+        deleteQueue(q);
+        deleteExchange(x);
     }
 
 
@@ -135,15 +135,15 @@ private void restartPrimary() throws IOException, TimeoutException {
      * publish a message to it using the queue name as a routing key
      */
     @Test public void defaultBindingRecovery() throws IOException, TimeoutException {
-        declareDurableQueue(Q);
+        declareDurableQueue(q);
 
         restart();
 
-        basicPublishVolatile("", Q);
+        basicPublishVolatile("", q);
 
-        waitAtMost(() -> channel.basicGet(Q, true) != null);
+        waitAtMost(() -> channel.basicGet(q, true) != null);
 
-        deleteQueue(Q);
+        deleteQueue(q);
     }
 
     /**