diff --git a/pom.xml b/pom.xml index c2a18deb0..e911ac6c3 100644 --- a/pom.xml +++ b/pom.xml @@ -9,10 +9,9 @@ ${revision} pom - - - yudao-admin-server + yudao-dependencies yudao-framework + yudao-admin-server yudao @@ -23,4 +22,16 @@ 1.0.0 + + + + cn.iocoder.boot + yudao-dependencies + ${revision} + pom + import + + + + diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/config/InfConfigServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/config/InfConfigServiceTest.java index 12bcce62e..9f3f3f0b7 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/config/InfConfigServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/config/InfConfigServiceTest.java @@ -23,9 +23,9 @@ import java.util.function.Consumer; import static cn.hutool.core.util.RandomUtil.randomEle; import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.*; -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.RandomUtils.*; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.util.test.RandomUtils.*; import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.times; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/file/InfFileServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/file/InfFileServiceTest.java index 0445d1cb4..4507e9617 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/file/InfFileServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/file/InfFileServiceTest.java @@ -16,10 +16,10 @@ import javax.annotation.Resource; import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.FILE_NOT_EXISTS; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.FILE_PATH_EXISTS; -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.RandomUtils.randomPojo; -import static cn.iocoder.dashboard.util.RandomUtils.randomString; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.util.test.RandomUtils.randomPojo; +import static cn.iocoder.dashboard.util.test.RandomUtils.randomString; import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; import static org.junit.jupiter.api.Assertions.*; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobLogServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobLogServiceTest.java index d6caa2a54..4539390b2 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobLogServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobLogServiceTest.java @@ -1,10 +1,10 @@ package cn.iocoder.dashboard.modules.infra.service.job; import static cn.hutool.core.util.RandomUtil.randomEle; -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.RandomUtils.randomLongId; -import static cn.iocoder.dashboard.util.RandomUtils.randomPojo; -import static cn.iocoder.dashboard.util.RandomUtils.randomString; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.util.test.RandomUtils.randomLongId; +import static cn.iocoder.dashboard.util.test.RandomUtils.randomPojo; +import static cn.iocoder.dashboard.util.test.RandomUtils.randomString; import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobServiceTest.java index 22f4cc14c..9cb470071 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobServiceTest.java @@ -7,10 +7,10 @@ import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.JOB import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.JOB_HANDLER_EXISTS; import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.JOB_NOT_EXISTS; import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.JOB_UPDATE_ONLY_NORMAL_STATUS; -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.RandomUtils.randomPojo; -import static cn.iocoder.dashboard.util.RandomUtils.randomString; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.util.test.RandomUtils.randomPojo; +import static cn.iocoder.dashboard.util.test.RandomUtils.randomString; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiAccessLogServiceImplTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiAccessLogServiceImplTest.java index c08fee356..8e6e2a696 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiAccessLogServiceImplTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiAccessLogServiceImplTest.java @@ -11,7 +11,7 @@ import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfA import cn.iocoder.dashboard.modules.infra.dal.dataobject.logger.InfApiAccessLogDO; import cn.iocoder.dashboard.modules.infra.dal.mysql.logger.InfApiAccessLogMapper; import cn.iocoder.dashboard.modules.infra.service.logger.impl.InfApiAccessLogServiceImpl; -import cn.iocoder.dashboard.util.RandomUtils; +import cn.iocoder.dashboard.util.test.RandomUtils; import cn.iocoder.dashboard.util.object.ObjectUtils; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; @@ -21,7 +21,7 @@ import java.util.Date; import java.util.List; import java.util.concurrent.Future; -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiErrorLogServiceImplTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiErrorLogServiceImplTest.java index 4b9f46bc6..3240e5c83 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiErrorLogServiceImplTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiErrorLogServiceImplTest.java @@ -11,7 +11,7 @@ import cn.iocoder.dashboard.modules.infra.dal.dataobject.logger.InfApiErrorLogDO import cn.iocoder.dashboard.modules.infra.dal.mysql.logger.InfApiErrorLogMapper; import cn.iocoder.dashboard.modules.infra.enums.logger.InfApiErrorLogProcessStatusEnum; import cn.iocoder.dashboard.modules.infra.service.logger.impl.InfApiErrorLogServiceImpl; -import cn.iocoder.dashboard.util.RandomUtils; +import cn.iocoder.dashboard.util.test.RandomUtils; import cn.iocoder.dashboard.util.object.ObjectUtils; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; @@ -23,8 +23,8 @@ import java.util.concurrent.Future; import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.API_ERROR_LOG_NOT_FOUND; import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.API_ERROR_LOG_PROCESSED; -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysAuthServiceImplTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysAuthServiceImplTest.java index 40b606836..aecba9e4f 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysAuthServiceImplTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysAuthServiceImplTest.java @@ -12,7 +12,7 @@ import cn.iocoder.dashboard.modules.system.service.common.SysCaptchaService; import cn.iocoder.dashboard.modules.system.service.logger.SysLoginLogService; import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService; import cn.iocoder.dashboard.modules.system.service.user.SysUserService; -import cn.iocoder.dashboard.util.AssertUtils; +import cn.iocoder.dashboard.util.test.AssertUtils; import org.junit.jupiter.api.Test; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Import; @@ -28,8 +28,8 @@ import javax.annotation.Resource; import java.util.Set; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.RandomUtils.*; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.util.test.RandomUtils.*; import static java.util.Collections.singleton; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.eq; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysUserSessionServiceImplTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysUserSessionServiceImplTest.java index 740519430..3e5e17224 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysUserSessionServiceImplTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysUserSessionServiceImplTest.java @@ -1,11 +1,11 @@ package cn.iocoder.dashboard.modules.system.service.auth; import static cn.hutool.core.util.RandomUtil.randomEle; -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.RandomUtils.randomDate; -import static cn.iocoder.dashboard.util.RandomUtils.randomLongId; -import static cn.iocoder.dashboard.util.RandomUtils.randomPojo; -import static cn.iocoder.dashboard.util.RandomUtils.randomString; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.util.test.RandomUtils.randomDate; +import static cn.iocoder.dashboard.util.test.RandomUtils.randomLongId; +import static cn.iocoder.dashboard.util.test.RandomUtils.randomPojo; +import static cn.iocoder.dashboard.util.test.RandomUtils.randomString; import static cn.iocoder.dashboard.util.date.DateUtils.addTime; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; @@ -42,8 +42,8 @@ import cn.iocoder.dashboard.modules.system.service.auth.impl.SysUserSessionServi import cn.iocoder.dashboard.modules.system.service.dept.impl.SysDeptServiceImpl; import cn.iocoder.dashboard.modules.system.service.logger.impl.SysLoginLogServiceImpl; import cn.iocoder.dashboard.modules.system.service.user.SysUserServiceImpl; -import cn.iocoder.dashboard.util.AssertUtils; -import cn.iocoder.dashboard.util.RandomUtils; +import cn.iocoder.dashboard.util.test.AssertUtils; +import cn.iocoder.dashboard.util.test.RandomUtils; import cn.iocoder.dashboard.util.object.ObjectUtils; /** diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/common/SysCaptchaServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/common/SysCaptchaServiceTest.java index ed127442d..273065e47 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/common/SysCaptchaServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/common/SysCaptchaServiceTest.java @@ -10,7 +10,7 @@ import org.springframework.context.annotation.Import; import javax.annotation.Resource; -import static cn.iocoder.dashboard.util.RandomUtils.randomString; +import static cn.iocoder.dashboard.util.test.RandomUtils.randomString; import static org.junit.jupiter.api.Assertions.*; @Import({SysCaptchaServiceImpl.class, CaptchaProperties.class, SysCaptchaRedisDAO.class}) diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dept/SysDeptServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dept/SysDeptServiceTest.java index 48a80056e..9d17c4cb3 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dept/SysDeptServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dept/SysDeptServiceTest.java @@ -26,9 +26,9 @@ import java.util.function.Consumer; import static cn.hutool.core.bean.BeanUtil.getFieldValue; import static cn.hutool.core.util.RandomUtil.randomEle; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.RandomUtils.*; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.util.test.RandomUtils.*; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dept/SysPostServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dept/SysPostServiceTest.java index be8b3225d..b83937223 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dept/SysPostServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dept/SysPostServiceTest.java @@ -21,10 +21,10 @@ import java.util.function.Consumer; import static cn.hutool.core.util.RandomUtil.randomEle; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.RandomUtils.randomLongId; -import static cn.iocoder.dashboard.util.RandomUtils.randomPojo; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.util.test.RandomUtils.randomLongId; +import static cn.iocoder.dashboard.util.test.RandomUtils.randomPojo; import static org.junit.jupiter.api.Assertions.*; /** diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictDataServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictDataServiceTest.java index 2874285e4..043220fc4 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictDataServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictDataServiceTest.java @@ -26,9 +26,9 @@ import java.util.function.Consumer; import static cn.hutool.core.bean.BeanUtil.getFieldValue; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.RandomUtils.*; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.util.test.RandomUtils.*; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.*; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictTypeServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictTypeServiceTest.java index 9dd072733..a554f0bfa 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictTypeServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictTypeServiceTest.java @@ -22,9 +22,9 @@ import java.util.function.Consumer; import static cn.hutool.core.util.RandomUtil.randomEle; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.RandomUtils.*; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.util.test.RandomUtils.*; import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.eq; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/errorcode/SysErrorCodeServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/errorcode/SysErrorCodeServiceTest.java index c704dd6a0..84ca54130 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/errorcode/SysErrorCodeServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/errorcode/SysErrorCodeServiceTest.java @@ -27,9 +27,9 @@ import java.util.function.Consumer; import static cn.hutool.core.util.RandomUtil.randomEle; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.ERROR_CODE_DUPLICATE; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.ERROR_CODE_NOT_EXISTS; -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.RandomUtils.*; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.util.test.RandomUtils.*; import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; import static org.junit.jupiter.api.Assertions.*; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/logger/SysLoginLogServiceImplTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/logger/SysLoginLogServiceImplTest.java index 95f2d1985..e98ca5276 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/logger/SysLoginLogServiceImplTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/logger/SysLoginLogServiceImplTest.java @@ -1,11 +1,8 @@ package cn.iocoder.dashboard.modules.system.service.logger; -import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.RandomUtil; -import cn.hutool.core.util.ReflectUtil; import cn.iocoder.dashboard.BaseDbUnitTest; import cn.iocoder.dashboard.common.pojo.PageResult; -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.dashboard.framework.tracer.core.util.TracerUtils; import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogCreateReqVO; import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogExportReqVO; @@ -15,18 +12,15 @@ import cn.iocoder.dashboard.modules.system.dal.mysql.logger.SysLoginLogMapper; import cn.iocoder.dashboard.modules.system.enums.logger.SysLoginLogTypeEnum; import cn.iocoder.dashboard.modules.system.enums.logger.SysLoginResultEnum; import cn.iocoder.dashboard.modules.system.service.logger.impl.SysLoginLogServiceImpl; -import cn.iocoder.dashboard.util.RandomUtils; +import cn.iocoder.dashboard.util.test.RandomUtils; import cn.iocoder.dashboard.util.object.ObjectUtils; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; import javax.annotation.Resource; -import java.lang.reflect.Field; -import java.util.Arrays; import java.util.List; -import java.util.stream.Collectors; -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/logger/SysOperateLogServiceImplTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/logger/SysOperateLogServiceImplTest.java index b1529b609..0bf98b635 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/logger/SysOperateLogServiceImplTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/logger/SysOperateLogServiceImplTest.java @@ -16,7 +16,7 @@ import cn.iocoder.dashboard.modules.system.dal.mysql.logger.SysOperateLogMapper; import cn.iocoder.dashboard.modules.system.enums.common.SysSexEnum; import cn.iocoder.dashboard.modules.system.service.logger.impl.SysOperateLogServiceImpl; import cn.iocoder.dashboard.modules.system.service.user.SysUserService; -import cn.iocoder.dashboard.util.RandomUtils; +import cn.iocoder.dashboard.util.test.RandomUtils; import cn.iocoder.dashboard.util.object.ObjectUtils; import org.junit.jupiter.api.Test; import org.springframework.boot.test.mock.mockito.MockBean; @@ -27,8 +27,8 @@ import java.util.*; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.RandomUtils.randomLongId; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.util.test.RandomUtils.randomLongId; import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.when; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/notice/SysNoticeServiceImplTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/notice/SysNoticeServiceImplTest.java index 801ecea8c..c20013da2 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/notice/SysNoticeServiceImplTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/notice/SysNoticeServiceImplTest.java @@ -20,10 +20,10 @@ import java.util.function.Consumer; import static cn.hutool.core.util.RandomUtil.randomEle; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.NOTICE_NOT_FOUND; -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.RandomUtils.randomLongId; -import static cn.iocoder.dashboard.util.RandomUtils.randomPojo; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.util.test.RandomUtils.randomLongId; +import static cn.iocoder.dashboard.util.test.RandomUtils.randomPojo; import static org.junit.jupiter.api.Assertions.*; @Import(SysNoticeServiceImpl.class) @@ -161,4 +161,4 @@ class SysNoticeServiceImplTest extends BaseDbUnitTest { } -} \ No newline at end of file +} diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysMenuServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysMenuServiceTest.java index 9cefaada3..bff5f5b4b 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysMenuServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysMenuServiceTest.java @@ -13,7 +13,7 @@ import cn.iocoder.dashboard.modules.system.enums.permission.MenuTypeEnum; import cn.iocoder.dashboard.modules.system.mq.producer.permission.SysMenuProducer; import cn.iocoder.dashboard.modules.system.service.permission.impl.SysMenuServiceImpl; import cn.iocoder.dashboard.util.sping.SpringAopUtils; -import cn.iocoder.dashboard.util.RandomUtils; +import cn.iocoder.dashboard.util.test.RandomUtils; import cn.iocoder.dashboard.util.object.ObjectUtils; import com.google.common.collect.Multimap; import org.junit.jupiter.api.Assertions; @@ -25,9 +25,9 @@ import javax.annotation.Resource; import java.util.*; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.RandomUtils.*; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.util.test.RandomUtils.*; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.verify; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysPermissionServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysPermissionServiceTest.java index a4b5fa71e..9d974c7bd 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysPermissionServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysPermissionServiceTest.java @@ -14,9 +14,9 @@ import org.springframework.context.annotation.Import; import javax.annotation.Resource; import java.util.List; -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.RandomUtils.randomLongId; -import static cn.iocoder.dashboard.util.RandomUtils.randomPojo; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.util.test.RandomUtils.randomLongId; +import static cn.iocoder.dashboard.util.test.RandomUtils.randomPojo; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.verify; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysRoleServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysRoleServiceTest.java index ed647798a..682472881 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysRoleServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysRoleServiceTest.java @@ -23,9 +23,9 @@ import java.util.*; import java.util.stream.Collectors; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.RandomUtils.*; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.util.test.RandomUtils.*; import static cn.iocoder.dashboard.util.object.ObjectUtils.max; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.verify; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsChannelServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsChannelServiceTest.java index e1b7b145c..60980a235 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsChannelServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsChannelServiceTest.java @@ -25,8 +25,8 @@ import java.util.function.Consumer; import static cn.hutool.core.util.RandomUtil.randomEle; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.SMS_CHANNEL_HAS_CHILDREN; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.SMS_CHANNEL_NOT_EXISTS; -import static cn.iocoder.dashboard.util.AssertUtils.*; -import static cn.iocoder.dashboard.util.RandomUtils.*; +import static cn.iocoder.dashboard.util.test.AssertUtils.*; +import static cn.iocoder.dashboard.util.test.RandomUtils.*; import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; import static cn.iocoder.dashboard.util.object.ObjectUtils.max; import static org.junit.jupiter.api.Assertions.*; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsLogServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsLogServiceTest.java index b7152d1ba..0e1208b3d 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsLogServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsLogServiceTest.java @@ -27,8 +27,8 @@ import java.util.function.Consumer; import static cn.hutool.core.util.RandomUtil.randomBoolean; import static cn.hutool.core.util.RandomUtil.randomEle; -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.RandomUtils.*; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.util.test.RandomUtils.*; import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; import static org.junit.jupiter.api.Assertions.*; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsServiceTest.java index f84e8753f..5391f117f 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsServiceTest.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.modules.system.service.sms; import cn.hutool.core.map.MapUtil; -import cn.iocoder.dashboard.BaseMockitoUnitTest; +import cn.iocoder.dashboard.framework.test.core.BaseMockitoUnitTest; import cn.iocoder.dashboard.common.core.KeyValue; import cn.iocoder.dashboard.common.enums.CommonStatusEnum; import cn.iocoder.dashboard.common.enums.UserTypeEnum; @@ -25,8 +25,8 @@ import java.util.Map; import static cn.hutool.core.util.RandomUtil.randomEle; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.RandomUtils.*; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.util.test.RandomUtils.*; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.*; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsTemplateServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsTemplateServiceTest.java index f4bd9efa6..db6f06ce1 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsTemplateServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsTemplateServiceTest.java @@ -34,9 +34,9 @@ import java.util.function.Consumer; import static cn.hutool.core.bean.BeanUtil.getFieldValue; import static cn.hutool.core.util.RandomUtil.randomEle; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.RandomUtils.*; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.util.test.RandomUtils.*; import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; import static cn.iocoder.dashboard.util.object.ObjectUtils.max; import static org.junit.jupiter.api.Assertions.*; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/user/SysUserServiceImplTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/user/SysUserServiceImplTest.java index bdb663f82..9f1b7d3c3 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/user/SysUserServiceImplTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/user/SysUserServiceImplTest.java @@ -35,9 +35,9 @@ import java.util.function.Consumer; import static cn.hutool.core.util.RandomUtil.randomBytes; import static cn.hutool.core.util.RandomUtil.randomEle; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.RandomUtils.*; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.util.test.RandomUtils.*; import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; import static org.assertj.core.util.Lists.newArrayList; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml index 829d67422..cc077bc0a 100644 --- a/yudao-dependencies/pom.xml +++ b/yudao-dependencies/pom.xml @@ -13,4 +13,93 @@ 基础 bom 文件，管理整个项目的依赖版本 https://github.com/YunaiV/ruoyi-vue-pro + + 1.0.0 + + 1.16.14 + 1.4.1.Final + 5.6.1 + 2.2.7 + 2.2 + 1.0.5 + + + 4.5.18 + 2.1.0 + 1.2.7 + + + + + + + org.projectlombok + lombok + ${lombok.version} + + + + org.mapstruct + mapstruct + ${mapstruct.version} + + + org.mapstruct + mapstruct-processor + ${mapstruct.version} + true + + + org.mapstruct + mapstruct-jdk8 + ${mapstruct.version} + + + + cn.hutool + hutool-all + ${hutool.version} + + + + com.alibaba + easyexcel + ${easyexcel.verion} + + + + org.apache.velocity + velocity-engine-core + ${velocity.version} + + + + cn.smallbun.screw + screw-core + ${screw.version} + + + + + + + com.yunpian.sdk + yunpian-java-sdk + ${yunpian-java-sdk.version} + + + + com.aliyun + aliyun-java-sdk-core + ${aliyun-java-sdk-core.version} + + + com.aliyun + aliyun-java-sdk-dysmsapi + ${aliyun-java-sdk-dysmsapi.version} + + + + + diff --git a/yudao-framework/pom.xml b/yudao-framework/pom.xml index 6278c533e..5f5713fd0 100644 --- a/yudao-framework/pom.xml +++ b/yudao-framework/pom.xml @@ -39,19 +39,9 @@ 8.5.0 6.1 2.3.1 - - 1.16.14 - 1.4.1.Final - 5.6.1 - 2.2.7 - 2.2 - 1.0.5 + 7.2.6.RELEASE 0.1.16 - - 4.5.18 - 2.1.0 - 1.2.7 @@ -250,48 +240,40 @@ org.projectlombok lombok - ${lombok.version} org.mapstruct mapstruct - ${mapstruct.version} org.mapstruct mapstruct-processor - ${mapstruct.version} true org.mapstruct mapstruct-jdk8 - ${mapstruct.version} cn.hutool hutool-all - ${hutool.version} com.alibaba easyexcel - ${easyexcel.verion} org.apache.velocity velocity-engine-core - ${velocity.version} cn.smallbun.screw screw-core - ${screw.version} @@ -300,18 +282,15 @@ com.yunpian.sdk yunpian-java-sdk - ${yunpian-java-sdk.version} com.aliyun aliyun-java-sdk-core - ${aliyun-java-sdk-core.version} com.aliyun aliyun-java-sdk-dysmsapi - ${aliyun-java-sdk-dysmsapi.version} diff --git a/yudao-framework/src/test/java/cn/iocoder/dashboard/BaseMockitoUnitTest.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/test/core/BaseMockitoUnitTest.java similarity index 82% rename from yudao-framework/src/test/java/cn/iocoder/dashboard/BaseMockitoUnitTest.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/test/core/BaseMockitoUnitTest.java index 4a595b24e..eb909a846 100644 --- a/yudao-framework/src/test/java/cn/iocoder/dashboard/BaseMockitoUnitTest.java +++ b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/test/core/BaseMockitoUnitTest.java @@ -1,4 +1,4 @@ -package cn.iocoder.dashboard; +package cn.iocoder.dashboard.framework.test.core; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; diff --git a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/test/package-info.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/test/package-info.java new file mode 100644 index 000000000..6e2073812 --- /dev/null +++ b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/test/package-info.java @@ -0,0 +1,4 @@ +/** + * 单元测试、集成测试的拓展 + */ +package cn.iocoder.dashboard.framework.test; diff --git a/yudao-framework/src/main/java/cn/iocoder/dashboard/util/AssertUtils.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/util/test/AssertUtils.java similarity index 98% rename from yudao-framework/src/main/java/cn/iocoder/dashboard/util/AssertUtils.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/util/test/AssertUtils.java index 0d6987549..c845216fe 100644 --- a/yudao-framework/src/main/java/cn/iocoder/dashboard/util/AssertUtils.java +++ b/yudao-framework/src/main/java/cn/iocoder/dashboard/util/test/AssertUtils.java @@ -1,4 +1,4 @@ -package cn.iocoder.dashboard.util; +package cn.iocoder.dashboard.util.test; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ReflectUtil; diff --git a/yudao-framework/src/main/java/cn/iocoder/dashboard/util/RandomUtils.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/util/test/RandomUtils.java similarity index 98% rename from yudao-framework/src/main/java/cn/iocoder/dashboard/util/RandomUtils.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/util/test/RandomUtils.java index 51cd61f89..9ff8d1c4c 100644 --- a/yudao-framework/src/main/java/cn/iocoder/dashboard/util/RandomUtils.java +++ b/yudao-framework/src/main/java/cn/iocoder/dashboard/util/test/RandomUtils.java @@ -1,4 +1,4 @@ -package cn.iocoder.dashboard.util; +package cn.iocoder.dashboard.util.test; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.RandomUtil; diff --git a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java index a544d03d5..89c1d597b 100644 --- a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java +++ b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.framework.sms.core.client.impl.aliyun; import cn.hutool.core.util.ReflectUtil; -import cn.iocoder.dashboard.BaseMockitoUnitTest; +import cn.iocoder.dashboard.framework.test.core.BaseMockitoUnitTest; import cn.iocoder.dashboard.common.core.KeyValue; import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult; @@ -29,7 +29,7 @@ import java.util.List; import java.util.function.Function; import static cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants.SMS_API_PARAM_ERROR; -import static cn.iocoder.dashboard.util.RandomUtils.*; +import static cn.iocoder.dashboard.util.test.RandomUtils.*; import static cn.iocoder.dashboard.util.json.JsonUtils.toJsonString; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; diff --git a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java index 54dba079b..67db4308d 100644 --- a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java +++ b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.framework.sms.core.client.impl.aliyun; -import cn.iocoder.dashboard.BaseMockitoUnitTest; +import cn.iocoder.dashboard.framework.test.core.BaseMockitoUnitTest; import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; import cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; import org.junit.jupiter.api.Test; diff --git a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java index 3e4190c0a..0d1232e67 100644 --- a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java +++ b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.framework.sms.core.client.impl.yunpian; import cn.hutool.core.util.ReflectUtil; -import cn.iocoder.dashboard.BaseMockitoUnitTest; +import cn.iocoder.dashboard.framework.test.core.BaseMockitoUnitTest; import cn.iocoder.dashboard.common.core.KeyValue; import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult; @@ -29,7 +29,7 @@ import java.util.Map; import java.util.function.Function; import java.util.function.Supplier; -import static cn.iocoder.dashboard.util.RandomUtils.*; +import static cn.iocoder.dashboard.util.test.RandomUtils.*; import static com.yunpian.sdk.constant.Code.OK; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; diff --git a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java index de6e46432..261bc0d22 100644 --- a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java +++ b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.framework.sms.core.client.impl.yunpian; -import cn.iocoder.dashboard.BaseMockitoUnitTest; +import cn.iocoder.dashboard.framework.test.core.BaseMockitoUnitTest; import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; import cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; import org.junit.jupiter.api.Test; diff --git a/yudao-framework/src/test/java/cn/iocoder/dashboard/package-info.java b/yudao-framework/src/test/java/cn/iocoder/dashboard/package-info.java deleted file mode 100644 index f49464f8e..000000000 --- a/yudao-framework/src/test/java/cn/iocoder/dashboard/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package cn.iocoder.dashboard;