From 1ad1c33d9574b8e606f3507bf0f4b76eb6c0def2 Mon Sep 17 00:00:00 2001
From: Nikita Koksharov <nkoksharov@redisson.pro>
Date: Mon, 11 Mar 2024 09:41:17 +0300
Subject: [PATCH] refactoring

---
 .../java/org/redisson/RedisDockerTest.java    |  2 +-
 .../RedissonBoundedBlockingQueueTest.java     | 21 ++++++-------------
 .../RedissonPriorityBlockingQueueTest.java    | 10 ++++-----
 3 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/redisson/src/test/java/org/redisson/RedisDockerTest.java b/redisson/src/test/java/org/redisson/RedisDockerTest.java
index 6e277bab8..1ee532de1 100644
--- a/redisson/src/test/java/org/redisson/RedisDockerTest.java
+++ b/redisson/src/test/java/org/redisson/RedisDockerTest.java
@@ -523,7 +523,7 @@ public class RedisDockerTest {
     }
 
     protected void restart(GenericContainer<?> redis) {
-        redis.setPortBindings(Arrays.asList(redis.getFirstMappedPort() + ":6379"));
+        redis.setPortBindings(Arrays.asList(redis.getFirstMappedPort() + ":" + redis.getExposedPorts().get(0)));
         redis.stop();
         redis.start();
     }
diff --git a/redisson/src/test/java/org/redisson/RedissonBoundedBlockingQueueTest.java b/redisson/src/test/java/org/redisson/RedissonBoundedBlockingQueueTest.java
index 3a3fd54b4..2c201355f 100644
--- a/redisson/src/test/java/org/redisson/RedissonBoundedBlockingQueueTest.java
+++ b/redisson/src/test/java/org/redisson/RedissonBoundedBlockingQueueTest.java
@@ -297,9 +297,7 @@ public class RedissonBoundedBlockingQueueTest extends RedisDockerTest {
         t.start();
         t.join(1000);
 
-        redis.setPortBindings(Arrays.asList(redis.getFirstMappedPort() + ":6379"));
-        redis.stop();
-        redis.start();
+        restart(redis);
 
         Thread.sleep(1000);
 
@@ -331,9 +329,7 @@ public class RedissonBoundedBlockingQueueTest extends RedisDockerTest {
             // skip
         }
 
-        redis.setPortBindings(Arrays.asList(redis.getFirstMappedPort() + ":6379"));
-        redis.stop();
-        redis.start();
+        restart(redis);
 
         assertThat(queue1.trySetCapacity(15)).isTrue();
         queue1.put(123);
@@ -359,8 +355,7 @@ public class RedissonBoundedBlockingQueueTest extends RedisDockerTest {
 
         Config config = createConfig(redis);
         RedissonClient redisson = Redisson.create(config);
-        redisson.getKeys().flushall();
-        
+
         RBoundedBlockingQueue<Integer> queue1 = redisson.getBoundedBlockingQueue("testTakeReattach");
         assertThat(queue1.trySetCapacity(15)).isTrue();
         RFuture<Integer> f = queue1.takeAsync();
@@ -370,9 +365,7 @@ public class RedissonBoundedBlockingQueueTest extends RedisDockerTest {
             // skip
         }
 
-        redis.setPortBindings(Arrays.asList(redis.getFirstMappedPort() + ":6379"));
-        redis.stop();
-        redis.start();
+        restart(redis);
 
         assertThat(queue1.trySetCapacity(15)).isTrue();
         queue1.put(123);
@@ -396,8 +389,7 @@ public class RedissonBoundedBlockingQueueTest extends RedisDockerTest {
         config.useSingleServer().setConnectionMinimumIdleSize(1).setConnectionPoolSize(1);
 
         RedissonClient redisson = Redisson.create(config);
-        redisson.getKeys().flushall();
-        
+
         RBoundedBlockingQueue<Integer> queue1 = redisson.getBoundedBlockingQueue("testTakeAsyncCancel");
         assertThat(queue1.trySetCapacity(15)).isTrue();
         for (int i = 0; i < 10; i++) {
@@ -417,8 +409,7 @@ public class RedissonBoundedBlockingQueueTest extends RedisDockerTest {
         config.useSingleServer().setConnectionMinimumIdleSize(1).setConnectionPoolSize(1);
 
         RedissonClient redisson = Redisson.create(config);
-        redisson.getKeys().flushall();
-        
+
         RBoundedBlockingQueue<Integer> queue1 = redisson.getBoundedBlockingQueue("queue:pollany");
         assertThat(queue1.trySetCapacity(15)).isTrue();
         for (int i = 0; i < 10; i++) {
diff --git a/redisson/src/test/java/org/redisson/RedissonPriorityBlockingQueueTest.java b/redisson/src/test/java/org/redisson/RedissonPriorityBlockingQueueTest.java
index c26875866..ec78030b5 100644
--- a/redisson/src/test/java/org/redisson/RedissonPriorityBlockingQueueTest.java
+++ b/redisson/src/test/java/org/redisson/RedissonPriorityBlockingQueueTest.java
@@ -48,10 +48,9 @@ public class RedissonPriorityBlockingQueueTest extends RedissonBlockingQueueTest
         } catch (ExecutionException | TimeoutException e) {
             // skip
         }
-        redis.setPortBindings(Arrays.asList(redis.getFirstMappedPort() + ":6379"));
-        redis.stop();
 
-        redis.start();
+        restart(redis);
+
         queue1.put(123);
         
         // check connection rotation
@@ -82,10 +81,9 @@ public class RedissonPriorityBlockingQueueTest extends RedissonBlockingQueueTest
         } catch (ExecutionException | TimeoutException e) {
             // skip
         }
-        redis.setPortBindings(Arrays.asList(redis.getFirstMappedPort() + ":6379"));
-        redis.stop();
 
-        redis.start();
+        restart(redis);
+
         queue1.put(123);
         
         // check connection rotation