miemie 4 år sedan
förälder
incheckning
e8decfe76c

+ 8 - 2
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/BaseDbTest.java

@@ -13,11 +13,13 @@ import org.apache.ibatis.logging.slf4j.Slf4jImpl;
 import org.apache.ibatis.mapping.Environment;
 import org.apache.ibatis.mapping.Environment;
 import org.apache.ibatis.plugin.Interceptor;
 import org.apache.ibatis.plugin.Interceptor;
 import org.apache.ibatis.session.Configuration;
 import org.apache.ibatis.session.Configuration;
+import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
 import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
 import org.apache.ibatis.type.TypeReference;
 import org.apache.ibatis.type.TypeReference;
 import org.h2.Driver;
 import org.h2.Driver;
+import org.jetbrains.annotations.Nullable;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.datasource.SimpleDriverDataSource;
 import org.springframework.jdbc.datasource.SimpleDriverDataSource;
 
 
@@ -94,14 +96,18 @@ public abstract class BaseDbTest<T> extends TypeReference<T> {
         return dataSource;
         return dataSource;
     }
     }
 
 
+    protected SqlSession sqlSession(@Nullable ExecutorType type) {
+        return sqlSessionFactory.openSession(type);
+    }
+
     protected void doTest(Consumer<T> consumer) {
     protected void doTest(Consumer<T> consumer) {
-        try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
+        try (SqlSession sqlSession = sqlSession(null)) {
             doTest(sqlSession, consumer);
             doTest(sqlSession, consumer);
         }
         }
     }
     }
 
 
     protected void doTestAutoCommit(Consumer<T> consumer) {
     protected void doTestAutoCommit(Consumer<T> consumer) {
-        try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
+        try (SqlSession sqlSession = sqlSession(null)) {
             doTestAutoCommit(sqlSession, consumer);
             doTestAutoCommit(sqlSession, consumer);
         }
         }
     }
     }

+ 1 - 1
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/batch/BatchTest.java

@@ -18,7 +18,7 @@ class BatchTest extends BaseDbTest<EntityMapper> {
 
 
     @Test
     @Test
     void save() {
     void save() {
-        doTestAutoCommit(sqlSessionFactory.openSession(ExecutorType.BATCH), i -> {
+        doTestAutoCommit(sqlSession(ExecutorType.BATCH), i -> {
             int i1 = i.insert(new Entity("老王"));
             int i1 = i.insert(new Entity("老王"));
             assertThat(i1).isEqualTo(BatchExecutor.BATCH_UPDATE_RETURN_VALUE);
             assertThat(i1).isEqualTo(BatchExecutor.BATCH_UPDATE_RETURN_VALUE);
             int i2 = i.insert(new Entity("老李"));
             int i2 = i.insert(new Entity("老李"));