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 0c214b2 refactor(starter): change Junit4 to Junit5 in
shenyu-spring-boot-starter module (#2853)
0c214b2 is described below
commit 0c214b23d4ccb9332f40e2c7c90a1741d87b7831
Author: luoxiaolong <[email protected]>
AuthorDate: Thu Feb 10 14:06:37 2022 +0800
refactor(starter): change Junit4 to Junit5 in shenyu-spring-boot-starter
module (#2853)
---
.../ShenyuAlibabaDubboClientConfigurationTest.java | 4 +-
.../ShenyuApacheDubboClientConfigurationTest.java | 4 +-
.../ShenyuClientCommonBeanConfigurationTest.java | 8 +-
.../grpc/ShenyuGrpcClientConfigurationTest.java | 8 +-
.../motan/ShenyuMotanClientConfigurationTest.java | 4 +-
.../sofa/ShenyuSofaClientConfigurationTest.java | 4 +-
.../ShenyuSpringCloudClientConfigurationTest.java | 8 +-
.../ShenyuSpringMvcClientConfigurationTest.java | 8 +-
.../tars/ShenyuTarsClientConfigurationTest.java | 8 +-
.../starter/gateway/ShenyuConfigurationTest.java | 10 +-
.../path/ContextPathPluginConfigurationTest.java | 4 +-
.../cryptor/CryptorPluginConfigurationTest.java | 8 +-
.../divide/DividePluginConfigurationTest.java | 8 +-
.../dubbo/AlibabaDubboPluginConfigurationTest.java | 10 +-
.../dubbo/ApacheDubboPluginConfigurationTest.java | 10 +-
.../dubbo/common/DubboCommonConfigurationTest.java | 4 +-
.../GeneralContextPluginConfigurationTest.java | 2 +-
.../global/GlobalPluginConfigurationTest.java | 8 +-
.../plugin/grpc/GrpcPluginConfigurationTest.java | 8 +-
.../HttpClientPluginConfigurationTest.java | 143 +++++++++++----------
.../hystrix/HystrixPluginConfigurationTest.java | 4 +-
.../plugin/jwt/JwtPluginConfigurationTest.java | 4 +-
.../logging/LoggingPluginConfigurationTest.java | 4 +-
.../ModifyResponsePluginConfigurationTest.java | 4 +-
.../monitor/MonitorPluginConfigurationTest.java | 4 +-
.../plugin/motan/MotanPluginConfigurationTest.java | 8 +-
.../plugin/mqtt/MqttPluginConfigurationTest.java | 4 +-
.../oauth2/OAuth2PluginConfigurationTest.java | 8 +-
.../ParamMappingPluginConfigurationTest.java | 4 +-
.../RateLimiterPluginConfigurationTest.java | 4 +-
.../redirect/RedirectPluginConfigurationTest.java | 4 +-
.../request/RequestPluginConfigurationTest.java | 4 +-
.../Resilience4JPluginConfigurationTest.java | 4 +-
.../response/ResponsePluginConfigurationTest.java | 8 +-
.../rewrite/RewritePluginConfigurationTest.java | 4 +-
.../sentinel/SentinelPluginConfigurationTest.java | 8 +-
.../plugin/sign/SignPluginConfigurationTest.java | 8 +-
.../plugin/sofa/SofaPluginConfigurationTest.java | 8 +-
.../SpringCloudPluginConfigurationTest.java | 8 +-
.../plugin/tars/TarsPluginConfigurationTest.java | 8 +-
.../plugin/uri/URIPluginConfigurationTest.java | 4 +-
.../plugin/waf/WafPluginConfigurationTest.java | 4 +-
.../WebSocketPluginConfigurationTest.java | 8 +-
.../http/HttpClientPluginConfigurationTest.java | 16 +--
.../data/nacos/NacosSyncDataConfigurationTest.java | 14 +-
.../WebsocketSyncDataConfigurationTest.java | 12 +-
.../ZookeeperSyncDataConfigurationTest.java | 18 +--
47 files changed, 230 insertions(+), 229 deletions(-)
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-alibaba-dubbo/src/test/java/org/apache/shenyu/springboot/starter/client/alibaba/dubbo/ShenyuAlibabaDubboClientConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-alibaba-dubbo/src/test/java/org/apache/shenyu/springboot/starter/client/alibaba/dubbo/ShenyuAlibabaDubboClientConfigurationTest.java
index 65104eb..44a856f 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-alibaba-dubbo/src/test/java/org/apache/shenyu/springboot/starter/client/alibaba/dubbo/ShenyuAlibabaDubboClientConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-alibaba-dubbo/src/test/java/org/apache/shenyu/springboot/starter/client/alibaba/dubbo/ShenyuAlibabaDubboClientConfigurationTest.java
@@ -19,7 +19,7 @@ package
org.apache.shenyu.springboot.starter.client.alibaba.dubbo;
import org.apache.shenyu.client.alibaba.dubbo.AlibabaDubboServiceBeanListener;
import org.apache.shenyu.register.client.http.utils.RegisterUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.MockedStatic;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -29,7 +29,7 @@ import org.springframework.context.annotation.PropertySource;
import java.util.Optional;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mockStatic;
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-apache-dubbo/src/test/java/org/apache/shenyu/springboot/starter/client/apache/dubbo/ShenyuApacheDubboClientConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-apache-dubbo/src/test/java/org/apache/shenyu/springboot/starter/client/apache/dubbo/ShenyuApacheDubboClientConfigurationTest.java
index 9094333..3d766a2 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-apache-dubbo/src/test/java/org/apache/shenyu/springboot/starter/client/apache/dubbo/ShenyuApacheDubboClientConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-apache-dubbo/src/test/java/org/apache/shenyu/springboot/starter/client/apache/dubbo/ShenyuApacheDubboClientConfigurationTest.java
@@ -19,7 +19,7 @@ package
org.apache.shenyu.springboot.starter.client.apache.dubbo;
import org.apache.shenyu.client.apache.dubbo.ApacheDubboServiceBeanListener;
import org.apache.shenyu.register.client.http.utils.RegisterUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.MockedStatic;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -29,7 +29,7 @@ import org.springframework.context.annotation.PropertySource;
import java.util.Optional;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mockStatic;
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-common/src/test/java/org/apache/shenyu/springboot/starter/client/common/config/ShenyuClientCommonBeanConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-common/src/test/java/org/apache/shenyu/springboot/starter/client/common/config/ShenyuClientCommonBeanConfigurationTest.java
index 406df6a..5cbcfcf 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-common/src/test/java/org/apache/shenyu/springboot/starter/client/common/config/ShenyuClientCommonBeanConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-common/src/test/java/org/apache/shenyu/springboot/starter/client/common/config/ShenyuClientCommonBeanConfigurationTest.java
@@ -22,8 +22,8 @@ import
org.apache.shenyu.register.client.http.utils.RegisterUtils;
import org.apache.shenyu.register.common.config.ShenyuClientConfig;
import org.apache.shenyu.register.common.config.ShenyuRegisterCenterConfig;
import org.apache.shenyu.register.common.enums.RegisterTypeEnum;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.MockedStatic;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -33,7 +33,7 @@ import org.springframework.context.annotation.Configuration;
import java.util.Optional;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mockStatic;
@@ -46,7 +46,7 @@ public class ShenyuClientCommonBeanConfigurationTest {
private ApplicationContextRunner applicationContextRunner;
- @Before
+ @BeforeEach
public void before() {
applicationContextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(ShenyuClientCommonBeanConfiguration.class))
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-grpc/src/test/java/org/apache/dromara/springboot/starter/client/grpc/ShenyuGrpcClientConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-grpc/src/test/java/org/apache/dromara/springboot/starter/client/grpc/ShenyuGrpcClientConfigurationTest.java
index e515602..5dc5483 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-grpc/src/test/java/org/apache/dromara/springboot/starter/client/grpc/ShenyuGrpcClientConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-grpc/src/test/java/org/apache/dromara/springboot/starter/client/grpc/ShenyuGrpcClientConfigurationTest.java
@@ -22,8 +22,8 @@ import
org.apache.shenyu.client.grpc.GrpcClientBeanPostProcessor;
import org.apache.shenyu.client.grpc.GrpcContextRefreshedEventListener;
import org.apache.shenyu.client.grpc.server.GrpcServerRunner;
import org.apache.shenyu.register.client.http.utils.RegisterUtils;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.MockedStatic;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -33,7 +33,7 @@ import org.springframework.context.annotation.Configuration;
import java.util.Optional;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mockStatic;
@@ -47,7 +47,7 @@ public class ShenyuGrpcClientConfigurationTest {
private ApplicationContextRunner applicationContextRunner;
- @Before
+ @BeforeEach
public void before() {
applicationContextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(ShenyuGrpcClientConfiguration.class))
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-motan/src/test/java/org/apache/shenyu/springboot/starter/client/motan/ShenyuMotanClientConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-motan/src/test/java/org/apache/shenyu/springboot/starter/client/motan/ShenyuMotanClientConfigurationTest.java
index bd0337e..973eeeb 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-motan/src/test/java/org/apache/shenyu/springboot/starter/client/motan/ShenyuMotanClientConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-motan/src/test/java/org/apache/shenyu/springboot/starter/client/motan/ShenyuMotanClientConfigurationTest.java
@@ -20,7 +20,7 @@ package org.apache.shenyu.springboot.starter.client.motan;
import org.apache.shenyu.client.motan.MotanServiceBeanPostProcessor;
import org.apache.shenyu.register.client.http.utils.RegisterUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.MockedStatic;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -29,7 +29,7 @@ import org.springframework.context.annotation.Configuration;
import java.util.Optional;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mockStatic;
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-sofa/src/test/java/org/apache/shenyu/springboot/starter/client/sofa/ShenyuSofaClientConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-sofa/src/test/java/org/apache/shenyu/springboot/starter/client/sofa/ShenyuSofaClientConfigurationTest.java
index dc8401d..8fcc041 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-sofa/src/test/java/org/apache/shenyu/springboot/starter/client/sofa/ShenyuSofaClientConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-sofa/src/test/java/org/apache/shenyu/springboot/starter/client/sofa/ShenyuSofaClientConfigurationTest.java
@@ -20,7 +20,7 @@ package org.apache.shenyu.springboot.starter.client.sofa;
import org.apache.shenyu.client.sofa.SofaServiceBeanPostProcessor;
import org.apache.shenyu.register.client.http.utils.RegisterUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.MockedStatic;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -29,7 +29,7 @@ import org.springframework.context.annotation.Configuration;
import java.util.Optional;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mockStatic;
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-springcloud/src/test/java/org/apache/shenyu/springboot/starter/client/springcloud/ShenyuSpringCloudClientConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-springcloud/src/test/java/org/apache/shenyu/springboot/starter/client/springcloud/ShenyuSpringCloudClientConfigurationTest.java
index 6e41caa..3520d5a 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-springcloud/src/test/java/org/apache/shenyu/springboot/starter/client/springcloud/ShenyuSpringCloudClientConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-springcloud/src/test/java/org/apache/shenyu/springboot/starter/client/springcloud/ShenyuSpringCloudClientConfigurationTest.java
@@ -20,8 +20,8 @@ package
org.apache.shenyu.springboot.starter.client.springcloud;
import org.apache.shenyu.client.springcloud.init.ContextRegisterListener;
import
org.apache.shenyu.client.springcloud.init.SpringCloudClientBeanPostProcessor;
import org.apache.shenyu.register.client.http.utils.RegisterUtils;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.MockedStatic;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -30,7 +30,7 @@ import org.springframework.context.annotation.Configuration;
import java.util.Optional;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mockStatic;
@@ -43,7 +43,7 @@ public class ShenyuSpringCloudClientConfigurationTest {
private ApplicationContextRunner applicationContextRunner;
- @Before
+ @BeforeEach
public void before() {
applicationContextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(ShenyuSpringCloudClientConfiguration.class))
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-springmvc/src/test/java/org/apache/shenyu/springboot/starter/client/springmvc/ShenyuSpringMvcClientConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-springmvc/src/test/java/org/apache/shenyu/springboot/starter/client/springmvc/ShenyuSpringMvcClientConfigurationTest.java
index e62d8f7..6f5c4ec 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-springmvc/src/test/java/org/apache/shenyu/springboot/starter/client/springmvc/ShenyuSpringMvcClientConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-springmvc/src/test/java/org/apache/shenyu/springboot/starter/client/springmvc/ShenyuSpringMvcClientConfigurationTest.java
@@ -20,8 +20,8 @@ package org.apache.shenyu.springboot.starter.client.springmvc;
import org.apache.shenyu.client.springmvc.init.ContextRegisterListener;
import
org.apache.shenyu.client.springmvc.init.SpringMvcClientBeanPostProcessor;
import org.apache.shenyu.register.client.http.utils.RegisterUtils;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.MockedStatic;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -30,7 +30,7 @@ import org.springframework.context.annotation.Configuration;
import java.util.Optional;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mockStatic;
@@ -43,7 +43,7 @@ public class ShenyuSpringMvcClientConfigurationTest {
private ApplicationContextRunner applicationContextRunner;
- @Before
+ @BeforeEach
public void before() {
applicationContextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(ShenyuSpringMvcClientConfiguration.class))
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-tars/src/test/java/org/apache/shenyu/springboot/starter/client/tars/ShenyuTarsClientConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-tars/src/test/java/org/apache/shenyu/springboot/starter/client/tars/ShenyuTarsClientConfigurationTest.java
index 0255837..1ee037b 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-tars/src/test/java/org/apache/shenyu/springboot/starter/client/tars/ShenyuTarsClientConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-tars/src/test/java/org/apache/shenyu/springboot/starter/client/tars/ShenyuTarsClientConfigurationTest.java
@@ -21,8 +21,8 @@ package org.apache.shenyu.springboot.starter.client.tars;
import org.apache.shenyu.client.tars.TarsContextRefreshedEventListener;
import org.apache.shenyu.client.tars.TarsServiceBeanPostProcessor;
import org.apache.shenyu.register.client.http.utils.RegisterUtils;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.MockedStatic;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -31,7 +31,7 @@ import org.springframework.context.annotation.Configuration;
import java.util.Optional;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mockStatic;
@@ -44,7 +44,7 @@ public class ShenyuTarsClientConfigurationTest {
private ApplicationContextRunner applicationContextRunner;
- @Before
+ @BeforeEach
public void before() {
applicationContextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(ShenyuTarsClientConfiguration.class))
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-gateway/src/test/java/org/apache/shenyu/springboot/starter/gateway/ShenyuConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-gateway/src/test/java/org/apache/shenyu/springboot/starter/gateway/ShenyuConfigurationTest.java
index c1d08c8..6aadadf 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-gateway/src/test/java/org/apache/shenyu/springboot/starter/gateway/ShenyuConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-gateway/src/test/java/org/apache/shenyu/springboot/starter/gateway/ShenyuConfigurationTest.java
@@ -24,8 +24,8 @@ import org.apache.shenyu.plugin.api.result.ShenyuResult;
import org.apache.shenyu.sync.data.api.PluginDataSubscriber;
import org.apache.shenyu.web.handler.ShenyuWebHandler;
import org.apache.shenyu.web.loader.ShenyuLoaderService;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
@@ -37,8 +37,8 @@ import
org.springframework.http.codec.support.DefaultServerCodecConfigurer;
import org.springframework.web.reactive.DispatcherHandler;
import org.springframework.web.server.WebFilter;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Test case for {@link ShenyuConfiguration}.
@@ -49,7 +49,7 @@ public class ShenyuConfigurationTest {
private ApplicationContextRunner applicationContextRunner;
- @Before
+ @BeforeEach
public void before() {
applicationContextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(ShenyuConfiguration.class))
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-context-path/src/test/java/org/apache/shenyu/springboot/starter/plugin/context/path/ContextPathPluginConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-context-path/src/test/java/org/apache/shenyu/springboot/starter/plugin/context/path/ContextPathPluginConfigurationTest.java
index 3dbe0c7..aadc3f4 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-context-path/src/test/java/org/apache/shenyu/springboot/starter/plugin/context/path/ContextPathPluginConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-context-path/src/test/java/org/apache/shenyu/springboot/starter/plugin/context/path/ContextPathPluginConfigurationTest.java
@@ -20,14 +20,14 @@ package
org.apache.shenyu.springboot.starter.plugin.context.path;
import org.apache.shenyu.common.enums.PluginEnum;
import org.apache.shenyu.plugin.api.ShenyuPlugin;
import org.apache.shenyu.plugin.base.handler.PluginDataHandler;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.annotation.Configuration;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Test case for {@link ContextPathPluginConfiguration}.
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-cryptor/src/test/java/org/apache/shenyu/springboot/starter/plugin/cryptor/CryptorPluginConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-cryptor/src/test/java/org/apache/shenyu/springboot/starter/plugin/cryptor/CryptorPluginConfigurationTest.java
index 1ed1d3c..82188df 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-cryptor/src/test/java/org/apache/shenyu/springboot/starter/plugin/cryptor/CryptorPluginConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-cryptor/src/test/java/org/apache/shenyu/springboot/starter/plugin/cryptor/CryptorPluginConfigurationTest.java
@@ -19,14 +19,14 @@ package org.apache.shenyu.springboot.starter.plugin.cryptor;
import org.apache.shenyu.plugin.api.ShenyuPlugin;
import org.apache.shenyu.plugin.base.handler.PluginDataHandler;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.annotation.Configuration;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Test case for {@link CryptorPluginConfiguration}.
@@ -37,7 +37,7 @@ public class CryptorPluginConfigurationTest {
private ApplicationContextRunner applicationContextRunner;
- @Before
+ @BeforeEach
public void before() {
applicationContextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(CryptorPluginConfiguration.class))
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-divide/src/test/java/org/apache/shenyu/springboot/plugin/divide/DividePluginConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-divide/src/test/java/org/apache/shenyu/springboot/plugin/divide/DividePluginConfigurationTest.java
index 9049a08..f8cb978 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-divide/src/test/java/org/apache/shenyu/springboot/plugin/divide/DividePluginConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-divide/src/test/java/org/apache/shenyu/springboot/plugin/divide/DividePluginConfigurationTest.java
@@ -20,14 +20,14 @@ package org.apache.shenyu.springboot.plugin.divide;
import org.apache.shenyu.plugin.api.ShenyuPlugin;
import org.apache.shenyu.plugin.api.context.ShenyuContextDecorator;
import org.apache.shenyu.plugin.base.handler.PluginDataHandler;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.annotation.Configuration;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Test case for {@link DividePluginConfiguration}.
@@ -38,7 +38,7 @@ public class DividePluginConfigurationTest {
private ApplicationContextRunner applicationContextRunner;
- @Before
+ @BeforeEach
public void before() {
applicationContextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(DividePluginConfiguration.class))
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-dubbo/shenyu-spring-boot-starter-plugin-alibaba-dubbo/src/test/java/org/apache/shenyu/springboot/starter/plugin/alibaba/dubbo/AlibabaDubboPluginConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-dubbo/shenyu-spring-boot-starter-plugin-alibaba-dubbo/src/test/java/org/apache/shenyu/springboot/starter/plugin/alibaba/d
[...]
index 3912473..d362c0a 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-dubbo/shenyu-spring-boot-starter-plugin-alibaba-dubbo/src/test/java/org/apache/shenyu/springboot/starter/plugin/alibaba/dubbo/AlibabaDubboPluginConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-dubbo/shenyu-spring-boot-starter-plugin-alibaba-dubbo/src/test/java/org/apache/shenyu/springboot/starter/plugin/alibaba/dubbo/AlibabaDubboPluginConfigurationTest.java
@@ -21,16 +21,16 @@ import org.apache.shenyu.common.enums.PluginEnum;
import org.apache.shenyu.plugin.api.ShenyuPlugin;
import org.apache.shenyu.plugin.base.handler.PluginDataHandler;
import org.apache.shenyu.sync.data.api.MetaDataSubscriber;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.annotation.Configuration;
import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.hamcrest.MatcherAssert.assertThat;
/**
* Test case for {@link AlibabaDubboPluginConfiguration}.
@@ -41,7 +41,7 @@ public class AlibabaDubboPluginConfigurationTest {
private ApplicationContextRunner applicationContextRunner;
- @Before
+ @BeforeEach
public void before() {
applicationContextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(AlibabaDubboPluginConfiguration.class))
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-dubbo/shenyu-spring-boot-starter-plugin-apache-dubbo/src/test/java/org/apache/shenyu/springboot/starter/plugin/apache/dubbo/ApacheDubboPluginConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-dubbo/shenyu-spring-boot-starter-plugin-apache-dubbo/src/test/java/org/apache/shenyu/springboot/starter/plugin/apache/dubbo/
[...]
index 8c3c879..aed8098 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-dubbo/shenyu-spring-boot-starter-plugin-apache-dubbo/src/test/java/org/apache/shenyu/springboot/starter/plugin/apache/dubbo/ApacheDubboPluginConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-dubbo/shenyu-spring-boot-starter-plugin-apache-dubbo/src/test/java/org/apache/shenyu/springboot/starter/plugin/apache/dubbo/ApacheDubboPluginConfigurationTest.java
@@ -21,16 +21,16 @@ import org.apache.shenyu.common.enums.PluginEnum;
import org.apache.shenyu.plugin.api.ShenyuPlugin;
import org.apache.shenyu.plugin.base.handler.PluginDataHandler;
import org.apache.shenyu.sync.data.api.MetaDataSubscriber;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.annotation.Configuration;
import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.hamcrest.MatcherAssert.assertThat;
/**
* Test case for {@link ApacheDubboPluginConfiguration}.
@@ -41,7 +41,7 @@ public class ApacheDubboPluginConfigurationTest {
private ApplicationContextRunner applicationContextRunner;
- @Before
+ @BeforeEach
public void before() {
applicationContextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(ApacheDubboPluginConfiguration.class))
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-dubbo/shenyu-spring-boot-starter-plugin-dubbo-common/src/test/java/org/apache/shenyu/springboot/plugin/dubbo/common/DubboCommonConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-dubbo/shenyu-spring-boot-starter-plugin-dubbo-common/src/test/java/org/apache/shenyu/springboot/plugin/dubbo/common/DubboCommonConfigurati
[...]
index c06b1b6..2d08f00 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-dubbo/shenyu-spring-boot-starter-plugin-dubbo-common/src/test/java/org/apache/shenyu/springboot/plugin/dubbo/common/DubboCommonConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-dubbo/shenyu-spring-boot-starter-plugin-dubbo-common/src/test/java/org/apache/shenyu/springboot/plugin/dubbo/common/DubboCommonConfigurationTest.java
@@ -19,13 +19,13 @@ package org.apache.shenyu.springboot.plugin.dubbo.common;
import org.apache.shenyu.plugin.api.context.ShenyuContextDecorator;
import org.apache.shenyu.plugin.dubbo.common.param.DubboParamResolveService;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.annotation.Configuration;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Test case for {@link DubboCommonConfiguration}.
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-general-context/src/test/java/org/apache/shenyu/springboot/starter/plugin/general/context/GeneralContextPluginConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-general-context/src/test/java/org/apache/shenyu/springboot/starter/plugin/general/context/GeneralContextPluginConfigurationTest.java
index cf4dec5..742b8c0 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-general-context/src/test/java/org/apache/shenyu/springboot/starter/plugin/general/context/GeneralContextPluginConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-general-context/src/test/java/org/apache/shenyu/springboot/starter/plugin/general/context/GeneralContextPluginConfigurationTest.java
@@ -21,7 +21,7 @@ import org.apache.shenyu.common.enums.PluginEnum;
import org.apache.shenyu.plugin.api.ShenyuPlugin;
import org.apache.shenyu.plugin.general.context.GeneralContextPlugin;
import
org.apache.shenyu.plugin.general.context.handler.GeneralContextPluginDataHandler;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-global/src/test/java/org/apache/shenyu/springboot/starter/plugin/global/GlobalPluginConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-global/src/test/java/org/apache/shenyu/springboot/starter/plugin/global/GlobalPluginConfigurationTest.java
index a4978f4..4d66b89 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-global/src/test/java/org/apache/shenyu/springboot/starter/plugin/global/GlobalPluginConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-global/src/test/java/org/apache/shenyu/springboot/starter/plugin/global/GlobalPluginConfigurationTest.java
@@ -20,14 +20,14 @@ package org.apache.shenyu.springboot.starter.plugin.global;
import org.apache.shenyu.plugin.api.ShenyuPlugin;
import org.apache.shenyu.plugin.api.context.ShenyuContextBuilder;
import org.apache.shenyu.sync.data.api.MetaDataSubscriber;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.annotation.Configuration;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Test case for {@link GlobalPluginConfiguration}.
@@ -38,7 +38,7 @@ public class GlobalPluginConfigurationTest {
private ApplicationContextRunner applicationContextRunner;
- @Before
+ @BeforeEach
public void before() {
applicationContextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(GlobalPluginConfiguration.class))
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-grpc/src/test/java/org/apache/shenyu/springboot/starter/plugin/grpc/GrpcPluginConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-grpc/src/test/java/org/apache/shenyu/springboot/starter/plugin/grpc/GrpcPluginConfigurationTest.java
index 2548677..2927a18 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-grpc/src/test/java/org/apache/shenyu/springboot/starter/plugin/grpc/GrpcPluginConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-grpc/src/test/java/org/apache/shenyu/springboot/starter/plugin/grpc/GrpcPluginConfigurationTest.java
@@ -20,14 +20,14 @@ package org.apache.shenyu.springboot.starter.plugin.grpc;
import org.apache.shenyu.plugin.api.ShenyuPlugin;
import org.apache.shenyu.plugin.api.context.ShenyuContextDecorator;
import org.apache.shenyu.plugin.base.handler.PluginDataHandler;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.annotation.Configuration;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Test case for {@link GrpcPluginConfiguration}.
@@ -38,7 +38,7 @@ public class GrpcPluginConfigurationTest {
private ApplicationContextRunner applicationContextRunner;
- @Before
+ @BeforeEach
public void before() {
applicationContextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(GrpcPluginConfiguration.class))
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-httpclient/src/test/java/org/apache/shenyu/springboot/starter/plugin/httpclient/HttpClientPluginConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-httpclient/src/test/java/org/apache/shenyu/springboot/starter/plugin/httpclient/HttpClientPluginConfigurationTest.java
index 8dc48d2..f6f66e8 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-httpclient/src/test/java/org/apache/shenyu/springboot/starter/plugin/httpclient/HttpClientPluginConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-httpclient/src/test/java/org/apache/shenyu/springboot/starter/plugin/httpclient/HttpClientPluginConfigurationTest.java
@@ -17,24 +17,25 @@
package org.apache.shenyu.springboot.starter.plugin.httpclient;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import java.time.Duration;
+
import org.apache.shenyu.plugin.api.ShenyuPlugin;
import org.apache.shenyu.plugin.httpclient.config.HttpClientProperties;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.annotation.Configuration;
+
import reactor.netty.http.client.HttpClient;
import reactor.netty.resources.ConnectionProvider;
import reactor.netty.tcp.SslProvider;
-import java.time.Duration;
-
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-
/**
* Test case for {@link HttpClientPluginConfiguration}.
*/
@@ -44,90 +45,90 @@ public class HttpClientPluginConfigurationTest {
private ApplicationContextRunner applicationContextRunner;
- @Before
+ @BeforeEach
public void before() {
applicationContextRunner = new ApplicationContextRunner()
-
.withConfiguration(AutoConfigurations.of(HttpClientPluginConfiguration.class))
- .withBean(HttpClientPluginConfigurationTest.class);
+
.withConfiguration(AutoConfigurations.of(HttpClientPluginConfiguration.class))
+ .withBean(HttpClientPluginConfigurationTest.class);
}
@Test
public void testHttpClientProperties() {
applicationContextRunner
- .withPropertyValues(
- "debug=true",
- "shenyu.httpclient.connectTimeout=3",
- "shenyu.httpclient.responseTimeout=0",
- "shenyu.httpclient.pool.PoolType=0",
- "shenyu.httpclient.pool.name=proxy",
- "shenyu.httpclient.pool.maxConnections=1",
- "shenyu.httpclient.pool.acquireTimeout=45000",
- "shenyu.httpclient.proxy.host=http://localhost",
- "shenyu.httpclient.proxy.port=18848",
- "shenyu.httpclient.proxy.username=itmiwang",
- "shenyu.httpclient.proxy.password=itmiwang",
- "shenyu.httpclient.proxy.nonProxyHostsPattern=itmiwang",
- "shenyu.httpclient.ssl.X509Certificate[]=[]",
- "shenyu.httpclient.ssl.handshakeTimeout=10000",
- "shenyu.httpclient.ssl.closeNotifyFlushTimeout=3000",
- "shenyu.httpclient.ssl.closeNotifyReadTimeout=0",
- "shenyu.httpclient.ssl.SslProvider.DefaultConfigurationType=1"
- )
- .run(context -> {
- HttpClientProperties properties =
context.getBean("httpClientProperties", HttpClientProperties.class);
- assertNotNull(properties);
- assertThat(properties.getConnectTimeout(), is(3));
- assertThat(properties.getResponseTimeout(), is(Duration.ZERO));
- assertThat(properties.getPool().getType(),
is(HttpClientProperties.Pool.PoolType.ELASTIC));
- assertThat(properties.getPool().getName(), is("proxy"));
- assertThat(properties.getPool().getMaxConnections(), is(1));
- assertThat(properties.getPool().getAcquireTimeout(),
is(ConnectionProvider.DEFAULT_POOL_ACQUIRE_TIMEOUT));
- assertThat(properties.getProxy().getHost(),
is("http://localhost"));
- assertThat(properties.getProxy().getPort(), is(18848));
- assertThat(properties.getProxy().getUsername(),
is("itmiwang"));
- assertThat(properties.getProxy().getPassword(),
is("itmiwang"));
- assertThat(properties.getProxy().getNonProxyHostsPattern(),
is("itmiwang"));
- assertThat(properties.getSsl().getHandshakeTimeout(),
is(Duration.ofMillis(10000)));
-
assertNotNull(properties.getSsl().getTrustedX509Certificates());
- assertThat(properties.getSsl().getCloseNotifyFlushTimeout(),
is(Duration.ofMillis(3000)));
- assertThat(properties.getSsl().getCloseNotifyReadTimeout(),
is(Duration.ZERO));
- assertThat(properties.getSsl().getDefaultConfigurationType(),
is(SslProvider.DefaultConfigurationType.TCP));
- });
+ .withPropertyValues(
+ "debug=true",
+ "shenyu.httpclient.connectTimeout=3",
+ "shenyu.httpclient.responseTimeout=0",
+ "shenyu.httpclient.pool.PoolType=0",
+ "shenyu.httpclient.pool.name=proxy",
+ "shenyu.httpclient.pool.maxConnections=1",
+ "shenyu.httpclient.pool.acquireTimeout=45000",
+ "shenyu.httpclient.proxy.host=http://localhost",
+ "shenyu.httpclient.proxy.port=18848",
+ "shenyu.httpclient.proxy.username=itmiwang",
+ "shenyu.httpclient.proxy.password=itmiwang",
+
"shenyu.httpclient.proxy.nonProxyHostsPattern=itmiwang",
+ "shenyu.httpclient.ssl.X509Certificate[]=[]",
+ "shenyu.httpclient.ssl.handshakeTimeout=10000",
+ "shenyu.httpclient.ssl.closeNotifyFlushTimeout=3000",
+ "shenyu.httpclient.ssl.closeNotifyReadTimeout=0",
+
"shenyu.httpclient.ssl.SslProvider.DefaultConfigurationType=1"
+ )
+ .run(context -> {
+ HttpClientProperties properties =
context.getBean("httpClientProperties", HttpClientProperties.class);
+ assertNotNull(properties);
+ assertThat(properties.getConnectTimeout(), is(3));
+ assertThat(properties.getResponseTimeout(),
is(Duration.ZERO));
+ assertThat(properties.getPool().getType(),
is(HttpClientProperties.Pool.PoolType.ELASTIC));
+ assertThat(properties.getPool().getName(), is("proxy"));
+ assertThat(properties.getPool().getMaxConnections(),
is(1));
+ assertThat(properties.getPool().getAcquireTimeout(),
is(ConnectionProvider.DEFAULT_POOL_ACQUIRE_TIMEOUT));
+ assertThat(properties.getProxy().getHost(),
is("http://localhost"));
+ assertThat(properties.getProxy().getPort(), is(18848));
+ assertThat(properties.getProxy().getUsername(),
is("itmiwang"));
+ assertThat(properties.getProxy().getPassword(),
is("itmiwang"));
+
assertThat(properties.getProxy().getNonProxyHostsPattern(), is("itmiwang"));
+ assertThat(properties.getSsl().getHandshakeTimeout(),
is(Duration.ofMillis(10000)));
+
assertNotNull(properties.getSsl().getTrustedX509Certificates());
+
assertThat(properties.getSsl().getCloseNotifyFlushTimeout(),
is(Duration.ofMillis(3000)));
+
assertThat(properties.getSsl().getCloseNotifyReadTimeout(), is(Duration.ZERO));
+
assertThat(properties.getSsl().getDefaultConfigurationType(),
is(SslProvider.DefaultConfigurationType.TCP));
+ });
}
@Test
public void testHttpClient() {
applicationContextRunner
- .withPropertyValues("debug=true")
- .run(context -> {
- HttpClient client = context.getBean("httpClient",
HttpClient.class);
- assertNotNull(client);
- });
+ .withPropertyValues("debug=true")
+ .run(context -> {
+ HttpClient client = context.getBean("httpClient",
HttpClient.class);
+ assertNotNull(client);
+ });
}
@Test
public void testWebClientPlugin() {
applicationContextRunner
- .withPropertyValues(
- "debug=true",
- "shenyu.httpclient.strategy=webClient"
- )
- .run(context -> {
- ShenyuPlugin plugin = context.getBean("webClientPlugin",
ShenyuPlugin.class);
- assertNotNull(plugin);
- });
+ .withPropertyValues(
+ "debug=true",
+ "shenyu.httpclient.strategy=webClient"
+ )
+ .run(context -> {
+ ShenyuPlugin plugin = context.getBean("webClientPlugin",
ShenyuPlugin.class);
+ assertNotNull(plugin);
+ });
}
@Test
public void testNettyHttpClientPlugin() {
applicationContextRunner
- .withPropertyValues(
- "debug=true",
- "shenyu.httpclient.strategy=netty"
- )
- .run(context -> {
- ShenyuPlugin plugin = context.getBean("nettyHttpClientPlugin",
ShenyuPlugin.class);
- assertNotNull(plugin);
- });
+ .withPropertyValues(
+ "debug=true",
+ "shenyu.httpclient.strategy=netty"
+ )
+ .run(context -> {
+ ShenyuPlugin plugin =
context.getBean("nettyHttpClientPlugin", ShenyuPlugin.class);
+ assertNotNull(plugin);
+ });
}
}
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-hystrix/src/test/java/org/apache/shenyu/springboot/starter/plugin/hystrix/HystrixPluginConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-hystrix/src/test/java/org/apache/shenyu/springboot/starter/plugin/hystrix/HystrixPluginConfigurationTest.java
index 75c19df..8db9ac4 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-hystrix/src/test/java/org/apache/shenyu/springboot/starter/plugin/hystrix/HystrixPluginConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-hystrix/src/test/java/org/apache/shenyu/springboot/starter/plugin/hystrix/HystrixPluginConfigurationTest.java
@@ -20,14 +20,14 @@ package org.apache.shenyu.springboot.starter.plugin.hystrix;
import org.apache.shenyu.common.enums.PluginEnum;
import org.apache.shenyu.plugin.api.ShenyuPlugin;
import org.apache.shenyu.plugin.base.handler.PluginDataHandler;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.annotation.Configuration;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Test case for {@link HystrixPluginConfiguration}.
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-jwt/src/test/java/org/apache/shenyu/springboot/starter/plugin/jwt/JwtPluginConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-jwt/src/test/java/org/apache/shenyu/springboot/starter/plugin/jwt/JwtPluginConfigurationTest.java
index 7ff16e5..7098d48 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-jwt/src/test/java/org/apache/shenyu/springboot/starter/plugin/jwt/JwtPluginConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-jwt/src/test/java/org/apache/shenyu/springboot/starter/plugin/jwt/JwtPluginConfigurationTest.java
@@ -20,14 +20,14 @@ package org.apache.shenyu.springboot.starter.plugin.jwt;
import org.apache.shenyu.common.enums.PluginEnum;
import org.apache.shenyu.plugin.api.ShenyuPlugin;
import org.apache.shenyu.plugin.base.handler.PluginDataHandler;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.annotation.Configuration;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Test case for {@link JwtPluginConfiguration}.
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-logging/src/test/java/org/apache/shenyu/springboot/starter/plugin/logging/LoggingPluginConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-logging/src/test/java/org/apache/shenyu/springboot/starter/plugin/logging/LoggingPluginConfigurationTest.java
index 5c39dde..998f34d 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-logging/src/test/java/org/apache/shenyu/springboot/starter/plugin/logging/LoggingPluginConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-logging/src/test/java/org/apache/shenyu/springboot/starter/plugin/logging/LoggingPluginConfigurationTest.java
@@ -19,14 +19,14 @@ package org.apache.shenyu.springboot.starter.plugin.logging;
import org.apache.shenyu.common.enums.PluginEnum;
import org.apache.shenyu.plugin.api.ShenyuPlugin;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.annotation.Configuration;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Test case for {@link LoggingPluginConfiguration}.
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-modify-response/src/test/java/org/apache/shenyu/springboot/starter/plugin/modify/response/ModifyResponsePluginConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-modify-response/src/test/java/org/apache/shenyu/springboot/starter/plugin/modify/response/ModifyResponsePluginConfigurationTest.java
index 8aa1d93..8d5c746 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-modify-response/src/test/java/org/apache/shenyu/springboot/starter/plugin/modify/response/ModifyResponsePluginConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-modify-response/src/test/java/org/apache/shenyu/springboot/starter/plugin/modify/response/ModifyResponsePluginConfigurationTest.java
@@ -22,14 +22,14 @@ import org.apache.shenyu.plugin.api.ShenyuPlugin;
import org.apache.shenyu.plugin.base.handler.PluginDataHandler;
import org.apache.shenyu.plugin.modify.response.ModifyResponsePlugin;
import
org.apache.shenyu.plugin.modify.response.handler.ModifyResponsePluginDataHandler;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.annotation.Configuration;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Test case for {@link ModifyResponsePluginConfiguration}.
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-monitor/src/test/java/org/apache/shenyu/springboot/starter/plugin/monitor/MonitorPluginConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-monitor/src/test/java/org/apache/shenyu/springboot/starter/plugin/monitor/MonitorPluginConfigurationTest.java
index 06c704a..21ed2c2 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-monitor/src/test/java/org/apache/shenyu/springboot/starter/plugin/monitor/MonitorPluginConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-monitor/src/test/java/org/apache/shenyu/springboot/starter/plugin/monitor/MonitorPluginConfigurationTest.java
@@ -20,14 +20,14 @@ package org.apache.shenyu.springboot.starter.plugin.monitor;
import org.apache.shenyu.common.enums.PluginEnum;
import org.apache.shenyu.plugin.api.ShenyuPlugin;
import org.apache.shenyu.plugin.base.handler.PluginDataHandler;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.annotation.Configuration;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Test case for {@link MonitorPluginConfiguration}.
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-motan/src/test/java/org/apache/shenyu/springboot/starter/plugin/motan/MotanPluginConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-motan/src/test/java/org/apache/shenyu/springboot/starter/plugin/motan/MotanPluginConfigurationTest.java
index a3a7378..a9e04b3 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-motan/src/test/java/org/apache/shenyu/springboot/starter/plugin/motan/MotanPluginConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-motan/src/test/java/org/apache/shenyu/springboot/starter/plugin/motan/MotanPluginConfigurationTest.java
@@ -21,14 +21,14 @@ import
org.apache.shenyu.plugin.api.context.ShenyuContextDecorator;
import org.apache.shenyu.plugin.base.handler.PluginDataHandler;
import org.apache.shenyu.plugin.motan.MotanPlugin;
import org.apache.shenyu.sync.data.api.MetaDataSubscriber;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.annotation.Configuration;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Test case for {@link MotanPluginConfiguration}.
@@ -39,7 +39,7 @@ public class MotanPluginConfigurationTest {
private ApplicationContextRunner applicationContextRunner;
- @Before
+ @BeforeEach
public void before() {
applicationContextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(MotanPluginConfiguration.class))
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-mqtt/src/test/java/org/apache/shenyu/springboot/starter/plugin/mqtt/MqttPluginConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-mqtt/src/test/java/org/apache/shenyu/springboot/starter/plugin/mqtt/MqttPluginConfigurationTest.java
index 1d0cb1f..2a24d00 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-mqtt/src/test/java/org/apache/shenyu/springboot/starter/plugin/mqtt/MqttPluginConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-mqtt/src/test/java/org/apache/shenyu/springboot/starter/plugin/mqtt/MqttPluginConfigurationTest.java
@@ -18,11 +18,11 @@
package org.apache.shenyu.springboot.starter.plugin.mqtt;
import org.apache.shenyu.plugin.base.handler.PluginDataHandler;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Test case for {@link MqttPluginConfiguration}.
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-oauth2/src/test/java/org/apache/shenyu/springboot/starter/plugin/oauth2/OAuth2PluginConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-oauth2/src/test/java/org/apache/shenyu/springboot/starter/plugin/oauth2/OAuth2PluginConfigurationTest.java
index 8c840c0..79769ab 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-oauth2/src/test/java/org/apache/shenyu/springboot/starter/plugin/oauth2/OAuth2PluginConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-oauth2/src/test/java/org/apache/shenyu/springboot/starter/plugin/oauth2/OAuth2PluginConfigurationTest.java
@@ -19,8 +19,8 @@ package org.apache.shenyu.springboot.starter.plugin.oauth2;
import org.apache.shenyu.common.enums.PluginEnum;
import org.apache.shenyu.plugin.api.ShenyuPlugin;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
@@ -31,7 +31,7 @@ import
org.springframework.security.oauth2.client.registration.ReactiveClientReg
import org.springframework.security.web.server.SecurityWebFilterChain;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Test case for {@link OAuth2PluginConfiguration}.
@@ -42,7 +42,7 @@ public class OAuth2PluginConfigurationTest {
private ApplicationContextRunner applicationContextRunner;
- @Before
+ @BeforeEach
public void before() {
applicationContextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(OAuth2PluginConfiguration.class))
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-param-mapping/src/test/java/org/apache/shenyu/springboot/starter/plugin/param/mapping/ParamMappingPluginConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-param-mapping/src/test/java/org/apache/shenyu/springboot/starter/plugin/param/mapping/ParamMappingPluginConfigurationTest.java
index ee33806..3eaa827 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-param-mapping/src/test/java/org/apache/shenyu/springboot/starter/plugin/param/mapping/ParamMappingPluginConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-param-mapping/src/test/java/org/apache/shenyu/springboot/starter/plugin/param/mapping/ParamMappingPluginConfigurationTest.java
@@ -21,14 +21,14 @@ import org.apache.shenyu.common.enums.PluginEnum;
import org.apache.shenyu.plugin.api.ShenyuPlugin;
import org.apache.shenyu.plugin.base.handler.PluginDataHandler;
import org.apache.shenyu.plugin.param.mapping.ParamMappingPlugin;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.annotation.Configuration;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Test case for {@link ParamMappingPluginConfiguration}.
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-ratelimiter/src/test/java/org/apache/shenyu/springboot/starter/plugin/ratelimiter/RateLimiterPluginConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-ratelimiter/src/test/java/org/apache/shenyu/springboot/starter/plugin/ratelimiter/RateLimiterPluginConfigurationTest.java
index 5b2dd1d..9a42abc 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-ratelimiter/src/test/java/org/apache/shenyu/springboot/starter/plugin/ratelimiter/RateLimiterPluginConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-ratelimiter/src/test/java/org/apache/shenyu/springboot/starter/plugin/ratelimiter/RateLimiterPluginConfigurationTest.java
@@ -20,14 +20,14 @@ package
org.apache.shenyu.springboot.starter.plugin.ratelimiter;
import org.apache.shenyu.common.enums.PluginEnum;
import org.apache.shenyu.plugin.api.ShenyuPlugin;
import org.apache.shenyu.plugin.base.handler.PluginDataHandler;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.annotation.Configuration;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Test case for {@link RateLimiterPluginConfiguration}.
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-redirect/src/test/java/org/apache/shenyu/springboot/starter/plugin/redirect/RedirectPluginConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-redirect/src/test/java/org/apache/shenyu/springboot/starter/plugin/redirect/RedirectPluginConfigurationTest.java
index e12a5aa..d8baf46 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-redirect/src/test/java/org/apache/shenyu/springboot/starter/plugin/redirect/RedirectPluginConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-redirect/src/test/java/org/apache/shenyu/springboot/starter/plugin/redirect/RedirectPluginConfigurationTest.java
@@ -20,7 +20,7 @@ package org.apache.shenyu.springboot.starter.plugin.redirect;
import org.apache.shenyu.common.enums.PluginEnum;
import org.apache.shenyu.plugin.api.ShenyuPlugin;
import org.apache.shenyu.plugin.base.handler.PluginDataHandler;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
@@ -28,7 +28,7 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.web.reactive.DispatcherHandler;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* test case for {@link RedirectPluginConfiguration}.
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-request/src/test/java/org/apache/shenyu/springboot/starter/plugin/request/RequestPluginConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-request/src/test/java/org/apache/shenyu/springboot/starter/plugin/request/RequestPluginConfigurationTest.java
index 6938f38..8fadd2d 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-request/src/test/java/org/apache/shenyu/springboot/starter/plugin/request/RequestPluginConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-request/src/test/java/org/apache/shenyu/springboot/starter/plugin/request/RequestPluginConfigurationTest.java
@@ -22,14 +22,14 @@ import org.apache.shenyu.plugin.api.ShenyuPlugin;
import org.apache.shenyu.plugin.base.handler.PluginDataHandler;
import org.apache.shenyu.plugin.request.RequestPlugin;
import org.apache.shenyu.plugin.request.handler.RequestPluginHandler;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.annotation.Configuration;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Test case for {@link RequestPluginConfiguration}.
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-resilience4j/src/test/java/org/apache/shenyu/springboot/starter/plugin/resilience4j/Resilience4JPluginConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-resilience4j/src/test/java/org/apache/shenyu/springboot/starter/plugin/resilience4j/Resilience4JPluginConfigurationTest.java
index 4e765e5..b75a882 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-resilience4j/src/test/java/org/apache/shenyu/springboot/starter/plugin/resilience4j/Resilience4JPluginConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-resilience4j/src/test/java/org/apache/shenyu/springboot/starter/plugin/resilience4j/Resilience4JPluginConfigurationTest.java
@@ -20,14 +20,14 @@ package
org.apache.shenyu.springboot.starter.plugin.resilience4j;
import org.apache.shenyu.common.enums.PluginEnum;
import org.apache.shenyu.plugin.resilience4j.Resilience4JPlugin;
import org.apache.shenyu.plugin.resilience4j.handler.Resilience4JHandler;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.annotation.Configuration;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Test case for {@link Resilience4JPluginConfiguration}.
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-response/src/test/java/org/apache/shenyu/springboot/starter/plugin/response/ResponsePluginConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-response/src/test/java/org/apache/shenyu/springboot/starter/plugin/response/ResponsePluginConfigurationTest.java
index a1913e5..2a8312b 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-response/src/test/java/org/apache/shenyu/springboot/starter/plugin/response/ResponsePluginConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-response/src/test/java/org/apache/shenyu/springboot/starter/plugin/response/ResponsePluginConfigurationTest.java
@@ -23,15 +23,15 @@ import org.apache.shenyu.plugin.response.ResponsePlugin;
import org.apache.shenyu.plugin.response.strategy.MessageWriter;
import org.apache.shenyu.plugin.response.strategy.NettyClientMessageWriter;
import org.apache.shenyu.plugin.response.strategy.WebClientMessageWriter;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.annotation.Configuration;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Test case for {@link ResponsePluginConfiguration}.
@@ -42,7 +42,7 @@ public class ResponsePluginConfigurationTest {
private ApplicationContextRunner applicationContextRunner;
- @Before
+ @BeforeEach
public void before() {
applicationContextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(ResponsePluginConfiguration.class))
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-rewrite/src/test/java/org/apache/shenyu/springboot/starter/plugin/rewrite/RewritePluginConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-rewrite/src/test/java/org/apache/shenyu/springboot/starter/plugin/rewrite/RewritePluginConfigurationTest.java
index af711c9..54179eb 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-rewrite/src/test/java/org/apache/shenyu/springboot/starter/plugin/rewrite/RewritePluginConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-rewrite/src/test/java/org/apache/shenyu/springboot/starter/plugin/rewrite/RewritePluginConfigurationTest.java
@@ -20,14 +20,14 @@ package org.apache.shenyu.springboot.starter.plugin.rewrite;
import org.apache.shenyu.common.enums.PluginEnum;
import org.apache.shenyu.plugin.api.ShenyuPlugin;
import org.apache.shenyu.plugin.base.handler.PluginDataHandler;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.annotation.Configuration;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Test case for {@link RewritePluginConfiguration}.
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-sentinel/src/test/java/org/apache/shenyu/springboot/starter/plugin/sentinel/SentinelPluginConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-sentinel/src/test/java/org/apache/shenyu/springboot/starter/plugin/sentinel/SentinelPluginConfigurationTest.java
index 854dcb5..fa4302d 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-sentinel/src/test/java/org/apache/shenyu/springboot/starter/plugin/sentinel/SentinelPluginConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-sentinel/src/test/java/org/apache/shenyu/springboot/starter/plugin/sentinel/SentinelPluginConfigurationTest.java
@@ -22,8 +22,8 @@ import org.apache.shenyu.common.enums.PluginEnum;
import org.apache.shenyu.plugin.base.fallback.FallbackHandler;
import org.apache.shenyu.plugin.base.handler.PluginDataHandler;
import org.apache.shenyu.plugin.sentinel.SentinelPlugin;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
@@ -31,7 +31,7 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.http.codec.support.DefaultServerCodecConfigurer;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Test case for {@link SentinelPluginConfiguration}.
@@ -42,7 +42,7 @@ public class SentinelPluginConfigurationTest {
private ApplicationContextRunner applicationContextRunner;
- @Before
+ @BeforeEach
public void before() {
applicationContextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(SentinelPluginConfiguration.class))
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-sign/src/test/java/org/apache/shenyu/springboot/starter/plugin/sign/SignPluginConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-sign/src/test/java/org/apache/shenyu/springboot/starter/plugin/sign/SignPluginConfigurationTest.java
index 227828c..d0bc708 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-sign/src/test/java/org/apache/shenyu/springboot/starter/plugin/sign/SignPluginConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-sign/src/test/java/org/apache/shenyu/springboot/starter/plugin/sign/SignPluginConfigurationTest.java
@@ -22,15 +22,15 @@ import org.apache.shenyu.plugin.sign.api.SignProvider;
import org.apache.shenyu.plugin.sign.api.SignService;
import org.apache.shenyu.plugin.api.ShenyuPlugin;
import org.apache.shenyu.sync.data.api.AuthDataSubscriber;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.annotation.Configuration;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Test case for {@link SignPluginConfiguration}.
@@ -41,7 +41,7 @@ public class SignPluginConfigurationTest {
private ApplicationContextRunner applicationContextRunner;
- @Before
+ @BeforeEach
public void before() {
applicationContextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(SignPluginConfiguration.class))
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-sofa/src/test/java/org/apache/shenyu/springboot/starter/plugin/sofa/SofaPluginConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-sofa/src/test/java/org/apache/shenyu/springboot/starter/plugin/sofa/SofaPluginConfigurationTest.java
index 5b069a4..3a0a30b 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-sofa/src/test/java/org/apache/shenyu/springboot/starter/plugin/sofa/SofaPluginConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-sofa/src/test/java/org/apache/shenyu/springboot/starter/plugin/sofa/SofaPluginConfigurationTest.java
@@ -23,15 +23,15 @@ import
org.apache.shenyu.plugin.api.context.ShenyuContextDecorator;
import org.apache.shenyu.plugin.base.handler.PluginDataHandler;
import org.apache.shenyu.plugin.sofa.param.SofaParamResolveService;
import org.apache.shenyu.sync.data.api.MetaDataSubscriber;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.annotation.Configuration;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Test case for {@link SofaPluginConfiguration}.
@@ -42,7 +42,7 @@ public class SofaPluginConfigurationTest {
private ApplicationContextRunner applicationContextRunner;
- @Before
+ @BeforeEach
public void before() {
applicationContextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(SofaPluginConfiguration.class))
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-springcloud/src/test/java/org/apache/shenyu/springboot/starter/plugin/springcloud/SpringCloudPluginConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-springcloud/src/test/java/org/apache/shenyu/springboot/starter/plugin/springcloud/SpringCloudPluginConfigurationTest.java
index 4be242b..f9aebe0 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-springcloud/src/test/java/org/apache/shenyu/springboot/starter/plugin/springcloud/SpringCloudPluginConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-springcloud/src/test/java/org/apache/shenyu/springboot/starter/plugin/springcloud/SpringCloudPluginConfigurationTest.java
@@ -22,8 +22,8 @@ import org.apache.shenyu.common.enums.PluginEnum;
import org.apache.shenyu.plugin.api.ShenyuPlugin;
import org.apache.shenyu.plugin.api.context.ShenyuContextDecorator;
import org.apache.shenyu.plugin.base.handler.PluginDataHandler;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
@@ -31,7 +31,7 @@ import
org.springframework.cloud.netflix.ribbon.RibbonClientSpecification;
import org.springframework.context.annotation.Configuration;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* test case for {@link SpringCloudPluginConfiguration}.
@@ -42,7 +42,7 @@ public class SpringCloudPluginConfigurationTest {
private ApplicationContextRunner applicationContextRunner;
- @Before
+ @BeforeEach
public void before() {
applicationContextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(SpringCloudPluginConfiguration.class))
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-tars/src/test/java/org/apache/shenyu/springboot/starter/plugin/tars/TarsPluginConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-tars/src/test/java/org/apache/shenyu/springboot/starter/plugin/tars/TarsPluginConfigurationTest.java
index 47a7921..4fdd75c 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-tars/src/test/java/org/apache/shenyu/springboot/starter/plugin/tars/TarsPluginConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-tars/src/test/java/org/apache/shenyu/springboot/starter/plugin/tars/TarsPluginConfigurationTest.java
@@ -22,15 +22,15 @@ import org.apache.shenyu.plugin.api.ShenyuPlugin;
import org.apache.shenyu.plugin.api.context.ShenyuContextDecorator;
import org.apache.shenyu.plugin.base.handler.PluginDataHandler;
import org.apache.shenyu.sync.data.api.MetaDataSubscriber;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.annotation.Configuration;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Test case for {@link TarsPluginConfiguration}.
@@ -41,7 +41,7 @@ public class TarsPluginConfigurationTest {
private ApplicationContextRunner applicationContextRunner;
- @Before
+ @BeforeEach
public void before() {
applicationContextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(TarsPluginConfiguration.class))
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-uri/src/test/java/org/apache/shenyu/springboot/starter/plugin/uri/URIPluginConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-uri/src/test/java/org/apache/shenyu/springboot/starter/plugin/uri/URIPluginConfigurationTest.java
index b5064bc..eb7fa14 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-uri/src/test/java/org/apache/shenyu/springboot/starter/plugin/uri/URIPluginConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-uri/src/test/java/org/apache/shenyu/springboot/starter/plugin/uri/URIPluginConfigurationTest.java
@@ -19,14 +19,14 @@ package org.apache.shenyu.springboot.starter.plugin.uri;
import org.apache.shenyu.common.enums.PluginEnum;
import org.apache.shenyu.plugin.api.ShenyuPlugin;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.annotation.Configuration;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Test case for {@link URIPluginConfiguration}.
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-waf/src/test/java/org/apache/shenyu/springboot/starter/plugin/waf/WafPluginConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-waf/src/test/java/org/apache/shenyu/springboot/starter/plugin/waf/WafPluginConfigurationTest.java
index ff1fcd4..98fb8bd 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-waf/src/test/java/org/apache/shenyu/springboot/starter/plugin/waf/WafPluginConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-waf/src/test/java/org/apache/shenyu/springboot/starter/plugin/waf/WafPluginConfigurationTest.java
@@ -20,14 +20,14 @@ package org.apache.shenyu.springboot.starter.plugin.waf;
import org.apache.shenyu.common.enums.PluginEnum;
import org.apache.shenyu.plugin.api.ShenyuPlugin;
import org.apache.shenyu.plugin.base.handler.PluginDataHandler;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.annotation.Configuration;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Test case for {@link WafPluginConfiguration}.
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-websocket/src/test/java/org/apache/shenyu/springboot/plugin/websocket/WebSocketPluginConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-websocket/src/test/java/org/apache/shenyu/springboot/plugin/websocket/WebSocketPluginConfigurationTest.java
index 58aea03..234dc9c 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-websocket/src/test/java/org/apache/shenyu/springboot/plugin/websocket/WebSocketPluginConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-websocket/src/test/java/org/apache/shenyu/springboot/plugin/websocket/WebSocketPluginConfigurationTest.java
@@ -21,8 +21,8 @@ import org.apache.shenyu.common.enums.PluginEnum;
import org.apache.shenyu.plugin.api.context.ShenyuContextDecorator;
import org.apache.shenyu.plugin.base.handler.PluginDataHandler;
import org.apache.shenyu.plugin.websocket.WebSocketPlugin;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
@@ -31,7 +31,7 @@ import
org.springframework.web.reactive.socket.client.ReactorNettyWebSocketClien
import org.springframework.web.reactive.socket.server.WebSocketService;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Test case for {@link WebSocketPluginConfiguration}.
@@ -42,7 +42,7 @@ public class WebSocketPluginConfigurationTest {
private ApplicationContextRunner applicationContextRunner;
- @Before
+ @BeforeEach
public void before() {
applicationContextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(WebSocketPluginConfiguration.class))
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-sync-data-center/shenyu-spring-boot-starter-sync-data-http/src/test/java/org/apache/shenyu/springboot/starter/sync/data/http/HttpClientPluginConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-sync-data-center/shenyu-spring-boot-starter-sync-data-http/src/test/java/org/apache/shenyu/springboot/starter/sync/data/http/HttpClientPluginConfigurationTest.java
index 2d1a053..ad016c7 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-sync-data-center/shenyu-spring-boot-starter-sync-data-http/src/test/java/org/apache/shenyu/springboot/starter/sync/data/http/HttpClientPluginConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-sync-data-center/shenyu-spring-boot-starter-sync-data-http/src/test/java/org/apache/shenyu/springboot/starter/sync/data/http/HttpClientPluginConfigurationTest.java
@@ -23,15 +23,15 @@ import org.apache.shenyu.common.utils.GsonUtils;
import org.apache.shenyu.sync.data.api.PluginDataSubscriber;
import org.apache.shenyu.sync.data.http.HttpSyncDataService;
import org.apache.shenyu.sync.data.http.config.HttpConfig;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.boot.web.servlet.server.ServletWebServerFactory;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
import wiremock.org.apache.http.HttpHeaders;
import wiremock.org.apache.http.entity.ContentType;
@@ -47,13 +47,13 @@ import static
com.github.tomakehurst.wiremock.client.WireMock.post;
import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
import static
com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.hamcrest.MatcherAssert.assertThat;
/**
* Test cases for {@link HttpSyncDataConfiguration}.
*/
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
@SpringBootTest(
classes = {
HttpSyncDataConfiguration.class
@@ -76,7 +76,7 @@ public final class HttpClientPluginConfigurationTest {
@Autowired
private HttpSyncDataService httpSyncDataService;
- @BeforeClass
+ @BeforeAll
public static void setUpWireMock() throws Exception {
WireMockServer wireMockServer = new
WireMockServer(options().port(18848));
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-sync-data-center/shenyu-spring-boot-starter-sync-data-nacos/src/test/java/org/apache/shenyu/springboot/starter/sync/data/nacos/NacosSyncDataConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-sync-data-center/shenyu-spring-boot-starter-sync-data-nacos/src/test/java/org/apache/shenyu/springboot/starter/sync/data/nacos/NacosSyncDataConfigurationTest.java
index 680788f..93b7dd9 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-sync-data-center/shenyu-spring-boot-starter-sync-data-nacos/src/test/java/org/apache/shenyu/springboot/starter/sync/data/nacos/NacosSyncDataConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-sync-data-center/shenyu-spring-boot-starter-sync-data-nacos/src/test/java/org/apache/shenyu/springboot/starter/sync/data/nacos/NacosSyncDataConfigurationTest.java
@@ -19,21 +19,21 @@ package
org.apache.shenyu.springboot.starter.sync.data.nacos;
import org.apache.shenyu.sync.data.api.SyncDataService;
import org.apache.shenyu.sync.data.nacos.config.NacosConfig;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
import static org.mockito.Answers.CALLS_REAL_METHODS;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* The test case for {@link NacosSyncDataConfiguration}.
*/
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
@SpringBootTest(
classes = NacosSyncDataConfiguration.class,
properties = {
@@ -52,11 +52,11 @@ public final class NacosSyncDataConfigurationTest {
@Test
public void nacosSyncDataServiceTest() {
- Assert.assertNotNull("the syncDataService must be not null",
syncDataService);
+ assertNotNull(syncDataService);
}
@Test
public void nacosConfigTest() {
- Assert.assertNotNull("the nacosConfig must be not null", nacosConfig);
+ assertNotNull(nacosConfig);
}
}
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-sync-data-center/shenyu-spring-boot-starter-sync-data-websocket/src/test/java/org/apache/shenyu/springboot/starter/sync/data/websocket/WebsocketSyncDataConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-sync-data-center/shenyu-spring-boot-starter-sync-data-websocket/src/test/java/org/apache/shenyu/springboot/starter/sync/data/websocket/WebsocketSyncDataConfigurationTest.java
index 219106d..6cde1fc 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-sync-data-center/shenyu-spring-boot-starter-sync-data-websocket/src/test/java/org/apache/shenyu/springboot/starter/sync/data/websocket/WebsocketSyncDataConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-sync-data-center/shenyu-spring-boot-starter-sync-data-websocket/src/test/java/org/apache/shenyu/springboot/starter/sync/data/websocket/WebsocketSyncDataConfigurationTest.java
@@ -20,22 +20,22 @@ package
org.apache.shenyu.springboot.starter.sync.data.websocket;
import org.apache.shenyu.plugin.sync.data.websocket.WebsocketSyncDataService;
import org.apache.shenyu.plugin.sync.data.websocket.config.WebsocketConfig;
import org.apache.shenyu.sync.data.api.PluginDataSubscriber;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.hamcrest.MatcherAssert.assertThat;
/**
* Test case for {@link WebsocketSyncDataConfiguration}.
*/
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
@SpringBootTest(
classes = {
WebsocketSyncDataConfiguration.class
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-sync-data-center/shenyu-spring-boot-starter-sync-data-zookeeper/src/test/java/org/apache/shenyu/springboot/sync/data/zookeeper/ZookeeperSyncDataConfigurationTest.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-sync-data-center/shenyu-spring-boot-starter-sync-data-zookeeper/src/test/java/org/apache/shenyu/springboot/sync/data/zookeeper/ZookeeperSyncDataConfigurationTest.java
index 3b4616b..cd33fbb 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-sync-data-center/shenyu-spring-boot-starter-sync-data-zookeeper/src/test/java/org/apache/shenyu/springboot/sync/data/zookeeper/ZookeeperSyncDataConfigurationTest.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-sync-data-center/shenyu-spring-boot-starter-sync-data-zookeeper/src/test/java/org/apache/shenyu/springboot/sync/data/zookeeper/ZookeeperSyncDataConfigurationTest.java
@@ -17,27 +17,27 @@
package org.apache.shenyu.springboot.sync.data.zookeeper;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.I0Itec.zkclient.ZkClient;
import org.apache.shenyu.sync.data.api.PluginDataSubscriber;
import org.apache.shenyu.sync.data.api.SyncDataService;
import org.apache.shenyu.sync.data.zookeeper.ZookeeperSyncDataService;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
/**
* test case for {@link ZookeeperSyncDataConfiguration}.
*/
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
@SpringBootTest(
classes = {
ZookeeperSyncDataConfiguration.class