修改单元测试.

mybatis-plus-boot-starter/src/test/java/com/baomidou/mybatisplus/starter/MetadataTest.java

@@ -4,10 +4,8 @@ import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration;
 import com.baomidou.mybatisplus.autoconfigure.MybatisPlusProperties;
 import com.baomidou.mybatisplus.core.MybatisConfiguration;
 import com.baomidou.mybatisplus.core.config.GlobalConfig;
-import com.baomidou.mybatisplus.core.incrementer.IKeyGenerator;
 import com.jayway.jsonpath.DocumentContext;
 import com.jayway.jsonpath.JsonPath;
-import com.jayway.jsonpath.TypeRef;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import org.apache.ibatis.session.SqlSessionFactory;

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/spring/MybatisSqlSessionFactoryBean.java

@@ -481,24 +481,24 @@ public class MybatisSqlSessionFactoryBean implements FactoryBean<SqlSessionFacto
                 }
             } else {
                 String[] typeAliasPackageArray = tokenizeToStringArray(this.typeAliasesPackage, ConfigurableApplicationContext.CONFIG_LOCATION_DELIMITERS);
-                for (String one : typeAliasPackageArray) {
-                    if (one.contains(StringPool.ASTERISK)) {
-                        String[] convertTypeAliasesPackages = PackageHelper.convertTypeAliasesPackage(one);
+                Stream.of(typeAliasPackageArray).forEach(pkg -> {
+                    if (pkg.contains(StringPool.ASTERISK)) {
+                        String[] convertTypeAliasesPackages = PackageHelper.convertTypeAliasesPackage(pkg);
                         if (ArrayUtils.isEmpty(convertTypeAliasesPackages)) {
-                            LOGGER.warn(() -> "Can't find class in '[" + one + "]' package. Please check your configuration.");
+                            LOGGER.warn(() -> "Can't find class in '[" + pkg + "]' package. Please check your configuration.");
                         } else {
                             typeAliasPackageList.addAll(Arrays.asList(convertTypeAliasesPackages));
                         }
                     } else {
-                        typeAliasPackageList.add(one);
+                        typeAliasPackageList.add(pkg);
                     }
-                }
+                });
             }
-            for (String packageToScan : typeAliasPackageList) {
+            typeAliasPackageList.forEach(packageToScan -> {
                 configuration.getTypeAliasRegistry().registerAliases(packageToScan,
                     typeAliasesSuperType == null ? Object.class : typeAliasesSuperType);
                 LOGGER.debug(() -> "Scanned package: '" + packageToScan + "' for aliases");
-            }
+            });
         }
 
         // TODO 自定义枚举类扫描处理
@@ -515,14 +515,14 @@ public class MybatisSqlSessionFactoryBean implements FactoryBean<SqlSessionFacto
                     ConfigurableApplicationContext.CONFIG_LOCATION_DELIMITERS);
                 Assert.notNull(typeEnumsPackageArray, "not find typeEnumsPackage:" + typeEnumsPackage);
                 classes = new HashSet<>();
-                for (String typePackage : typeEnumsPackageArray) {
+                Stream.of(typeEnumsPackageArray).forEach(typePackage -> {
                     Set<Class> scanTypePackage = PackageHelper.scanTypePackage(typePackage);
                     if (scanTypePackage.isEmpty()) {
                         LOGGER.warn(() -> "Can't find class in '[" + typePackage + "]' package. Please check your configuration.");
                     } else {
                         classes.addAll(PackageHelper.scanTypePackage(typePackage));
                     }
-                }
+                });
             }
             // 取得类型转换注册器
             TypeHandlerRegistry typeHandlerRegistry = configuration.getTypeHandlerRegistry();

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/BaseTest.java

@@ -1,11 +1,5 @@
 package com.baomidou.mybatisplus.test.h2;
 
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.Statement;
 
 public class BaseTest {
 
@@ -15,41 +9,4 @@ public class BaseTest {
         System.out.println(object);
     }
 
-    public void initData(Connection conn, String ddlFileName, String insertFileName, String tableName) throws SQLException, IOException {
-        String createTableSql = readFile(ddlFileName);
-        Statement stmt = conn.createStatement();
-        stmt.execute(createTableSql);
-        stmt.execute("truncate table " + tableName);
-        executeSql(stmt, insertFileName);
-        conn.commit();
-    }
-
-    public void executeSql(Statement stmt, String sqlFilename) throws SQLException, IOException {
-        try (
-            BufferedReader reader = new BufferedReader(new FileReader(filePath(sqlFilename)))
-        ) {
-            String line;
-            while ((line = reader.readLine()) != null) {
-                stmt.execute(line.replace(";", ""));
-            }
-        }
-    }
-
-    public String readFile(String fileName) {
-        StringBuilder builder = new StringBuilder();
-        try (
-            BufferedReader reader = new BufferedReader(new FileReader(filePath(fileName)))
-        ) {
-            String line;
-            while ((line = reader.readLine()) != null)
-                builder.append(line).append(" ");
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return builder.toString();
-    }
-
-    public String filePath(String fileName) {
-        return H2UserTest.class.getResource("/h2/" + fileName).getPath();
-    }
 }

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/SqlRunnerTest.java

@@ -27,7 +27,7 @@ class SqlRunnerTest {
     private IH2StudentService studentService;
 
     @Test
-    @Order(1)
+    @Order(3)
     void testSelectCount(){
         int count = SqlRunner.db().selectCount("select count(1) from h2student");
         Assertions.assertTrue(count > 0);
@@ -41,7 +41,7 @@ class SqlRunnerTest {
 
     @Test
     @Transactional
-    @Order(2)
+    @Order(1)
     void testInsert(){
         Assertions.assertTrue(SqlRunner.db().insert("INSERT INTO h2student ( name, age ) VALUES ( {0}, {1} )","测试学生",2));
         Assertions.assertTrue(SqlRunner.db(H2Student.class).insert("INSERT INTO h2student ( name, age ) VALUES ( {0}, {1} )","测试学生2",3));

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/config/MybatisPlusConfig.java

@@ -4,7 +4,6 @@ import javax.sql.DataSource;
 
 import com.baomidou.mybatisplus.core.parser.AbstractJsqlParser;
 import com.baomidou.mybatisplus.core.parser.ISqlParser;
-import com.baomidou.mybatisplus.extension.parsers.BlockAttackSqlParser;
 import com.baomidou.mybatisplus.extension.plugins.SqlExplainInterceptor;
 import net.sf.jsqlparser.statement.delete.Delete;
 import net.sf.jsqlparser.statement.insert.Insert;

mybatis-plus/src/test/resources/h2/student.insert.sql

@@ -1,3 +1,4 @@
+delete from h2student;
 insert into h2student (id, name, age)values (1, 'Tom', 1);
 insert into h2student (id, name, age)values (2, 'Jerry', 1);
 insert into h2student (id, name, age)values (12, '要开除的学生', 1);

mybatis-plus/src/test/resources/h2/user.insert.sql

@@ -1,3 +1,4 @@
+delete from h2user;
 insert into h2user (test_id, name, test_date, age, price, test_type, version, deleted)values (101, 'Tomcat', '2017-1-1 1:1:1', 3, 9.99, 1, 1, 0);
 insert into h2user (test_id, name, test_date, age, price, test_type, version, deleted)values (102, 'Jerry', '2017-3-1 1:1:1', 2, 19.99, 2, 2, 0);
 insert into h2user (test_id, name, test_date, age, price, test_type, version, deleted)values (103, 'Bob', '2017-4-1 1:1:1', 1, 99.99, 3, 3, 0);

mybatis-plus/src/test/resources/mybatis-config.xml

@@ -6,6 +6,7 @@
 
     <settings>
         <setting name="mapUnderscoreToCamelCase" value="true"/>
+        <setting name="defaultEnumTypeHandler" value="org.apache.ibatis.type.EnumOrdinalTypeHandler"/>
     </settings>
 
     <objectFactory type="com.baomidou.mybatisplus.test.reflection.ExampleObjectFactory">