Skip to content

Commit 863ec14

Browse files
YunaiVYunaiV
committed
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts: # yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/db/DataSourceConfigServiceImplTest.java # yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImplTest.java # yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/file/FileConfigServiceImplTest.java # yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/job/JobServiceImplTest.java # yudao-module-mall/yudao-module-product/src/test/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceTest.java # yudao-module-mall/yudao-module-trade/src/test/java/cn/iocoder/yudao/module/trade/service/aftersale/AfterSaleServiceTest.java # yudao-module-mall/yudao-module-trade/src/test/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageRecordServiceImplTest.java # yudao-module-member/src/test/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceTest.java # yudao-module-member/src/test/java/cn/iocoder/yudao/module/member/service/group/MemberGroupServiceImplTest.java # yudao-module-member/src/test/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImplTest.java # yudao-module-member/src/test/java/cn/iocoder/yudao/module/member/service/tag/MemberTagServiceImplTest.java # yudao-module-pay/src/test/java/cn/iocoder/yudao/module/pay/service/app/PayAppServiceTest.java # yudao-module-pay/src/test/java/cn/iocoder/yudao/module/pay/service/channel/PayChannelServiceTest.java # yudao-module-pay/src/test/java/cn/iocoder/yudao/module/pay/service/notify/PayNotifyServiceTest.java # yudao-module-pay/src/test/java/cn/iocoder/yudao/module/pay/service/refund/PayRefundServiceTest.java # yudao-module-report/src/test/java/cn/iocoder/yudao/module/report/service/goview/GoViewDataServiceImplTest.java # yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/dict/DictDataServiceImplTest.java # yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/dict/DictTypeServiceImplTest.java # yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailAccountServiceImplTest.java # yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ApproveServiceImplTest.java # yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImplTest.java # yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/permission/PermissionServiceTest.java # yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceImplTest.java # yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelServiceTest.java # yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateServiceImplTest.java # yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/tenant/TenantPackageServiceImplTest.java # yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImplTest.java
2 parents 7a8e913 + e79005a commit 863ec14

52 files changed

Lines changed: 228 additions & 238 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎yudao-module-infra/src/main/resources/codegen/java/test/serviceTest.vm‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package ${basePackage}.module.${table.moduleName}.service.${table.businessName};
22

33
import org.junit.jupiter.api.Disabled;
44
import org.junit.jupiter.api.Test;
5-
import org.springframework.boot.test.mock.mockito.MockBean;
65

76
import ${jakartaPackage}.annotation.Resource;
87

‎yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImplTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
import com.baomidou.mybatisplus.generator.config.po.TableField;
2424
import com.baomidou.mybatisplus.generator.config.po.TableInfo;
2525
import org.junit.jupiter.api.Test;
26-
import org.springframework.boot.test.mock.mockito.MockBean;
2726
import org.springframework.context.annotation.Import;
27+
import org.springframework.test.context.bean.override.mockito.MockitoBean;
2828

2929
import javax.annotation.Resource;
3030
import java.util.Arrays;
@@ -60,15 +60,15 @@ public class CodegenServiceImplTest extends BaseDbUnitTest {
6060
@Resource
6161
private CodegenColumnMapper codegenColumnMapper;
6262

63-
@MockBean
63+
@MockitoBean
6464
private DatabaseTableService databaseTableService;
6565

66-
@MockBean
66+
@MockitoBean
6767
private CodegenBuilder codegenBuilder;
68-
@MockBean
68+
@MockitoBean
6969
private CodegenEngine codegenEngine;
7070

71-
@MockBean
71+
@MockitoBean
7272
private CodegenProperties codegenProperties;
7373

7474
@Test

‎yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/db/DataSourceConfigServiceImplTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
import cn.iocoder.yudao.module.infra.dal.mysql.db.DataSourceConfigMapper;
1212
import com.baomidou.dynamic.datasource.creator.DataSourceProperty;
1313
import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties;
14+
import jakarta.annotation.Resource;
1415
import org.junit.jupiter.api.BeforeEach;
1516
import org.junit.jupiter.api.Test;
1617
import org.mockito.MockedStatic;
1718
import org.mockito.stubbing.Answer;
18-
import org.springframework.boot.test.mock.mockito.MockBean;
1919
import org.springframework.context.annotation.Import;
20+
import org.springframework.test.context.bean.override.mockito.MockitoBean;
2021

21-
import javax.annotation.Resource;
2222
import java.util.List;
2323

2424
import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
@@ -46,10 +46,10 @@ public class DataSourceConfigServiceImplTest extends BaseDbUnitTest {
4646
@Resource
4747
private DataSourceConfigMapper dataSourceConfigMapper;
4848

49-
@MockBean
49+
@MockitoBean
5050
private AES aes;
5151

52-
@MockBean
52+
@MockitoBean
5353
private DynamicDataSourceProperties dynamicDataSourceProperties;
5454

5555
@BeforeEach

‎yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImplTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
import com.baomidou.mybatisplus.generator.config.po.TableField;
66
import com.baomidou.mybatisplus.generator.config.po.TableInfo;
77
import com.baomidou.mybatisplus.generator.config.rules.DbColumnType;
8+
import jakarta.annotation.Resource;
89
import org.apache.ibatis.type.JdbcType;
910
import org.junit.jupiter.api.Test;
10-
import org.springframework.boot.test.mock.mockito.MockBean;
1111
import org.springframework.context.annotation.Import;
12+
import org.springframework.test.context.bean.override.mockito.MockitoBean;
1213

13-
import javax.annotation.Resource;
1414
import java.util.List;
1515

1616
import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;
@@ -24,7 +24,7 @@ public class DatabaseTableServiceImplTest extends BaseDbUnitTest {
2424
@Resource
2525
private DatabaseTableServiceImpl databaseTableService;
2626

27-
@MockBean
27+
@MockitoBean
2828
private DataSourceConfigService dataSourceConfigService;
2929

3030
@Test

‎yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/file/FileConfigServiceImplTest.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,24 @@
44
import cn.hutool.core.date.LocalDateTimeUtil;
55
import cn.hutool.core.map.MapUtil;
66
import cn.iocoder.yudao.framework.common.pojo.PageResult;
7+
import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
8+
import cn.iocoder.yudao.module.infra.controller.admin.file.vo.config.FileConfigPageReqVO;
9+
import cn.iocoder.yudao.module.infra.controller.admin.file.vo.config.FileConfigSaveReqVO;
10+
import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileConfigDO;
11+
import cn.iocoder.yudao.module.infra.dal.mysql.file.FileConfigMapper;
712
import cn.iocoder.yudao.module.infra.framework.file.core.client.FileClient;
813
import cn.iocoder.yudao.module.infra.framework.file.core.client.FileClientConfig;
914
import cn.iocoder.yudao.module.infra.framework.file.core.client.FileClientFactory;
1015
import cn.iocoder.yudao.module.infra.framework.file.core.client.local.LocalFileClient;
1116
import cn.iocoder.yudao.module.infra.framework.file.core.client.local.LocalFileClientConfig;
1217
import cn.iocoder.yudao.module.infra.framework.file.core.enums.FileStorageEnum;
13-
import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
14-
import cn.iocoder.yudao.module.infra.controller.admin.file.vo.config.FileConfigPageReqVO;
15-
import cn.iocoder.yudao.module.infra.controller.admin.file.vo.config.FileConfigSaveReqVO;
16-
import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileConfigDO;
17-
import cn.iocoder.yudao.module.infra.dal.mysql.file.FileConfigMapper;
18+
import jakarta.annotation.Resource;
19+
import jakarta.validation.Validator;
1820
import lombok.Data;
1921
import org.junit.jupiter.api.Test;
20-
import org.springframework.boot.test.mock.mockito.MockBean;
2122
import org.springframework.context.annotation.Import;
23+
import org.springframework.test.context.bean.override.mockito.MockitoBean;
2224

23-
import javax.annotation.Resource;
24-
import javax.validation.Validator;
2525
import java.io.Serializable;
2626
import java.time.LocalDateTime;
2727
import java.util.Map;
@@ -53,9 +53,9 @@ public class FileConfigServiceImplTest extends BaseDbUnitTest {
5353
@Resource
5454
private FileConfigMapper fileConfigMapper;
5555

56-
@MockBean
56+
@MockitoBean
5757
private Validator validator;
58-
@MockBean
58+
@MockitoBean
5959
private FileClientFactory fileClientFactory;
6060

6161
@Test

‎yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImplTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
import cn.iocoder.yudao.module.infra.framework.file.core.client.FileClient;
1212
import org.junit.jupiter.api.BeforeEach;
1313
import org.junit.jupiter.api.Test;
14-
import org.springframework.boot.test.mock.mockito.MockBean;
1514
import org.springframework.context.annotation.Import;
15+
import org.springframework.test.context.bean.override.mockito.MockitoBean;
1616

1717
import javax.annotation.Resource;
1818
import java.time.LocalDateTime;
@@ -35,7 +35,7 @@ public class FileServiceImplTest extends BaseDbUnitTest {
3535
@Resource
3636
private FileMapper fileMapper;
3737

38-
@MockBean
38+
@MockitoBean
3939
private FileConfigService fileConfigService;
4040

4141
@BeforeEach

‎yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/job/JobServiceImplTest.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,12 @@
1010
import cn.iocoder.yudao.module.infra.dal.mysql.job.JobMapper;
1111
import cn.iocoder.yudao.module.infra.enums.job.JobStatusEnum;
1212
import cn.iocoder.yudao.module.infra.job.job.JobLogCleanJob;
13+
import jakarta.annotation.Resource;
1314
import org.junit.jupiter.api.Test;
1415
import org.mockito.MockedStatic;
1516
import org.quartz.SchedulerException;
16-
import org.springframework.boot.test.mock.mockito.MockBean;
1717
import org.springframework.context.annotation.Import;
18-
19-
import javax.annotation.Resource;
18+
import org.springframework.test.context.bean.override.mockito.MockitoBean;
2019

2120
import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
2221
import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
@@ -36,10 +35,10 @@ public class JobServiceImplTest extends BaseDbUnitTest {
3635
private JobServiceImpl jobService;
3736
@Resource
3837
private JobMapper jobMapper;
39-
@MockBean
38+
@MockitoBean
4039
private SchedulerManager schedulerManager;
4140

42-
@MockBean
41+
@MockitoBean
4342
private JobLogCleanJob jobLogCleanJob;
4443

4544
@Test

‎yudao-module-infra/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentServiceImplTest‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.infra.service.demo;
22

33
import org.junit.jupiter.api.Disabled;
44
import org.junit.jupiter.api.Test;
5-
import org.springframework.boot.test.mock.mockito.MockBean;
65

76
import javax.annotation.Resource;
87

‎yudao-module-infra/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentServiceImplTest‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.infra.service.demo;
22

33
import org.junit.jupiter.api.Disabled;
44
import org.junit.jupiter.api.Test;
5-
import org.springframework.boot.test.mock.mockito.MockBean;
65

76
import javax.annotation.Resource;
87

‎yudao-module-infra/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentServiceImplTest‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.infra.service.demo;
22

33
import org.junit.jupiter.api.Disabled;
44
import org.junit.jupiter.api.Test;
5-
import org.springframework.boot.test.mock.mockito.MockBean;
65

76
import javax.annotation.Resource;
87

0 commit comments

Comments
 (0)