Skip to content

Commit ef9fcc9

Browse files
committed
reactor:@MockBean => @MockitoBean
1 parent 863ec14 commit ef9fcc9

42 files changed

Lines changed: 206 additions & 203 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.

pom.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
<!-- 各种 module 拓展 -->
1616
<module>yudao-module-system</module>
1717
<module>yudao-module-infra</module>
18-
<module>yudao-module-member</module>
19-
<module>yudao-module-bpm</module>
20-
<module>yudao-module-report</module>
21-
<module>yudao-module-mp</module>
22-
<module>yudao-module-pay</module>
23-
<module>yudao-module-mall</module>
24-
<module>yudao-module-crm</module>
25-
<module>yudao-module-erp</module>
26-
<module>yudao-module-iot</module>
18+
<!-- <module>yudao-module-member</module>-->
19+
<!-- <module>yudao-module-bpm</module>-->
20+
<!-- <module>yudao-module-report</module>-->
21+
<!-- <module>yudao-module-mp</module>-->
22+
<!-- <module>yudao-module-pay</module>-->
23+
<!-- <module>yudao-module-mall</module>-->
24+
<!-- <module>yudao-module-crm</module>-->
25+
<!-- <module>yudao-module-erp</module>-->
26+
<!-- <module>yudao-module-iot</module>-->
2727
<!-- AI 大模型的开启,请参考 https://doc.iocoder.cn/ai/build/ 文档,对 JDK 版本要要求! -->
2828
<!-- <module>yudao-module-ai</module>-->
2929
</modules>

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;
2627
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-
@MockitoBean
63+
@MockBean
6464
private DatabaseTableService databaseTableService;
6565

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

71-
@MockitoBean
71+
@MockBean
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;
1514
import org.junit.jupiter.api.BeforeEach;
1615
import org.junit.jupiter.api.Test;
1716
import org.mockito.MockedStatic;
1817
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;
2120

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-
@MockitoBean
49+
@MockBean
5050
private AES aes;
5151

52-
@MockitoBean
52+
@MockBean
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;
98
import org.apache.ibatis.type.JdbcType;
109
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;
1312

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-
@MockitoBean
27+
@MockBean
2828
private DataSourceConfigService dataSourceConfigService;
2929

3030
@Test

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
import cn.iocoder.yudao.module.infra.framework.file.core.client.local.LocalFileClient;
1616
import cn.iocoder.yudao.module.infra.framework.file.core.client.local.LocalFileClientConfig;
1717
import cn.iocoder.yudao.module.infra.framework.file.core.enums.FileStorageEnum;
18-
import jakarta.annotation.Resource;
19-
import jakarta.validation.Validator;
2018
import lombok.Data;
2119
import org.junit.jupiter.api.Test;
20+
import org.springframework.boot.test.mock.mockito.MockBean;
2221
import org.springframework.context.annotation.Import;
23-
import org.springframework.test.context.bean.override.mockito.MockitoBean;
2422

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-
@MockitoBean
56+
@MockBean
5757
private Validator validator;
58-
@MockitoBean
58+
@MockBean
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;
1415
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-
@MockitoBean
38+
@MockBean
3939
private FileConfigService fileConfigService;
4040

4141
@BeforeEach

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@
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;
1413
import org.junit.jupiter.api.Test;
1514
import org.mockito.MockedStatic;
1615
import org.quartz.SchedulerException;
16+
import org.springframework.boot.test.mock.mockito.MockBean;
1717
import org.springframework.context.annotation.Import;
18-
import org.springframework.test.context.bean.override.mockito.MockitoBean;
18+
19+
import javax.annotation.Resource;
1920

2021
import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
2122
import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
@@ -35,10 +36,10 @@ public class JobServiceImplTest extends BaseDbUnitTest {
3536
private JobServiceImpl jobService;
3637
@Resource
3738
private JobMapper jobMapper;
38-
@MockitoBean
39+
@MockBean
3940
private SchedulerManager schedulerManager;
4041

41-
@MockitoBean
42+
@MockBean
4243
private JobLogCleanJob jobLogCleanJob;
4344

4445
@Test

yudao-module-mall/yudao-module-product/src/test/java/cn/iocoder/yudao/module/product/service/comment/ProductCommentServiceImplTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
import cn.iocoder.yudao.module.product.service.spu.ProductSpuService;
1818
import org.junit.jupiter.api.Disabled;
1919
import org.junit.jupiter.api.Test;
20+
import org.springframework.boot.test.mock.mockito.MockBean;
2021
import org.springframework.context.annotation.Import;
2122
import org.springframework.context.annotation.Lazy;
22-
import org.springframework.test.context.bean.override.mockito.MockitoBean;
2323

2424
import javax.annotation.Resource;
2525
import java.time.LocalDateTime;
@@ -48,9 +48,9 @@ public class ProductCommentServiceImplTest extends BaseDbUnitTest {
4848
@Lazy
4949
private ProductCommentServiceImpl productCommentService;
5050

51-
@MockitoBean
51+
@MockBean
5252
private ProductSpuService productSpuService;
53-
@MockitoBean
53+
@MockBean
5454
private ProductSkuService productSkuService;
5555

5656
public String generateNo() {

yudao-module-mall/yudao-module-product/src/test/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
import cn.iocoder.yudao.module.product.service.property.ProductPropertyService;
1111
import cn.iocoder.yudao.module.product.service.property.ProductPropertyValueService;
1212
import cn.iocoder.yudao.module.product.service.spu.ProductSpuService;
13-
import jakarta.annotation.Resource;
1413
import org.junit.jupiter.api.Disabled;
1514
import org.junit.jupiter.api.Test;
15+
import org.springframework.boot.test.mock.mockito.MockBean;
1616
import org.springframework.context.annotation.Import;
17-
import org.springframework.test.context.bean.override.mockito.MockitoBean;
1817

18+
import javax.annotation.Resource;
1919
import java.util.Arrays;
2020
import java.util.List;
2121

@@ -44,11 +44,11 @@ public class ProductSkuServiceTest extends BaseDbUnitTest {
4444
@Resource
4545
private ProductSkuMapper productSkuMapper;
4646

47-
@MockitoBean
47+
@MockBean
4848
private ProductSpuService productSpuService;
49-
@MockitoBean
49+
@MockBean
5050
private ProductPropertyService productPropertyService;
51-
@MockitoBean
51+
@MockBean
5252
private ProductPropertyValueService productPropertyValueService;
5353

5454
public Long generateId() {

yudao-module-mall/yudao-module-product/src/test/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImplTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import org.junit.jupiter.api.Assertions;
2222
import org.junit.jupiter.api.Disabled;
2323
import org.junit.jupiter.api.Test;
24+
import org.springframework.boot.test.mock.mockito.MockBean;
2425
import org.springframework.context.annotation.Import;
25-
import org.springframework.test.context.bean.override.mockito.MockitoBean;
2626

2727
import javax.annotation.Resource;
2828
import java.math.RoundingMode;
@@ -58,15 +58,15 @@ public class ProductSpuServiceImplTest extends BaseDbUnitTest {
5858
@Resource
5959
private ProductSpuMapper productSpuMapper;
6060

61-
@MockitoBean
61+
@MockBean
6262
private ProductSkuServiceImpl productSkuService;
63-
@MockitoBean
63+
@MockBean
6464
private ProductCategoryServiceImpl categoryService;
65-
@MockitoBean
65+
@MockBean
6666
private ProductBrandServiceImpl brandService;
67-
@MockitoBean
67+
@MockBean
6868
private ProductPropertyService productPropertyService;
69-
@MockitoBean
69+
@MockBean
7070
private ProductPropertyValueService productPropertyValueService;
7171

7272
public String generateNo() {

0 commit comments

Comments
 (0)