This is an automated email from the ASF dual-hosted git repository.
jianbin pushed a commit to branch 0407
in repository https://gitbox.apache.org/repos/asf/incubator-seata.git
commit 04d344cefdb25fbf01f81040f44cd3130e4ed18b
Author: jianbin <jian...@apache.org>
AuthorDate: Fri Apr 12 16:19:23 2024 +0800
test: support Redis integration testing
---
.../seata/discovery/registry/redis/RedisRegisterServiceImplTest.java | 5 +++--
.../org/apache/seata/server/lock/redis/RedisLockManagerTest.java | 4 ++--
.../org/apache/seata/server/lock/redis/RedisLuaLockManagerTest.java | 4 ++--
.../seata/server/session/redis/RedisDistributedLockerTest.java | 4 ++--
.../server/session/redis/RedisLuaTransactionStoreManagerTest.java | 4 ++--
.../org/apache/seata/server/session/redis/RedisQueryConsolTest.java | 4 ++--
.../apache/seata/server/session/redis/RedisSessionManagerTest.java | 4 ++--
.../seata/server/session/redis/RedisTransactionStoreManagerTest.java | 4 ++--
8 files changed, 17 insertions(+), 16 deletions(-)
diff --git
a/discovery/seata-discovery-redis/src/test/java/org/apache/seata/discovery/registry/redis/RedisRegisterServiceImplTest.java
b/discovery/seata-discovery-redis/src/test/java/org/apache/seata/discovery/registry/redis/RedisRegisterServiceImplTest.java
index ddcdc90b24..36079b12e8 100644
---
a/discovery/seata-discovery-redis/src/test/java/org/apache/seata/discovery/registry/redis/RedisRegisterServiceImplTest.java
+++
b/discovery/seata-discovery-redis/src/test/java/org/apache/seata/discovery/registry/redis/RedisRegisterServiceImplTest.java
@@ -20,7 +20,8 @@ import org.apache.seata.common.util.NetUtil;
import org.apache.seata.config.Configuration;
import org.apache.seata.config.ConfigurationFactory;
import org.junit.jupiter.api.*;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
import org.mockito.MockedStatic;
import org.mockito.internal.util.collections.Sets;
@@ -38,7 +39,7 @@ import static org.mockito.Mockito.mockStatic;
import static org.mockito.Mockito.when;
-@DisabledIfSystemProperty(named = "redisCaseEnabled", matches = "true")
+@EnabledIfSystemProperty(named = "redisCaseEnabled", matches = "true")
public class RedisRegisterServiceImplTest {
private static RedisRegistryServiceImpl redisRegistryService;
diff --git
a/server/src/test/java/org/apache/seata/server/lock/redis/RedisLockManagerTest.java
b/server/src/test/java/org/apache/seata/server/lock/redis/RedisLockManagerTest.java
index 31a638422c..f4924e405d 100644
---
a/server/src/test/java/org/apache/seata/server/lock/redis/RedisLockManagerTest.java
+++
b/server/src/test/java/org/apache/seata/server/lock/redis/RedisLockManagerTest.java
@@ -30,7 +30,7 @@ import org.apache.seata.server.storage.redis.lock.RedisLocker;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.ApplicationContext;
import redis.clients.jedis.Jedis;
@@ -40,7 +40,7 @@ import redis.clients.jedis.JedisPoolConfig;
/**
*/
@SpringBootTest
-@DisabledIfSystemProperty(named = "redisCaseEnabled", matches = "true")
+@EnabledIfSystemProperty(named = "redisCaseEnabled", matches = "true")
public class RedisLockManagerTest {
static LockManager lockManager = null;
diff --git
a/server/src/test/java/org/apache/seata/server/lock/redis/RedisLuaLockManagerTest.java
b/server/src/test/java/org/apache/seata/server/lock/redis/RedisLuaLockManagerTest.java
index dbecd42291..4effb309e4 100644
---
a/server/src/test/java/org/apache/seata/server/lock/redis/RedisLuaLockManagerTest.java
+++
b/server/src/test/java/org/apache/seata/server/lock/redis/RedisLuaLockManagerTest.java
@@ -25,7 +25,7 @@ import
org.apache.seata.server.storage.redis.lock.RedisLockManager;
import org.apache.seata.server.storage.redis.lock.RedisLuaLocker;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.ApplicationContext;
@@ -34,7 +34,7 @@ import org.springframework.context.ApplicationContext;
*
*/
@SpringBootTest
-@DisabledIfSystemProperty(named = "redisCaseEnabled", matches = "true")
+@EnabledIfSystemProperty(named = "redisCaseEnabled", matches = "true")
public class RedisLuaLockManagerTest extends RedisLockManagerTest {
/**
diff --git
a/server/src/test/java/org/apache/seata/server/session/redis/RedisDistributedLockerTest.java
b/server/src/test/java/org/apache/seata/server/session/redis/RedisDistributedLockerTest.java
index acf0e17464..e1e1fc199c 100644
---
a/server/src/test/java/org/apache/seata/server/session/redis/RedisDistributedLockerTest.java
+++
b/server/src/test/java/org/apache/seata/server/session/redis/RedisDistributedLockerTest.java
@@ -24,7 +24,7 @@ import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.ApplicationContext;
import redis.clients.jedis.Jedis;
@@ -41,7 +41,7 @@ import static
org.apache.seata.server.store.StoreConfig.StoreMode;
*
*/
@SpringBootTest
-@DisabledIfSystemProperty(named = "redisCaseEnabled", matches = "true")
+@EnabledIfSystemProperty(named = "redisCaseEnabled", matches = "false")
public class RedisDistributedLockerTest {
private String retryRollbacking = "RetryRollbacking";
diff --git
a/server/src/test/java/org/apache/seata/server/session/redis/RedisLuaTransactionStoreManagerTest.java
b/server/src/test/java/org/apache/seata/server/session/redis/RedisLuaTransactionStoreManagerTest.java
index 8b4d970008..b52d23528c 100644
---
a/server/src/test/java/org/apache/seata/server/session/redis/RedisLuaTransactionStoreManagerTest.java
+++
b/server/src/test/java/org/apache/seata/server/session/redis/RedisLuaTransactionStoreManagerTest.java
@@ -23,7 +23,7 @@ import
org.apache.seata.server.storage.redis.session.RedisSessionManager;
import
org.apache.seata.server.storage.redis.store.RedisLuaTransactionStoreManager;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.ApplicationContext;
@@ -32,7 +32,7 @@ import org.springframework.context.ApplicationContext;
*
*/
@SpringBootTest
-@DisabledIfSystemProperty(named = "redisCaseEnabled", matches = "true")
+@EnabledIfSystemProperty(named = "redisCaseEnabled", matches = "true")
public class RedisLuaTransactionStoreManagerTest extends
RedisTransactionStoreManagerTest {
/**
diff --git
a/server/src/test/java/org/apache/seata/server/session/redis/RedisQueryConsolTest.java
b/server/src/test/java/org/apache/seata/server/session/redis/RedisQueryConsolTest.java
index 09088faed9..86de42afe0 100644
---
a/server/src/test/java/org/apache/seata/server/session/redis/RedisQueryConsolTest.java
+++
b/server/src/test/java/org/apache/seata/server/session/redis/RedisQueryConsolTest.java
@@ -27,13 +27,13 @@ import
org.apache.seata.server.console.service.GlobalSessionService;
import org.apache.seata.server.console.vo.GlobalLockVO;
import org.apache.seata.server.console.vo.GlobalSessionVO;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
import org.springframework.boot.test.context.SpringBootTest;
/**
*/
@SpringBootTest
-@DisabledIfSystemProperty(named = "redisCaseEnabled", matches = "true")
+@EnabledIfSystemProperty(named = "redisCaseEnabled", matches = "true")
public class RedisQueryConsolTest {
/**
diff --git
a/server/src/test/java/org/apache/seata/server/session/redis/RedisSessionManagerTest.java
b/server/src/test/java/org/apache/seata/server/session/redis/RedisSessionManagerTest.java
index b83855f949..7a75f60a77 100644
---
a/server/src/test/java/org/apache/seata/server/session/redis/RedisSessionManagerTest.java
+++
b/server/src/test/java/org/apache/seata/server/session/redis/RedisSessionManagerTest.java
@@ -37,7 +37,7 @@ import
org.apache.seata.server.storage.redis.store.RedisTransactionStoreManager;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.test.context.SpringBootTest;
@@ -49,7 +49,7 @@ import static
org.apache.seata.common.DefaultValues.DEFAULT_TX_GROUP;
/**
*/
@SpringBootTest
-@DisabledIfSystemProperty(named = "redisCaseEnabled", matches = "true")
+@EnabledIfSystemProperty(named = "redisCaseEnabled", matches = "true")
public class RedisSessionManagerTest {
private static final Logger LOGGER =
LoggerFactory.getLogger(RedisSessionManagerTest.class);
diff --git
a/server/src/test/java/org/apache/seata/server/session/redis/RedisTransactionStoreManagerTest.java
b/server/src/test/java/org/apache/seata/server/session/redis/RedisTransactionStoreManagerTest.java
index 802854526a..25755fe1cf 100644
---
a/server/src/test/java/org/apache/seata/server/session/redis/RedisTransactionStoreManagerTest.java
+++
b/server/src/test/java/org/apache/seata/server/session/redis/RedisTransactionStoreManagerTest.java
@@ -41,7 +41,7 @@ import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.test.context.SpringBootTest;
@@ -52,7 +52,7 @@ import static
org.apache.seata.server.storage.SessionConverter.convertToGlobalSe
/**
*/
@SpringBootTest
-@DisabledIfSystemProperty(named = "redisCaseEnabled", matches = "true")
+@EnabledIfSystemProperty(named = "redisCaseEnabled", matches = "true")
public class RedisTransactionStoreManagerTest {
private static final Logger LOGGER =
LoggerFactory.getLogger(RedisTransactionStoreManagerTest.class);
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@seata.apache.org
For additional commands, e-mail: notifications-h...@seata.apache.org
