Skip to content

Commit 840ab74

Browse files
YunaiVYunaiV
committed
reactor：@MockBean => @MockitoBean
1 parent ec990c9 commit 840ab74

File tree

28 files changed

+129
-131
lines changed

28 files changed

+129
-131
lines changed

‎yudao-module-infra/yudao-module-infra-server/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/yudao-module-infra-server/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/yudao-module-infra-server/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/yudao-module-infra-server/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.xml.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/yudao-module-infra-server/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-pay/yudao-module-pay-server/src/test/java/cn/iocoder/yudao/module/pay/service/app/PayAppServiceTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
import cn.iocoder.yudao.module.pay.dal.mysql.app.PayAppMapper;
1212
import cn.iocoder.yudao.module.pay.service.order.PayOrderService;
1313
import cn.iocoder.yudao.module.pay.service.refund.PayRefundService;
14-
import jakarta.annotation.Resource;
1514
import org.junit.jupiter.api.Disabled;
1615
import org.junit.jupiter.api.Test;
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;
1918

19+
import javax.annotation.Resource;
2020
import java.util.Map;
2121

2222
import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime;
@@ -46,9 +46,9 @@ public class PayAppServiceTest extends BaseDbUnitTest {
4646
@Resource
4747
private PayAppMapper appMapper;
4848

49-
@MockitoBean
49+
@MockBean
5050
private PayOrderService orderService;
51-
@MockitoBean
51+
@MockBean
5252
private PayRefundService refundService;
5353

5454
@Test

‎yudao-module-pay/yudao-module-pay-server/src/test/java/cn/iocoder/yudao/module/pay/service/channel/PayChannelServiceTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
import cn.iocoder.yudao.module.pay.framework.pay.core.client.impl.alipay.AlipayPayClientConfig;
1414
import cn.iocoder.yudao.module.pay.framework.pay.core.client.impl.weixin.WxPayClientConfig;
1515
import com.alibaba.fastjson.JSON;
16-
import jakarta.annotation.Resource;
17-
import jakarta.validation.Validator;
1816
import org.junit.jupiter.api.Test;
17+
import org.springframework.boot.test.mock.mockito.MockBean;
1918
import org.springframework.context.annotation.Import;
20-
import org.springframework.test.context.bean.override.mockito.MockitoBean;
2119

20+
import javax.annotation.Resource;
21+
import javax.validation.Validator;
2222
import java.util.Collections;
2323
import java.util.List;
2424

@@ -40,9 +40,9 @@ public class PayChannelServiceTest extends BaseDbUnitTest {
4040
@Resource
4141
private PayChannelMapper channelMapper;
4242

43-
@MockitoBean
43+
@MockBean
4444
private PayClientFactory payClientFactory;
45-
@MockitoBean
45+
@MockBean
4646
private Validator validator;
4747

4848
@Test

‎yudao-module-pay/yudao-module-pay-server/src/test/java/cn/iocoder/yudao/module/pay/service/notify/PayNotifyServiceTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
import cn.iocoder.yudao.module.pay.service.order.PayOrderService;
1919
import cn.iocoder.yudao.module.pay.service.refund.PayRefundService;
2020
import cn.iocoder.yudao.module.pay.service.refund.PayRefundServiceImpl;
21-
import jakarta.annotation.Resource;
2221
import org.junit.jupiter.api.Disabled;
2322
import org.junit.jupiter.api.Test;
2423
import org.mockito.MockedStatic;
2524
import org.redisson.api.RLock;
2625
import org.redisson.api.RedissonClient;
26+
import org.springframework.boot.test.mock.mockito.MockBean;
2727
import org.springframework.context.annotation.Import;
28-
import org.springframework.test.context.bean.override.mockito.MockitoBean;
2928

29+
import javax.annotation.Resource;
3030
import java.time.Duration;
3131
import java.util.List;
3232

@@ -54,17 +54,17 @@ public class PayNotifyServiceTest extends BaseDbUnitTest {
5454
@Resource
5555
private PayNotifyServiceImpl notifyService;
5656

57-
@MockitoBean
57+
@MockBean
5858
private PayOrderService orderService;
59-
@MockitoBean
59+
@MockBean
6060
private PayRefundService refundService;
6161

6262
@Resource
6363
private PayNotifyTaskMapper notifyTaskMapper;
6464
@Resource
6565
private PayNotifyLogMapper notifyLogMapper;
6666

67-
@MockitoBean
67+
@MockBean
6868
private RedissonClient redissonClient;
6969

7070
@Test

‎yudao-module-pay/yudao-module-pay-server/src/test/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
import org.junit.jupiter.api.BeforeEach;
2929
import org.junit.jupiter.api.Test;
3030
import org.mockito.MockedStatic;
31+
import org.springframework.boot.test.mock.mockito.MockBean;
3132
import org.springframework.context.annotation.Import;
32-
import org.springframework.test.context.bean.override.mockito.MockitoBean;
3333

3434
import javax.annotation.Resource;
3535
import java.time.Duration;
@@ -65,13 +65,13 @@ public class PayOrderServiceTest extends BaseDbAndRedisUnitTest {
6565
@Resource
6666
private PayOrderExtensionMapper orderExtensionMapper;
6767

68-
@MockitoBean
68+
@MockBean
6969
private PayProperties properties;
70-
@MockitoBean
70+
@MockBean
7171
private PayAppService appService;
72-
@MockitoBean
72+
@MockBean
7373
private PayChannelService channelService;
74-
@MockitoBean
74+
@MockBean
7575
private PayNotifyService notifyService;
7676

7777
@BeforeEach

‎yudao-module-pay/yudao-module-pay-server/src/test/java/cn/iocoder/yudao/module/pay/service/refund/PayRefundServiceTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
import cn.iocoder.yudao.module.pay.service.channel.PayChannelService;
2525
import cn.iocoder.yudao.module.pay.service.notify.PayNotifyService;
2626
import cn.iocoder.yudao.module.pay.service.order.PayOrderService;
27-
import jakarta.annotation.Resource;
2827
import org.junit.jupiter.api.BeforeEach;
2928
import org.junit.jupiter.api.Test;
3029
import org.mockito.MockedStatic;
30+
import org.springframework.boot.test.mock.mockito.MockBean;
3131
import org.springframework.context.annotation.Import;
32-
import org.springframework.test.context.bean.override.mockito.MockitoBean;
3332

33+
import javax.annotation.Resource;
3434
import java.util.List;
3535

3636
import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime;
@@ -62,15 +62,15 @@ public class PayRefundServiceTest extends BaseDbAndRedisUnitTest {
6262
@Resource
6363
private PayRefundMapper refundMapper;
6464

65-
@MockitoBean
65+
@MockBean
6666
private PayProperties payProperties;
67-
@MockitoBean
67+
@MockBean
6868
private PayOrderService orderService;
69-
@MockitoBean
69+
@MockBean
7070
private PayAppService appService;
71-
@MockitoBean
71+
@MockBean
7272
private PayChannelService channelService;
73-
@MockitoBean
73+
@MockBean
7474
private PayNotifyService notifyService;
7575

7676
@BeforeEach

0 commit comments

Comments
 (0)