From 9c3b82966aea47c66f9ef784790b8d7906210fcc Mon Sep 17 00:00:00 2001 From: Nikita Koksharov Date: Thu, 14 Mar 2024 12:05:23 +0300 Subject: [PATCH] refactoring --- redisson/src/test/java/org/redisson/BaseConcurrentTest.java | 4 ++-- redisson/src/test/java/org/redisson/RedisVersion.java | 1 + .../test/java/org/redisson/RedissonRuntimeEnvironment.java | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/redisson/src/test/java/org/redisson/BaseConcurrentTest.java b/redisson/src/test/java/org/redisson/BaseConcurrentTest.java index b432d60c5..0a0dfac53 100644 --- a/redisson/src/test/java/org/redisson/BaseConcurrentTest.java +++ b/redisson/src/test/java/org/redisson/BaseConcurrentTest.java @@ -39,7 +39,7 @@ public abstract class BaseConcurrentTest extends RedisDockerTest { } executor.shutdown(); - Assertions.assertTrue(executor.awaitTermination(RedissonRuntimeEnvironment.isTravis ? 10 : 3, TimeUnit.MINUTES)); + Assertions.assertTrue(executor.awaitTermination(3, TimeUnit.MINUTES)); System.out.println("multi: " + (System.currentTimeMillis() - watch)); @@ -73,7 +73,7 @@ public abstract class BaseConcurrentTest extends RedisDockerTest { } pool.shutdown(); - Assertions.assertTrue(pool.awaitTermination(RedissonRuntimeEnvironment.isTravis ? 20 : 3, TimeUnit.MINUTES)); + Assertions.assertTrue(pool.awaitTermination(3, TimeUnit.MINUTES)); System.out.println(System.currentTimeMillis() - watch); diff --git a/redisson/src/test/java/org/redisson/RedisVersion.java b/redisson/src/test/java/org/redisson/RedisVersion.java index 3b8411798..f1e5cc7e2 100644 --- a/redisson/src/test/java/org/redisson/RedisVersion.java +++ b/redisson/src/test/java/org/redisson/RedisVersion.java @@ -7,6 +7,7 @@ import java.util.regex.Pattern; * * @author Rui Gu (https://github.com/jackygurui) */ +@Deprecated public class RedisVersion implements Comparable{ private final String fullVersion; diff --git a/redisson/src/test/java/org/redisson/RedissonRuntimeEnvironment.java b/redisson/src/test/java/org/redisson/RedissonRuntimeEnvironment.java index 236d37dae..2350a69ea 100644 --- a/redisson/src/test/java/org/redisson/RedissonRuntimeEnvironment.java +++ b/redisson/src/test/java/org/redisson/RedissonRuntimeEnvironment.java @@ -6,6 +6,7 @@ import java.util.Locale; * * @author Rui Gu (https://github.com/jackygurui) */ +@Deprecated public class RedissonRuntimeEnvironment { public static final boolean isTravis = "true".equalsIgnoreCase(System.getProperty("travisEnv"));