BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 5dcf763f08ee9aa7723499e99aec97979e2f632d

Authored by YunaiV
1 parent 128ee679

修复缺少 user_type 导致的单元测试错误

Inline Side-by-side
Showing 3 changed files with 18 additions and 12 deletions
yudao-module-system/yudao-module-system-impl/src/test/java/cn/iocoder/yudao/module/system/service/logger/OperateLogServiceImplTest.java
  View file @5dcf763
1 1 package cn.iocoder.yudao.module.system.service.logger;
2 2  
3 3 import cn.hutool.core.map.MapUtil;
4   -import cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog.OperateLogExportReqVO;
5   -import cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog.OperateLogPageReqVO;
6   -import cn.iocoder.yudao.module.system.dal.dataobject.logger.OperateLogDO;
7   -import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
8   -import cn.iocoder.yudao.module.system.dal.mysql.logger.OperateLogMapper;
9   -import cn.iocoder.yudao.module.system.service.user.AdminUserService;
10   -import cn.iocoder.yudao.module.system.enums.common.SexEnum;
11 4 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
  5 +import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
12 6 import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
13 7 import cn.iocoder.yudao.framework.common.pojo.PageResult;
14 8 import cn.iocoder.yudao.framework.common.util.monitor.TracerUtils;
... ... @@ -16,6 +10,13 @@ import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
16 10 import cn.iocoder.yudao.framework.operatelog.core.dto.OperateLogCreateReqDTO;
17 11 import cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum;
18 12 import cn.iocoder.yudao.framework.test.core.util.RandomUtils;
  13 +import cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog.OperateLogExportReqVO;
  14 +import cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog.OperateLogPageReqVO;
  15 +import cn.iocoder.yudao.module.system.dal.dataobject.logger.OperateLogDO;
  16 +import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
  17 +import cn.iocoder.yudao.module.system.dal.mysql.logger.OperateLogMapper;
  18 +import cn.iocoder.yudao.module.system.enums.common.SexEnum;
  19 +import cn.iocoder.yudao.module.system.service.user.AdminUserService;
19 20 import cn.iocoder.yudao.module.system.test.BaseDbUnitTest;
20 21 import org.junit.jupiter.api.Test;
21 22 import org.springframework.boot.test.mock.mockito.MockBean;
... ... @@ -27,6 +28,8 @@ import java.util.List;
27 28 import java.util.concurrent.ExecutionException;
28 29 import java.util.concurrent.Future;
29 30  
  31 +import static cn.hutool.core.util.RandomUtil.randomEle;
  32 +import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST;
30 33 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime;
31 34 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
32 35 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;
... ... @@ -51,6 +54,7 @@ public class OperateLogServiceImplTest extends BaseDbUnitTest {
51 54 OperateLogCreateReqDTO reqVO = RandomUtils.randomPojo(OperateLogCreateReqDTO.class, o -> {
52 55 o.setTraceId(traceId);
53 56 o.setUserId(randomLongId());
  57 + o.setUserType(randomEle(UserTypeEnum.values()).getValue());
54 58 o.setExts(MapUtil.<String, Object>builder("orderId", randomLongId()).build());
55 59 });
56 60  
... ... @@ -76,6 +80,7 @@ public class OperateLogServiceImplTest extends BaseDbUnitTest {
76 80 // 构造操作日志
77 81 OperateLogDO sysOperateLogDO = RandomUtils.randomPojo(OperateLogDO.class, o -> {
78 82 o.setUserId(userId);
  83 + o.setUserType(randomEle(UserTypeEnum.values()).getValue());
79 84 o.setModule("order");
80 85 o.setType(OperateTypeEnum.CREATE.getType());
81 86 o.setStartTime(buildTime(2021, 3, 6));
... ... @@ -94,7 +99,7 @@ public class OperateLogServiceImplTest extends BaseDbUnitTest {
94 99 // createTime 不同
95 100 operateLogMapper.insert(ObjectUtils.cloneIgnoreId(sysOperateLogDO, logDO -> logDO.setStartTime(buildTime(2021, 2, 6))));
96 101 // resultCode 不同
97   - operateLogMapper.insert(ObjectUtils.cloneIgnoreId(sysOperateLogDO, logDO -> logDO.setResultCode(GlobalErrorCodeConstants.BAD_REQUEST.getCode())));
  102 + operateLogMapper.insert(ObjectUtils.cloneIgnoreId(sysOperateLogDO, logDO -> logDO.setResultCode(BAD_REQUEST.getCode())));
98 103  
99 104 // 构造调用参数
100 105 OperateLogPageReqVO reqVO = new OperateLogPageReqVO();
... ... @@ -127,6 +132,7 @@ public class OperateLogServiceImplTest extends BaseDbUnitTest {
127 132 // 构造操作日志
128 133 OperateLogDO sysOperateLogDO = RandomUtils.randomPojo(OperateLogDO.class, o -> {
129 134 o.setUserId(userId);
  135 + o.setUserType(randomEle(UserTypeEnum.values()).getValue());
130 136 o.setModule("order");
131 137 o.setType(OperateTypeEnum.CREATE.getType());
132 138 o.setStartTime(buildTime(2021, 3, 6));
... ... @@ -145,7 +151,7 @@ public class OperateLogServiceImplTest extends BaseDbUnitTest {
145 151 // createTime 不同
146 152 operateLogMapper.insert(ObjectUtils.cloneIgnoreId(sysOperateLogDO, logDO -> logDO.setStartTime(buildTime(2021, 2, 6))));
147 153 // resultCode 不同
148   - operateLogMapper.insert(ObjectUtils.cloneIgnoreId(sysOperateLogDO, logDO -> logDO.setResultCode(GlobalErrorCodeConstants.BAD_REQUEST.getCode())));
  154 + operateLogMapper.insert(ObjectUtils.cloneIgnoreId(sysOperateLogDO, logDO -> logDO.setResultCode(BAD_REQUEST.getCode())));
149 155  
150 156 // 构造调用参数
151 157 OperateLogExportReqVO reqVO = new OperateLogExportReqVO();
... ...
yudao-module-system/yudao-module-system-impl/src/test/java/cn/iocoder/yudao/module/system/service/permission/PermissionServiceTest.java
  View file @5dcf763
... ... @@ -203,8 +203,9 @@ public class PermissionServiceTest extends BaseDbUnitTest {
203 203 // 断言
204 204 assertFalse(result.getAll());
205 205 assertFalse(result.getSelf());
206   - assertEquals(1, result.getDeptIds().size());
  206 + assertEquals(2, result.getDeptIds().size());
207 207 assertTrue(CollUtil.contains(result.getDeptIds(), deptDO.getId()));
  208 + assertTrue(CollUtil.contains(result.getDeptIds(), loginUser.getDeptId()));
208 209 assertSame(result, loginUser.getContext(PermissionServiceImpl.CONTEXT_KEY, DeptDataPermissionRespDTO.class));
209 210 }
210 211  
... ...
yudao-module-system/yudao-module-system-impl/src/test/resources/sql/create_tables.sql
  View file @5dcf763
1   --- sys 开头的 DB
2   -
3 1 CREATE TABLE IF NOT EXISTS "system_dept" (
4 2 "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
5 3 "name" varchar(30) NOT NULL DEFAULT '',
... ... @@ -179,6 +177,7 @@ CREATE TABLE IF NOT EXISTS `system_operate_log` (
179 177 `id` bigint(20) NOT NULL GENERATED BY DEFAULT AS IDENTITY,
180 178 `trace_id` varchar(64) NOT NULL DEFAULT '',
181 179 `user_id` bigint(20) NOT NULL,
  180 + "user_type" tinyint not null default '0',
182 181 `module` varchar(50) NOT NULL,
183 182 `name` varchar(50) NOT NULL,
184 183 `operate_type` bigint(4) NOT NULL DEFAULT '0',
... ...