optimize: adjust GlobalLockTemplateTest (apache#3345)

funky-eyes · Dec 8, 2020 · 3e50fe5 · 3e50fe5
1 parent e84feea
commit 3e50fe5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git 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 @@
  */
 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
@@ -20,6 +20,7 @@
 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 @@ void testLockConfigListener() {
         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();
+    }
 }