This is an automated email from the ASF dual-hosted git repository.
yixia pushed a commit to branch 2.3.0
in repository https://gitbox.apache.org/repos/asf/incubator-seata.git
The following commit(s) were added to refs/heads/2.3.0 by this push:
new e19854c777 optimize: fix 2.3.0 ut (#7079)
e19854c777 is described below
commit e19854c777086acbb79562bc44eb17b8a6c1e05f
Author: wt_better <yixia...@alibaba-inc.com>
AuthorDate: Thu Dec 26 21:02:02 2024 +0800
optimize: fix 2.3.0 ut (#7079)
---
.../rm/tcc/interceptor/ProxyUtilsTccTest.java | 27 +++++++++++++---------
.../apache/seata/core/context/RootContextTest.java | 1 +
.../parser/ProxyUtilsGlobalTransactionalTest.java | 6 +----
.../seata/saga/engine/db/StateMachineDBTests.java | 1 -
4 files changed, 18 insertions(+), 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
index 7802ba291e..e886e4bf61 100644
---
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.Resource;
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 class ProxyUtilsTccTest {
@Test
public void testTcc() {
- //given
- RootContext.bind(DEFAULT_XID);
-
TccParam tccParam = new TccParam(1, "a...@163.com");
List<String> listB = Collections.singletonList("b");
@@ -121,9 +124,6 @@ public class ProxyUtilsTccTest {
@Test
public void testTccThrowRawException() {
- //given
- RootContext.bind(DEFAULT_XID);
-
TccParam tccParam = new TccParam(1, "a...@163.com");
List<String> listB = Collections.singletonList("b");
@@ -139,5 +139,10 @@ public class ProxyUtilsTccTest {
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
index 1bc660e60c..6220703ea3 100644
--- 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 class RootContextTest {
assertThat(RootContext.getXID()).isEqualTo(DEFAULT_XID);
assertThat(RootContext.unbind()).isEqualTo(DEFAULT_XID);
assertThat(RootContext.getXID()).isNull();
+ RootContext.unbind();
}
/**
diff --git
a/integration-tx-api/src/test/java/org/apache/seata/integration/tx/api/interceptor/parser/ProxyUtilsGlobalTransactionalTest.java
b/integration-tx-api/src/test/java/org/apache/seata/integration/tx/api/interceptor/parser/ProxyUtilsGlobalTransactionalTest.java
index 933ceb6bfe..4d5c42dba9 100644
---
a/integration-tx-api/src/test/java/org/apache/seata/integration/tx/api/interceptor/parser/ProxyUtilsGlobalTransactionalTest.java
+++
b/integration-tx-api/src/test/java/org/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 class ProxyUtilsGlobalTransactionalTest {
//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
index 9a30a3ada5..8b65411f34 100644
---
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.AfterAll;
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;
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@seata.apache.org
For additional commands, e-mail: notifications-h...@seata.apache.org
