diff --git a/server/src/test/java/io/seata/server/coordinator/DefaultCoordinatorMetricsTest.java b/server/src/test/java/io/seata/server/coordinator/DefaultCoordinatorMetricsTest.java
index 0d0c2011e4e..ff50cd500ea 100644
--- a/server/src/test/java/io/seata/server/coordinator/DefaultCoordinatorMetricsTest.java
+++ b/server/src/test/java/io/seata/server/coordinator/DefaultCoordinatorMetricsTest.java
@@ -18,6 +18,7 @@
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -42,9 +43,9 @@
  *
  * @author zhengyangyong
  */
-public class DefaultCoordinatorMetricsTest {
+class DefaultCoordinatorMetricsTest {
     @Test
-    public void test() throws IOException, TransactionException, InterruptedException {
+    void test() throws IOException, TransactionException, InterruptedException {
         SessionHolder.init(null);
         DefaultCoordinator coordinator = new DefaultCoordinator(new MockServerMessageSender());
         coordinator.init();
@@ -72,7 +73,7 @@ public void test() throws IOException, TransactionException, InterruptedExceptio
             coordinator.doGlobalCommit(commitRequest, new GlobalCommitResponse(), new RpcContext());
 
             //we need sleep for a short while because default canBeCommittedAsync() is true
-            Thread.sleep(200);
+            TimeUnit.MILLISECONDS.sleep(200);
 
             measurements.clear();
             MetricsManager.get().getRegistry().measure().forEach(
@@ -105,7 +106,7 @@ public void test() throws IOException, TransactionException, InterruptedExceptio
             rollbackRequest.setXid(response.getXid());
             coordinator.doGlobalRollback(rollbackRequest, new GlobalRollbackResponse(), new RpcContext());
 
-            Thread.sleep(200);
+            TimeUnit.MILLISECONDS.sleep(200);
 
             measurements.clear();
             MetricsManager.get().getRegistry().measure().forEach(
diff --git a/server/src/test/java/io/seata/server/coordinator/DefaultCoordinatorTest.java b/server/src/test/java/io/seata/server/coordinator/DefaultCoordinatorTest.java
index 33344b01616..f7b7a1a7448 100644
--- a/server/src/test/java/io/seata/server/coordinator/DefaultCoordinatorTest.java
+++ b/server/src/test/java/io/seata/server/coordinator/DefaultCoordinatorTest.java
@@ -64,7 +64,7 @@
  *
  * @author leizhiyuan
  */
-public class DefaultCoordinatorTest {
+class DefaultCoordinatorTest {
     private static DefaultCoordinator defaultCoordinator;
 
     private static final String applicationId = "demo-child-app";
@@ -106,7 +106,7 @@ public void tearUp() throws IOException {
     }
 
     @Test
-    public void branchCommit() throws TransactionException {
+    void branchCommit() throws TransactionException {
         BranchStatus result = null;
         String xid = null;
         GlobalSession globalSession = null;
@@ -124,10 +124,12 @@ public void branchCommit() throws TransactionException {
         globalSession.end();
     }
 
+
+
     @Disabled
     @ParameterizedTest
     @MethodSource("xidAndBranchIdProviderForRollback")
-    public void branchRollback(String xid, Long branchId) {
+    void branchRollback(String xid, Long branchId) {
         BranchStatus result = null;
         GlobalSession globalSession = SessionHolder.findGlobalSession(xid);
         try {
@@ -140,14 +142,14 @@ public void branchRollback(String xid, Long branchId) {
 
 
     @Test
-    public void test_handleRetryRollbacking() throws TransactionException, InterruptedException {
+    void test_handleRetryRollbacking() throws TransactionException, InterruptedException {
 
         String xid = core.begin(applicationId, txServiceGroup, txName, 10);
         Long branchId = core.branchRegister(BranchType.AT, "abcd", clientId, xid, applicationData, lockKeys_2);
 
         Assertions.assertNotNull(branchId);
 
-        Thread.sleep(100);
+        TimeUnit.MILLISECONDS.sleep(100);
         defaultCoordinator.timeoutCheck();
         defaultCoordinator.handleRetryRollbacking();
 
@@ -157,7 +159,7 @@ public void test_handleRetryRollbacking() throws TransactionException, Interrupt
     }
 
     @Test
-    public void test_handleRetryRollbackingTimeOut() throws TransactionException, InterruptedException, NoSuchFieldException, IllegalAccessException {
+    void test_handleRetryRollbackingTimeOut() throws TransactionException, InterruptedException, NoSuchFieldException, IllegalAccessException {
         String xid = core.begin(applicationId, txServiceGroup, txName, 10);
         Long branchId = core.branchRegister(BranchType.AT, "abcd", clientId, xid, applicationData, lockKeys_2);
 
@@ -182,7 +184,7 @@ public void test_handleRetryRollbackingTimeOut() throws TransactionException, In
     }
 
     @Test
-    public void test_handleRetryRollbackingTimeOut_unlock() throws TransactionException, InterruptedException,
+    void test_handleRetryRollbackingTimeOut_unlock() throws TransactionException, InterruptedException,
         NoSuchFieldException, IllegalAccessException {
         String xid = core.begin(applicationId, txServiceGroup, txName, 10);
         Long branchId = core.branchRegister(BranchType.AT, "abcd", clientId, xid, applicationData, lockKeys_2);
@@ -201,7 +203,7 @@ public void test_handleRetryRollbackingTimeOut_unlock() throws TransactionExcept
 
         int lockSize = globalSession.getBranchSessions().get(0).getLockHolder().size();
         try {
-            Assertions.assertTrue(lockSize == 0);
+            Assertions.assertEquals(0, lockSize);
         } finally {
             globalSession.closeAndClean();
             ReflectionUtil.modifyStaticFinalField(defaultCoordinator.getClass(), "MAX_ROLLBACK_RETRY_TIMEOUT",
diff --git a/server/src/test/java/io/seata/server/lock/db/DataBaseLockManagerImplTest.java b/server/src/test/java/io/seata/server/lock/db/DataBaseLockManagerImplTest.java
index 031cd1a794d..318e0e4fdd6 100644
--- a/server/src/test/java/io/seata/server/lock/db/DataBaseLockManagerImplTest.java
+++ b/server/src/test/java/io/seata/server/lock/db/DataBaseLockManagerImplTest.java
@@ -38,7 +38,7 @@
 /**
  * @author zhangsen
  */
-public class DataBaseLockManagerImplTest {
+class DataBaseLockManagerImplTest {
 
     static LockManager lockManager = null;
 
@@ -83,7 +83,7 @@ private static void prepareTable(BasicDataSource dataSource) {
     }
 
     @Test
-    public void acquireLock() throws TransactionException, SQLException {
+    void acquireLock() throws TransactionException, SQLException {
         BranchSession branchSession = new BranchSession();
         branchSession.setXid("abc-123:786756");
         branchSession.setTransactionId(123543465);
@@ -125,7 +125,7 @@ public void acquireLock() throws TransactionException, SQLException {
     }
 
     @Test
-    public void re_acquireLock() throws TransactionException, SQLException {
+    void re_acquireLock() throws TransactionException, SQLException {
         BranchSession branchSession = new BranchSession();
         branchSession.setXid("abc-123:65867978");
         branchSession.setTransactionId(123543465);
@@ -165,7 +165,7 @@ public void re_acquireLock() throws TransactionException, SQLException {
     }
 
     @Test
-    public void unLock() throws TransactionException, SQLException {
+    void unLock() throws TransactionException, SQLException {
         BranchSession branchSession = new BranchSession();
         branchSession.setXid("abc-123:56867");
         branchSession.setTransactionId(1236765);
@@ -219,7 +219,7 @@ public void unLock() throws TransactionException, SQLException {
     }
 
     @Test
-    public void isLockable() throws TransactionException, SQLException {
+    void isLockable() throws TransactionException, SQLException {
         BranchSession branchSession = new BranchSession();
         branchSession.setXid("abc-123:56877898");
         branchSession.setTransactionId(245686786);
diff --git a/server/src/test/java/io/seata/server/lock/db/DataBaseLockStoreDAOTest.java b/server/src/test/java/io/seata/server/lock/db/DataBaseLockStoreDAOTest.java
index a59511ad9f8..f35eabf39f0 100644
--- a/server/src/test/java/io/seata/server/lock/db/DataBaseLockStoreDAOTest.java
+++ b/server/src/test/java/io/seata/server/lock/db/DataBaseLockStoreDAOTest.java
@@ -35,7 +35,7 @@
 /**
  * @author zhangsen
  */
-public class DataBaseLockStoreDAOTest {
+class DataBaseLockStoreDAOTest {
 
     static LockStoreDataBaseDAO dataBaseLockStoreDAO  = null;
 
@@ -76,7 +76,7 @@ private static void prepareTable(BasicDataSource dataSource) {
     }
 
     @Test
-    public void test_acquireLocks() throws SQLException {
+    void test_acquireLocks() throws SQLException {
         List<LockDO> lockDOs = new ArrayList<>();
         for(int i = 0; i < 3; i++){
             LockDO lock = new LockDO();
@@ -113,7 +113,7 @@ public void test_acquireLocks() throws SQLException {
 
 
     @Test
-    public void test_re_acquireLocks() throws SQLException {
+    void test_re_acquireLocks() throws SQLException {
         List<LockDO> lockDOs = new ArrayList<>();
         for(int i = 0; i < 3; i++){
             LockDO lock = new LockDO();
@@ -152,7 +152,7 @@ public void test_re_acquireLocks() throws SQLException {
     }
 
     @Test
-    public void tes_unLocks() throws SQLException {
+    void tes_unLocks() throws SQLException {
         List<LockDO> lockDOs = new ArrayList<>();
         for(int i = 0; i < 3; i++){
             LockDO lock = new LockDO();
@@ -200,7 +200,7 @@ public void tes_unLocks() throws SQLException {
 
 
     @Test
-    public void test_isLockable_can(){
+    void test_isLockable_can(){
         List<LockDO> lockDOs = new ArrayList<>();
         for(int i = 0; i < 3; i++){
             LockDO lock = new LockDO();
@@ -222,7 +222,7 @@ public void test_isLockable_can(){
     }
 
     @Test
-    public void test_isLockable_cannot() throws SQLException {
+    void test_isLockable_cannot() throws SQLException {
         List<LockDO> lockDOs = new ArrayList<>();
         for(int i = 0; i < 3; i++){
             LockDO lock = new LockDO();
diff --git a/server/src/test/java/io/seata/server/session/BranchSessionTest.java b/server/src/test/java/io/seata/server/session/BranchSessionTest.java
index d025f93a92d..cd3b3412c3e 100644
--- a/server/src/test/java/io/seata/server/session/BranchSessionTest.java
+++ b/server/src/test/java/io/seata/server/session/BranchSessionTest.java
@@ -30,7 +30,7 @@
  * @author tianming.xm @gmail.com
  * @since 2019 /1/23
  */
-public class BranchSessionTest {
+class BranchSessionTest {
 
     /**
      * Codec test.
@@ -39,7 +39,7 @@ public class BranchSessionTest {
      */
     @ParameterizedTest
     @MethodSource("branchSessionProvider")
-    public void codecTest(BranchSession branchSession) {
+    void codecTest(BranchSession branchSession) {
         byte[] result = branchSession.encode();
         Assertions.assertNotNull(result);
         BranchSession expected = new BranchSession();
diff --git a/server/src/test/java/io/seata/server/session/db/DataBaseSessionManagerTest.java b/server/src/test/java/io/seata/server/session/db/DataBaseSessionManagerTest.java
index 4509e5642ad..594079e164d 100644
--- a/server/src/test/java/io/seata/server/session/db/DataBaseSessionManagerTest.java
+++ b/server/src/test/java/io/seata/server/session/db/DataBaseSessionManagerTest.java
@@ -46,7 +46,7 @@
  *
  * @author zhangsen
  */
-public class DataBaseSessionManagerTest {
+class DataBaseSessionManagerTest {
 
     static SessionManager sessionManager = null;
 
@@ -109,7 +109,7 @@ private static void prepareTable(BasicDataSource dataSource) {
 
 
     @Test
-    public void test_addGlobalSession() throws TransactionException, SQLException {
+    void test_addGlobalSession() throws TransactionException, SQLException {
         GlobalSession session = GlobalSession.createGlobalSession("test",
                 "test", "test123", 100);
         String xid = XID.generateXID(session.getTransactionId());
@@ -143,7 +143,7 @@ public void test_addGlobalSession() throws TransactionException, SQLException {
 
 
     @Test
-    public void test_updateGlobalSessionStatus() throws TransactionException, SQLException {
+    void test_updateGlobalSessionStatus() throws TransactionException, SQLException {
         GlobalSession session = GlobalSession.createGlobalSession("test",
                 "test", "test123", 100);
         String xid = XID.generateXID(session.getTransactionId());
@@ -180,7 +180,7 @@ public void test_updateGlobalSessionStatus() throws TransactionException, SQLExc
     }
 
     @Test
-    public void test_removeGlobalSession() throws Exception {
+    void test_removeGlobalSession() throws Exception {
         GlobalSession session = GlobalSession.createGlobalSession("test",
                 "test", "test123", 100);
         String xid = XID.generateXID(session.getTransactionId());
@@ -225,7 +225,7 @@ public void test_removeGlobalSession() throws Exception {
     }
 
     @Test
-    public void test_findGlobalSession() throws Exception {
+    void test_findGlobalSession() throws Exception {
         GlobalSession session = GlobalSession.createGlobalSession("test",
                 "test", "test123", 100);
         String xid = XID.generateXID(session.getTransactionId());
@@ -264,7 +264,7 @@ public void test_findGlobalSession() throws Exception {
 
 
     @Test
-    public void test_addBranchSession() throws Exception {
+    void test_addBranchSession() throws Exception {
         GlobalSession globalSession = GlobalSession.createGlobalSession("test",
                 "test", "test123", 100);
         String xid = XID.generateXID(globalSession.getTransactionId());
@@ -309,7 +309,7 @@ public void test_addBranchSession() throws Exception {
 
 
     @Test
-    public void test_updateBranchSessionStatus() throws Exception {
+    void test_updateBranchSessionStatus() throws Exception {
         GlobalSession globalSession = GlobalSession.createGlobalSession("test",
                 "test", "test123", 100);
         String xid = XID.generateXID(globalSession.getTransactionId());
@@ -346,7 +346,7 @@ public void test_updateBranchSessionStatus() throws Exception {
                 Assertions.assertTrue(true);
                 Assertions.assertEquals(rs.getInt("status"), BranchStatus.PhaseOne_Timeout.getCode());
             }else{
-                Assertions.assertTrue(false);
+                Assertions.fail();
             }
 
             conn.createStatement().execute(delSql);
@@ -358,7 +358,7 @@ public void test_updateBranchSessionStatus() throws Exception {
     }
 
     @Test
-    public void test_removeBranchSession() throws Exception {
+    void test_removeBranchSession() throws Exception {
         GlobalSession globalSession = GlobalSession.createGlobalSession("test",
                 "test", "test123", 100);
         String xid = XID.generateXID(globalSession.getTransactionId());
@@ -406,7 +406,7 @@ public void test_removeBranchSession() throws Exception {
 
 
     @Test
-    public void test_allSessions() throws Exception {
+    void test_allSessions() throws Exception {
         GlobalSession globalSession = GlobalSession.createGlobalSession("test",
                 "test", "test123", 100);
         String xid = XID.generateXID(globalSession.getTransactionId());
@@ -474,7 +474,7 @@ public void test_allSessions() throws Exception {
     }
 
     @Test
-    public void test_findGlobalSessions() throws TransactionException, SQLException {
+    void test_findGlobalSessions() throws TransactionException, SQLException {
         String xid = null;
         {
             GlobalSession globalSession = GlobalSession.createGlobalSession("test",
@@ -557,7 +557,7 @@ public void test_findGlobalSessions() throws TransactionException, SQLException
     }
 
     @Test
-    public void test_transactionNameGreaterDbSize() throws Exception {
+    void test_transactionNameGreaterDbSize() throws Exception {
 
         int transactionNameColumnSize = logStoreDataBaseDAO.getTransactionNameColumnSize();
         StringBuilder sb = new StringBuilder("test");
diff --git a/server/src/test/java/io/seata/server/store/db/AbstractDataSourceProviderTest.java b/server/src/test/java/io/seata/server/store/db/AbstractDataSourceProviderTest.java
index 15d320be6c3..7fb5d59869e 100644
--- a/server/src/test/java/io/seata/server/store/db/AbstractDataSourceProviderTest.java
+++ b/server/src/test/java/io/seata/server/store/db/AbstractDataSourceProviderTest.java
@@ -25,7 +25,7 @@
 /**
  * @author: will
  */
-public class AbstractDataSourceProviderTest {
+class AbstractDataSourceProviderTest {
 
     private final String dbcpDatasourceType = "dbcp";
 
@@ -34,19 +34,19 @@ public class AbstractDataSourceProviderTest {
     private final String hikariDatasourceType = "hikari";
 
     @Test
-    public void testDbcpDataSourceProvider() {
+    void testDbcpDataSourceProvider() {
         DataSource dataSource = EnhancedServiceLoader.load(DataSourceProvider.class, dbcpDatasourceType).provide();
         Assertions.assertNotNull(dataSource);
     }
 
     @Test
-    public void testDruidDataSourceProvider() {
+    void testDruidDataSourceProvider() {
         DataSource dataSource = EnhancedServiceLoader.load(DataSourceProvider.class, druidDatasourceType).provide();
         Assertions.assertNotNull(dataSource);
     }
 
     @Test
-    public void testHikariDataSourceProvider() {
+    void testHikariDataSourceProvider() {
         DataSource dataSource = EnhancedServiceLoader.load(DataSourceProvider.class, hikariDatasourceType).provide();
         Assertions.assertNotNull(dataSource);
     }
diff --git a/spring/src/test/java/io/seata/spring/annotation/MethodDescTest.java b/spring/src/test/java/io/seata/spring/annotation/MethodDescTest.java
index 68d6696adb9..b66370a3ba5 100644
--- a/spring/src/test/java/io/seata/spring/annotation/MethodDescTest.java
+++ b/spring/src/test/java/io/seata/spring/annotation/MethodDescTest.java
@@ -31,7 +31,7 @@
 /**
  * @author Wu
  */
-public class MethodDescTest {
+class MethodDescTest {
 
     private static final GlobalTransactionScanner GLOBAL_TRANSACTION_SCANNER = new GlobalTransactionScanner(
         "global-trans-scanner-test");
@@ -45,12 +45,12 @@ public MethodDescTest() throws NoSuchMethodException {
     }
 
     @Test
-    public void testGetAnnotation() throws NoSuchMethodException {
+    void testGetAnnotation() throws NoSuchMethodException {
         GlobalTransactionalInterceptor globalTransactionalInterceptor = new GlobalTransactionalInterceptor(null);
         Method method = MockBusiness.class.getDeclaredMethod("doBiz", String.class);
         targetClass = Mockito.mock(MockBusiness.class).getClass();
         transactional = globalTransactionalInterceptor.getAnnotation(method, targetClass, GlobalTransactional.class);
-        Assertions.assertEquals(transactional.timeoutMills(), 300000);
+        Assertions.assertEquals(300000,transactional.timeoutMills());
         method = null;
         transactional = globalTransactionalInterceptor.getAnnotation(method, targetClass, GlobalTransactional.class);
         Assertions.assertEquals(transactional.timeoutMills(), DefaultValues.DEFAULT_GLOBAL_TRANSACTION_TIMEOUT * 2);
@@ -61,16 +61,16 @@ public void testGetAnnotation() throws NoSuchMethodException {
         targetClass = Mockito.mock(MockMethodAnnotation.class).getClass();
         method = MockMethodAnnotation.class.getDeclaredMethod("doBiz", String.class);
         transactional = globalTransactionalInterceptor.getAnnotation(method, targetClass, GlobalTransactional.class);
-        Assertions.assertEquals(transactional.name(), "doBiz");
+        Assertions.assertEquals("doBiz",transactional.name());
         // only method has Annotation, class is not null
         targetClass = Mockito.mock(MockClassAnnotation.class).getClass();
         method = MockClassAnnotation.class.getDeclaredMethod("doBiz", String.class);
         transactional = globalTransactionalInterceptor.getAnnotation(method, targetClass, GlobalTransactional.class);
-        Assertions.assertEquals(transactional.name(), "MockClassAnnotation");
+        Assertions.assertEquals("MockClassAnnotation",transactional.name());
     }
 
     @Test
-    public void testGlobalTransactional() throws NoSuchMethodException {
+    void testGlobalTransactional() throws NoSuchMethodException {
         MockClassAnnotation mockClassAnnotation = new MockClassAnnotation();
         ProxyFactory proxyFactory = new ProxyFactory();
         proxyFactory.setTarget(mockClassAnnotation);
@@ -91,7 +91,7 @@ public void testGlobalTransactional() throws NoSuchMethodException {
     }
 
     @Test
-    public void testGetTransactionAnnotation()
+    void testGetTransactionAnnotation()
         throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
         MethodDesc methodDesc = getMethodDesc();
         assertThat(methodDesc.getTransactionAnnotation()).isEqualTo(transactional);
@@ -99,13 +99,13 @@ public void testGetTransactionAnnotation()
     }
 
     @Test
-    public void testGetMethod() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+    void testGetMethod() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
         MethodDesc methodDesc = getMethodDesc();
         assertThat(methodDesc.getMethod()).isEqualTo(method);
     }
 
     @Test
-    public void testSetTransactionAnnotation()
+    void testSetTransactionAnnotation()
         throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
         MethodDesc methodDesc = getMethodDesc();
         assertThat(methodDesc.getTransactionAnnotation()).isNotNull();
@@ -114,7 +114,7 @@ public void testSetTransactionAnnotation()
     }
 
     @Test
-    public void testSetMethod() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+    void testSetMethod() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
         MethodDesc methodDesc = getMethodDesc();
         assertThat(methodDesc.getMethod()).isNotNull();
         methodDesc.setMethod(null);
diff --git a/spring/src/test/java/io/seata/spring/util/OrderUtilTest.java b/spring/src/test/java/io/seata/spring/util/OrderUtilTest.java
index c633a3090d3..a2b8c41ab44 100644
--- a/spring/src/test/java/io/seata/spring/util/OrderUtilTest.java
+++ b/spring/src/test/java/io/seata/spring/util/OrderUtilTest.java
@@ -27,10 +27,10 @@
  *
  * @author wang.liang
  */
-public class OrderUtilTest {
+class OrderUtilTest {
 
     @Test
-    public void test_getOrder() {
+    void test_getOrder() {
         // get from Ordered
         MockOrdered ordered = new MockOrdered(100);
         assertThat(OrderUtil.getOrder(ordered)).isEqualTo(100);
@@ -43,7 +43,7 @@ public void test_getOrder() {
     }
 
     @Test
-    public void test_lowerThan() {
+    void test_lowerThan() {
         assertThat(OrderUtil.lowerThan(Ordered.LOWEST_PRECEDENCE, Ordered.HIGHEST_PRECEDENCE)).isTrue();
         assertThat(OrderUtil.lowerThan(1, 0)).isTrue();
         assertThat(OrderUtil.lowerThan(1, 1)).isFalse();
@@ -68,7 +68,7 @@ public void test_lowerThan() {
     }
 
     @Test
-    public void test_higherThan() {
+    void test_higherThan() {
         assertThat(OrderUtil.higherThan(Ordered.HIGHEST_PRECEDENCE, Ordered.LOWEST_PRECEDENCE)).isTrue();
         assertThat(OrderUtil.higherThan(0, 1)).isTrue();
         assertThat(OrderUtil.higherThan(1, 1)).isFalse();
@@ -93,7 +93,7 @@ public void test_higherThan() {
     }
 
     @Test
-    public void test_lower() {
+    void test_lower() {
         assertThat(OrderUtil.lower(1, 1)).isEqualTo(2);
         assertThat(OrderUtil.lower(Ordered.LOWEST_PRECEDENCE - 1, 2)).isEqualTo(Ordered.LOWEST_PRECEDENCE);
         assertThat(OrderUtil.lower(Ordered.LOWEST_PRECEDENCE, 1)).isEqualTo(Ordered.LOWEST_PRECEDENCE);
@@ -102,8 +102,8 @@ public void test_lower() {
     }
 
     @Test
-    public void test_higher() {
-        assertThat(OrderUtil.higher(1, 1)).isEqualTo(0);
+    void test_higher() {
+        assertThat(OrderUtil.higher(1, 1)).isZero();
         assertThat(OrderUtil.higher(Ordered.HIGHEST_PRECEDENCE + 1, 2)).isEqualTo(Ordered.HIGHEST_PRECEDENCE);
         assertThat(OrderUtil.higher(Ordered.HIGHEST_PRECEDENCE, 1)).isEqualTo(Ordered.HIGHEST_PRECEDENCE);
 
diff --git a/tm/src/test/java/io/seata/tm/api/APITest.java b/tm/src/test/java/io/seata/tm/api/APITest.java
index 96c19d023f2..e829780d02e 100644
--- a/tm/src/test/java/io/seata/tm/api/APITest.java
+++ b/tm/src/test/java/io/seata/tm/api/APITest.java
@@ -29,7 +29,7 @@
 /**
  * The type Api test.
  */
-public class APITest {
+class APITest {
 
     private static final String DEFAULT_XID = "1234567890";
     private static final String TX_NAME = "test";
@@ -83,11 +83,11 @@ public void cleanRootContext() {
      * @throws Exception the exception
      */
     @Test
-    public void testCurrent() throws Exception {
+    void testCurrent() throws Exception {
         RootContext.bind(DEFAULT_XID);
         GlobalTransaction tx = GlobalTransactionContext.getCurrentOrCreate();
-        Assertions.assertEquals(tx.getXid(), DEFAULT_XID);
-        Assertions.assertEquals(tx.getStatus(), GlobalStatus.Begin);
+        Assertions.assertEquals(DEFAULT_XID,tx.getXid());
+        Assertions.assertEquals(GlobalStatus.Begin,tx.getStatus());
 
     }
 
@@ -97,9 +97,9 @@ public void testCurrent() throws Exception {
      * @throws Exception the exception
      */
     @Test
-    public void testNewTx() throws Exception {
+    void testNewTx() throws Exception {
         GlobalTransaction tx = GlobalTransactionContext.getCurrentOrCreate();
-        Assertions.assertEquals(tx.getStatus(), GlobalStatus.UnKnown);
+        Assertions.assertEquals( GlobalStatus.UnKnown,tx.getStatus());
         Assertions.assertNull(tx.getXid());
     }
 
@@ -109,10 +109,10 @@ public void testNewTx() throws Exception {
      * @throws Exception the exception
      */
     @Test
-    public void testBegin() throws Exception {
+    void testBegin() throws Exception {
         GlobalTransaction tx = GlobalTransactionContext.getCurrentOrCreate();
         tx.begin();
-        Assertions.assertEquals(tx.getStatus(), GlobalStatus.Begin);
+        Assertions.assertEquals(GlobalStatus.Begin,tx.getStatus());
         Assertions.assertNotNull(tx.getXid());
 
     }
@@ -123,9 +123,9 @@ public void testBegin() throws Exception {
      * @throws Exception the exception
      */
     @Test
-    public void testNestedCommit() throws Throwable {
+    void testNestedCommit() throws Throwable {
         TransactionalTemplate template = new TransactionalTemplate();
-        template.execute(new AbstractTransactionalExecutor() {
+        Object result = template.execute(new AbstractTransactionalExecutor() {
             @Override
             public Object execute() throws Throwable {
 
@@ -147,6 +147,8 @@ public Object execute() throws Throwable {
                 return null;
             }
         });
+        Assertions.assertNull(result);
+
     }
 
     /**
@@ -155,7 +157,7 @@ public Object execute() throws Throwable {
      * @throws Exception the exception
      */
     @Test
-    public void testNestedRollback() throws Throwable {
+    void testNestedRollback() throws Throwable {
 
         final String oexMsg = "xxx";
 
@@ -198,21 +200,19 @@ public Object execute() throws Throwable {
     }
 
     @Test
-    public void testGlobalReport() throws Exception {
+    void testGlobalReport() throws Exception {
         RootContext.bind(DEFAULT_XID);
         GlobalTransaction tx = GlobalTransactionContext.getCurrentOrCreate();
         tx.globalReport(tx.getStatus());
 
         Assertions.assertThrows(IllegalStateException.class, () ->  tx.globalReport(null));
-        Assertions.assertThrows(IllegalStateException.class, () -> {
-            RootContext.unbind();
-            GlobalTransaction tx2 = GlobalTransactionContext.getCurrentOrCreate();
-            tx2.globalReport(tx2.getStatus());
-        });
+        RootContext.unbind();
+        GlobalTransaction tx2 = GlobalTransactionContext.getCurrentOrCreate();
+        GlobalStatus tx2Status = tx2.getStatus();
+        Assertions.assertThrows(IllegalStateException.class, () -> tx2.globalReport(tx2Status));
 
-        Assertions.assertEquals(tx.getStatus(), GlobalStatus.Begin);
+        Assertions.assertEquals(GlobalStatus.Begin,tx.getStatus());
         Assertions.assertNotNull(tx.getXid());
-
     }