optimize: fix 2.3.0 ut (#7079)

apache · Dec 26, 2024 · e19854c · e19854c
1 parent 07dbc4e
commit e19854c
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 17 deletions.
diff --git a/compatible/src/test/java/io/seata/rm/tcc/interceptor/ProxyUtilsTccTest.java b/compatible/src/test/java/io/seata/rm/tcc/interceptor/ProxyUtilsTccTest.java
@@ -16,11 +16,6 @@
  */
 package io.seata.rm.tcc.interceptor;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicReference;
-
 import io.seata.core.context.RootContext;
 import io.seata.rm.tcc.NormalTccActionImpl;
 import io.seata.rm.tcc.TccParam;
@@ -32,15 +27,26 @@
 import org.apache.seata.core.model.ResourceManager;
 import org.apache.seata.integration.tx.api.util.ProxyUtil;
 import org.apache.seata.rm.DefaultResourceManager;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
+
 public class ProxyUtilsTccTest {
 
     private final String DEFAULT_XID = "default_xid";
 
     private final AtomicReference<String> branchReference = new AtomicReference<String>();
 
+    @BeforeEach
+    public void before() {
+        RootContext.bind(DEFAULT_XID);
+    }
 
     private final ResourceManager resourceManager = new ResourceManager() {
 
@@ -103,9 +109,6 @@ public GlobalStatus getGlobalStatus(BranchType branchType, String xid) {
 
     @Test
     public void testTcc() {
-        //given
-        RootContext.bind(DEFAULT_XID);
-
         TccParam tccParam = new TccParam(1, "abc@163.com");
         List<String> listB = Collections.singletonList("b");
 
@@ -121,9 +124,6 @@ public void testTcc() {
 
     @Test
     public void testTccThrowRawException() {
-        //given
-        RootContext.bind(DEFAULT_XID);
-
         TccParam tccParam = new TccParam(1, "abc@163.com");
         List<String> listB = Collections.singletonList("b");
 
@@ -139,5 +139,10 @@ public void testTccImplementOtherMethod(){
         Assertions.assertTrue(tccActionProxy.otherMethod());
     }
 
+    @AfterEach
+    public void clear() {
+        RootContext.unbind();
+    }
+
 
 }
diff --git a/core/src/test/java/org/apache/seata/core/context/RootContextTest.java b/core/src/test/java/org/apache/seata/core/context/RootContextTest.java
@@ -57,6 +57,7 @@ public void testGetXID() {
         assertThat(RootContext.getXID()).isEqualTo(DEFAULT_XID);
         assertThat(RootContext.unbind()).isEqualTo(DEFAULT_XID);
         assertThat(RootContext.getXID()).isNull();
+        RootContext.unbind();
     }
 
     /**

diff --git a/...apache/seata/integration/tx/api/interceptor/parser/ProxyUtilsGlobalTransactionalTest.java b/...apache/seata/integration/tx/api/interceptor/parser/ProxyUtilsGlobalTransactionalTest.java
@@ -16,16 +16,14 @@
  */
 package org.apache.seata.integration.tx.api.interceptor.parser;
 
-import org.apache.seata.integration.tx.api.util.ProxyUtil;
 import org.apache.seata.core.exception.TransactionException;
 import org.apache.seata.core.model.GlobalStatus;
 import org.apache.seata.core.model.TransactionManager;
+import org.apache.seata.integration.tx.api.util.ProxyUtil;
 import org.apache.seata.tm.TransactionManagerHolder;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import java.util.concurrent.atomic.AtomicReference;
-
 
 public class ProxyUtilsGlobalTransactionalTest {
 
@@ -37,8 +35,6 @@ public void testTcc() {
         //given
         BusinessImpl business = new BusinessImpl();
 
-        AtomicReference<String> branchReference = new AtomicReference<String>();
-
         Business businessProxy = ProxyUtil.createProxy(business);
 
         TransactionManager mockTransactionManager = new TransactionManager() {

diff --git a/test/src/test/java/org/apache/seata/saga/engine/db/StateMachineDBTests.java b/test/src/test/java/org/apache/seata/saga/engine/db/StateMachineDBTests.java
@@ -49,7 +49,6 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;