多模块重构 13：修复各种单元测试的报错

pom.xml

@@ -61,7 +61,7 @@
                     <artifactId>maven-surefire-plugin</artifactId>
                     <version>${maven-surefire-plugin.version}</version>
                 </plugin>
-                <!-- TODO 看看咋放到 bom 里 -->
+                <!-- maven-compiler-plugin 插件，解决 Lombok + MapStruct 组合 -->
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>

yudao-module-bpm/yudao-module-bpm-base/src/test/resources/application-unit-test.yaml

@@ -36,3 +36,6 @@ mybatis:
 --- #################### 芋道相关配置 ####################
 
 # 芋道配置项，设置当前项目所有自定义的配置
+yudao:
+  info:
+    base-package: cn.iocoder.yudao.module

yudao-module-infra/yudao-module-infra-impl/pom.xml

@@ -103,26 +103,4 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <!-- 设置构建的 jar 包名 -->
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <!-- 打包 -->
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <configuration>
-                    <fork>true</fork>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal> <!-- 将引入的 jar 打入其中 -->
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>

yudao-module-infra/yudao-module-infra-impl/src/test/resources/sql/create_tables.sql

@@ -105,7 +105,7 @@ CREATE TABLE IF NOT EXISTS "infra_api_access_log" (
     ) COMMENT 'API 访问日志表';
 
 CREATE TABLE IF NOT EXISTS "infra_api_error_log" (
-    "id" integer not null GENERATED BY DEFAULT AS IDENTITY,
+    "id" bigint not null GENERATED BY DEFAULT AS IDENTITY,
     "trace_id" varchar(64) not null,
     "user_id" bigint not null default '0',
     "user_type" tinyint not null default '0',

yudao-module-member/yudao-module-member-impl/pom.xml

@@ -81,26 +81,4 @@
 
     </dependencies>
 
-    <build>
-        <!-- 设置构建的 jar 包名 -->
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <!-- 打包 -->
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <configuration>
-                    <fork>true</fork>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal> <!-- 将引入的 jar 打入其中 -->
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>

yudao-module-pay/yudao-module-pay-impl/pom.xml

@@ -78,26 +78,4 @@
 
     </dependencies>
 
-    <build>
-        <!-- 设置构建的 jar 包名 -->
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <!-- 打包 -->
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <configuration>
-                    <fork>true</fork>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal> <!-- 将引入的 jar 打入其中 -->
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>

yudao-module-system/yudao-module-system-impl/pom.xml

@@ -98,26 +98,4 @@
 
     </dependencies>
 
-    <build>
-        <!-- 设置构建的 jar 包名 -->
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <!-- 打包 -->
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <configuration>
-                    <fork>true</fork>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal> <!-- 将引入的 jar 打入其中 -->
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>

yudao-module-tool/yudao-module-tool-impl/pom.xml

@@ -79,26 +79,4 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <!-- 设置构建的 jar 包名 -->
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <!-- 打包 -->
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <configuration>
-                    <fork>true</fork>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal> <!-- 将引入的 jar 打入其中 -->
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>

yudao-module-tool/yudao-module-tool-impl/src/main/java/cn/iocoder/yudao/module/tool/dal/dataobject/test/TestDemoDO.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 
-import java.util.Date;
-
 /**
  * 字典类型 DO
  *
@@ -46,25 +44,5 @@ public class TestDemoDO extends BaseDO {
      * 备注
      */
     private String remark;
-    /**
-     * 创建者
-     */
-    private String creator;
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-    /**
-     * 更新者
-     */
-    private String updater;
-    /**
-     * 更新时间
-     */
-    private Date updateTime;
-    /**
-     * 是否删除
-     */
-    private Boolean deleted;
 
 }

yudao-module-tool/yudao-module-tool-impl/src/main/java/cn/iocoder/yudao/module/tool/service/codegen/inner/CodegenBuilder.java

@@ -1,8 +1,8 @@
 package cn.iocoder.yudao.module.tool.service.codegen.inner;
 
 import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.ReflectUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
 import cn.iocoder.yudao.module.tool.convert.codegen.CodegenConvert;
 import cn.iocoder.yudao.module.tool.dal.dataobject.codegen.CodegenColumnDO;
@@ -96,7 +96,7 @@ public class CodegenBuilder {
             .build();
 
     static {
-        Arrays.stream(TenantBaseDO.class.getDeclaredFields()).forEach(field -> BASE_DO_FIELDS.add(field.getName()));
+        Arrays.stream(ReflectUtil.getFields(TenantBaseDO.class)).forEach(field -> BASE_DO_FIELDS.add(field.getName()));
         // 处理 OPERATION 相关的字段
         CREATE_OPERATION_EXCLUDE_COLUMN.addAll(BASE_DO_FIELDS);
         UPDATE_OPERATION_EXCLUDE_COLUMN.addAll(BASE_DO_FIELDS);

yudao-module-tool/yudao-module-tool-impl/src/test/java/cn/iocoder/yudao/module/tool/service/test/TestDemoServiceImplTest.java

@@ -1,34 +1,34 @@
 package cn.iocoder.yudao.module.tool.service.test;
 
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.mock.mockito.MockBean;
-
-import javax.annotation.Resource;
-
-import cn.iocoder.yudao.module.tool.test.BaseDbUnitTest;
-import cn.iocoder.yudao.module.tool.controller.admin.test.vo.*;
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.date.DateUtils;
+import cn.iocoder.yudao.module.tool.controller.admin.test.vo.TestDemoCreateReqVO;
+import cn.iocoder.yudao.module.tool.controller.admin.test.vo.TestDemoExportReqVO;
+import cn.iocoder.yudao.module.tool.controller.admin.test.vo.TestDemoPageReqVO;
+import cn.iocoder.yudao.module.tool.controller.admin.test.vo.TestDemoUpdateReqVO;
 import cn.iocoder.yudao.module.tool.dal.dataobject.test.TestDemoDO;
 import cn.iocoder.yudao.module.tool.dal.mysql.test.TestDemoMapper;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.tool.test.BaseDbUnitTest;
+import org.junit.jupiter.api.Test;
+import org.springframework.context.annotation.Import;
 
 import javax.annotation.Resource;
-import org.springframework.context.annotation.Import;
-import java.util.*;
-
-import static cn.hutool.core.util.RandomUtil.*;
-import static cn.iocoder.yudao.module.tool.enums.ErrorCodeConstants.*;
-import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.*;
-import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
-import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.*;
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.*;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
+import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
+import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
+import static cn.iocoder.yudao.module.tool.enums.ErrorCodeConstants.TEST_DEMO_NOT_EXISTS;
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
 
 /**
-* {@link TestDemoServiceImpl} 的单元测试类
-*
-* @author 芋道源码
-*/
+ * {@link TestDemoServiceImpl} 的单元测试类
+ *
+ * @author 芋道源码
+ */
 @Import(TestDemoServiceImpl.class)
 public class TestDemoServiceImplTest extends BaseDbUnitTest {
 
@@ -88,8 +88,8 @@ public class TestDemoServiceImplTest extends BaseDbUnitTest {
 
         // 调用
         testDemoService.deleteTestDemo(id);
-       // 校验数据不存在了
-       assertNull(testDemoMapper.selectById(id));
+        // 校验数据不存在了
+        assertNull(testDemoMapper.selectById(id));
     }
 
     @Test
@@ -101,87 +101,87 @@ public class TestDemoServiceImplTest extends BaseDbUnitTest {
         assertServiceException(() -> testDemoService.deleteTestDemo(id), TEST_DEMO_NOT_EXISTS);
     }
 
-    @Test // TODO 请修改 null 为需要的值
+    @Test
     public void testGetTestDemoPage() {
-       // mock 数据
-       TestDemoDO dbTestDemo = randomPojo(TestDemoDO.class, o -> { // 等会查询到
-           o.setName(null);
-           o.setStatus(null);
-           o.setType(null);
-           o.setCategory(null);
-           o.setRemark(null);
-           o.setCreateTime(null);
-       });
-       testDemoMapper.insert(dbTestDemo);
-       // 测试 name 不匹配
-       testDemoMapper.insert(cloneIgnoreId(dbTestDemo, o -> o.setName(null)));
-       // 测试 status 不匹配
-       testDemoMapper.insert(cloneIgnoreId(dbTestDemo, o -> o.setStatus(null)));
-       // 测试 type 不匹配
-       testDemoMapper.insert(cloneIgnoreId(dbTestDemo, o -> o.setType(null)));
-       // 测试 category 不匹配
-       testDemoMapper.insert(cloneIgnoreId(dbTestDemo, o -> o.setCategory(null)));
-       // 测试 remark 不匹配
-       testDemoMapper.insert(cloneIgnoreId(dbTestDemo, o -> o.setRemark(null)));
-       // 测试 createTime 不匹配
-       testDemoMapper.insert(cloneIgnoreId(dbTestDemo, o -> o.setCreateTime(null)));
-       // 准备参数
-       TestDemoPageReqVO reqVO = new TestDemoPageReqVO();
-       reqVO.setName(null);
-       reqVO.setStatus(null);
-       reqVO.setType(null);
-       reqVO.setCategory(null);
-       reqVO.setRemark(null);
-       reqVO.setBeginCreateTime(null);
-       reqVO.setEndCreateTime(null);
-
-       // 调用
-       PageResult<TestDemoDO> pageResult = testDemoService.getTestDemoPage(reqVO);
-       // 断言
-       assertEquals(1, pageResult.getTotal());
-       assertEquals(1, pageResult.getList().size());
-       assertPojoEquals(dbTestDemo, pageResult.getList().get(0));
+        // mock 数据
+        TestDemoDO dbTestDemo = randomPojo(TestDemoDO.class, o -> { // 等会查询到
+            o.setName("芋道源码");
+            o.setStatus(CommonStatusEnum.ENABLE.getStatus());
+            o.setType(1);
+            o.setCategory(2);
+            o.setRemark("哈哈哈");
+            o.setCreateTime(DateUtils.buildTime(2021, 11, 11));
+        });
+        testDemoMapper.insert(dbTestDemo);
+        // 测试 name 不匹配
+        testDemoMapper.insert(cloneIgnoreId(dbTestDemo, o -> o.setName("不匹配")));
+        // 测试 status 不匹配
+        testDemoMapper.insert(cloneIgnoreId(dbTestDemo, o -> o.setStatus(CommonStatusEnum.DISABLE.getStatus())));
+        // 测试 type 不匹配
+        testDemoMapper.insert(cloneIgnoreId(dbTestDemo, o -> o.setType(2)));
+        // 测试 category 不匹配
+        testDemoMapper.insert(cloneIgnoreId(dbTestDemo, o -> o.setCategory(1)));
+        // 测试 remark 不匹配
+        testDemoMapper.insert(cloneIgnoreId(dbTestDemo, o -> o.setRemark("呵呵呵")));
+        // 测试 createTime 不匹配
+        testDemoMapper.insert(cloneIgnoreId(dbTestDemo, o -> o.setCreateTime(DateUtils.buildTime(2021, 12, 12))));
+        // 准备参数
+        TestDemoPageReqVO reqVO = new TestDemoPageReqVO();
+        reqVO.setName("芋道");
+        reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
+        reqVO.setType(1);
+        reqVO.setCategory(2);
+        reqVO.setRemark("哈哈哈");
+        reqVO.setBeginCreateTime(DateUtils.buildTime(2021, 11, 10));
+        reqVO.setEndCreateTime(DateUtils.buildTime(2021, 11, 12));
+
+        // 调用
+        PageResult<TestDemoDO> pageResult = testDemoService.getTestDemoPage(reqVO);
+        // 断言
+        assertEquals(1, pageResult.getTotal());
+        assertEquals(1, pageResult.getList().size());
+        assertPojoEquals(dbTestDemo, pageResult.getList().get(0));
     }
 
-    @Test // TODO 请修改 null 为需要的值
+    @Test
     public void testGetTestDemoList() {
-       // mock 数据
-       TestDemoDO dbTestDemo = randomPojo(TestDemoDO.class, o -> { // 等会查询到
-           o.setName(null);
-           o.setStatus(null);
-           o.setType(null);
-           o.setCategory(null);
-           o.setRemark(null);
-           o.setCreateTime(null);
-       });
-       testDemoMapper.insert(dbTestDemo);
-       // 测试 name 不匹配
-       testDemoMapper.insert(cloneIgnoreId(dbTestDemo, o -> o.setName(null)));
-       // 测试 status 不匹配
-       testDemoMapper.insert(cloneIgnoreId(dbTestDemo, o -> o.setStatus(null)));
-       // 测试 type 不匹配
-       testDemoMapper.insert(cloneIgnoreId(dbTestDemo, o -> o.setType(null)));
-       // 测试 category 不匹配
-       testDemoMapper.insert(cloneIgnoreId(dbTestDemo, o -> o.setCategory(null)));
-       // 测试 remark 不匹配
-       testDemoMapper.insert(cloneIgnoreId(dbTestDemo, o -> o.setRemark(null)));
-       // 测试 createTime 不匹配
-       testDemoMapper.insert(cloneIgnoreId(dbTestDemo, o -> o.setCreateTime(null)));
-       // 准备参数
-       TestDemoExportReqVO reqVO = new TestDemoExportReqVO();
-       reqVO.setName(null);
-       reqVO.setStatus(null);
-       reqVO.setType(null);
-       reqVO.setCategory(null);
-       reqVO.setRemark(null);
-       reqVO.setBeginCreateTime(null);
-       reqVO.setEndCreateTime(null);
-
-       // 调用
-       List<TestDemoDO> list = testDemoService.getTestDemoList(reqVO);
-       // 断言
-       assertEquals(1, list.size());
-       assertPojoEquals(dbTestDemo, list.get(0));
+        // mock 数据
+        TestDemoDO dbTestDemo = randomPojo(TestDemoDO.class, o -> { // 等会查询到
+            o.setName("芋道源码");
+            o.setStatus(CommonStatusEnum.ENABLE.getStatus());
+            o.setType(1);
+            o.setCategory(2);
+            o.setRemark("哈哈哈");
+            o.setCreateTime(DateUtils.buildTime(2021, 11, 11));
+        });
+        testDemoMapper.insert(dbTestDemo);
+        // 测试 name 不匹配
+        testDemoMapper.insert(cloneIgnoreId(dbTestDemo, o -> o.setName("不匹配")));
+        // 测试 status 不匹配
+        testDemoMapper.insert(cloneIgnoreId(dbTestDemo, o -> o.setStatus(CommonStatusEnum.DISABLE.getStatus())));
+        // 测试 type 不匹配
+        testDemoMapper.insert(cloneIgnoreId(dbTestDemo, o -> o.setType(2)));
+        // 测试 category 不匹配
+        testDemoMapper.insert(cloneIgnoreId(dbTestDemo, o -> o.setCategory(1)));
+        // 测试 remark 不匹配
+        testDemoMapper.insert(cloneIgnoreId(dbTestDemo, o -> o.setRemark("呵呵呵")));
+        // 测试 createTime 不匹配
+        testDemoMapper.insert(cloneIgnoreId(dbTestDemo, o -> o.setCreateTime(DateUtils.buildTime(2021, 12, 12))));
+        // 准备参数
+        TestDemoExportReqVO reqVO = new TestDemoExportReqVO();
+        reqVO.setName("芋道");
+        reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
+        reqVO.setType(1);
+        reqVO.setCategory(2);
+        reqVO.setRemark("哈哈哈");
+        reqVO.setBeginCreateTime(DateUtils.buildTime(2021, 11, 10));
+        reqVO.setEndCreateTime(DateUtils.buildTime(2021, 11, 12));
+
+        // 调用
+        List<TestDemoDO> list = testDemoService.getTestDemoList(reqVO);
+        // 断言
+        assertEquals(1, list.size());
+        assertPojoEquals(dbTestDemo, list.get(0));
     }
 
 }