优化生成单元测试代码

ljk163wy · ljk163wy · commit 309dea70aa40 · 2020-08-09T07:58:04.000+08:00
diff --git a/pom.xml b/pom.xml
@@ -20,6 +20,9 @@
         <druid.version>1.1.1</druid.version>
         <freemarker.version>2.3.23</freemarker.version>
         <knife4j.version>2.0.3</knife4j.version>
+        <gson.version>2.6</gson.version>
+        <hutool.version>5.3.7</hutool.version>
+        <kk-anti-reptile.version>1.0.0-RELEASE</kk-anti-reptile.version>
     </properties>
 
     <!-- Inherit defaults from Spring Boot -->
@@ -103,21 +106,10 @@
             <artifactId>knife4j-spring-boot-starter</artifactId>
             <version>${knife4j.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.github.xiaoymin</groupId>
-            <artifactId>knife4j-springdoc-ui</artifactId>
-            <version>2.0.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-ui</artifactId>
-            <version>1.3.9</version>
-        </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.6</version>
-            <!--<scope>compile</scope>-->
+            <version>${gson.version}</version>
         </dependency>
 
         <dependency>
@@ -133,21 +125,10 @@
             <version>${freemarker.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>tk.mybatis</groupId>
-            <artifactId>mapper</artifactId>
-            <version>4.1.5</version>
-        </dependency>
-        <dependency>
-            <groupId>org.mybatis.generator</groupId>
-            <artifactId>mybatis-generator-core</artifactId>
-            <version>1.3.7</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
-            <version>5.3.7</version>
+            <version>${hutool.version}</version>
         </dependency>
         <!-- RedisTemplate-->
         <dependency>
@@ -162,7 +143,7 @@
         <dependency>
             <groupId>cn.keking.project</groupId>
             <artifactId>kk-anti-reptile</artifactId>
-            <version>1.0.0-RELEASE</version>
+            <version>${kk-anti-reptile.version}</version>
         </dependency>
     </dependencies>
 
@@ -180,21 +161,6 @@
                     <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>
-            <!--2、添加mybatis.generator插件 -->
-            <plugin>
-                <groupId>org.mybatis.generator</groupId>
-                <artifactId>mybatis-generator-maven-plugin</artifactId>
-                <version>1.3.7</version>
-                <configuration>
-                    <!--配置XML文件地址，以下为根目录，如果是resources，则为：src/main/resources/generatorConfig.xml -->
-                    <!--                        <configurationFile>generatorConfig.xml</configurationFile>-->
-                    <configurationFile>src/main/resources/generatorConfig.xml</configurationFile>
-                    <!--允许移动生成的文件 -->
-                    <verbose>true</verbose>
-                    <!--是否覆盖 -->
-                    <overwrite>true</overwrite>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
diff --git a/src/main/java/com/company/project/core/Service.java b/src/main/java/com/company/project/core/Service.java
@@ -1,8 +1,5 @@
 package com.company.project.core;
 
-import org.apache.ibatis.exceptions.TooManyResultsException;
-import tk.mybatis.mapper.entity.Condition;
-
 import java.util.List;
 import java.util.Map;
 
diff --git a/src/main/java/com/company/project/demoUser/domain/DemoUser.java b/src/main/java/com/company/project/demoUser/domain/DemoUser.java
@@ -5,8 +5,8 @@
 import java.util.Date;
 
 /**
- * @Author： CodeGenerator
- * @Date： 2020/08/08.
+ * @Author： zhuoqianmingyue
+ * @Date： 2020/08/09.
  * @Description：
  **/
 public class DemoUser extends BasicEntity{
diff --git a/src/main/java/com/company/project/demoUser/mapper/DemoUserMapper.java b/src/main/java/com/company/project/demoUser/mapper/DemoUserMapper.java
@@ -5,8 +5,8 @@
 
 
 /**
- * @Author： CodeGenerator
- * @Date： 2020/08/08.
+ * @Author： zhuoqianmingyue
+ * @Date： 2020/08/09.
  * @Description：
  **/
 @Mapper
diff --git a/src/main/java/com/company/project/demoUser/service/DemoUserService.java b/src/main/java/com/company/project/demoUser/service/DemoUserService.java
@@ -4,8 +4,8 @@
 
 
 /**
-* @Author： CodeGenerator
-* @Date： 2020/08/08.
+* @Author： zhuoqianmingyue
+* @Date： 2020/08/09.
 * @Description：
 **/
 public interface DemoUserService extends Service<DemoUser> {
diff --git a/src/main/java/com/company/project/demoUser/service/impl/DemoUserServiceImpl.java b/src/main/java/com/company/project/demoUser/service/impl/DemoUserServiceImpl.java
@@ -12,8 +12,8 @@
 
 
 /**
- * @Author： CodeGenerator
- * @Date： 2020/08/08.
+ * @Author： zhuoqianmingyue
+ * @Date： 2020/08/09.
  * @Description：
  **/
 @Service
diff --git a/src/main/java/com/company/project/demoUser/web/DemoUserController.java b/src/main/java/com/company/project/demoUser/web/DemoUserController.java
@@ -19,8 +19,8 @@
 import com.company.project.core.ControllerSupport;
 import com.company.project.core.Page;
 /**
- * @Author： CodeGenerator
- * @Date： 2020/08/08.
+ * @Author： zhuoqianmingyue
+ * @Date： 2020/08/09.
  * @Description：
  **/
 @RestController
diff --git a/src/main/java/com/company/project/generator/model/DateFieldTypeState.java b/src/main/java/com/company/project/generator/model/DateFieldTypeState.java
@@ -22,13 +22,6 @@ public void setJavaType(GenTableColumn tableColumn) {
 
     @Override
     public void switchState(String dataType, GenTableColumn tableColumn) {
-
-        if (arraysContains(GenConstants.COLUMNTYPE_STR, dataType)){
-            tableColumn.setCurrent(new SetStringFieldTypeState()).getJavaType();
-        }
-
-        if (arraysContains(GenConstants.COLUMNTYPE_NUMBER, dataType)) {
             tableColumn.setCurrent(new NumbeFieldTypeState()).getJavaType();
-        }
     }
 }
diff --git a/src/main/java/com/company/project/generator/model/NumbeFieldTypeState.java b/src/main/java/com/company/project/generator/model/NumbeFieldTypeState.java
@@ -34,11 +34,6 @@ public void setJavaType(GenTableColumn tableColumn) {
 
     @Override
     public void switchState(String dataType, GenTableColumn tableColumn) {
-        if (arraysContains(GenConstants.COLUMNTYPE_TIME, dataType)){
-            tableColumn.setCurrent(new DateFieldTypeState()).getJavaType();
-        }
-        if (arraysContains(GenConstants.COLUMNTYPE_STR, dataType)){
             tableColumn.setCurrent(new SetStringFieldTypeState()).getJavaType();
-        }
     }
 }
diff --git a/src/main/java/com/company/project/generator/model/SetStringFieldTypeState.java b/src/main/java/com/company/project/generator/model/SetStringFieldTypeState.java
@@ -22,13 +22,6 @@ public void setJavaType(GenTableColumn tableColumn) {
 
     @Override
     public void switchState(String dataType, GenTableColumn tableColumn) {
-        if (arraysContains(GenConstants.COLUMNTYPE_NUMBER, dataType)) {
-            tableColumn.setCurrent(new NumbeFieldTypeState()).getJavaType();
-        }
-
-        if (arraysContains(GenConstants.COLUMNTYPE_TIME, dataType)){
             tableColumn.setCurrent(new DateFieldTypeState()).getJavaType();
-        }
     }
-
 }
diff --git a/src/test/java/com/company/project/core/AbstractRequestMethodMockMvc.java b/src/test/java/com/company/project/core/AbstractRequestMethodMockMvc.java
@@ -41,7 +41,9 @@ public abstract class AbstractRequestMethodMockMvc implements RequestMethodMockM
      * 认证授权的 accessToken
      * */
     private String accessToken;
-
+    /**
+     * 请求参数日期格式
+     */
     private String requestBodyModelDateFormat;
 
 
diff --git a/src/test/java/com/company/project/demoUser/web/DemoUserControllerTest.java b/src/test/java/com/company/project/demoUser/web/DemoUserControllerTest.java
@@ -15,8 +15,8 @@
 import java.util.stream.Collectors;
 
 /**
- * @Author： CodeGenerator
- * @Date： 2020/08/08.
+ * @Author： zhuoqianmingyue
+ * @Date： 2020/08/09.
  * @Description：
  **/
 public class DemoUserControllerTest extends Tester{
@@ -186,8 +186,7 @@ private Long addDataToDB() {
      * @return
     */
     private  DemoUser buildEntity() {
-        //TODO 模拟Entitiy 信息数据 建议使用JMockData
-                MockConfig mockConfig = new MockConfig()
+        MockConfig mockConfig = new MockConfig()
                 //随机段落字符串
                 .stringRegex("I'am a nice man\\.And I'll just scribble the characters, like：[a-z]{2}-[0-9]{2}-[abc123]{2}-\\w{2}-\\d{2}@\\s{1}-\\S{1}\\.?-.")
                 // 邮箱
diff --git a/src/test/java/com/company/project/generator/CodeGenerator.java b/src/test/java/com/company/project/generator/CodeGenerator.java
@@ -67,15 +67,15 @@ public  void genModelAndMapper(String tableName,String packageName, String model
 
             String modelNameUpperCamel = (String)data.get("modelNameUpperCamel");
             String entityPath = JAVA_PATHP_REFIX + CodeNameConverUtil.packageConvertPath(BASE_PACKAGE + "." + packageName + ".domain") + modelNameUpperCamel + ".java";
-            freemarkerUtil.createFile("entity.ftl",entityPath);
+            freemarkerUtil.createCodeFile("entity.ftl",entityPath);
             log.info(modelNameUpperCamel + ".java 生成成功");
 
             String mapperPath = JAVA_PATHP_REFIX + CodeNameConverUtil.packageConvertPath(BASE_PACKAGE +"."+ packageName+ ".mapper") + modelNameUpperCamel + "Mapper.java";
-            freemarkerUtil.createFile("mapper.ftl",mapperPath);
+            freemarkerUtil.createCodeFile("mapper.ftl",mapperPath);
             log.info(modelNameUpperCamel + "Mapper.java 生成成功");
 
             String mapperXmlPath = RESOURCES_PATH_REFIX + "/mapper/" + modelNameUpperCamel + "Mapper.xml";
-            freemarkerUtil.createFile("mapperXml.ftl",mapperXmlPath);
+            freemarkerUtil.createCodeFile("mapperXml.ftl",mapperXmlPath);
             log.info(modelNameUpperCamel + "Mapper.xml");
         } catch (IOException | TemplateException e) {
             e.printStackTrace();
@@ -89,11 +89,11 @@ public  void genService(String tableName,String packageName, String modelName) {
 
             FreemarkerUtil freemarkerUtil = new FreemarkerUtil(data);
             String servicePath = JAVA_PATHP_REFIX + CodeNameConverUtil.packageConvertPath(BASE_PACKAGE +"."+ packageName+ ".service") + modelNameUpperCamel + "Service.java";
-            freemarkerUtil.createFile("service.ftl",servicePath);
+            freemarkerUtil.createCodeFile("service.ftl",servicePath);
             log.info(modelNameUpperCamel + "Service.java 生成成功");
 
             String serviceImplPath =  JAVA_PATHP_REFIX + CodeNameConverUtil.packageConvertPath(BASE_PACKAGE  +"."+ packageName+".service" + ".impl") + modelNameUpperCamel + "ServiceImpl.java";
-            freemarkerUtil.createFile("service-impl.ftl",serviceImplPath);
+            freemarkerUtil.createCodeFile("service-impl.ftl",serviceImplPath);
             log.info(modelNameUpperCamel + "ServiceImpl.java 生成成功");
         } catch (Exception e) {
             throw new RuntimeException("生成Service失败", e);
@@ -109,7 +109,7 @@ public  void genController(String tableName,String packageName, String modelName
 
             String controllerPath = PROJECT_PATH + JAVA_PATH + CodeNameConverUtil.packageConvertPath(BASE_PACKAGE  +"."+ packageName+ ".web") + modelNameUpperCamel + "Controller.java";
             FreemarkerUtil freemarkerUtil = new FreemarkerUtil(data);
-            freemarkerUtil.createFile("controller-restful.ftl",controllerPath);
+            freemarkerUtil.createCodeFile("controller-restful.ftl",controllerPath);
             log.info(modelNameUpperCamel + "Controller.java 生成成功");
         } catch (Exception e) {
             throw new RuntimeException("生成Controller失败", e);
@@ -126,7 +126,7 @@ public  void genControllerTest(String tableName,String packageName, String model
 
             String controllerTestPath = PROJECT_PATH + JAVA_TEST_PATH + CodeNameConverUtil.packageConvertPath(BASE_PACKAGE  +"."+ packageName+ ".web") + modelNameUpperCamel + "ControllerTest.java";
             FreemarkerUtil freemarkerUtil = new FreemarkerUtil(data);
-            freemarkerUtil.createFile("controller-restful-test.ftl",controllerTestPath);
+            freemarkerUtil.createCodeFile("controller-restful-test.ftl",controllerTestPath);
             log.info(modelNameUpperCamel + "ControllerTest.java 生成成功");
         } catch (Exception e) {
             throw new RuntimeException("生成Controller失败", e);
diff --git a/src/test/java/com/company/project/generator/constants/CodeGeneratorConstant.java b/src/test/java/com/company/project/generator/constants/CodeGeneratorConstant.java
@@ -12,27 +12,20 @@ public final class CodeGeneratorConstant {
 
     /**生成代码所在的基础包名称，可根据自己公司的项目修改（注意：这个配置修改之后需要手工修改src目录项目默认的包路径，使其保持一致，不然会找不到类）*/
     public static final String BASE_PACKAGE = "com.company.project";
-    /**生成的Model所在包*/
-    public static final String MODEL_PACKAGE = BASE_PACKAGE + ".model";
-    /**生成的Mapper所在包*/
-    public static final String MAPPER_PACKAGE = BASE_PACKAGE + ".dao";
-    /**生成的Service所在包*/
-    public static final String SERVICE_PACKAGE = BASE_PACKAGE + ".service";
-    /**生成的ServiceImpl所在包*/
-    public static final String SERVICE_IMPL_PACKAGE = SERVICE_PACKAGE + ".impl";
-    /**生成的Controller所在包*/
-    public static final String CONTROLLER_PACKAGE = BASE_PACKAGE + ".web";
-    /**Mapper插件基础接口的完全限定名*/
-    public static final String MAPPER_INTERFACE_REFERENCE = BASE_PACKAGE + ".core.Mapper";
-
-    public static final String PROJECT_PATH = System.getProperty("user.dir");//项目在硬盘上的基础路径
-    public static final String TEMPLATE_FILE_PATH = PROJECT_PATH + "/src/test/resources/generator/template";//模板位置
-
-    public static final String JAVA_PATH = "/src/main/java"; //java文件路径
-    public static final String JAVA_TEST_PATH = "/src/test/java"; //java文件路径
+    /**项目在硬盘上的基础路径*/
+    public static final String PROJECT_PATH = System.getProperty("user.dir");
+    /**java文件路径*/
+    public static final String JAVA_PATH = "/src/main/java";
+    /**test文件路径*/
+    public static final String JAVA_TEST_PATH = "/src/test/java";
+    /**java绝对文件路径前缀*/
     public static final String JAVA_PATHP_REFIX = PROJECT_PATH + JAVA_PATH;
-    public static final String RESOURCES_PATH = "/src/main/resources";//资源文件路径
+    /**资源文件路径*/
+    public static final String RESOURCES_PATH = "/src/main/resources";
+    /**资源文件绝对路径前缀*/
     public static final String RESOURCES_PATH_REFIX = PROJECT_PATH + RESOURCES_PATH;
-    public static final String AUTHOR = "CodeGenerator";//@author
-    public static final String DATE = new SimpleDateFormat("yyyy/MM/dd").format(new Date());//@date
+    /**代码作者*/
+    public static final String AUTHOR = "zhuoqianmingyue";
+    /**日期*/
+    public static final String DATE = new SimpleDateFormat("yyyy/MM/dd").format(new Date());
 }
diff --git a/src/test/java/com/company/project/generator/mapper/CodeGenneratorMapperTest.java b/src/test/java/com/company/project/generator/mapper/CodeGenneratorMapperTest.java
@@ -36,14 +36,6 @@ public void CodeGenneratorMapper() {
     public void selectTableColumnsByTableName() {
         CodeGenneratorMapper codeGenneratorMapper = SpringUtil.getBean(CodeGenneratorMapper.class);
         List<GenTableColumn> demoUserTableColumn = codeGenneratorMapper.selectTableColumnsByTableName("demo_user");
-        for (GenTableColumn tableColumn : demoUserTableColumn) {
-            String javaType = tableColumn.getJavaType();
-            String javaField = tableColumn.getJavaField();
-            String javaFieldGetSetName = tableColumn.getJavaFieldGetSetName();
-            System.out.println(javaFieldGetSetName);
-            System.out.println(javaType);
-            System.out.println(javaField);
-        }
         Assert.assertNotNull(demoUserTableColumn);
     }
 }
diff --git a/src/test/java/com/company/project/generator/service/CodeGenneratorServiceTest.java b/src/test/java/com/company/project/generator/service/CodeGenneratorServiceTest.java
@@ -1,13 +1,12 @@
 package com.company.project.generator.service;
 
 import com.company.project.Application;
-//import com.company.project.Tester;
 import com.company.project.generator.model.GenTable;
+import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.stereotype.Service;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import static org.junit.Assert.*;
@@ -25,8 +24,8 @@ public class CodeGenneratorServiceTest {
     private CodeGenneratorService CodeGenneratorService;
     @Test
     public void getTableInfo(){
-        GenTable demo_user = CodeGenneratorService.getTableInfo("demo_user");
-        System.out.println("");
+        GenTable tableInfo = CodeGenneratorService.getTableInfo("demo_user");
+        Assert.assertNotNull(tableInfo);
     }
 
 }
diff --git a/src/test/java/com/company/project/generator/utils/CodeNameConverUtil.java b/src/test/java/com/company/project/generator/utils/CodeNameConverUtil.java
@@ -17,7 +17,11 @@ public static String modelNameConvertMappingPath(String modelName) {
         String tableName = CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, modelName);
         return tableNameConvertMappingPath(tableName);
     }
-
+    /**
+     *  将表名转换成Mapping 路径
+     * @param tableName
+     * @return
+     */
     public static  String tableNameConvertMappingPath(String tableName) {
         tableName = tableName.toLowerCase();//兼容使用大写的表名
         return "/" + (tableName.contains("_") ? tableName.replaceAll("_", "/") : tableName);
diff --git a/src/test/java/com/company/project/generator/utils/FreemarkerUtil.java b/src/test/java/com/company/project/generator/utils/FreemarkerUtil.java
diff --git a/src/test/java/com/company/project/jmock/JmockTest.java b/src/test/java/com/company/project/jmock/JmockTest.java
diff --git a/src/test/resources/generator/template/controller-restful-test.ftl b/src/test/resources/generator/template/controller-restful-test.ftl

Original file line number	Diff line number	Diff line change
`@@ -22,13 +22,6 @@ public void setJavaType(GenTableColumn tableColumn) {`
`22`	`22`
`23`	`23`	`@Override`
`24`	`24`	`public void switchState(String dataType, GenTableColumn tableColumn) {`
`25`		`-`
`26`		`- if (arraysContains(GenConstants.COLUMNTYPE_STR, dataType)){`
`27`		`- tableColumn.setCurrent(new SetStringFieldTypeState()).getJavaType();`
`28`		`- }`
`29`		`-`
`30`		`- if (arraysContains(GenConstants.COLUMNTYPE_NUMBER, dataType)) {`
`31`	`25`	`tableColumn.setCurrent(new NumbeFieldTypeState()).getJavaType();`
`32`		`- }`
`33`	`26`	`}`
`34`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,11 +34,6 @@ public void setJavaType(GenTableColumn tableColumn) {`
`34`	`34`
`35`	`35`	`@Override`
`36`	`36`	`public void switchState(String dataType, GenTableColumn tableColumn) {`
`37`		`- if (arraysContains(GenConstants.COLUMNTYPE_TIME, dataType)){`
`38`		`- tableColumn.setCurrent(new DateFieldTypeState()).getJavaType();`
`39`		`- }`
`40`		`- if (arraysContains(GenConstants.COLUMNTYPE_STR, dataType)){`
`41`	`37`	`tableColumn.setCurrent(new SetStringFieldTypeState()).getJavaType();`
`42`		`- }`
`43`	`38`	`}`
`44`	`39`	`}`