diff --git a/rm-datasource/src/test/java/io/seata/rm/GlobalLockTemplateTest.java b/rm-datasource/src/test/java/io/seata/rm/GlobalLockTemplateTest.java index c9c4717697f5057843e94c4af8be278bb443f5ef..39ca4249af312a48a260d0f0f1c3acfcc8730918 100644 --- a/rm-datasource/src/test/java/io/seata/rm/GlobalLockTemplateTest.java +++ b/rm-datasource/src/test/java/io/seata/rm/GlobalLockTemplateTest.java @@ -29,17 +29,16 @@ import static org.junit.jupiter.api.Assertions.*; */ public class GlobalLockTemplateTest { - private GlobalLockTemplate template = new GlobalLockTemplate(); + private final GlobalLockTemplate template = new GlobalLockTemplate(); - private GlobalLockConfig config1 = generateGlobalLockConfig(); + private final GlobalLockConfig config1 = generateGlobalLockConfig(); - private GlobalLockConfig config2 = generateGlobalLockConfig(); + private final GlobalLockConfig config2 = generateGlobalLockConfig(); @BeforeEach void setUp() { - assertFalse(RootContext.requireGlobalLock(), "initial global lock flag should be false"); - assertNull(GlobalLockConfigHolder.getCurrentGlobalLockConfig(), - "initial global lock config should be null"); + RootContext.unbindGlobalLockFlag(); + GlobalLockConfigHolder.remove(); } @Test diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/exec/LockRetryControllerTest.java b/rm-datasource/src/test/java/io/seata/rm/datasource/exec/LockRetryControllerTest.java index f707c7aeb1a9be9b43295838a3fc3e8207507b8b..e4bd041c2b64327380b23b6970f34ffebe3d8ffe 100644 --- a/rm-datasource/src/test/java/io/seata/rm/datasource/exec/LockRetryControllerTest.java +++ b/rm-datasource/src/test/java/io/seata/rm/datasource/exec/LockRetryControllerTest.java @@ -20,6 +20,7 @@ import io.seata.config.ConfigurationChangeEvent; import io.seata.core.constants.ConfigurationKeys; import io.seata.core.context.GlobalLockConfigHolder; import io.seata.core.model.GlobalLockConfig; +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -103,4 +104,9 @@ public class LockRetryControllerTest { String message4 = "should fallback to default value when receive an illegal config value of CLIENT_LOCK_RETRY_TIMES"; assertEquals(defaultRetryTimes, config.getGlobalLockRetryTimes(), message4); } + + @AfterEach + void tearDown() { + GlobalLockConfigHolder.remove(); + } } \ No newline at end of file