From 30914f371d36495f75f8f28418bf2de764008e47 Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Thu, 15 Jan 2026 17:30:54 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E5=8D=87=E7=BA=A7Mockito=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 ++-- weixin-java-channel/pom.xml | 7 +------ weixin-java-common/pom.xml | 11 ++++++----- weixin-java-cp/pom.xml | 4 +++- .../service/impl/WxCpTpCustomizedServiceImplTest.java | 4 ++-- .../tp/service/impl/WxCpTpEditionServiceImplTest.java | 6 +++--- .../tp/service/impl/WxCpTpLicenseServiceImplTest.java | 6 +++--- .../tp/service/impl/WxCpTpOrderServiceImplTest.java | 6 +++--- .../cp/tp/service/impl/WxCpTpTagServiceImplTest.java | 4 ++-- weixin-java-miniapp/pom.xml | 2 +- weixin-java-mp/pom.xml | 4 +++- .../mp/api/impl/WxMpCommentServiceImplTest.java | 2 +- .../weixin/mp/api/impl/WxMpOcrServiceImplTest.java | 2 +- .../weixin/mp/api/impl/WxMpWifiServiceImplTest.java | 4 ++-- weixin-java-qidian/pom.xml | 6 +----- 15 files changed, 34 insertions(+), 38 deletions(-) diff --git a/pom.xml b/pom.xml index d58a677b2..d7d93322b 100644 --- a/pom.xml +++ b/pom.xml @@ -257,8 +257,8 @@ org.mockito - mockito-all - 1.10.19 + mockito-core + 5.14.2 test diff --git a/weixin-java-channel/pom.xml b/weixin-java-channel/pom.xml index c15ea302e..28b3e2ed6 100644 --- a/weixin-java-channel/pom.xml +++ b/weixin-java-channel/pom.xml @@ -121,12 +121,7 @@ jedis-lock true - - org.mockito - mockito-core - 3.3.3 - test - + diff --git a/weixin-java-common/pom.xml b/weixin-java-common/pom.xml index 68826ca2d..2053177b1 100644 --- a/weixin-java-common/pom.xml +++ b/weixin-java-common/pom.xml @@ -86,6 +86,11 @@ org.projectlombok lombok + + org.mockito + mockito-core + test + ch.qos.logback @@ -97,11 +102,7 @@ testng test - - org.mockito - mockito-all - test - + com.google.inject guice diff --git a/weixin-java-cp/pom.xml b/weixin-java-cp/pom.xml index 6f8ab756a..9294b62d2 100644 --- a/weixin-java-cp/pom.xml +++ b/weixin-java-cp/pom.xml @@ -57,6 +57,7 @@ org.springframework.data spring-data-redis + org.testng testng @@ -64,9 +65,10 @@ org.mockito - mockito-all + mockito-core test + com.google.inject guice diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/tp/service/impl/WxCpTpCustomizedServiceImplTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/tp/service/impl/WxCpTpCustomizedServiceImplTest.java index 82fdb1d2a..23babff41 100644 --- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/tp/service/impl/WxCpTpCustomizedServiceImplTest.java +++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/tp/service/impl/WxCpTpCustomizedServiceImplTest.java @@ -13,8 +13,8 @@ import org.testng.annotations.Test; import static me.chanjar.weixin.cp.constant.WxCpApiPathConsts.Tp.GET_CUSTOMIZED_APP_DETAIL; import static me.chanjar.weixin.cp.constant.WxCpApiPathConsts.Tp.GET_TEMPLATE_LIST; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/tp/service/impl/WxCpTpEditionServiceImplTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/tp/service/impl/WxCpTpEditionServiceImplTest.java index 7eebf1f30..5746c1e91 100644 --- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/tp/service/impl/WxCpTpEditionServiceImplTest.java +++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/tp/service/impl/WxCpTpEditionServiceImplTest.java @@ -11,8 +11,8 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import static me.chanjar.weixin.cp.constant.WxCpApiPathConsts.Tp.PROLONG_TRY; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; @@ -34,7 +34,7 @@ public class WxCpTpEditionServiceImplTest { */ @BeforeClass public void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); configStorage = new WxCpTpDefaultConfigImpl(); when(wxCpTpService.getWxCpTpConfigStorage()).thenReturn(configStorage); wxCpTpEditionService = new WxCpTpEditionServiceImpl(wxCpTpService); diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/tp/service/impl/WxCpTpLicenseServiceImplTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/tp/service/impl/WxCpTpLicenseServiceImplTest.java index 7ad22c654..3398d0806 100644 --- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/tp/service/impl/WxCpTpLicenseServiceImplTest.java +++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/tp/service/impl/WxCpTpLicenseServiceImplTest.java @@ -16,8 +16,8 @@ import org.testng.annotations.Test; import java.util.*; import static me.chanjar.weixin.cp.constant.WxCpApiPathConsts.License.*; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; @@ -41,7 +41,7 @@ public class WxCpTpLicenseServiceImplTest { */ @BeforeClass public void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); configStorage = new WxCpTpDefaultConfigImpl(); when(wxCpTpService.getWxCpTpConfigStorage()).thenReturn(configStorage); wxCpTpLicenseService = new WxCpTpLicenseServiceImpl(wxCpTpService); diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/tp/service/impl/WxCpTpOrderServiceImplTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/tp/service/impl/WxCpTpOrderServiceImplTest.java index 91df78051..db504fe24 100644 --- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/tp/service/impl/WxCpTpOrderServiceImplTest.java +++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/tp/service/impl/WxCpTpOrderServiceImplTest.java @@ -18,8 +18,8 @@ import java.util.Objects; import static me.chanjar.weixin.cp.constant.WxCpApiPathConsts.Tp.GET_ORDER; import static me.chanjar.weixin.cp.constant.WxCpApiPathConsts.Tp.GET_ORDER_LIST; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; import static org.testng.Assert.*; @@ -40,7 +40,7 @@ public class WxCpTpOrderServiceImplTest { */ @BeforeClass public void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); configStorage = new WxCpTpDefaultConfigImpl(); when(wxCpTpService.getWxCpTpConfigStorage()).thenReturn(configStorage); wxCpTpOrderService = new WxCpTpOrderServiceImpl(wxCpTpService); diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/tp/service/impl/WxCpTpTagServiceImplTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/tp/service/impl/WxCpTpTagServiceImplTest.java index 7ff33045f..2939b8a8b 100644 --- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/tp/service/impl/WxCpTpTagServiceImplTest.java +++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/tp/service/impl/WxCpTpTagServiceImplTest.java @@ -17,7 +17,7 @@ import java.util.Arrays; import java.util.List; import static me.chanjar.weixin.cp.constant.WxCpApiPathConsts.Tag.*; -import static org.mockito.Matchers.*; +import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.when; import static org.testng.Assert.*; @@ -41,7 +41,7 @@ public class WxCpTpTagServiceImplTest { */ @BeforeClass public void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); configStorage = new WxCpTpDefaultConfigImpl(); when(wxCpTpService.getWxCpTpConfigStorage()).thenReturn(configStorage); wxCpTpTagService = new WxCpTpTagServiceImpl(wxCpTpService); diff --git a/weixin-java-miniapp/pom.xml b/weixin-java-miniapp/pom.xml index 4f5378727..a3b1687b2 100644 --- a/weixin-java-miniapp/pom.xml +++ b/weixin-java-miniapp/pom.xml @@ -106,9 +106,9 @@ org.mockito mockito-core - 3.3.3 test + diff --git a/weixin-java-mp/pom.xml b/weixin-java-mp/pom.xml index 755695d0c..823e7fd1f 100644 --- a/weixin-java-mp/pom.xml +++ b/weixin-java-mp/pom.xml @@ -54,9 +54,11 @@ org.mockito - mockito-all + mockito-core test + + com.google.inject guice diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpCommentServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpCommentServiceImplTest.java index 0109f676a..060dee10f 100644 --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpCommentServiceImplTest.java +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpCommentServiceImplTest.java @@ -10,7 +10,7 @@ import org.testng.annotations.Guice; import org.testng.annotations.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpOcrServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpOcrServiceImplTest.java index 2cc8b8011..7e9d47787 100644 --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpOcrServiceImplTest.java +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpOcrServiceImplTest.java @@ -24,7 +24,7 @@ import java.net.URL; import java.util.UUID; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpWifiServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpWifiServiceImplTest.java index d9225c7bc..a8f79603f 100644 --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpWifiServiceImplTest.java +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpWifiServiceImplTest.java @@ -11,8 +11,8 @@ import org.testng.annotations.Test; import static me.chanjar.weixin.mp.enums.WxMpApiUrl.Wifi.BIZWIFI_SHOP_GET; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/weixin-java-qidian/pom.xml b/weixin-java-qidian/pom.xml index 0752ce69d..7b06feb08 100644 --- a/weixin-java-qidian/pom.xml +++ b/weixin-java-qidian/pom.xml @@ -47,11 +47,7 @@ testng test - - org.mockito - mockito-all - test - + com.google.inject guice