Merge pull request #6226 from lanjerry/3.0-pr

feat: 修改生成器单元测试用例，修正废弃的配置.

mybatis-plus-generator/src/test/java/com/baomidou/mybatisplus/generator/config/builder/ConfigBuilderTest.java

@@ -36,7 +36,7 @@ public class ConfigBuilderTest {
         ConfigBuilder configBuilder;
         Map<OutputFile, String> pathInfo;
         configBuilder = new ConfigBuilder(GeneratorBuilder.packageConfig(), DATA_SOURCE_CONFIG, GeneratorBuilder.strategyConfig(),
-            GeneratorBuilder.templateConfig(), null, null);
+            null, null, null);
         pathInfo = configBuilder.getPathInfo();
         Assertions.assertFalse(pathInfo.isEmpty());
         Assertions.assertEquals(7, pathInfo.size());
@@ -51,7 +51,7 @@ public class ConfigBuilderTest {
         configBuilder = new ConfigBuilder(
             GeneratorBuilder.packageConfigBuilder().pathInfo(Collections.singletonMap(OutputFile.entity,
                 "/tmp/code/entity")).build(), DATA_SOURCE_CONFIG, GeneratorBuilder.strategyConfig(),
-            GeneratorBuilder.templateConfig(), null, null);
+            null, null, null);
         pathInfo = configBuilder.getPathInfo();
         Assertions.assertFalse(pathInfo.isEmpty());
         Assertions.assertEquals(7, pathInfo.size());

mybatis-plus-generator/src/test/java/com/baomidou/mybatisplus/generator/engine/TemplateEngineTest.java

@@ -3,7 +3,6 @@ package com.baomidou.mybatisplus.generator.engine;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.generator.config.DataSourceConfig;
 import com.baomidou.mybatisplus.generator.config.StrategyConfig;
-import com.baomidou.mybatisplus.generator.config.TemplateConfig;
 import com.baomidou.mybatisplus.generator.config.builder.ConfigBuilder;
 import com.baomidou.mybatisplus.generator.config.builder.GeneratorBuilder;
 import com.baomidou.mybatisplus.generator.config.po.LikeTable;
@@ -41,7 +40,6 @@ public class TemplateEngineTest {
                 .entityBuilder().enableActiveRecord().idType(IdType.INPUT)
                 .mapperBuilder().enableBaseResultMap().enableBaseColumnList()
                 .build(),
-            new TemplateConfig.Builder().build(),
-            GeneratorBuilder.globalConfig(), null));
+            null, GeneratorBuilder.globalConfig(), null));
     }
 }

mybatis-plus-generator/src/test/java/com/baomidou/mybatisplus/generator/jdbc/DatabaseMetaDataWrapperTest.java

@@ -5,21 +5,18 @@ import org.apache.ibatis.type.JdbcType;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import java.sql.SQLException;
 import java.util.Map;
 
 public class DatabaseMetaDataWrapperTest {
 
     @Test
-    void test() throws SQLException {
+    void test() {
         DataSourceConfig dataSourceConfig = new DataSourceConfig.Builder("jdbc:h2:mem:test;MODE=mysql;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE", "sa", "").build();
         DatabaseMetaDataWrapper databaseMetaDataWrapper = new DatabaseMetaDataWrapper(dataSourceConfig.getConn(), dataSourceConfig.getSchemaName());
-        Map<String, DatabaseMetaDataWrapper.Column> columnsInfo = databaseMetaDataWrapper.getColumnsInfo(null, null, "USERS",true);
+        Map<String, DatabaseMetaDataWrapper.Column> columnsInfo = databaseMetaDataWrapper.getColumnsInfo(null, null, "USERS", true);
         Assertions.assertNotNull(columnsInfo);
         DatabaseMetaDataWrapper.Column name = columnsInfo.get("user_name");
         Assertions.assertTrue(name.isNullable());
         Assertions.assertEquals(JdbcType.VARCHAR, name.getJdbcType());
-//        Assertions.assertEquals(Integer.MAX_VALUE, name.getLength());
     }
-
 }

mybatis-plus-generator/src/test/java/com/baomidou/mybatisplus/generator/samples/BaseGeneratorTest.java

@@ -49,13 +49,6 @@ public class BaseGeneratorTest {
         return new PackageConfig.Builder();
     }
 
-    /**
-     * 模板配置
-     */
-    protected static TemplateConfig.Builder templateConfig() {
-        return new TemplateConfig.Builder();
-    }
-
     /**
      * 注入配置
      */

mybatis-plus-generator/src/test/java/com/baomidou/mybatisplus/generator/samples/H2CodeGeneratorTest.java

@@ -168,9 +168,8 @@ public class H2CodeGeneratorTest extends BaseGeneratorTest {
     @Test
     public void testCustomTemplate() {
         AutoGenerator generator = new AutoGenerator(DATA_SOURCE_CONFIG);
-        generator.strategy(strategyConfig().build());
-        generator.template(templateConfig()
-            .entity("/templates/entity1.java")
+        generator.strategy(strategyConfig()
+            .entityBuilder().javaTemplate("/templates/entity1.java")
             .build());
         generator.global(globalConfig().build());
         generator.execute();
@@ -203,13 +202,11 @@ public class H2CodeGeneratorTest extends BaseGeneratorTest {
         AutoGenerator generator = new AutoGenerator(DATA_SOURCE_CONFIG);
         generator.strategy(strategyConfig().build());
         // 关闭其它模块生成只生成实体
-        generator.template(templateConfig().disable(
-            TemplateType.CONTROLLER,
-            TemplateType.SERVICE,
-            TemplateType.SERVICE_IMPL,
-            TemplateType.XML,
-            TemplateType.MAPPER
-        ).build());
+        generator.strategy(strategyConfig()
+            .controllerBuilder().disable()
+            .serviceBuilder().disable()
+            .mapperBuilder().disable()
+            .build());
         // 日期类型强制设置为 Date 类型
         generator.global(globalConfig().dateType(DateType.ONLY_DATE).build());
         generator.execute();
@@ -224,9 +221,8 @@ public class H2CodeGeneratorTest extends BaseGeneratorTest {
         Map<String, Object> map = new HashMap<>();
         map.put("abc", 123);
         AutoGenerator generator = new AutoGenerator(DATA_SOURCE_CONFIG);
-        generator.strategy(strategyConfig().build());
-        generator.template(templateConfig()
-            .entity("/templates/entity1.java")
+        generator.strategy(strategyConfig()
+            .entityBuilder().javaTemplate("/templates/entity1.java")
             .build());
         generator.injection(injectionConfig().customMap(map).build());
         generator.global(globalConfig().build());
@@ -270,9 +266,10 @@ public class H2CodeGeneratorTest extends BaseGeneratorTest {
     public void testCustomFileByList() {
         // 设置自定义输出文件
         AutoGenerator generator = new AutoGenerator(DATA_SOURCE_CONFIG);
-        generator.strategy(strategyConfig().build());
-        // 警用默认模板
-        generator.template(templateConfig().disable(TemplateType.CONTROLLER).build());
+        generator.strategy(strategyConfig()
+            // 禁用Controller默认模板
+            .controllerBuilder().disable()
+            .build());
         generator.injection(injectionConfig().customFile(new ArrayList<CustomFile>() {{
             add(new CustomFile.Builder().fileName("DTO.java").templatePath("/templates/dto.java.vm").packageName("dto").build());
             add(new CustomFile.Builder().fileName("VO.java").templatePath("/templates/vo.java.vm").packageName("vo").build());