This is an automated email from the ASF dual-hosted git repository.
xiaoyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new 6dd75df [ISSUE 2830] Update junit4 to junit5 modify shenyu-plugin
part 2. (#2866)
6dd75df is described below
commit 6dd75df9ef3982e58938d10bfe9e0b5bb94f3212
Author: haibo.duan <[email protected]>
AuthorDate: Fri Feb 11 14:42:55 2022 +0800
[ISSUE 2830] Update junit4 to junit5 modify shenyu-plugin part 2. (#2866)
* [Task] Update junit4 to junit5 inshenyu-plugin-base module
* [Task] Update junit4 to junit5 in shenyu-plugin-context-path module
* [Task] Update junit4 to junit5 in shenyu-plugin-cryptor module
* [Task] Update junit4 to junit5 in shenyu-plugin-divide module
* [Task] Update junit4 to junit5 in shenyu-plugin-dubbo module
---
.../plugin/base/AbstractShenyuPluginTest.java | 6 +-
.../plugin/base/RpcParamTransformPluginTest.java | 14 ++--
.../plugin/base/cache/BaseDataCacheTest.java | 73 +++++++++----------
.../plugin/base/cache/CommonHandleCacheTest.java | 6 +-
.../base/cache/CommonPluginDataSubscriberTest.java | 81 +++++++++++-----------
.../condition/data/CookieParameterDataTest.java | 13 ++--
.../condition/data/HeaderParameterDataTest.java | 13 ++--
.../base/condition/data/HostParameterDataTest.java | 22 +++---
.../base/condition/data/IpParameterDataTest.java | 12 ++--
.../condition/data/ParameterDataFactoryTest.java | 24 +++----
.../base/condition/data/PostParameterDataTest.java | 13 ++--
.../condition/data/QueryParameterDataTest.java | 11 +--
.../data/RequestMethodParameterDataTest.java | 11 +--
.../base/condition/data/URIParameterDataTest.java | 11 +--
.../judge/ContainsPredicateJudgeTest.java | 14 ++--
.../condition/judge/PredicateJudgeFactoryTest.java | 54 ++++++++-------
.../strategy/AbstractMatchStrategyTest.java | 35 ++++++----
.../condition/strategy/AndMatchStrategyTest.java | 17 ++---
.../strategy/MatchStrategyFactoryTest.java | 21 +++---
.../condition/strategy/OrMatchStrategyTest.java | 17 ++---
.../plugin/base/fallback/FallbackHandlerTest.java | 15 ++--
.../plugin/base/handler/PluginDataHandlerTest.java | 34 +++++----
.../plugin/base/utils/CacheKeyUtilsTest.java | 2 +-
.../plugin/base/utils/HostAddressUtilsTest.java | 18 ++---
.../base/utils/MatchStrategyFactoryTest.java | 17 ++---
.../plugin/base/utils/ShenyuResultWrapTest.java | 22 +++---
.../shenyu/plugin/base/utils/SingletonTest.java | 18 ++---
.../shenyu/plugin/base/utils/UriUtilsTest.java | 16 +++--
.../plugin/context/path/ContextPathPluginTest.java | 17 ++---
.../cryptor/request/CryptorRequestPluginTest.java | 14 ++--
.../response/CryptorResponsePluginTest.java | 16 ++---
.../shenyu/plugin/divide/DividePluginTest.java | 34 +++++----
.../handler/DividePluginDataHandlerTest.java | 25 ++++---
.../alibaba/dubbo/AlibabaDubboPluginTest.java | 21 +++---
.../dubbo/cache/AlibabaDubboConfigCacheTest.java | 25 ++++---
.../dubbo/handler/AlibabaDubboPluginDataTest.java | 37 ++++++----
.../dubbo/proxy/AlibabaDubboProxyServiceTest.java | 26 ++++---
.../AlibabaDubboMetaDataSubscriberTest.java | 17 +++--
.../plugin/apache/dubbo/ApacheDubboPluginTest.java | 38 ++++++----
.../dubbo/cache/ApacheDubboConfigCacheTest.java | 25 ++++---
.../handler/ApacheDubboPluginDataHandlerTest.java | 8 +--
.../dubbo/proxy/ApacheDubboProxyServiceTest.java | 19 ++---
.../ApacheDubboMetaDataSubscriberTest.java | 18 ++---
.../context/DubboShenyuContextDecoratorTest.java | 15 ++--
.../common/param/DubboParamResolveServiceTest.java | 15 ++--
45 files changed, 537 insertions(+), 443 deletions(-)
diff --git
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/AbstractShenyuPluginTest.java
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/AbstractShenyuPluginTest.java
index 175e5c2..a2bb7af 100644
---
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/AbstractShenyuPluginTest.java
+++
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/AbstractShenyuPluginTest.java
@@ -24,13 +24,13 @@ import org.apache.shenyu.common.dto.SelectorData;
import org.apache.shenyu.common.enums.SelectorTypeEnum;
import org.apache.shenyu.plugin.api.ShenyuPluginChain;
import org.apache.shenyu.plugin.base.cache.BaseDataCache;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
import org.springframework.mock.web.server.MockServerWebExchange;
import org.springframework.web.server.ServerWebExchange;
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.Collections;
import java.util.List;
@@ -57,7 +57,7 @@ public final class AbstractShenyuPluginTest {
private ShenyuPluginChain shenyuPluginChain;
- @Before
+ @BeforeEach
public void setUp() {
this.ruleData = RuleData.builder().id("1")
.selectorId("1").enabled(true)
diff --git
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/RpcParamTransformPluginTest.java
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/RpcParamTransformPluginTest.java
index 45668d2..6b501c1 100644
---
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/RpcParamTransformPluginTest.java
+++
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/RpcParamTransformPluginTest.java
@@ -22,11 +22,11 @@ import org.apache.shenyu.common.enums.PluginEnum;
import org.apache.shenyu.common.enums.RpcTypeEnum;
import org.apache.shenyu.plugin.api.ShenyuPluginChain;
import org.apache.shenyu.plugin.api.context.ShenyuContext;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.http.MediaType;
import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
import org.springframework.mock.web.server.MockServerWebExchange;
@@ -34,13 +34,13 @@ import org.springframework.web.server.ServerWebExchange;
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
/**
* TThe param transform plugin test.
*/
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public final class RpcParamTransformPluginTest {
private ShenyuPluginChain chain;
@@ -50,7 +50,7 @@ public final class RpcParamTransformPluginTest {
/**
* Sets up.
*/
- @Before
+ @BeforeEach
public void setUp() {
rpcParamTransformPlugin = new RpcParamTransformPlugin();
chain = mock(ShenyuPluginChain.class);
diff --git
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/cache/BaseDataCacheTest.java
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/cache/BaseDataCacheTest.java
index ff94316..6185480 100644
---
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/cache/BaseDataCacheTest.java
+++
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/cache/BaseDataCacheTest.java
@@ -9,7 +9,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
+ * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
@@ -21,13 +21,16 @@ import com.google.common.collect.Lists;
import org.apache.shenyu.common.dto.PluginData;
import org.apache.shenyu.common.dto.RuleData;
import org.apache.shenyu.common.dto.SelectorData;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.lang.reflect.Field;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
/**
* Test cases for BaseDataCache.
*/
@@ -55,18 +58,18 @@ public final class BaseDataCacheTest {
@Test
public void testGetInstance() {
BaseDataCache baseDataCache = BaseDataCache.getInstance();
- Assert.assertNotNull(baseDataCache);
+ assertNotNull(baseDataCache);
}
@Test
public void testCachePluginData() throws NoSuchFieldException,
IllegalAccessException {
PluginData pluginData = PluginData.builder().name(mockName1).build();
ConcurrentHashMap<String, PluginData> pluginMap =
getFieldByName(pluginMapStr);
- Assert.assertNull(pluginMap.get(mockName1));
+ assertNull(pluginMap.get(mockName1));
BaseDataCache.getInstance().cachePluginData(pluginData);
- Assert.assertNotNull(pluginMap.get(mockName1));
- Assert.assertEquals(pluginData, pluginMap.get(mockName1));
+ assertNotNull(pluginMap.get(mockName1));
+ assertEquals(pluginData, pluginMap.get(mockName1));
}
@Test
@@ -74,10 +77,10 @@ public final class BaseDataCacheTest {
PluginData pluginData = PluginData.builder().name(mockName1).build();
ConcurrentHashMap<String, PluginData> pluginMap =
getFieldByName(pluginMapStr);
pluginMap.put(mockName1, pluginData);
- Assert.assertNotNull(pluginMap.get(mockName1));
+ assertNotNull(pluginMap.get(mockName1));
BaseDataCache.getInstance().removePluginData(pluginData);
- Assert.assertNull(pluginMap.get(mockName1));
+ assertNull(pluginMap.get(mockName1));
}
@Test
@@ -87,12 +90,12 @@ public final class BaseDataCacheTest {
ConcurrentHashMap<String, PluginData> pluginMap =
getFieldByName(pluginMapStr);
pluginMap.put(mockName1, firstCachedPluginData);
pluginMap.put(mockName2, secondCachedPluginData);
- Assert.assertNotNull(pluginMap.get(mockName1));
- Assert.assertNotNull(pluginMap.get(mockName2));
+ assertNotNull(pluginMap.get(mockName1));
+ assertNotNull(pluginMap.get(mockName2));
BaseDataCache.getInstance().cleanPluginData();
- Assert.assertNull(pluginMap.get(mockName1));
- Assert.assertNull(pluginMap.get(mockName2));
+ assertNull(pluginMap.get(mockName1));
+ assertNull(pluginMap.get(mockName2));
}
@Test
@@ -102,13 +105,13 @@ public final class BaseDataCacheTest {
ConcurrentHashMap<String, PluginData> pluginMap =
getFieldByName(pluginMapStr);
pluginMap.put(mockName1, firstCachedPluginData);
pluginMap.put(mockName2, secondCachedPluginData);
- Assert.assertNotNull(pluginMap.get(mockName1));
- Assert.assertNotNull(pluginMap.get(mockName2));
+ assertNotNull(pluginMap.get(mockName1));
+ assertNotNull(pluginMap.get(mockName2));
List<PluginData> pluginDataList =
Lists.newArrayList(firstCachedPluginData);
BaseDataCache.getInstance().cleanPluginDataSelf(pluginDataList);
- Assert.assertNull(pluginMap.get(mockName1));
- Assert.assertNotNull(pluginMap.get(mockName2));
+ assertNull(pluginMap.get(mockName1));
+ assertNotNull(pluginMap.get(mockName2));
}
@Test
@@ -116,8 +119,8 @@ public final class BaseDataCacheTest {
PluginData pluginData = PluginData.builder().name(mockName1).build();
ConcurrentHashMap<String, PluginData> pluginMap =
getFieldByName(pluginMapStr);
pluginMap.put(mockName1, pluginData);
- Assert.assertNotNull(pluginMap.get(mockName1));
- Assert.assertEquals(pluginData,
BaseDataCache.getInstance().obtainPluginData(mockName1));
+ assertNotNull(pluginMap.get(mockName1));
+ assertEquals(pluginData,
BaseDataCache.getInstance().obtainPluginData(mockName1));
}
@Test
@@ -125,11 +128,11 @@ public final class BaseDataCacheTest {
SelectorData firstCachedSelectorData =
SelectorData.builder().id("1").pluginName(mockPluginName1).sort(1).build();
BaseDataCache.getInstance().cacheSelectData(firstCachedSelectorData);
ConcurrentHashMap<String, List<SelectorData>> selectorMap =
getFieldByName(selectorMapStr);
- Assert.assertEquals(Lists.newArrayList(firstCachedSelectorData),
selectorMap.get(mockPluginName1));
+ assertEquals(Lists.newArrayList(firstCachedSelectorData),
selectorMap.get(mockPluginName1));
SelectorData secondCachedSelectorData =
SelectorData.builder().id("2").pluginName(mockPluginName1).sort(2).build();
BaseDataCache.getInstance().cacheSelectData(secondCachedSelectorData);
- Assert.assertEquals(Lists.newArrayList(firstCachedSelectorData,
secondCachedSelectorData), selectorMap.get(mockPluginName1));
+ assertEquals(Lists.newArrayList(firstCachedSelectorData,
secondCachedSelectorData), selectorMap.get(mockPluginName1));
}
@Test
@@ -139,7 +142,7 @@ public final class BaseDataCacheTest {
selectorMap.put(mockPluginName1, Lists.newArrayList(selectorData));
BaseDataCache.getInstance().removeSelectData(selectorData);
- Assert.assertEquals(Lists.newArrayList(),
selectorMap.get(mockPluginName1));
+ assertEquals(Lists.newArrayList(), selectorMap.get(mockPluginName1));
}
@Test
@@ -151,8 +154,8 @@ public final class BaseDataCacheTest {
selectorMap.put(mockPluginName2,
Lists.newArrayList(secondCachedSelectorData));
BaseDataCache.getInstance().cleanSelectorData();
- Assert.assertNull(selectorMap.get(mockPluginName1));
- Assert.assertNull(selectorMap.get(mockPluginName2));
+ assertNull(selectorMap.get(mockPluginName1));
+ assertNull(selectorMap.get(mockPluginName2));
}
@Test
@@ -164,8 +167,8 @@ public final class BaseDataCacheTest {
selectorMap.put(mockPluginName2,
Lists.newArrayList(secondCachedSelectorData));
BaseDataCache.getInstance().cleanSelectorDataSelf(Lists.newArrayList(firstCachedSelectorData));
- Assert.assertEquals(Lists.newArrayList(),
selectorMap.get(mockPluginName1));
- Assert.assertEquals(Lists.newArrayList(secondCachedSelectorData),
selectorMap.get(mockPluginName2));
+ assertEquals(Lists.newArrayList(), selectorMap.get(mockPluginName1));
+ assertEquals(Lists.newArrayList(secondCachedSelectorData),
selectorMap.get(mockPluginName2));
}
@Test
@@ -175,7 +178,7 @@ public final class BaseDataCacheTest {
selectorMap.put(mockPluginName1, Lists.newArrayList(selectorData));
List<SelectorData> selectorDataList =
BaseDataCache.getInstance().obtainSelectorData(mockPluginName1);
- Assert.assertEquals(Lists.newArrayList(selectorData),
selectorDataList);
+ assertEquals(Lists.newArrayList(selectorData), selectorDataList);
}
@Test
@@ -183,11 +186,11 @@ public final class BaseDataCacheTest {
RuleData firstCachedRuleData =
RuleData.builder().id("1").selectorId(mockSelectorId1).sort(1).build();
BaseDataCache.getInstance().cacheRuleData(firstCachedRuleData);
ConcurrentHashMap<String, List<RuleData>> ruleMap =
getFieldByName(ruleMapStr);
- Assert.assertEquals(Lists.newArrayList(firstCachedRuleData),
ruleMap.get(mockSelectorId1));
+ assertEquals(Lists.newArrayList(firstCachedRuleData),
ruleMap.get(mockSelectorId1));
RuleData secondCachedRuleData =
RuleData.builder().id("2").selectorId(mockSelectorId1).sort(2).build();
BaseDataCache.getInstance().cacheRuleData(secondCachedRuleData);
- Assert.assertEquals(Lists.newArrayList(firstCachedRuleData,
secondCachedRuleData), ruleMap.get(mockSelectorId1));
+ assertEquals(Lists.newArrayList(firstCachedRuleData,
secondCachedRuleData), ruleMap.get(mockSelectorId1));
}
@Test
@@ -197,7 +200,7 @@ public final class BaseDataCacheTest {
ruleMap.put(mockSelectorId1, Lists.newArrayList(ruleData));
BaseDataCache.getInstance().removeRuleData(ruleData);
- Assert.assertEquals(Lists.newArrayList(),
ruleMap.get(mockSelectorId1));
+ assertEquals(Lists.newArrayList(), ruleMap.get(mockSelectorId1));
}
@Test
@@ -209,8 +212,8 @@ public final class BaseDataCacheTest {
ruleMap.put(mockSelectorId2, Lists.newArrayList(secondCachedRuleData));
BaseDataCache.getInstance().cleanRuleData();
- Assert.assertNull(ruleMap.get(mockSelectorId1));
- Assert.assertNull(ruleMap.get(mockSelectorId2));
+ assertNull(ruleMap.get(mockSelectorId1));
+ assertNull(ruleMap.get(mockSelectorId2));
}
@Test
@@ -222,8 +225,8 @@ public final class BaseDataCacheTest {
ruleMap.put(mockSelectorId2, Lists.newArrayList(secondCachedRuleData));
BaseDataCache.getInstance().cleanRuleDataSelf(Lists.newArrayList(firstCachedRuleData));
- Assert.assertEquals(Lists.newArrayList(),
ruleMap.get(mockSelectorId1));
- Assert.assertEquals(Lists.newArrayList(secondCachedRuleData),
ruleMap.get(mockSelectorId2));
+ assertEquals(Lists.newArrayList(), ruleMap.get(mockSelectorId1));
+ assertEquals(Lists.newArrayList(secondCachedRuleData),
ruleMap.get(mockSelectorId2));
}
@Test
@@ -233,7 +236,7 @@ public final class BaseDataCacheTest {
ruleMap.put(mockSelectorId1, Lists.newArrayList(ruleData));
List<RuleData> ruleDataList =
BaseDataCache.getInstance().obtainRuleData(mockSelectorId1);
- Assert.assertEquals(Lists.newArrayList(ruleData), ruleDataList);
+ assertEquals(Lists.newArrayList(ruleData), ruleDataList);
}
@SuppressWarnings("rawtypes")
diff --git
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/cache/CommonHandleCacheTest.java
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/cache/CommonHandleCacheTest.java
index b48e143..965ddf0 100644
---
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/cache/CommonHandleCacheTest.java
+++
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/cache/CommonHandleCacheTest.java
@@ -20,8 +20,8 @@ package org.apache.shenyu.plugin.base.cache;
import java.lang.reflect.Field;
import java.util.concurrent.ConcurrentHashMap;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* BaseHandleCache test.
@@ -36,7 +36,7 @@ public final class CommonHandleCacheTest {
private ConcurrentHashMap<String, String> cachedMockMap;
- @Before
+ @BeforeEach
public void setUp() throws NoSuchFieldException, IllegalAccessException {
this.commonHandleCache = new EmptyMockCommonHandleCache<>();
this.cachedMockMap = new ConcurrentHashMap<>();
diff --git
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/cache/CommonPluginDataSubscriberTest.java
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/cache/CommonPluginDataSubscriberTest.java
index f4ab4ef..cb3ea38 100644
---
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/cache/CommonPluginDataSubscriberTest.java
+++
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/cache/CommonPluginDataSubscriberTest.java
@@ -22,13 +22,16 @@ import org.apache.shenyu.common.dto.PluginData;
import org.apache.shenyu.common.dto.RuleData;
import org.apache.shenyu.common.dto.SelectorData;
import org.apache.shenyu.plugin.base.handler.PluginDataHandler;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.util.ArrayList;
import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
/**
* Test cases for CommonPluginDataSubscriber.
*/
@@ -50,7 +53,7 @@ public final class CommonPluginDataSubscriberTest {
private BaseDataCache baseDataCache;
- @Before
+ @BeforeEach
public void setup() {
ArrayList<PluginDataHandler> pluginDataHandlerList =
Lists.newArrayList();
commonPluginDataSubscriber = new
CommonPluginDataSubscriber(pluginDataHandlerList);
@@ -63,8 +66,8 @@ public final class CommonPluginDataSubscriberTest {
PluginData pluginData = PluginData.builder().name(mockName1).build();
commonPluginDataSubscriber.onSubscribe(pluginData);
-
Assert.assertNotNull(baseDataCache.obtainPluginData(pluginData.getName()));
- Assert.assertEquals(pluginData,
baseDataCache.obtainPluginData(pluginData.getName()));
+ assertNotNull(baseDataCache.obtainPluginData(pluginData.getName()));
+ assertEquals(pluginData,
baseDataCache.obtainPluginData(pluginData.getName()));
}
@Test
@@ -72,10 +75,10 @@ public final class CommonPluginDataSubscriberTest {
baseDataCache.cleanPluginData();
PluginData pluginData = PluginData.builder().name(mockName1).build();
baseDataCache.cachePluginData(pluginData);
-
Assert.assertNotNull(baseDataCache.obtainPluginData(pluginData.getName()));
+ assertNotNull(baseDataCache.obtainPluginData(pluginData.getName()));
commonPluginDataSubscriber.unSubscribe(pluginData);
-
Assert.assertNull(baseDataCache.obtainPluginData(pluginData.getName()));
+ assertNull(baseDataCache.obtainPluginData(pluginData.getName()));
}
@Test
@@ -85,12 +88,12 @@ public final class CommonPluginDataSubscriberTest {
PluginData secondCachedPluginData =
PluginData.builder().name(mockName2).build();
baseDataCache.cachePluginData(firstCachedPluginData);
baseDataCache.cachePluginData(secondCachedPluginData);
-
Assert.assertNotNull(baseDataCache.obtainPluginData(firstCachedPluginData.getName()));
-
Assert.assertNotNull(baseDataCache.obtainPluginData(secondCachedPluginData.getName()));
+
assertNotNull(baseDataCache.obtainPluginData(firstCachedPluginData.getName()));
+
assertNotNull(baseDataCache.obtainPluginData(secondCachedPluginData.getName()));
commonPluginDataSubscriber.refreshPluginDataAll();
-
Assert.assertNull(baseDataCache.obtainPluginData(firstCachedPluginData.getName()));
-
Assert.assertNull(baseDataCache.obtainPluginData(secondCachedPluginData.getName()));
+
assertNull(baseDataCache.obtainPluginData(firstCachedPluginData.getName()));
+
assertNull(baseDataCache.obtainPluginData(secondCachedPluginData.getName()));
}
@Test
@@ -100,12 +103,12 @@ public final class CommonPluginDataSubscriberTest {
PluginData secondCachedPluginData =
PluginData.builder().name(mockName2).build();
baseDataCache.cachePluginData(firstCachedPluginData);
baseDataCache.cachePluginData(secondCachedPluginData);
-
Assert.assertNotNull(baseDataCache.obtainPluginData(firstCachedPluginData.getName()));
-
Assert.assertNotNull(baseDataCache.obtainPluginData(secondCachedPluginData.getName()));
+
assertNotNull(baseDataCache.obtainPluginData(firstCachedPluginData.getName()));
+
assertNotNull(baseDataCache.obtainPluginData(secondCachedPluginData.getName()));
commonPluginDataSubscriber.refreshPluginDataSelf(Lists.newArrayList(firstCachedPluginData));
-
Assert.assertNull(baseDataCache.obtainPluginData(firstCachedPluginData.getName()));
-
Assert.assertNotNull(baseDataCache.obtainPluginData(secondCachedPluginData.getName()));
+
assertNull(baseDataCache.obtainPluginData(firstCachedPluginData.getName()));
+
assertNotNull(baseDataCache.obtainPluginData(secondCachedPluginData.getName()));
}
@Test
@@ -115,7 +118,7 @@ public final class CommonPluginDataSubscriberTest {
SelectorData selectorData =
SelectorData.builder().id("1").pluginName(mockPluginName1).sort(1).build();
commonPluginDataSubscriber.onSelectorSubscribe(selectorData);
List<SelectorData> obtainSelectorData =
baseDataCache.obtainSelectorData(selectorData.getPluginName());
- Assert.assertEquals(Lists.newArrayList(selectorData),
obtainSelectorData);
+ assertEquals(Lists.newArrayList(selectorData), obtainSelectorData);
}
@Test
@@ -123,10 +126,10 @@ public final class CommonPluginDataSubscriberTest {
baseDataCache.cleanSelectorData();
SelectorData selectorData =
SelectorData.builder().id("1").pluginName(mockPluginName1).build();
baseDataCache.cacheSelectData(selectorData);
-
Assert.assertNotNull(baseDataCache.obtainSelectorData(selectorData.getPluginName()));
+
assertNotNull(baseDataCache.obtainSelectorData(selectorData.getPluginName()));
commonPluginDataSubscriber.unSelectorSubscribe(selectorData);
- Assert.assertEquals(Lists.newArrayList(),
baseDataCache.obtainSelectorData(selectorData.getPluginName()));
+ assertEquals(Lists.newArrayList(),
baseDataCache.obtainSelectorData(selectorData.getPluginName()));
}
@Test
@@ -136,12 +139,12 @@ public final class CommonPluginDataSubscriberTest {
SelectorData secondCachedSelectorData =
SelectorData.builder().id("2").pluginName(mockPluginName2).build();
baseDataCache.cacheSelectData(firstCachedSelectorData);
baseDataCache.cacheSelectData(secondCachedSelectorData);
-
Assert.assertNotNull(baseDataCache.obtainSelectorData(firstCachedSelectorData.getPluginName()));
-
Assert.assertNotNull(baseDataCache.obtainSelectorData(secondCachedSelectorData.getPluginName()));
+
assertNotNull(baseDataCache.obtainSelectorData(firstCachedSelectorData.getPluginName()));
+
assertNotNull(baseDataCache.obtainSelectorData(secondCachedSelectorData.getPluginName()));
commonPluginDataSubscriber.refreshSelectorDataAll();
-
Assert.assertNull(baseDataCache.obtainSelectorData(firstCachedSelectorData.getPluginName()));
-
Assert.assertNull(baseDataCache.obtainSelectorData(secondCachedSelectorData.getPluginName()));
+
assertNull(baseDataCache.obtainSelectorData(firstCachedSelectorData.getPluginName()));
+
assertNull(baseDataCache.obtainSelectorData(secondCachedSelectorData.getPluginName()));
}
@Test
@@ -151,12 +154,12 @@ public final class CommonPluginDataSubscriberTest {
SelectorData secondCachedSelectorData =
SelectorData.builder().id("2").pluginName(mockPluginName2).build();
baseDataCache.cacheSelectData(firstCachedSelectorData);
baseDataCache.cacheSelectData(secondCachedSelectorData);
-
Assert.assertNotNull(baseDataCache.obtainSelectorData(firstCachedSelectorData.getPluginName()));
-
Assert.assertNotNull(baseDataCache.obtainSelectorData(secondCachedSelectorData.getPluginName()));
+
assertNotNull(baseDataCache.obtainSelectorData(firstCachedSelectorData.getPluginName()));
+
assertNotNull(baseDataCache.obtainSelectorData(secondCachedSelectorData.getPluginName()));
commonPluginDataSubscriber.refreshSelectorDataSelf(Lists.newArrayList(firstCachedSelectorData));
- Assert.assertEquals(Lists.newArrayList(),
baseDataCache.obtainSelectorData(firstCachedSelectorData.getPluginName()));
- Assert.assertEquals(Lists.newArrayList(secondCachedSelectorData),
baseDataCache.obtainSelectorData(secondCachedSelectorData.getPluginName()));
+ assertEquals(Lists.newArrayList(),
baseDataCache.obtainSelectorData(firstCachedSelectorData.getPluginName()));
+ assertEquals(Lists.newArrayList(secondCachedSelectorData),
baseDataCache.obtainSelectorData(secondCachedSelectorData.getPluginName()));
}
@Test
@@ -165,8 +168,8 @@ public final class CommonPluginDataSubscriberTest {
RuleData ruleData =
RuleData.builder().id("1").selectorId(mockSelectorId1).pluginName(mockPluginName1).sort(1).build();
commonPluginDataSubscriber.onRuleSubscribe(ruleData);
-
Assert.assertNotNull(baseDataCache.obtainRuleData(ruleData.getSelectorId()));
- Assert.assertEquals(Lists.newArrayList(ruleData),
baseDataCache.obtainRuleData(ruleData.getSelectorId()));
+ assertNotNull(baseDataCache.obtainRuleData(ruleData.getSelectorId()));
+ assertEquals(Lists.newArrayList(ruleData),
baseDataCache.obtainRuleData(ruleData.getSelectorId()));
}
@Test
@@ -174,10 +177,10 @@ public final class CommonPluginDataSubscriberTest {
baseDataCache.cleanRuleData();
RuleData ruleData =
RuleData.builder().id("1").selectorId(mockSelectorId1).pluginName(mockPluginName1).sort(1).build();
baseDataCache.cacheRuleData(ruleData);
-
Assert.assertNotNull(baseDataCache.obtainRuleData(ruleData.getSelectorId()));
+ assertNotNull(baseDataCache.obtainRuleData(ruleData.getSelectorId()));
commonPluginDataSubscriber.unRuleSubscribe(ruleData);
- Assert.assertEquals(Lists.newArrayList(),
baseDataCache.obtainRuleData(ruleData.getSelectorId()));
+ assertEquals(Lists.newArrayList(),
baseDataCache.obtainRuleData(ruleData.getSelectorId()));
}
@Test
@@ -187,12 +190,12 @@ public final class CommonPluginDataSubscriberTest {
RuleData secondCachedRuleData =
RuleData.builder().id("2").selectorId(mockSelectorId2).pluginName(mockPluginName2).build();
baseDataCache.cacheRuleData(firstCachedRuleData);
baseDataCache.cacheRuleData(secondCachedRuleData);
-
Assert.assertNotNull(baseDataCache.obtainRuleData(firstCachedRuleData.getSelectorId()));
-
Assert.assertNotNull(baseDataCache.obtainRuleData(firstCachedRuleData.getSelectorId()));
+
assertNotNull(baseDataCache.obtainRuleData(firstCachedRuleData.getSelectorId()));
+
assertNotNull(baseDataCache.obtainRuleData(firstCachedRuleData.getSelectorId()));
commonPluginDataSubscriber.refreshRuleDataAll();
-
Assert.assertNull(baseDataCache.obtainRuleData(firstCachedRuleData.getSelectorId()));
-
Assert.assertNull(baseDataCache.obtainRuleData(firstCachedRuleData.getSelectorId()));
+
assertNull(baseDataCache.obtainRuleData(firstCachedRuleData.getSelectorId()));
+
assertNull(baseDataCache.obtainRuleData(firstCachedRuleData.getSelectorId()));
}
@Test
@@ -202,11 +205,11 @@ public final class CommonPluginDataSubscriberTest {
RuleData secondCachedRuleData =
RuleData.builder().id("2").selectorId(mockSelectorId2).pluginName(mockPluginName2).build();
baseDataCache.cacheRuleData(firstCachedRuleData);
baseDataCache.cacheRuleData(secondCachedRuleData);
-
Assert.assertNotNull(baseDataCache.obtainRuleData(firstCachedRuleData.getSelectorId()));
-
Assert.assertNotNull(baseDataCache.obtainRuleData(firstCachedRuleData.getSelectorId()));
+
assertNotNull(baseDataCache.obtainRuleData(firstCachedRuleData.getSelectorId()));
+
assertNotNull(baseDataCache.obtainRuleData(firstCachedRuleData.getSelectorId()));
commonPluginDataSubscriber.refreshRuleDataSelf(Lists.newArrayList(firstCachedRuleData));
- Assert.assertEquals(Lists.newArrayList(),
baseDataCache.obtainRuleData(firstCachedRuleData.getSelectorId()));
- Assert.assertEquals(Lists.newArrayList(secondCachedRuleData),
baseDataCache.obtainRuleData(secondCachedRuleData.getSelectorId()));
+ assertEquals(Lists.newArrayList(),
baseDataCache.obtainRuleData(firstCachedRuleData.getSelectorId()));
+ assertEquals(Lists.newArrayList(secondCachedRuleData),
baseDataCache.obtainRuleData(secondCachedRuleData.getSelectorId()));
}
}
diff --git
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/data/CookieParameterDataTest.java
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/data/CookieParameterDataTest.java
index 15117bc..4fcfef4 100644
---
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/data/CookieParameterDataTest.java
+++
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/data/CookieParameterDataTest.java
@@ -17,9 +17,8 @@
package org.apache.shenyu.plugin.base.condition.data;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.http.HttpCookie;
import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
import org.springframework.mock.web.server.MockServerWebExchange;
@@ -27,6 +26,8 @@ import org.springframework.web.server.ServerWebExchange;
import java.net.InetSocketAddress;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* Test cases for {@link CookieParameterData}.
*/
@@ -36,7 +37,7 @@ public final class CookieParameterDataTest {
private CookieParameterData parameterData;
- @Before
+ @BeforeEach
public void setUp() {
this.exchange =
MockServerWebExchange.from(MockServerHttpRequest.get("/http")
.remoteAddress(new InetSocketAddress("localhost", 8080))
@@ -47,7 +48,7 @@ public final class CookieParameterDataTest {
@Test
public void testBuilder() {
- Assert.assertEquals("", parameterData.builder("invalid-cookie-name",
exchange));
- Assert.assertEquals("cookie-value",
parameterData.builder("cookie-name", exchange));
+ assertEquals("", parameterData.builder("invalid-cookie-name",
exchange));
+ assertEquals("cookie-value", parameterData.builder("cookie-name",
exchange));
}
}
diff --git
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/data/HeaderParameterDataTest.java
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/data/HeaderParameterDataTest.java
index 11f882e..fb03876 100644
---
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/data/HeaderParameterDataTest.java
+++
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/data/HeaderParameterDataTest.java
@@ -17,15 +17,16 @@
package org.apache.shenyu.plugin.base.condition.data;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
import org.springframework.mock.web.server.MockServerWebExchange;
import org.springframework.web.server.ServerWebExchange;
import java.net.InetSocketAddress;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* Test cases for {@link HeaderParameterData}.
*/
@@ -35,7 +36,7 @@ public final class HeaderParameterDataTest {
private HeaderParameterData parameterData;
- @Before
+ @BeforeEach
public void setUp() {
this.exchange =
MockServerWebExchange.from(MockServerHttpRequest.get("/http")
.remoteAddress(new InetSocketAddress("localhost", 8080))
@@ -46,7 +47,7 @@ public final class HeaderParameterDataTest {
@Test
public void testBuilder() {
- Assert.assertEquals("", parameterData.builder("invalidParamName",
exchange));
- Assert.assertEquals("shenyuHeader", parameterData.builder("shenyu",
exchange));
+ assertEquals("", parameterData.builder("invalidParamName", exchange));
+ assertEquals("shenyuHeader", parameterData.builder("shenyu",
exchange));
}
}
diff --git
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/data/HostParameterDataTest.java
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/data/HostParameterDataTest.java
index 0cd2d14..2aa9526 100644
---
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/data/HostParameterDataTest.java
+++
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/data/HostParameterDataTest.java
@@ -20,11 +20,12 @@ package org.apache.shenyu.plugin.base.condition.data;
import org.apache.shenyu.common.utils.UUIDUtils;
import org.apache.shenyu.plugin.api.RemoteAddressResolver;
import org.apache.shenyu.plugin.api.utils.SpringBeanUtils;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
import org.springframework.mock.web.server.MockServerWebExchange;
@@ -35,10 +36,13 @@ import java.net.InetSocketAddress;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* unit test for {@link HostParameterData}.
*/
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public final class HostParameterDataTest {
private ServerWebExchange exchange;
@@ -47,7 +51,7 @@ public final class HostParameterDataTest {
private final String testhost = "192.168.0.121";
- @Before
+ @BeforeEach
public void setUp() {
ConfigurableApplicationContext context =
mock(ConfigurableApplicationContext.class);
SpringBeanUtils.getInstance().setApplicationContext(context);
@@ -63,11 +67,11 @@ public final class HostParameterDataTest {
@Test
public void testBuilderWithNullParamName() {
- Assert.assertEquals(testhost, hostParameterData.builder(null,
exchange));
+ assertEquals(testhost, hostParameterData.builder(null, exchange));
}
@Test
public void testBuilderWithAnyParamName() {
- Assert.assertEquals(testhost,
hostParameterData.builder(UUIDUtils.getInstance().generateShortUuid(),
exchange));
+ assertEquals(testhost,
hostParameterData.builder(UUIDUtils.getInstance().generateShortUuid(),
exchange));
}
}
diff --git
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/data/IpParameterDataTest.java
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/data/IpParameterDataTest.java
index 1b9d48f..5e1889f 100644
---
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/data/IpParameterDataTest.java
+++
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/data/IpParameterDataTest.java
@@ -20,9 +20,8 @@ package org.apache.shenyu.plugin.base.condition.data;
import org.apache.shenyu.common.utils.UUIDUtils;
import org.apache.shenyu.plugin.api.RemoteAddressResolver;
import org.apache.shenyu.plugin.api.utils.SpringBeanUtils;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
import org.springframework.mock.web.server.MockServerWebExchange;
@@ -30,6 +29,7 @@ import org.springframework.web.server.ServerWebExchange;
import java.net.InetSocketAddress;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -44,7 +44,7 @@ public class IpParameterDataTest {
private final String testHost = "127.0.0.1";
- @Before
+ @BeforeEach
public void setUp() {
ConfigurableApplicationContext context =
mock(ConfigurableApplicationContext.class);
SpringBeanUtils.getInstance().setApplicationContext(context);
@@ -61,11 +61,11 @@ public class IpParameterDataTest {
@Test
public void testBuilderWithNullParamName() {
- Assert.assertEquals(testHost, ipParameterData.builder(null, exchange));
+ assertEquals(testHost, ipParameterData.builder(null, exchange));
}
@Test
public void testBuilderWithAnyParamName() {
- Assert.assertEquals(testHost,
ipParameterData.builder(UUIDUtils.getInstance().generateShortUuid(), exchange));
+ assertEquals(testHost,
ipParameterData.builder(UUIDUtils.getInstance().generateShortUuid(), exchange));
}
}
diff --git
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/data/ParameterDataFactoryTest.java
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/data/ParameterDataFactoryTest.java
index fbf8a96..c0e8691 100644
---
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/data/ParameterDataFactoryTest.java
+++
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/data/ParameterDataFactoryTest.java
@@ -23,8 +23,7 @@ import org.apache.shenyu.common.enums.RpcTypeEnum;
import org.apache.shenyu.plugin.api.RemoteAddressResolver;
import org.apache.shenyu.plugin.api.context.ShenyuContext;
import org.apache.shenyu.plugin.api.utils.SpringBeanUtils;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.http.HttpCookie;
import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
@@ -35,6 +34,7 @@ import java.net.InetSocketAddress;
import java.util.HashMap;
import java.util.Map;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -56,7 +56,7 @@ public final class ParameterDataFactoryTest {
parameterInstance.put("post", PostParameterData.class);
parameterInstance.put("req_method", RequestMethodParameterData.class);
- parameterInstance.forEach((key, clazz) ->
Assert.assertEquals(ParameterDataFactory.newInstance(key).getClass(), clazz));
+ parameterInstance.forEach((key, clazz) ->
assertEquals(ParameterDataFactory.newInstance(key).getClass(), clazz));
}
@Test
@@ -65,7 +65,7 @@ public final class ParameterDataFactoryTest {
.remoteAddress(new InetSocketAddress("localhost", 8080))
.header("shenyu", "shenyuHeader")
.build());
- Assert.assertEquals("shenyuHeader",
ParameterDataFactory.builderData("header", "shenyu", exchange));
+ assertEquals("shenyuHeader",
ParameterDataFactory.builderData("header", "shenyu", exchange));
}
@Test
@@ -74,7 +74,7 @@ public final class ParameterDataFactoryTest {
.remoteAddress(new InetSocketAddress("localhost", 8080))
.cookie(new HttpCookie("cookie-name", "cookie-value"))
.build());
- Assert.assertEquals("cookie-value",
ParameterDataFactory.builderData("cookie", "cookie-name", exchange));
+ assertEquals("cookie-value",
ParameterDataFactory.builderData("cookie", "cookie-name", exchange));
}
@Test
@@ -88,7 +88,7 @@ public final class ParameterDataFactoryTest {
.build());
when(context.getBean(RemoteAddressResolver.class)).thenReturn(remoteAddressResolver);
- Assert.assertEquals("localhost",
ParameterDataFactory.builderData("host", null, exchange));
+ assertEquals("localhost", ParameterDataFactory.builderData("host",
null, exchange));
}
@Test
@@ -102,7 +102,7 @@ public final class ParameterDataFactoryTest {
.build());
when(context.getBean(RemoteAddressResolver.class)).thenReturn(remoteAddressResolver);
- Assert.assertEquals("127.0.0.1",
ParameterDataFactory.builderData("ip", null, exchange));
+ assertEquals("127.0.0.1", ParameterDataFactory.builderData("ip", null,
exchange));
}
@Test
@@ -110,7 +110,7 @@ public final class ParameterDataFactoryTest {
ServerWebExchange exchange =
MockServerWebExchange.from(MockServerHttpRequest.get("/uri/path")
.remoteAddress(new InetSocketAddress("localhost", 8080))
.build());
- Assert.assertEquals("/uri/path",
ParameterDataFactory.builderData("uri", null, exchange));
+ assertEquals("/uri/path", ParameterDataFactory.builderData("uri",
null, exchange));
}
@Test
@@ -119,7 +119,7 @@ public final class ParameterDataFactoryTest {
.queryParam("key", "value")
.remoteAddress(new InetSocketAddress("localhost", 8080))
.build());
- Assert.assertEquals("value", ParameterDataFactory.builderData("query",
"key", exchange));
+ assertEquals("value", ParameterDataFactory.builderData("query", "key",
exchange));
}
@Test
@@ -132,8 +132,8 @@ public final class ParameterDataFactoryTest {
context.setHttpMethod(HttpMethodEnum.POST.getName());
exchange.getAttributes().put(Constants.CONTEXT, context);
- Assert.assertEquals("post", ParameterDataFactory.builderData("post",
"httpMethod", exchange));
- Assert.assertEquals("http", ParameterDataFactory.builderData("post",
"rpcType", exchange));
+ assertEquals("post", ParameterDataFactory.builderData("post",
"httpMethod", exchange));
+ assertEquals("http", ParameterDataFactory.builderData("post",
"rpcType", exchange));
}
@Test
@@ -142,6 +142,6 @@ public final class ParameterDataFactoryTest {
.remoteAddress(new InetSocketAddress("localhost", 8080))
.build());
- Assert.assertEquals("GET",
ParameterDataFactory.builderData("req_method", null, exchange));
+ assertEquals("GET", ParameterDataFactory.builderData("req_method",
null, exchange));
}
}
diff --git
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/data/PostParameterDataTest.java
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/data/PostParameterDataTest.java
index 0094cb0..6cd4212 100644
---
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/data/PostParameterDataTest.java
+++
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/data/PostParameterDataTest.java
@@ -21,15 +21,16 @@ import org.apache.shenyu.common.constant.Constants;
import org.apache.shenyu.common.enums.HttpMethodEnum;
import org.apache.shenyu.common.enums.RpcTypeEnum;
import org.apache.shenyu.plugin.api.context.ShenyuContext;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
import org.springframework.mock.web.server.MockServerWebExchange;
import org.springframework.web.server.ServerWebExchange;
import java.net.InetSocketAddress;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* Test cases for {@link PostParameterData}.
*/
@@ -39,7 +40,7 @@ public final class PostParameterDataTest {
private PostParameterData postParameterData;
- @Before
+ @BeforeEach
public void setUp() {
this.exchange =
MockServerWebExchange.from(MockServerHttpRequest.get("/uri/path")
.remoteAddress(new InetSocketAddress("localhost", 8080))
@@ -53,7 +54,7 @@ public final class PostParameterDataTest {
@Test
public void testBuilder() {
- Assert.assertEquals("post",
this.postParameterData.builder("httpMethod", this.exchange));
- Assert.assertEquals("http", this.postParameterData.builder("rpcType",
this.exchange));
+ assertEquals("post", this.postParameterData.builder("httpMethod",
this.exchange));
+ assertEquals("http", this.postParameterData.builder("rpcType",
this.exchange));
}
}
diff --git
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/data/QueryParameterDataTest.java
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/data/QueryParameterDataTest.java
index 9d8189c..fbddc7a 100644
---
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/data/QueryParameterDataTest.java
+++
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/data/QueryParameterDataTest.java
@@ -17,15 +17,16 @@
package org.apache.shenyu.plugin.base.condition.data;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeEach;
import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
import org.springframework.mock.web.server.MockServerWebExchange;
import org.springframework.web.server.ServerWebExchange;
import java.net.InetSocketAddress;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* Test cases for {@link QueryParameterData}.
*/
@@ -35,7 +36,7 @@ public final class QueryParameterDataTest {
private QueryParameterData queryParameterData;
- @Before
+ @BeforeEach
public void setUp() {
this.exchange =
MockServerWebExchange.from(MockServerHttpRequest.get("/uri/path")
.queryParam("key", "value")
@@ -46,6 +47,6 @@ public final class QueryParameterDataTest {
@Test
public void testBuilder() {
- Assert.assertEquals("value", this.queryParameterData.builder("key",
this.exchange));
+ assertEquals("value", this.queryParameterData.builder("key",
this.exchange));
}
}
diff --git
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/data/RequestMethodParameterDataTest.java
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/data/RequestMethodParameterDataTest.java
index ca094d3..c5eb115 100644
---
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/data/RequestMethodParameterDataTest.java
+++
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/data/RequestMethodParameterDataTest.java
@@ -17,15 +17,16 @@
package org.apache.shenyu.plugin.base.condition.data;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
import org.springframework.mock.web.server.MockServerWebExchange;
import org.springframework.web.server.ServerWebExchange;
import java.net.InetSocketAddress;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* Test cases for {@link RequestMethodParameterData}.
*/
@@ -35,7 +36,7 @@ public final class RequestMethodParameterDataTest {
private RequestMethodParameterData requestMethodParameterData;
- @Before
+ @BeforeEach
public void setUp() {
this.exchange =
MockServerWebExchange.from(MockServerHttpRequest.get("/uri/path")
.remoteAddress(new InetSocketAddress("localhost", 8080))
@@ -45,6 +46,6 @@ public final class RequestMethodParameterDataTest {
@Test
public void testBuilder() {
- Assert.assertEquals("GET",
this.requestMethodParameterData.builder(null, this.exchange));
+ assertEquals("GET", this.requestMethodParameterData.builder(null,
this.exchange));
}
}
diff --git
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/data/URIParameterDataTest.java
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/data/URIParameterDataTest.java
index 1a61fc2..7b960be 100644
---
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/data/URIParameterDataTest.java
+++
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/data/URIParameterDataTest.java
@@ -17,15 +17,16 @@
package org.apache.shenyu.plugin.base.condition.data;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
import org.springframework.mock.web.server.MockServerWebExchange;
import org.springframework.web.server.ServerWebExchange;
import java.net.InetSocketAddress;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* Test cases for {@link URIParameterData}.
*/
@@ -35,7 +36,7 @@ public final class URIParameterDataTest {
private URIParameterData uriParameterData;
- @Before
+ @BeforeEach
public void setUp() {
this.exchange =
MockServerWebExchange.from(MockServerHttpRequest.get("/uri/path")
.remoteAddress(new InetSocketAddress("localhost", 8080))
@@ -46,6 +47,6 @@ public final class URIParameterDataTest {
@Test
public void testBuilder() {
- Assert.assertEquals("/uri/path", uriParameterData.builder(null,
exchange));
+ assertEquals("/uri/path", uriParameterData.builder(null, exchange));
}
}
diff --git
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/judge/ContainsPredicateJudgeTest.java
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/judge/ContainsPredicateJudgeTest.java
index fcf3d17..ff24360 100644
---
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/judge/ContainsPredicateJudgeTest.java
+++
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/judge/ContainsPredicateJudgeTest.java
@@ -21,15 +21,15 @@ import junit.framework.TestCase;
import org.apache.shenyu.common.dto.ConditionData;
import org.apache.shenyu.common.enums.OperatorEnum;
import org.apache.shenyu.common.enums.ParamTypeEnum;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class ContainsPredicateJudgeTest extends TestCase {
private ConditionData conditionDataForIp;
- @Before
+ @BeforeEach
public void setUp() {
conditionDataForIp = new ConditionData();
conditionDataForIp.setParamType(ParamTypeEnum.IP.getName());
@@ -39,8 +39,8 @@ public class ContainsPredicateJudgeTest extends TestCase {
@Test
public void testContainsJudgeForIp() {
conditionDataForIp.setOperator(OperatorEnum.CONTAINS.getAlias());
- Assert.assertTrue(PredicateJudgeFactory.judge(conditionDataForIp,
"127.0.0.1"));
- Assert.assertTrue(PredicateJudgeFactory.judge(conditionDataForIp,
"128.0.0.1"));
- Assert.assertFalse(PredicateJudgeFactory.judge(conditionDataForIp,
"0.1.128.0"));
+ Assertions.assertTrue(PredicateJudgeFactory.judge(conditionDataForIp,
"127.0.0.1"));
+ Assertions.assertTrue(PredicateJudgeFactory.judge(conditionDataForIp,
"128.0.0.1"));
+ Assertions.assertFalse(PredicateJudgeFactory.judge(conditionDataForIp,
"0.1.128.0"));
}
}
diff --git
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/judge/PredicateJudgeFactoryTest.java
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/judge/PredicateJudgeFactoryTest.java
index ddae8a2..5681ce0 100644
---
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/judge/PredicateJudgeFactoryTest.java
+++
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/judge/PredicateJudgeFactoryTest.java
@@ -20,9 +20,11 @@ package org.apache.shenyu.plugin.base.condition.judge;
import org.apache.shenyu.common.dto.ConditionData;
import org.apache.shenyu.common.enums.OperatorEnum;
import org.apache.shenyu.common.enums.ParamTypeEnum;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Test cases for {@link PredicateJudgeFactory}.
@@ -34,7 +36,7 @@ public final class PredicateJudgeFactoryTest {
private ConditionData conditionData;
- @Before
+ @BeforeEach
public void setUp() {
conditionData = new ConditionData();
conditionData.setParamType("uri");
@@ -43,43 +45,43 @@ public final class PredicateJudgeFactoryTest {
@Test
public void testConditionDataIsNull() {
- Assert.assertFalse(PredicateJudgeFactory.judge(null, "testRealData"));
+ assertFalse(PredicateJudgeFactory.judge(null, "testRealData"));
}
@Test
public void testRealDataIsBlank() {
- Assert.assertFalse(PredicateJudgeFactory.judge(conditionData, null));
- Assert.assertFalse(PredicateJudgeFactory.judge(conditionData, ""));
+ assertFalse(PredicateJudgeFactory.judge(conditionData, null));
+ assertFalse(PredicateJudgeFactory.judge(conditionData, ""));
}
@Test
public void testEqJudge() {
conditionData.setOperator(OperatorEnum.EQ.getAlias());
- Assert.assertTrue(PredicateJudgeFactory.judge(conditionData,
"/http/**"));
- Assert.assertFalse(PredicateJudgeFactory.judge(conditionData,
"/http/test"));
+ assertTrue(PredicateJudgeFactory.judge(conditionData, "/http/**"));
+ assertFalse(PredicateJudgeFactory.judge(conditionData, "/http/test"));
}
@Test
public void testMatchJudge() {
conditionData.setOperator(OperatorEnum.MATCH.getAlias());
conditionData.setParamType(ParamTypeEnum.URI.getName());
- Assert.assertTrue(PredicateJudgeFactory.judge(conditionData,
"/http/**"));
- Assert.assertTrue(PredicateJudgeFactory.judge(conditionData,
"/http/test"));
- Assert.assertTrue(PredicateJudgeFactory.judge(conditionData,
"/http/test/test"));
- Assert.assertFalse(PredicateJudgeFactory.judge(conditionData,
"/http1/**"));
+ assertTrue(PredicateJudgeFactory.judge(conditionData, "/http/**"));
+ assertTrue(PredicateJudgeFactory.judge(conditionData, "/http/test"));
+ assertTrue(PredicateJudgeFactory.judge(conditionData,
"/http/test/test"));
+ assertFalse(PredicateJudgeFactory.judge(conditionData, "/http1/**"));
conditionData.setParamType(ParamTypeEnum.HEADER.getName());
- Assert.assertTrue(PredicateJudgeFactory.judge(conditionData,
"/http/**"));
- Assert.assertTrue(PredicateJudgeFactory.judge(conditionData,
"/http/**/test"));
- Assert.assertFalse(PredicateJudgeFactory.judge(conditionData,
"/http1/**"));
+ assertTrue(PredicateJudgeFactory.judge(conditionData, "/http/**"));
+ assertTrue(PredicateJudgeFactory.judge(conditionData,
"/http/**/test"));
+ assertFalse(PredicateJudgeFactory.judge(conditionData, "/http1/**"));
}
@Test
public void testRegexJudge() {
conditionData.setOperator(OperatorEnum.REGEX.getAlias());
conditionData.setParamValue("[/a-zA-Z0-9]+");
- Assert.assertTrue(PredicateJudgeFactory.judge(conditionData,
"/http/test"));
- Assert.assertFalse(PredicateJudgeFactory.judge(conditionData,
"/http?/test"));
+ assertTrue(PredicateJudgeFactory.judge(conditionData, "/http/test"));
+ assertFalse(PredicateJudgeFactory.judge(conditionData, "/http?/test"));
}
@Test
@@ -87,30 +89,30 @@ public final class PredicateJudgeFactoryTest {
conditionData.setOperator(OperatorEnum.TIME_BEFORE.getAlias());
//Because the realData can't be empty, so the realDate must fill in
the values
conditionData.setParamValue(MAX_TIME);
- Assert.assertTrue(PredicateJudgeFactory.judge(conditionData,
MAX_TIME));
+ assertTrue(PredicateJudgeFactory.judge(conditionData, MAX_TIME));
conditionData.setParamValue(FIRST_TIME);
- Assert.assertFalse(PredicateJudgeFactory.judge(conditionData,
MAX_TIME));
+ assertFalse(PredicateJudgeFactory.judge(conditionData, MAX_TIME));
conditionData.setParamName(OperatorEnum.TIME_BEFORE.name());
conditionData.setParamValue(MAX_TIME);
- Assert.assertTrue(PredicateJudgeFactory.judge(conditionData,
FIRST_TIME));
- Assert.assertFalse(PredicateJudgeFactory.judge(conditionData,
MAX_TIME));
+ assertTrue(PredicateJudgeFactory.judge(conditionData, FIRST_TIME));
+ assertFalse(PredicateJudgeFactory.judge(conditionData, MAX_TIME));
}
@Test
public void testTimerAfterJudge() {
conditionData.setOperator(OperatorEnum.TIME_AFTER.getAlias());
conditionData.setParamValue(FIRST_TIME);
- Assert.assertTrue(PredicateJudgeFactory.judge(conditionData,
FIRST_TIME));
+ assertTrue(PredicateJudgeFactory.judge(conditionData, FIRST_TIME));
conditionData.setParamValue(MAX_TIME);
- Assert.assertFalse(PredicateJudgeFactory.judge(conditionData,
FIRST_TIME));
+ assertFalse(PredicateJudgeFactory.judge(conditionData, FIRST_TIME));
}
@Test
public void testExcludeJudge() {
conditionData.setOperator(OperatorEnum.EXCLUDE.getAlias());
conditionData.setParamValue("/http/test");
- Assert.assertFalse(PredicateJudgeFactory.judge(conditionData,
"/http/test"));
- Assert.assertTrue(PredicateJudgeFactory.judge(conditionData,
"/http?/test"));
+ assertFalse(PredicateJudgeFactory.judge(conditionData, "/http/test"));
+ assertTrue(PredicateJudgeFactory.judge(conditionData, "/http?/test"));
}
}
diff --git
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/strategy/AbstractMatchStrategyTest.java
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/strategy/AbstractMatchStrategyTest.java
index 79de922..27aa31c 100644
---
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/strategy/AbstractMatchStrategyTest.java
+++
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/strategy/AbstractMatchStrategyTest.java
@@ -23,11 +23,12 @@ import org.apache.shenyu.common.enums.ParamTypeEnum;
import org.apache.shenyu.plugin.api.RemoteAddressResolver;
import org.apache.shenyu.plugin.api.context.ShenyuContext;
import org.apache.shenyu.plugin.api.utils.SpringBeanUtils;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
import org.springframework.mock.web.server.MockServerWebExchange;
@@ -35,13 +36,16 @@ import org.springframework.web.server.ServerWebExchange;
import java.net.InetSocketAddress;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
* Test cases for AbstractMatchStrategy.
*/
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public final class AbstractMatchStrategyTest {
private ConditionData conditionData;
@@ -50,11 +54,12 @@ public final class AbstractMatchStrategyTest {
private AbstractMatchStrategy abstractMatchStrategy;
- @Before
+ @BeforeEach
public void setUp() {
ConfigurableApplicationContext context =
mock(ConfigurableApplicationContext.class);
SpringBeanUtils.getInstance().setApplicationContext(context);
- when(context.getBean(RemoteAddressResolver.class)).thenReturn(new
RemoteAddressResolver() { });
+ when(context.getBean(RemoteAddressResolver.class)).thenReturn(new
RemoteAddressResolver() {
+ });
conditionData = new ConditionData();
conditionData.setParamName("shenyu");
conditionData.setParamType("uri");
@@ -72,39 +77,39 @@ public final class AbstractMatchStrategyTest {
@Test
public void testBuildRealDataHeaderBranch() {
conditionData.setParamType(ParamTypeEnum.HEADER.getName());
- Assert.assertEquals("shenyuHeader",
abstractMatchStrategy.buildRealData(conditionData, exchange));
+ assertEquals("shenyuHeader",
abstractMatchStrategy.buildRealData(conditionData, exchange));
}
@Test
public void testBuildRealDataUriBranch() {
conditionData.setParamType(ParamTypeEnum.URI.getName());
- Assert.assertEquals("/http",
abstractMatchStrategy.buildRealData(conditionData, exchange));
+ assertEquals("/http",
abstractMatchStrategy.buildRealData(conditionData, exchange));
}
@Test
public void testBuildRealDataQueryBranch() {
conditionData.setParamType(ParamTypeEnum.QUERY.getName());
- Assert.assertEquals("shenyuQueryParam",
abstractMatchStrategy.buildRealData(conditionData, exchange));
+ assertEquals("shenyuQueryParam",
abstractMatchStrategy.buildRealData(conditionData, exchange));
}
@Test
public void testBuildRealDataHostBranch() {
conditionData.setParamType(ParamTypeEnum.HOST.getName());
- Assert.assertEquals("localhost",
abstractMatchStrategy.buildRealData(conditionData, exchange));
+ assertEquals("localhost",
abstractMatchStrategy.buildRealData(conditionData, exchange));
}
@Test
public void testBuildRealDataIpBranch() {
conditionData.setParamType(ParamTypeEnum.IP.getName());
- Assert.assertEquals("127.0.0.1",
abstractMatchStrategy.buildRealData(conditionData, exchange));
+ assertEquals("127.0.0.1",
abstractMatchStrategy.buildRealData(conditionData, exchange));
}
@Test
public void testBuildRealDataPostBranch() {
conditionData.setParamType(ParamTypeEnum.POST.getName());
- Assert.assertNull(abstractMatchStrategy.buildRealData(conditionData,
exchange));
+ assertNull(abstractMatchStrategy.buildRealData(conditionData,
exchange));
conditionData.setParamName("method");
- Assert.assertEquals("testMethod",
abstractMatchStrategy.buildRealData(conditionData, exchange));
+ assertEquals("testMethod",
abstractMatchStrategy.buildRealData(conditionData, exchange));
}
private static class TestMatchStrategy extends AbstractMatchStrategy {
diff --git
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/strategy/AndMatchStrategyTest.java
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/strategy/AndMatchStrategyTest.java
index f3733ef..a3880ae 100644
---
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/strategy/AndMatchStrategyTest.java
+++
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/strategy/AndMatchStrategyTest.java
@@ -19,21 +19,22 @@ package org.apache.shenyu.plugin.base.condition.strategy;
import com.google.common.collect.Lists;
import org.apache.shenyu.common.dto.ConditionData;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
import org.springframework.mock.web.server.MockServerWebExchange;
import org.springframework.web.server.ServerWebExchange;
import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* Test cases for AndMatchStrategy.
*/
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public final class AndMatchStrategyTest {
private ServerWebExchange exchange;
@@ -42,7 +43,7 @@ public final class AndMatchStrategyTest {
private MatchStrategy matchStrategy;
- @Before
+ @BeforeEach
public void setUp() {
this.conditionDataList = Lists.newArrayListWithCapacity(2);
ConditionData matchConditionData = new ConditionData();
@@ -64,6 +65,6 @@ public final class AndMatchStrategyTest {
@Test
public void testMatch() {
- Assert.assertTrue(matchStrategy.match(conditionDataList, exchange));
+ assertTrue(matchStrategy.match(conditionDataList, exchange));
}
}
diff --git
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/strategy/MatchStrategyFactoryTest.java
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/strategy/MatchStrategyFactoryTest.java
index 6979e39..a9513f3 100644
---
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/strategy/MatchStrategyFactoryTest.java
+++
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/strategy/MatchStrategyFactoryTest.java
@@ -20,15 +20,18 @@ package org.apache.shenyu.plugin.base.condition.strategy;
import com.google.common.collect.Lists;
import org.apache.shenyu.common.dto.ConditionData;
import org.apache.shenyu.common.enums.MatchModeEnum;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeEach;
import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
import org.springframework.mock.web.server.MockServerWebExchange;
import org.springframework.web.server.ServerWebExchange;
import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* Test cases for MatchStrategyFactory.
*/
@@ -38,7 +41,7 @@ public final class MatchStrategyFactoryTest {
private List<ConditionData> conditionDataList;
- @Before
+ @BeforeEach
public void setUp() {
this.conditionDataList = Lists.newArrayListWithCapacity(2);
ConditionData matchConditionData = new ConditionData();
@@ -60,19 +63,19 @@ public final class MatchStrategyFactoryTest {
@Test
public void testNewInstance() {
MatchStrategy andMatchStrategy =
MatchStrategyFactory.newInstance(MatchModeEnum.AND.getCode());
- Assert.assertEquals(andMatchStrategy.getClass(),
AndMatchStrategy.class);
+ assertEquals(andMatchStrategy.getClass(), AndMatchStrategy.class);
MatchStrategy orMatchStrategy =
MatchStrategyFactory.newInstance(MatchModeEnum.OR.getCode());
- Assert.assertEquals(orMatchStrategy.getClass(), OrMatchStrategy.class);
+ assertEquals(orMatchStrategy.getClass(), OrMatchStrategy.class);
int nonExistCode = -1;
MatchStrategy defaultMatchStrategy =
MatchStrategyFactory.newInstance(nonExistCode);
- Assert.assertEquals(defaultMatchStrategy.getClass(),
AndMatchStrategy.class);
+ assertEquals(defaultMatchStrategy.getClass(), AndMatchStrategy.class);
}
@Test
public void testMatch() {
-
Assert.assertFalse(MatchStrategyFactory.match(MatchModeEnum.AND.getCode(),
conditionDataList, exchange));
-
Assert.assertTrue(MatchStrategyFactory.match(MatchModeEnum.OR.getCode(),
conditionDataList, exchange));
+ assertFalse(MatchStrategyFactory.match(MatchModeEnum.AND.getCode(),
conditionDataList, exchange));
+ assertTrue(MatchStrategyFactory.match(MatchModeEnum.OR.getCode(),
conditionDataList, exchange));
}
}
diff --git
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/strategy/OrMatchStrategyTest.java
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/strategy/OrMatchStrategyTest.java
index 6dc0ffb..b60e775 100644
---
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/strategy/OrMatchStrategyTest.java
+++
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/condition/strategy/OrMatchStrategyTest.java
@@ -19,21 +19,22 @@ package org.apache.shenyu.plugin.base.condition.strategy;
import com.google.common.collect.Lists;
import org.apache.shenyu.common.dto.ConditionData;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
import org.springframework.mock.web.server.MockServerWebExchange;
import org.springframework.web.server.ServerWebExchange;
import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* Test cases for OrMatchStrategy.
*/
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public final class OrMatchStrategyTest {
private ServerWebExchange exchange;
@@ -42,7 +43,7 @@ public final class OrMatchStrategyTest {
private MatchStrategy matchStrategy;
- @Before
+ @BeforeEach
public void setUp() {
this.conditionDataList = Lists.newArrayListWithCapacity(2);
ConditionData matchConditionData = new ConditionData();
@@ -64,6 +65,6 @@ public final class OrMatchStrategyTest {
@Test
public void testMatch() {
- Assert.assertTrue(matchStrategy.match(conditionDataList, exchange));
+ assertTrue(matchStrategy.match(conditionDataList, exchange));
}
}
diff --git
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/fallback/FallbackHandlerTest.java
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/fallback/FallbackHandlerTest.java
index ca1f7fa..918f803 100644
---
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/fallback/FallbackHandlerTest.java
+++
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/fallback/FallbackHandlerTest.java
@@ -18,10 +18,12 @@
package org.apache.shenyu.plugin.base.fallback;
import org.apache.shenyu.plugin.api.utils.SpringBeanUtils;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
import org.springframework.mock.web.server.MockServerWebExchange;
@@ -40,14 +42,15 @@ import static org.mockito.Mockito.when;
/**
* Test cases for FallbackHandler.
*/
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public final class FallbackHandlerTest {
private ServerWebExchange exchange;
private TestFallbackHandler testFallbackHandler;
- @Before
+ @BeforeEach
public void setUp() {
ConfigurableApplicationContext context =
mock(ConfigurableApplicationContext.class);
DispatcherHandler handler = mock(DispatcherHandler.class);
diff --git
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/handler/PluginDataHandlerTest.java
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/handler/PluginDataHandlerTest.java
index c5e9c52..071f01b 100644
---
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/handler/PluginDataHandlerTest.java
+++
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/handler/PluginDataHandlerTest.java
@@ -20,22 +20,26 @@ package org.apache.shenyu.plugin.base.handler;
import org.apache.shenyu.common.dto.PluginData;
import org.apache.shenyu.common.dto.RuleData;
import org.apache.shenyu.common.dto.SelectorData;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import java.util.HashMap;
import java.util.Map;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
* Test cases for PluginDataHandler.
*/
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public final class PluginDataHandlerTest {
private RuleData ruleData;
@@ -48,7 +52,7 @@ public final class PluginDataHandlerTest {
private PluginDataHandler pluginDataHandler;
- @Before
+ @BeforeEach
public void setUp() {
this.ruleData = mock(RuleData.class);
this.pluginData = mock(PluginData.class);
@@ -67,7 +71,7 @@ public final class PluginDataHandlerTest {
public void handlerPluginTest() {
pluginDataHandler.handlerPlugin(pluginData);
testPluginDataHandler.handlerPlugin(pluginData);
-
Assert.assertEquals(testPluginDataHandler.getPluginDataMap().get(pluginData.getId()).getId(),
pluginData.getId());
+
assertEquals(testPluginDataHandler.getPluginDataMap().get(pluginData.getId()).getId(),
pluginData.getId());
}
/**
@@ -78,7 +82,7 @@ public final class PluginDataHandlerTest {
pluginDataHandler.removePlugin(pluginData);
testPluginDataHandler.handlerPlugin(pluginData);
testPluginDataHandler.removePlugin(pluginData);
-
Assert.assertNull(testPluginDataHandler.getPluginDataMap().get(pluginData.getId()));
+
assertNull(testPluginDataHandler.getPluginDataMap().get(pluginData.getId()));
}
/**
@@ -88,7 +92,7 @@ public final class PluginDataHandlerTest {
public void handlerSelectorTest() {
pluginDataHandler.handlerSelector(selectorData);
testPluginDataHandler.handlerSelector(selectorData);
-
Assert.assertEquals(testPluginDataHandler.getSelectorDataMap().get(selectorData.getId()).getId(),
selectorData.getId());
+
assertEquals(testPluginDataHandler.getSelectorDataMap().get(selectorData.getId()).getId(),
selectorData.getId());
}
/**
@@ -99,7 +103,7 @@ public final class PluginDataHandlerTest {
pluginDataHandler.removeSelector(selectorData);
testPluginDataHandler.handlerSelector(selectorData);
testPluginDataHandler.removeSelector(selectorData);
-
Assert.assertNull(testPluginDataHandler.getSelectorDataMap().get(selectorData.getId()));
+
assertNull(testPluginDataHandler.getSelectorDataMap().get(selectorData.getId()));
}
/**
@@ -109,7 +113,7 @@ public final class PluginDataHandlerTest {
public void handlerRuleTest() {
pluginDataHandler.handlerRule(ruleData);
testPluginDataHandler.handlerRule(ruleData);
-
Assert.assertEquals(testPluginDataHandler.getRuleDataMap().get(ruleData.getId()).getId(),
ruleData.getId());
+
assertEquals(testPluginDataHandler.getRuleDataMap().get(ruleData.getId()).getId(),
ruleData.getId());
}
/**
@@ -120,7 +124,7 @@ public final class PluginDataHandlerTest {
pluginDataHandler.removeRule(ruleData);
testPluginDataHandler.handlerRule(ruleData);
testPluginDataHandler.removeRule(ruleData);
-
Assert.assertNull(testPluginDataHandler.getRuleDataMap().get(ruleData.getId()));
+
assertNull(testPluginDataHandler.getRuleDataMap().get(ruleData.getId()));
}
/**
@@ -128,8 +132,8 @@ public final class PluginDataHandlerTest {
*/
@Test
public void pluginNamedTest() {
- Assert.assertEquals("SHENYU", pluginDataHandler.pluginNamed());
- Assert.assertEquals("SHENYU_TEST",
testPluginDataHandler.pluginNamed());
+ assertEquals("SHENYU", pluginDataHandler.pluginNamed());
+ assertEquals("SHENYU_TEST", testPluginDataHandler.pluginNamed());
}
static class TestPluginDataHandler implements PluginDataHandler {
diff --git
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/utils/CacheKeyUtilsTest.java
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/utils/CacheKeyUtilsTest.java
index 2b686b4..d3b2644 100644
---
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/utils/CacheKeyUtilsTest.java
+++
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/utils/CacheKeyUtilsTest.java
@@ -18,7 +18,7 @@
package org.apache.shenyu.plugin.base.utils;
import org.apache.shenyu.common.dto.RuleData;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* CacheKeyUtilsTest test.
diff --git
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/utils/HostAddressUtilsTest.java
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/utils/HostAddressUtilsTest.java
index 138b0e4..dddec5a 100644
---
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/utils/HostAddressUtilsTest.java
+++
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/utils/HostAddressUtilsTest.java
@@ -19,11 +19,10 @@ package org.apache.shenyu.plugin.base.utils;
import org.apache.shenyu.plugin.api.RemoteAddressResolver;
import org.apache.shenyu.plugin.api.utils.SpringBeanUtils;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
import org.springframework.mock.web.server.MockServerWebExchange;
@@ -31,18 +30,19 @@ import org.springframework.web.server.ServerWebExchange;
import java.net.InetSocketAddress;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
* Test cases for HostAddressUtils.
*/
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public final class HostAddressUtilsTest {
private ServerWebExchange exchange;
- @Before
+ @BeforeEach
public void setUp() {
ConfigurableApplicationContext context =
mock(ConfigurableApplicationContext.class);
SpringBeanUtils.getInstance().setApplicationContext(context);
@@ -59,7 +59,7 @@ public final class HostAddressUtilsTest {
*/
@Test
public void acquireHostTest() {
- Assert.assertEquals("0.0.0.0", HostAddressUtils.acquireHost(exchange));
+ assertEquals("0.0.0.0", HostAddressUtils.acquireHost(exchange));
}
/**
@@ -67,6 +67,6 @@ public final class HostAddressUtilsTest {
*/
@Test
public void acquireIpTest() {
- Assert.assertEquals("0.0.0.0", HostAddressUtils.acquireIp(exchange));
+ assertEquals("0.0.0.0", HostAddressUtils.acquireIp(exchange));
}
}
diff --git
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/utils/MatchStrategyFactoryTest.java
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/utils/MatchStrategyFactoryTest.java
index 4666654..0cd57e6 100644
---
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/utils/MatchStrategyFactoryTest.java
+++
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/utils/MatchStrategyFactoryTest.java
@@ -19,11 +19,10 @@ package org.apache.shenyu.plugin.base.utils;
import org.apache.shenyu.common.dto.ConditionData;
import org.apache.shenyu.plugin.base.condition.strategy.MatchStrategyFactory;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
import org.springframework.mock.web.server.MockServerWebExchange;
import org.springframework.web.server.ServerWebExchange;
@@ -31,17 +30,19 @@ import org.springframework.web.server.ServerWebExchange;
import java.util.ArrayList;
import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* The MatchStrategyFactory test.
*/
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public final class MatchStrategyFactoryTest {
private ServerWebExchange exchange;
private List<ConditionData> conditionDatas;
- @Before
+ @BeforeEach
public void setUp() {
this.conditionDatas = new ArrayList<>();
ConditionData conditionData = new ConditionData();
@@ -59,6 +60,6 @@ public final class MatchStrategyFactoryTest {
*/
@Test
public void matchTest() {
- Assert.assertTrue(MatchStrategyFactory.match(0, conditionDatas,
exchange));
+ assertTrue(MatchStrategyFactory.match(0, conditionDatas, exchange));
}
}
diff --git
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/utils/ShenyuResultWrapTest.java
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/utils/ShenyuResultWrapTest.java
index 7f18d0b..d3bb2af 100644
---
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/utils/ShenyuResultWrapTest.java
+++
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/utils/ShenyuResultWrapTest.java
@@ -22,23 +22,23 @@ import
org.apache.shenyu.plugin.api.result.DefaultShenyuResult;
import org.apache.shenyu.plugin.api.result.ShenyuResult;
import org.apache.shenyu.plugin.api.result.ShenyuResultWrap;
import org.apache.shenyu.plugin.api.utils.SpringBeanUtils;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.context.ConfigurableApplicationContext;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
* The Shenyu result wrap test.
*/
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public final class ShenyuResultWrapTest {
- @Before
+ @BeforeEach
public void setUp() {
ConfigurableApplicationContext context =
mock(ConfigurableApplicationContext.class);
SpringBeanUtils.getInstance().setApplicationContext(context);
@@ -53,8 +53,8 @@ public final class ShenyuResultWrapTest {
Integer result = 0;
final DefaultShenyuEntity success = new DefaultShenyuEntity(result,
"success", null);
DefaultShenyuEntity shenyuResult = (DefaultShenyuEntity)
ShenyuResultWrap.success(null, success);
- Assert.assertEquals(shenyuResult.getCode(), result);
- Assert.assertEquals(shenyuResult.getMessage(), "success");
+ assertEquals(shenyuResult.getCode(), result);
+ assertEquals(shenyuResult.getMessage(), "success");
}
/**
@@ -64,7 +64,7 @@ public final class ShenyuResultWrapTest {
public void errorTest() {
Integer result = 1;
DefaultShenyuEntity shenyuResult = (DefaultShenyuEntity)
ShenyuResultWrap.error(null, result, "error", new Object());
- Assert.assertEquals(result, shenyuResult.getCode());
- Assert.assertEquals("error", shenyuResult.getMessage());
+ assertEquals(result, shenyuResult.getCode());
+ assertEquals("error", shenyuResult.getMessage());
}
}
diff --git
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/utils/SingletonTest.java
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/utils/SingletonTest.java
index ea7afcd..af3e480 100644
---
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/utils/SingletonTest.java
+++
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/utils/SingletonTest.java
@@ -19,22 +19,22 @@ package org.apache.shenyu.plugin.base.utils;
import org.apache.shenyu.common.dto.ConditionData;
import org.apache.shenyu.common.utils.Singleton;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* The Singleton test.
*/
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public final class SingletonTest {
private SingletonTest singletonTest;
- @Before
+ @BeforeEach
public void setUp() {
singletonTest = new SingletonTest();
Singleton.INST.single(SingletonTest.class, singletonTest);
@@ -47,7 +47,7 @@ public final class SingletonTest {
public void singleTest() {
ConditionData conditionData = new ConditionData();
Singleton.INST.single(ConditionData.class, conditionData);
- Assert.assertEquals(conditionData,
Singleton.INST.get(ConditionData.class));
+ assertEquals(conditionData, Singleton.INST.get(ConditionData.class));
}
/**
@@ -55,6 +55,6 @@ public final class SingletonTest {
*/
@Test
public void getTest() {
- Assert.assertEquals(singletonTest,
Singleton.INST.get(SingletonTest.class));
+ assertEquals(singletonTest, Singleton.INST.get(SingletonTest.class));
}
}
diff --git
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/utils/UriUtilsTest.java
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/utils/UriUtilsTest.java
index 820b51b..a1ed9b0 100644
---
a/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/utils/UriUtilsTest.java
+++
b/shenyu-plugin/shenyu-plugin-base/src/test/java/org/apache/shenyu/plugin/base/utils/UriUtilsTest.java
@@ -18,24 +18,26 @@
package org.apache.shenyu.plugin.base.utils;
import org.apache.shenyu.common.utils.UriUtils;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
import java.net.URI;
import java.util.Objects;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
/**
* The Uri Util test.
*/
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public final class UriUtilsTest {
@Test
public void createUriTest() {
URI uri = UriUtils.createUri("/SHENYU/TEST");
- Assert.assertEquals("/SHENYU/TEST",
Objects.requireNonNull(uri).getPath());
- Assert.assertNull(UriUtils.createUri(""));
+ assertEquals("/SHENYU/TEST", Objects.requireNonNull(uri).getPath());
+ assertNull(UriUtils.createUri(""));
}
}
diff --git
a/shenyu-plugin/shenyu-plugin-context-path/src/test/java/org/apache/shenyu/plugin/context/path/ContextPathPluginTest.java
b/shenyu-plugin/shenyu-plugin-context-path/src/test/java/org/apache/shenyu/plugin/context/path/ContextPathPluginTest.java
index ac2e8c5..7f5ac64 100644
---
a/shenyu-plugin/shenyu-plugin-context-path/src/test/java/org/apache/shenyu/plugin/context/path/ContextPathPluginTest.java
+++
b/shenyu-plugin/shenyu-plugin-context-path/src/test/java/org/apache/shenyu/plugin/context/path/ContextPathPluginTest.java
@@ -30,9 +30,8 @@ import
org.apache.shenyu.plugin.api.result.DefaultShenyuResult;
import org.apache.shenyu.plugin.api.result.ShenyuResult;
import org.apache.shenyu.plugin.api.utils.SpringBeanUtils;
import org.apache.shenyu.plugin.base.utils.CacheKeyUtils;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
import org.springframework.mock.web.server.MockServerWebExchange;
@@ -40,6 +39,8 @@ import org.springframework.web.server.ServerWebExchange;
import reactor.core.publisher.Mono;
import static
org.apache.shenyu.plugin.context.path.handler.ContextPathPluginDataHandler.CACHED_HANDLE;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -60,7 +61,7 @@ public final class ContextPathPluginTest {
private ContextPathPlugin contextPathPlugin;
- @Before
+ @BeforeEach
public void setup() {
this.shenyuContext = new ShenyuContext();
this.ruleData = mock(RuleData.class);
@@ -87,7 +88,7 @@ public final class ContextPathPluginTest {
CACHED_HANDLE.get().cachedHandle(CacheKeyUtils.INST.getKey(ruleData),
contextMappingRuleHandle);
when(ruleData.getHandle()).thenReturn(GsonUtils.getGson().toJson(contextMappingRuleHandle));
contextPathPlugin.doExecute(exchange, chain, selectorData, ruleData);
- Assert.assertEquals("/order/findById", shenyuContext.getRealUrl());
+ assertEquals("/order/findById", shenyuContext.getRealUrl());
}
/**
@@ -97,7 +98,7 @@ public final class ContextPathPluginTest {
public void skip() {
shenyuContext.setRpcType(RpcTypeEnum.DUBBO.getName());
this.exchange.getAttributes().put(Constants.CONTEXT, shenyuContext);
- Assert.assertTrue(contextPathPlugin.skip(exchange));
+ assertTrue(contextPathPlugin.skip(exchange));
}
/**
@@ -105,7 +106,7 @@ public final class ContextPathPluginTest {
*/
@Test
public void namedTest() {
- Assert.assertEquals(PluginEnum.CONTEXT_PATH.getName(),
contextPathPlugin.named());
+ assertEquals(PluginEnum.CONTEXT_PATH.getName(),
contextPathPlugin.named());
}
/**
@@ -113,6 +114,6 @@ public final class ContextPathPluginTest {
*/
@Test
public void getOrderTest() {
- Assert.assertEquals(PluginEnum.CONTEXT_PATH.getCode(),
contextPathPlugin.getOrder());
+ assertEquals(PluginEnum.CONTEXT_PATH.getCode(),
contextPathPlugin.getOrder());
}
}
diff --git
a/shenyu-plugin/shenyu-plugin-cryptor/src/test/java/org/apache/shenyu/plugin/cryptor/request/CryptorRequestPluginTest.java
b/shenyu-plugin/shenyu-plugin-cryptor/src/test/java/org/apache/shenyu/plugin/cryptor/request/CryptorRequestPluginTest.java
index da733a6..08067f9 100644
---
a/shenyu-plugin/shenyu-plugin-cryptor/src/test/java/org/apache/shenyu/plugin/cryptor/request/CryptorRequestPluginTest.java
+++
b/shenyu-plugin/shenyu-plugin-cryptor/src/test/java/org/apache/shenyu/plugin/cryptor/request/CryptorRequestPluginTest.java
@@ -22,11 +22,11 @@ import org.apache.shenyu.common.dto.SelectorData;
import org.apache.shenyu.common.enums.PluginEnum;
import org.apache.shenyu.plugin.api.ShenyuPluginChain;
import
org.apache.shenyu.plugin.cryptor.handler.CryptorRequestPluginDataHandler;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.http.MediaType;
@@ -36,7 +36,7 @@ import org.springframework.web.server.ServerWebExchange;
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -44,7 +44,7 @@ import static org.mockito.Mockito.when;
/**
* Test case for {@link CryptorRequestPlugin}.
*/
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class CryptorRequestPluginTest {
private RuleData ruleData;
@@ -58,7 +58,7 @@ public class CryptorRequestPluginTest {
private CryptorRequestPluginDataHandler cryptorRequestPluginDataHandler;
- @Before
+ @BeforeEach
public void setUp() {
this.ruleData = new RuleData();
this.ruleData.setSelectorId("test");
diff --git
a/shenyu-plugin/shenyu-plugin-cryptor/src/test/java/org/apache/shenyu/plugin/cryptor/response/CryptorResponsePluginTest.java
b/shenyu-plugin/shenyu-plugin-cryptor/src/test/java/org/apache/shenyu/plugin/cryptor/response/CryptorResponsePluginTest.java
index 80cd62f..12368f1 100644
---
a/shenyu-plugin/shenyu-plugin-cryptor/src/test/java/org/apache/shenyu/plugin/cryptor/response/CryptorResponsePluginTest.java
+++
b/shenyu-plugin/shenyu-plugin-cryptor/src/test/java/org/apache/shenyu/plugin/cryptor/response/CryptorResponsePluginTest.java
@@ -24,10 +24,10 @@ import org.apache.shenyu.common.enums.PluginEnum;
import org.apache.shenyu.plugin.api.ShenyuPluginChain;
import org.apache.shenyu.plugin.cryptor.decorator.CryptorResponseDecorator;
import
org.apache.shenyu.plugin.cryptor.handler.CryptorResponsePluginDataHandler;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
@@ -42,16 +42,16 @@ import reactor.test.StepVerifier;
import java.net.InetSocketAddress;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.mock;
/**
* Test case for {@link CryptorResponsePlugin}.
*/
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class CryptorResponsePluginTest {
private RuleData ruleData;
@@ -66,7 +66,7 @@ public class CryptorResponsePluginTest {
private SelectorData selectorData;
- @Before
+ @BeforeEach
public void setUp() {
this.ruleData = new RuleData();
this.ruleData.setSelectorId("test");
diff --git
a/shenyu-plugin/shenyu-plugin-divide/src/test/java/org/apache/shenyu/plugin/divide/DividePluginTest.java
b/shenyu-plugin/shenyu-plugin-divide/src/test/java/org/apache/shenyu/plugin/divide/DividePluginTest.java
index 437c1fc..259ef20 100644
---
a/shenyu-plugin/shenyu-plugin-divide/src/test/java/org/apache/shenyu/plugin/divide/DividePluginTest.java
+++
b/shenyu-plugin/shenyu-plugin-divide/src/test/java/org/apache/shenyu/plugin/divide/DividePluginTest.java
@@ -20,8 +20,8 @@ package org.apache.shenyu.plugin.divide;
import org.apache.shenyu.common.constant.Constants;
import org.apache.shenyu.common.dto.RuleData;
import org.apache.shenyu.common.dto.SelectorData;
-import org.apache.shenyu.common.dto.convert.selector.DivideUpstream;
import org.apache.shenyu.common.dto.convert.rule.impl.DivideRuleHandle;
+import org.apache.shenyu.common.dto.convert.selector.DivideUpstream;
import org.apache.shenyu.common.enums.PluginEnum;
import org.apache.shenyu.common.enums.RpcTypeEnum;
import org.apache.shenyu.common.utils.GsonUtils;
@@ -29,13 +29,14 @@ import org.apache.shenyu.common.utils.UpstreamCheckUtils;
import org.apache.shenyu.plugin.api.ShenyuPluginChain;
import org.apache.shenyu.plugin.api.context.ShenyuContext;
import org.apache.shenyu.plugin.divide.handler.DividePluginDataHandler;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.MockedStatic;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
import org.springframework.mock.web.server.MockServerWebExchange;
import org.springframework.web.server.ServerWebExchange;
@@ -47,6 +48,8 @@ import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
@@ -56,7 +59,8 @@ import static org.mockito.Mockito.when;
/**
* The type divide plugin test.
*/
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public final class DividePluginTest {
private RuleData ruleData;
@@ -74,8 +78,8 @@ public final class DividePluginTest {
private List<DivideUpstream> divideUpstreamList;
private MockedStatic<UpstreamCheckUtils> mockCheckUtils;
-
- @Before
+
+ @BeforeEach
public void setup() {
this.ruleData = mock(RuleData.class);
this.chain = mock(ShenyuPluginChain.class);
@@ -99,7 +103,7 @@ public final class DividePluginTest {
initMockInfo();
}
- @After
+ @AfterEach
public void tearDown() {
mockCheckUtils.close();
}
@@ -129,7 +133,7 @@ public final class DividePluginTest {
*/
@Test
public void skip() {
- Assert.assertTrue(dividePlugin.skip(exchange));
+ assertTrue(dividePlugin.skip(exchange));
}
/**
@@ -137,7 +141,7 @@ public final class DividePluginTest {
*/
@Test
public void namedTest() {
- Assert.assertEquals(PluginEnum.DIVIDE.getName(), dividePlugin.named());
+ assertEquals(PluginEnum.DIVIDE.getName(), dividePlugin.named());
}
/**
@@ -145,13 +149,13 @@ public final class DividePluginTest {
*/
@Test
public void getOrderTest() {
- Assert.assertEquals(PluginEnum.DIVIDE.getCode(),
dividePlugin.getOrder());
+ assertEquals(PluginEnum.DIVIDE.getCode(), dividePlugin.getOrder());
}
/**
* Init mock info.
*/
- private void initMockInfo() {
+ private void initMockInfo() {
ShenyuContext context = mock(ShenyuContext.class);
context.setRpcType(RpcTypeEnum.HTTP.getName());
DivideRuleHandle handle = new DivideRuleHandle();
diff --git
a/shenyu-plugin/shenyu-plugin-divide/src/test/java/org/apache/shenyu/plugin/divide/handler/DividePluginDataHandlerTest.java
b/shenyu-plugin/shenyu-plugin-divide/src/test/java/org/apache/shenyu/plugin/divide/handler/DividePluginDataHandlerTest.java
index 9df8718..5815e14 100644
---
a/shenyu-plugin/shenyu-plugin-divide/src/test/java/org/apache/shenyu/plugin/divide/handler/DividePluginDataHandlerTest.java
+++
b/shenyu-plugin/shenyu-plugin-divide/src/test/java/org/apache/shenyu/plugin/divide/handler/DividePluginDataHandlerTest.java
@@ -24,16 +24,21 @@ import org.apache.shenyu.common.utils.GsonUtils;
import org.apache.shenyu.common.utils.UpstreamCheckUtils;
import org.apache.shenyu.loadbalancer.cache.UpstreamCacheManager;
import org.apache.shenyu.loadbalancer.entity.Upstream;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.MockedStatic;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
@@ -43,6 +48,8 @@ import static org.mockito.Mockito.when;
/**
* The type divide plugin data handler test.
*/
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public final class DividePluginDataHandlerTest {
private SelectorData selectorData;
@@ -51,7 +58,7 @@ public final class DividePluginDataHandlerTest {
private MockedStatic<UpstreamCheckUtils> mockCheckUtils;
- @Before
+ @BeforeEach
public void setUp() {
this.dividePluginDataHandler = new DividePluginDataHandler();
List<DivideUpstream> divideUpstreamList = Stream.of(3)
@@ -68,7 +75,7 @@ public final class DividePluginDataHandlerTest {
mockCheckUtils.when(() -> UpstreamCheckUtils.checkUrl(anyString(),
anyInt())).thenReturn(true);
}
- @After
+ @AfterEach
public void tearDown() {
mockCheckUtils.close();
}
@@ -80,7 +87,7 @@ public final class DividePluginDataHandlerTest {
public void handlerSelectorTest() {
dividePluginDataHandler.handlerSelector(selectorData);
List<Upstream> result =
UpstreamCacheManager.getInstance().findUpstreamListBySelectorId("handler");
-
Assert.assertEquals(GsonUtils.getInstance().fromList(selectorData.getHandle(),
DivideUpstream.class).get(0).getUpstreamUrl(), result.get(0).getUrl());
+
assertEquals(GsonUtils.getInstance().fromList(selectorData.getHandle(),
DivideUpstream.class).get(0).getUpstreamUrl(), result.get(0).getUrl());
}
/**
@@ -91,7 +98,7 @@ public final class DividePluginDataHandlerTest {
dividePluginDataHandler.handlerSelector(selectorData);
dividePluginDataHandler.removeSelector(selectorData);
List<Upstream> result =
UpstreamCacheManager.getInstance().findUpstreamListBySelectorId("handler");
- Assert.assertNull(result);
+ assertNull(result);
}
/**
@@ -99,6 +106,6 @@ public final class DividePluginDataHandlerTest {
*/
@Test
public void pluginNamedTest() {
- Assert.assertEquals(dividePluginDataHandler.pluginNamed(),
PluginEnum.DIVIDE.getName());
+ assertEquals(dividePluginDataHandler.pluginNamed(),
PluginEnum.DIVIDE.getName());
}
}
diff --git
a/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-alibaba-dubbo/src/test/java/org/apache/shenyu/plugin/alibaba/dubbo/AlibabaDubboPluginTest.java
b/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-alibaba-dubbo/src/test/java/org/apache/shenyu/plugin/alibaba/dubbo/AlibabaDubboPluginTest.java
index 10adc0a..4b80fe6 100644
---
a/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-alibaba-dubbo/src/test/java/org/apache/shenyu/plugin/alibaba/dubbo/AlibabaDubboPluginTest.java
+++
b/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-alibaba-dubbo/src/test/java/org/apache/shenyu/plugin/alibaba/dubbo/AlibabaDubboPluginTest.java
@@ -30,12 +30,14 @@ import org.apache.shenyu.plugin.api.ShenyuPluginChain;
import org.apache.shenyu.plugin.api.context.ShenyuContext;
import org.apache.shenyu.plugin.api.result.ShenyuResultEnum;
import org.apache.shenyu.plugin.api.result.ShenyuResultWrap;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.MockedStatic;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
import org.springframework.mock.web.server.MockServerWebExchange;
import org.springframework.web.server.ServerWebExchange;
@@ -44,8 +46,8 @@ import reactor.test.StepVerifier;
import java.net.InetSocketAddress;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.mockStatic;
import static org.mockito.Mockito.when;
@@ -53,7 +55,8 @@ import static org.mockito.Mockito.when;
/**
* Test case for AlibabaDubboPlugin.
*/
-@RunWith(MockitoJUnitRunner.Silent.class)
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public final class AlibabaDubboPluginTest {
@Mock
private AlibabaDubboProxyService mockAlibabaDubboProxyService;
@@ -62,7 +65,7 @@ public final class AlibabaDubboPluginTest {
private MetaData metaData;
- @Before
+ @BeforeEach
public void setUp() {
metaData = new MetaData();
metaData.setId("1332017966661636096");
@@ -133,7 +136,7 @@ public final class AlibabaDubboPluginTest {
try (MockedStatic<ShenyuResultWrap> shenyuResultWrapMockedStatic =
mockStatic(ShenyuResultWrap.class)) {
shenyuResultWrapMockedStatic.when(() -> ShenyuResultWrap
- .error(exchange, ShenyuResultEnum.DUBBO_HAVE_BODY_PARAM,
null))
+ .error(exchange,
ShenyuResultEnum.DUBBO_HAVE_BODY_PARAM, null))
.thenReturn(new Object());
Mono<Void> voidMono =
alibabaDubboPluginUnderTest.doExecute(exchange, chain, selectorData, data);
diff --git
a/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-alibaba-dubbo/src/test/java/org/apache/shenyu/plugin/alibaba/dubbo/cache/AlibabaDubboConfigCacheTest.java
b/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-alibaba-dubbo/src/test/java/org/apache/shenyu/plugin/alibaba/dubbo/cache/AlibabaDubboConfigCacheTest.java
index 29c5c40..39b1966 100644
---
a/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-alibaba-dubbo/src/test/java/org/apache/shenyu/plugin/alibaba/dubbo/cache/AlibabaDubboConfigCacheTest.java
+++
b/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-alibaba-dubbo/src/test/java/org/apache/shenyu/plugin/alibaba/dubbo/cache/AlibabaDubboConfigCacheTest.java
@@ -23,16 +23,18 @@ import org.apache.shenyu.common.dto.MetaData;
import org.apache.shenyu.common.dto.convert.plugin.DubboRegisterConfig;
import org.apache.shenyu.common.utils.GsonUtils;
import org.apache.shenyu.plugin.dubbo.common.cache.DubboParam;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import java.lang.reflect.Field;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -40,12 +42,13 @@ import static org.mockito.Mockito.when;
/**
* The Test Case For AlibabaDubboConfigCache.
*/
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public final class AlibabaDubboConfigCacheTest {
private AlibabaDubboConfigCache alibabaDubboConfigCache;
- @Before
+ @BeforeEach
public void setUp() {
alibabaDubboConfigCache = AlibabaDubboConfigCache.getInstance();
}
@@ -70,7 +73,7 @@ public final class AlibabaDubboConfigCacheTest {
assertNotNull(config);
registryConfig = (RegistryConfig) config;
} catch (NoSuchFieldException | IllegalAccessException e) {
- Assert.fail();
+ fail();
}
DubboRegisterConfig dubboRegisterConfig1 = new DubboRegisterConfig();
@@ -86,7 +89,7 @@ public final class AlibabaDubboConfigCacheTest {
assertNotNull(config);
registryConfig1 = (RegistryConfig) config;
} catch (NoSuchFieldException | IllegalAccessException e) {
- Assert.fail();
+ fail();
}
assertNotSame(registryConfig, registryConfig1);
}
diff --git
a/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-alibaba-dubbo/src/test/java/org/apache/shenyu/plugin/alibaba/dubbo/handler/AlibabaDubboPluginDataTest.java
b/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-alibaba-dubbo/src/test/java/org/apache/shenyu/plugin/alibaba/dubbo/handler/AlibabaDubboPluginDataTest.java
index 26a526d..61cd462 100644
---
a/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-alibaba-dubbo/src/test/java/org/apache/shenyu/plugin/alibaba/dubbo/handler/AlibabaDubboPluginDataTest.java
+++
b/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-alibaba-dubbo/src/test/java/org/apache/shenyu/plugin/alibaba/dubbo/handler/AlibabaDubboPluginDataTest.java
@@ -17,31 +17,38 @@
package org.apache.shenyu.plugin.alibaba.dubbo.handler;
-import org.apache.shenyu.common.dto.convert.plugin.DubboRegisterConfig;
import org.apache.shenyu.common.dto.MetaData;
import org.apache.shenyu.common.dto.PluginData;
+import org.apache.shenyu.common.dto.convert.plugin.DubboRegisterConfig;
import org.apache.shenyu.common.enums.PluginEnum;
import org.apache.shenyu.common.utils.Singleton;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.FixMethodOrder;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.MethodSorters;
-import org.mockito.junit.MockitoJUnitRunner;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
/**
* AlibabaDubboPluginDataTest.
*/
-@RunWith(MockitoJUnitRunner.class)
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+@TestMethodOrder(MethodOrderer.Alphanumeric.class)
public final class AlibabaDubboPluginDataTest {
private AlibabaDubboPluginDataHandler alibabaDubboPluginDataHandler;
private final String registryConfig =
"{\"protocol\":\"zookeeper\",\"register\":\"127.0.0.1:2181\"}";
- @Before
+ @BeforeEach
public void setUp() {
alibabaDubboPluginDataHandler = new AlibabaDubboPluginDataHandler();
MetaData metaData = new MetaData();
@@ -50,25 +57,25 @@ public final class AlibabaDubboPluginDataTest {
metaData.setPath("/dubbo/findAll");
metaData.setServiceName("org.apache.shenyu.test.dubbo.api.service.DubboTestService");
metaData.setMethodName("findAll");
- Assert.assertNotNull(metaData);
+ assertNotNull(metaData);
}
@Test
public void testPluginEnable() {
PluginData pluginData = new PluginData("", "", registryConfig, "1",
true);
alibabaDubboPluginDataHandler.handlerPlugin(pluginData);
-
Assert.assertEquals(Singleton.INST.get(DubboRegisterConfig.class).getRegister(),
"127.0.0.1:2181");
+
assertEquals(Singleton.INST.get(DubboRegisterConfig.class).getRegister(),
"127.0.0.1:2181");
}
@Test
public void testPluginDisable() {
PluginData pluginData = new PluginData("", "", registryConfig, "1",
false);
alibabaDubboPluginDataHandler.handlerPlugin(pluginData);
- Assert.assertNull(Singleton.INST.get(DubboRegisterConfig.class));
+ assertNull(Singleton.INST.get(DubboRegisterConfig.class));
}
@Test
public void testPluginNamed() {
- Assert.assertEquals(alibabaDubboPluginDataHandler.pluginNamed(),
PluginEnum.DUBBO.getName());
+ assertEquals(alibabaDubboPluginDataHandler.pluginNamed(),
PluginEnum.DUBBO.getName());
}
}
diff --git
a/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-alibaba-dubbo/src/test/java/org/apache/shenyu/plugin/alibaba/dubbo/proxy/AlibabaDubboProxyServiceTest.java
b/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-alibaba-dubbo/src/test/java/org/apache/shenyu/plugin/alibaba/dubbo/proxy/AlibabaDubboProxyServiceTest.java
index 4d8bc03..8c6cc55 100644
---
a/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-alibaba-dubbo/src/test/java/org/apache/shenyu/plugin/alibaba/dubbo/proxy/AlibabaDubboProxyServiceTest.java
+++
b/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-alibaba-dubbo/src/test/java/org/apache/shenyu/plugin/alibaba/dubbo/proxy/AlibabaDubboProxyServiceTest.java
@@ -30,15 +30,18 @@ import org.apache.shenyu.common.dto.MetaData;
import org.apache.shenyu.common.enums.RpcTypeEnum;
import org.apache.shenyu.plugin.alibaba.dubbo.cache.AlibabaDubboConfigCache;
import org.apache.shenyu.plugin.dubbo.common.param.DubboParamResolveService;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.MockedStatic;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.mockStatic;
import static org.mockito.Mockito.when;
@@ -46,7 +49,8 @@ import static org.mockito.Mockito.when;
/**
* AlibabaDubboProxyServiceTest.
*/
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public final class AlibabaDubboProxyServiceTest {
private static final String PATH = "/sofa/findAll";
@@ -61,7 +65,7 @@ public final class AlibabaDubboProxyServiceTest {
@Mock
private ReferenceConfig<GenericService> referenceConfig;
- @Before
+ @BeforeEach
public void setup() {
metaData = new MetaData();
metaData.setId("1332017966661636096");
@@ -72,7 +76,7 @@ public final class AlibabaDubboProxyServiceTest {
metaData.setRpcType(RpcTypeEnum.SOFA.getName());
}
- @After
+ @AfterEach
public void after() {
AlibabaDubboConfigCache.getInstance().invalidateAll();
}
@@ -95,8 +99,8 @@ public final class AlibabaDubboProxyServiceTest {
AlibabaDubboProxyService alibabaDubboProxyService = new
AlibabaDubboProxyService(new BodyParamResolveServiceImpl());
ResponseFuture responseFuture =
alibabaDubboProxyService.genericInvoker("", metaData);
- Assert.assertNotNull(responseFuture);
- Assert.assertEquals(sample,
RpcContext.getContext().getFuture().get());
+ assertNotNull(responseFuture);
+ assertEquals(sample, RpcContext.getContext().getFuture().get());
}
}
diff --git
a/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-alibaba-dubbo/src/test/java/org/apache/shenyu/plugin/alibaba/dubbo/subscriber/AlibabaDubboMetaDataSubscriberTest.java
b/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-alibaba-dubbo/src/test/java/org/apache/shenyu/plugin/alibaba/dubbo/subscriber/AlibabaDubboMetaDataSubscriberTest.java
index 4da1c56..54df021 100644
---
a/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-alibaba-dubbo/src/test/java/org/apache/shenyu/plugin/alibaba/dubbo/subscriber/AlibabaDubboMetaDataSubscriberTest.java
+++
b/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-alibaba-dubbo/src/test/java/org/apache/shenyu/plugin/alibaba/dubbo/subscriber/AlibabaDubboMetaDataSubscriberTest.java
@@ -19,26 +19,29 @@ package org.apache.shenyu.plugin.alibaba.dubbo.subscriber;
import org.apache.shenyu.common.dto.MetaData;
import org.apache.shenyu.common.enums.RpcTypeEnum;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
-import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.mock;
/**
* The Test Case For AlibabaDubboMetaDataSubscriber.
*/
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public final class AlibabaDubboMetaDataSubscriberTest {
private AlibabaDubboMetaDataSubscriber alibabaDubboMetaDataSubscriber;
private MetaData metaData;
- @Before
+ @BeforeEach
public void setUp() {
alibabaDubboMetaDataSubscriber = new AlibabaDubboMetaDataSubscriber();
metaData = new MetaData();
diff --git
a/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-apache-dubbo/src/test/java/org/apache/shenyu/plugin/apache/dubbo/ApacheDubboPluginTest.java
b/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-apache-dubbo/src/test/java/org/apache/shenyu/plugin/apache/dubbo/ApacheDubboPluginTest.java
index 80f0345..f484479 100644
---
a/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-apache-dubbo/src/test/java/org/apache/shenyu/plugin/apache/dubbo/ApacheDubboPluginTest.java
+++
b/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-apache-dubbo/src/test/java/org/apache/shenyu/plugin/apache/dubbo/ApacheDubboPluginTest.java
@@ -26,25 +26,29 @@ import org.apache.shenyu.common.enums.RpcTypeEnum;
import org.apache.shenyu.plugin.apache.dubbo.proxy.ApacheDubboProxyService;
import org.apache.shenyu.plugin.api.ShenyuPluginChain;
import org.apache.shenyu.plugin.api.context.ShenyuContext;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
import org.springframework.mock.web.server.MockServerWebExchange;
import org.springframework.web.server.ServerWebExchange;
import reactor.test.StepVerifier;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
* The Test Case For ApachDubboPlugin.
*/
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public final class ApacheDubboPluginTest {
private ApacheDubboPlugin apacheDubboPlugin;
@@ -56,7 +60,7 @@ public final class ApacheDubboPluginTest {
@Mock
private ShenyuPluginChain chain;
- @Before
+ @BeforeEach
public void setUp() {
exchange =
MockServerWebExchange.from(MockServerHttpRequest.get("localhost").build());
metaData = new MetaData();
@@ -70,7 +74,7 @@ public final class ApacheDubboPluginTest {
apacheDubboPlugin = new ApacheDubboPlugin(apacheDubboProxyService);
}
- @Test(expected = NullPointerException.class)
+ @Test
public void doExecute() {
ShenyuContext context = mock(ShenyuContext.class);
exchange.getAttributes().put(Constants.CONTEXT, context);
@@ -78,10 +82,12 @@ public final class ApacheDubboPluginTest {
exchange.getAttributes().put(Constants.META_DATA, metaData);
SelectorData selectorData = mock(SelectorData.class);
RuleData data = mock(RuleData.class);
- StepVerifier.create(apacheDubboPlugin.doExecute(exchange, chain,
selectorData, data)).expectSubscription().verifyComplete();
+ assertThrows(NullPointerException.class, () -> {
+ StepVerifier.create(apacheDubboPlugin.doExecute(exchange, chain,
selectorData, data)).expectSubscription().verifyComplete();
+ });
}
- @Test(expected = NullPointerException.class)
+ @Test
public void testParameterNotNullExecute() {
ShenyuContext context = mock(ShenyuContext.class);
exchange.getAttributes().put(Constants.CONTEXT, context);
@@ -89,10 +95,12 @@ public final class ApacheDubboPluginTest {
exchange.getAttributes().put(Constants.META_DATA, metaData);
SelectorData selectorData = mock(SelectorData.class);
RuleData data = mock(RuleData.class);
- StepVerifier.create(apacheDubboPlugin.doExecute(exchange, chain,
selectorData, data)).expectSubscription().verifyComplete();
+ assertThrows(NullPointerException.class, () -> {
+ StepVerifier.create(apacheDubboPlugin.doExecute(exchange, chain,
selectorData, data)).expectSubscription().verifyComplete();
+ });
}
- @Test(expected = NullPointerException.class)
+ @Test
public void testMethodIsNullExecute() {
ShenyuContext context = mock(ShenyuContext.class);
exchange.getAttributes().put(Constants.CONTEXT, context);
@@ -107,7 +115,9 @@ public final class ApacheDubboPluginTest {
exchange.getAttributes().put(Constants.META_DATA, metaData);
SelectorData selectorData = mock(SelectorData.class);
RuleData data = mock(RuleData.class);
- StepVerifier.create(apacheDubboPlugin.doExecute(exchange, chain,
selectorData, data)).expectSubscription().verifyComplete();
+ assertThrows(NullPointerException.class, () -> {
+ StepVerifier.create(apacheDubboPlugin.doExecute(exchange, chain,
selectorData, data)).expectSubscription().verifyComplete();
+ });
}
@Test
diff --git
a/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-apache-dubbo/src/test/java/org/apache/shenyu/plugin/apache/dubbo/cache/ApacheDubboConfigCacheTest.java
b/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-apache-dubbo/src/test/java/org/apache/shenyu/plugin/apache/dubbo/cache/ApacheDubboConfigCacheTest.java
index f664a1f..78800d1 100644
---
a/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-apache-dubbo/src/test/java/org/apache/shenyu/plugin/apache/dubbo/cache/ApacheDubboConfigCacheTest.java
+++
b/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-apache-dubbo/src/test/java/org/apache/shenyu/plugin/apache/dubbo/cache/ApacheDubboConfigCacheTest.java
@@ -23,16 +23,18 @@ import org.apache.shenyu.common.dto.MetaData;
import org.apache.shenyu.common.dto.convert.plugin.DubboRegisterConfig;
import org.apache.shenyu.common.utils.GsonUtils;
import org.apache.shenyu.plugin.dubbo.common.cache.DubboParam;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import java.lang.reflect.Field;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -40,12 +42,13 @@ import static org.mockito.Mockito.when;
/**
* The Test Case For ApacheDubboConfigCache.
*/
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public final class ApacheDubboConfigCacheTest {
private ApacheDubboConfigCache apacheDubboConfigCache;
- @Before
+ @BeforeEach
public void setUp() {
apacheDubboConfigCache = ApacheDubboConfigCache.getInstance();
}
@@ -70,7 +73,7 @@ public final class ApacheDubboConfigCacheTest {
assertNotNull(config);
registryConfig = (RegistryConfig) config;
} catch (NoSuchFieldException | IllegalAccessException e) {
- Assert.fail();
+ fail();
}
DubboRegisterConfig dubboRegisterConfig1 = new DubboRegisterConfig();
@@ -86,7 +89,7 @@ public final class ApacheDubboConfigCacheTest {
assertNotNull(config);
registryConfig1 = (RegistryConfig) config;
} catch (NoSuchFieldException | IllegalAccessException e) {
- Assert.fail();
+ fail();
}
assertNotSame(registryConfig, registryConfig1);
}
diff --git
a/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-apache-dubbo/src/test/java/org/apache/shenyu/plugin/apache/dubbo/handler/ApacheDubboPluginDataHandlerTest.java
b/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-apache-dubbo/src/test/java/org/apache/shenyu/plugin/apache/dubbo/handler/ApacheDubboPluginDataHandlerTest.java
index ef7f5ac..9617889 100644
---
a/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-apache-dubbo/src/test/java/org/apache/shenyu/plugin/apache/dubbo/handler/ApacheDubboPluginDataHandlerTest.java
+++
b/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-apache-dubbo/src/test/java/org/apache/shenyu/plugin/apache/dubbo/handler/ApacheDubboPluginDataHandlerTest.java
@@ -21,11 +21,11 @@ import
org.apache.shenyu.common.dto.convert.plugin.DubboRegisterConfig;
import org.apache.shenyu.common.dto.PluginData;
import org.apache.shenyu.common.enums.PluginEnum;
import org.apache.shenyu.common.utils.GsonUtils;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.Mockito.mock;
/**
@@ -35,7 +35,7 @@ public final class ApacheDubboPluginDataHandlerTest {
private ApacheDubboPluginDataHandler apacheDubboPluginDataHandler;
- @Before
+ @BeforeEach
public void setUp() {
apacheDubboPluginDataHandler = new ApacheDubboPluginDataHandler();
}
diff --git
a/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-apache-dubbo/src/test/java/org/apache/shenyu/plugin/apache/dubbo/proxy/ApacheDubboProxyServiceTest.java
b/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-apache-dubbo/src/test/java/org/apache/shenyu/plugin/apache/dubbo/proxy/ApacheDubboProxyServiceTest.java
index 8654140..33ca5b9 100644
---
a/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-apache-dubbo/src/test/java/org/apache/shenyu/plugin/apache/dubbo/proxy/ApacheDubboProxyServiceTest.java
+++
b/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-apache-dubbo/src/test/java/org/apache/shenyu/plugin/apache/dubbo/proxy/ApacheDubboProxyServiceTest.java
@@ -26,12 +26,14 @@ import org.apache.shenyu.common.dto.MetaData;
import org.apache.shenyu.common.enums.RpcTypeEnum;
import org.apache.shenyu.plugin.apache.dubbo.cache.ApacheDubboConfigCache;
import org.apache.shenyu.plugin.dubbo.common.param.DubboParamResolveService;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
import org.springframework.mock.web.server.MockServerWebExchange;
import org.springframework.web.server.ServerWebExchange;
@@ -45,7 +47,8 @@ import static org.mockito.Mockito.when;
/**
* The Test Case For ApacheDubboProxyService.
*/
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public final class ApacheDubboProxyServiceTest {
private static final String PATH = "/duubo/findAll";
@@ -62,7 +65,7 @@ public final class ApacheDubboProxyServiceTest {
@Mock
private ReferenceConfig<GenericService> referenceConfig;
- @Before
+ @BeforeEach
public void setup() {
exchange =
MockServerWebExchange.from(MockServerHttpRequest.get("localhost").build());
metaData = new MetaData();
@@ -74,7 +77,7 @@ public final class ApacheDubboProxyServiceTest {
metaData.setRpcType(RpcTypeEnum.DUBBO.getName());
}
- @After
+ @AfterEach
public void after() {
ApacheDubboConfigCache.getInstance().invalidateAll();
}
diff --git
a/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-apache-dubbo/src/test/java/org/apache/shenyu/plugin/apache/dubbo/subscriber/ApacheDubboMetaDataSubscriberTest.java
b/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-apache-dubbo/src/test/java/org/apache/shenyu/plugin/apache/dubbo/subscriber/ApacheDubboMetaDataSubscriberTest.java
index 6e831ac..ba0090e 100644
---
a/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-apache-dubbo/src/test/java/org/apache/shenyu/plugin/apache/dubbo/subscriber/ApacheDubboMetaDataSubscriberTest.java
+++
b/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-apache-dubbo/src/test/java/org/apache/shenyu/plugin/apache/dubbo/subscriber/ApacheDubboMetaDataSubscriberTest.java
@@ -19,26 +19,28 @@ package org.apache.shenyu.plugin.apache.dubbo.subscriber;
import org.apache.shenyu.common.dto.MetaData;
import org.apache.shenyu.common.enums.RpcTypeEnum;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.mock;
/**
* The Test Case For ApacheDubboMetaDataSubscriber.
*/
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public final class ApacheDubboMetaDataSubscriberTest {
private ApacheDubboMetaDataSubscriber apacheDubboMetaDataSubscriber;
private MetaData metaData;
- @Before
+ @BeforeEach
public void setUp() {
apacheDubboMetaDataSubscriber = new ApacheDubboMetaDataSubscriber();
metaData = new MetaData();
diff --git
a/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-dubbo-common/src/test/java/org/apache/shenyu/plugin/dubbo/common/context/DubboShenyuContextDecoratorTest.java
b/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-dubbo-common/src/test/java/org/apache/shenyu/plugin/dubbo/common/context/DubboShenyuContextDecoratorTest.java
index 927c986..13c7a44 100644
---
a/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-dubbo-common/src/test/java/org/apache/shenyu/plugin/dubbo/common/context/DubboShenyuContextDecoratorTest.java
+++
b/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-dubbo-common/src/test/java/org/apache/shenyu/plugin/dubbo/common/context/DubboShenyuContextDecoratorTest.java
@@ -20,15 +20,18 @@ package org.apache.shenyu.plugin.dubbo.common.context;
import org.apache.shenyu.common.dto.MetaData;
import org.apache.shenyu.common.enums.RpcTypeEnum;
import org.apache.shenyu.plugin.api.context.ShenyuContext;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
/**
* DubboShenyuContextDecorator test.
*/
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class DubboShenyuContextDecoratorTest {
private static final String MOCK_APP_NAME = "mockAppName";
@@ -39,7 +42,7 @@ public class DubboShenyuContextDecoratorTest {
private DubboShenyuContextDecorator dubboShenyuContextDecorator;
- @Before
+ @BeforeEach
public void setUp() {
this.dubboShenyuContextDecorator = new DubboShenyuContextDecorator();
}
diff --git
a/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-dubbo-common/src/test/java/org/apache/shenyu/plugin/dubbo/common/param/DubboParamResolveServiceTest.java
b/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-dubbo-common/src/test/java/org/apache/shenyu/plugin/dubbo/common/param/DubboParamResolveServiceTest.java
index 8e87944..e08d223 100644
---
a/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-dubbo-common/src/test/java/org/apache/shenyu/plugin/dubbo/common/param/DubboParamResolveServiceTest.java
+++
b/shenyu-plugin/shenyu-plugin-dubbo/shenyu-plugin-dubbo-common/src/test/java/org/apache/shenyu/plugin/dubbo/common/param/DubboParamResolveServiceTest.java
@@ -18,23 +18,26 @@
package org.apache.shenyu.plugin.dubbo.common.param;
import org.apache.commons.lang3.tuple.Pair;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.InjectMocks;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertNull;
/**
* Test cases for DefaultDubboParamResolveService.
*/
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class DubboParamResolveServiceTest {
@InjectMocks
