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 b213372 migrate from junit 4 to 5 for client, agent and loadbalancer
modules (#2857)
b213372 is described below
commit b213372c912a38546fcd62a3fc24f415ca840188
Author: Han Gao <[email protected]>
AuthorDate: Thu Feb 10 14:07:38 2022 +0800
migrate from junit 4 to 5 for client, agent and loadbalancer modules (#2857)
---
pom.xml | 6 ++++++
.../shenyu/agent/core/ShenyuYamlEngineTest.java | 4 ++--
.../validation/AlibabaDubboClientValidatorTest.java | 16 +++++++++-------
.../validation/ApacheDubboClientValidationTest.java | 6 +++---
.../validation/ApacheDubboClientValidatorTest.java | 20 +++++++++++---------
.../init/SpringCloudClientBeanPostProcessorTest.java | 20 ++++++++++----------
.../tars/TarsServiceBeanPostProcessorTest.java | 18 +++++++++---------
shenyu-common/pom.xml | 6 ------
.../shenyu/common/utils/UpstreamCheckUtilsTest.java | 1 -
.../loadbalancer/cache/UpstreamCheckTaskTest.java | 12 +++++++-----
.../factory/LoadBalancerFactoryTest.java | 11 ++++++-----
.../shenyu/loadbalancer/spi/HashLoadBalanceTest.java | 15 ++++++++-------
.../loadbalancer/spi/RandomLoadBalanceTest.java | 15 ++++++++-------
.../loadbalancer/spi/RoundRobinLoadBalanceTest.java | 11 ++++++-----
14 files changed, 85 insertions(+), 76 deletions(-)
diff --git a/pom.xml b/pom.xml
index f71f1bc..024bf86 100644
--- a/pom.xml
+++ b/pom.xml
@@ -436,6 +436,12 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <version>${mockito.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
diff --git
a/shenyu-agent/shenyu-agent-core/src/test/java/org/apache/shenyu/agent/core/ShenyuYamlEngineTest.java
b/shenyu-agent/shenyu-agent-core/src/test/java/org/apache/shenyu/agent/core/ShenyuYamlEngineTest.java
index c2f3fb9..2dda31b 100644
---
a/shenyu-agent/shenyu-agent-core/src/test/java/org/apache/shenyu/agent/core/ShenyuYamlEngineTest.java
+++
b/shenyu-agent/shenyu-agent-core/src/test/java/org/apache/shenyu/agent/core/ShenyuYamlEngineTest.java
@@ -20,14 +20,14 @@ package org.apache.shenyu.agent.core;
import org.apache.shenyu.agent.api.config.ShenyuAgentConfig;
import org.apache.shenyu.agent.api.entity.PointCutConfig;
import org.apache.shenyu.agent.core.yaml.ShenyuYamlEngine;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.File;
import java.io.IOException;
import java.net.URISyntaxException;
import java.util.Objects;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* The type Shenyu yaml engine test.
diff --git
a/shenyu-client/shenyu-client-dubbo/shenyu-client-alibaba-dubbo/src/test/java/org/apache/shenyu/client/alibaba/dubbo/validation/AlibabaDubboClientValidatorTest.java
b/shenyu-client/shenyu-client-dubbo/shenyu-client-alibaba-dubbo/src/test/java/org/apache/shenyu/client/alibaba/dubbo/validation/AlibabaDubboClientValidatorTest.java
index 60429c7..4b1feac 100644
---
a/shenyu-client/shenyu-client-dubbo/shenyu-client-alibaba-dubbo/src/test/java/org/apache/shenyu/client/alibaba/dubbo/validation/AlibabaDubboClientValidatorTest.java
+++
b/shenyu-client/shenyu-client-dubbo/shenyu-client-alibaba-dubbo/src/test/java/org/apache/shenyu/client/alibaba/dubbo/validation/AlibabaDubboClientValidatorTest.java
@@ -19,7 +19,7 @@ package org.apache.shenyu.client.alibaba.dubbo.validation;
import com.alibaba.dubbo.common.URL;
import
org.apache.shenyu.client.alibaba.dubbo.validation.mock.MockValidationParameter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import javax.validation.ValidationException;
import java.util.Collections;
@@ -27,6 +27,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
/**
* Test case for {@link AlibabaDubboClientValidation}.
*/
@@ -35,11 +37,11 @@ public final class AlibabaDubboClientValidatorTest {
private static final String MOCK_SERVICE_URL =
"mock://test:28000/org.apache.shenyu.client.alibaba.dubbo.validation.mock.MockValidatorTarget";
- @Test(expected = NoSuchMethodException.class)
+ @Test
public void testItWithNonExistMethod() throws Exception {
final URL url = URL.valueOf(MOCK_SERVICE_URL);
- new AlibabaDubboClientValidation().getValidator(url)
- .validate("nonExistingMethod", new Class<?>[]{String.class},
new Object[]{"arg1"});
+ assertThrows(NoSuchMethodException.class, () -> new
AlibabaDubboClientValidation().getValidator(url)
+ .validate("nonExistingMethod", new Class<?>[]{String.class},
new Object[]{"arg1"}));
}
@@ -50,11 +52,11 @@ public final class AlibabaDubboClientValidatorTest {
.validate("method1", new Class<?>[]{String.class}, new
Object[]{"anything"});
}
- @Test(expected = ValidationException.class)
+ @Test
public void testValidateWhenMeetsConstraintThenValidationFailed() throws
Exception {
final URL url = URL.valueOf(MOCK_SERVICE_URL);
- new AlibabaDubboClientValidation().getValidator(url)
- .validate("method2", new
Class<?>[]{MockValidationParameter.class}, new Object[]{new
MockValidationParameter("NotBeNull")});
+ assertThrows(ValidationException.class, () -> new
AlibabaDubboClientValidation().getValidator(url)
+ .validate("method2", new
Class<?>[]{MockValidationParameter.class}, new Object[]{new
MockValidationParameter("NotBeNull")}));
}
@Test
diff --git
a/shenyu-client/shenyu-client-dubbo/shenyu-client-apache-dubbo/src/test/java/org/apache/shenyu/client/apache/dubbo/validation/ApacheDubboClientValidationTest.java
b/shenyu-client/shenyu-client-dubbo/shenyu-client-apache-dubbo/src/test/java/org/apache/shenyu/client/apache/dubbo/validation/ApacheDubboClientValidationTest.java
index b4e170d..0b7ad70 100644
---
a/shenyu-client/shenyu-client-dubbo/shenyu-client-apache-dubbo/src/test/java/org/apache/shenyu/client/apache/dubbo/validation/ApacheDubboClientValidationTest.java
+++
b/shenyu-client/shenyu-client-dubbo/shenyu-client-apache-dubbo/src/test/java/org/apache/shenyu/client/apache/dubbo/validation/ApacheDubboClientValidationTest.java
@@ -18,8 +18,8 @@
package org.apache.shenyu.client.apache.dubbo.validation;
import org.apache.dubbo.common.URL;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test case for {@link ApacheDubboClientValidation}.
@@ -28,7 +28,7 @@ public final class ApacheDubboClientValidationTest {
private ApacheDubboClientValidation apacheDubboClientValidationUnderTest;
- @Before
+ @BeforeEach
public void setUp() {
apacheDubboClientValidationUnderTest = new
ApacheDubboClientValidation();
}
diff --git
a/shenyu-client/shenyu-client-dubbo/shenyu-client-apache-dubbo/src/test/java/org/apache/shenyu/client/apache/dubbo/validation/ApacheDubboClientValidatorTest.java
b/shenyu-client/shenyu-client-dubbo/shenyu-client-apache-dubbo/src/test/java/org/apache/shenyu/client/apache/dubbo/validation/ApacheDubboClientValidatorTest.java
index cf8859d..4ae0835 100644
---
a/shenyu-client/shenyu-client-dubbo/shenyu-client-apache-dubbo/src/test/java/org/apache/shenyu/client/apache/dubbo/validation/ApacheDubboClientValidatorTest.java
+++
b/shenyu-client/shenyu-client-dubbo/shenyu-client-apache-dubbo/src/test/java/org/apache/shenyu/client/apache/dubbo/validation/ApacheDubboClientValidatorTest.java
@@ -21,8 +21,8 @@ import org.apache.dubbo.common.URL;
import org.apache.dubbo.validation.Validator;
import
org.apache.shenyu.client.apache.dubbo.validation.mock.MockValidationParameter;
import org.apache.shenyu.client.apache.dubbo.validation.service.TestService;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import javax.validation.ValidationException;
import java.util.Collections;
@@ -30,6 +30,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
/**
* Test case for {@link ApacheDubboClientValidator}.
*/
@@ -61,16 +63,16 @@ public final class ApacheDubboClientValidatorTest {
new Object[]{new TestService.TestObject(1)});
}
- @Before
+ @BeforeEach
public void setUp() {
URL url = URL.valueOf(MOCK_SERVICE_URL);
apacheDubboClientValidatorUnderTest = new
ApacheDubboClientValidator(url);
}
- @Test(expected = NoSuchMethodException.class)
+ @Test
public void testValidateWithNonExistMethod() throws Exception {
- apacheDubboClientValidatorUnderTest
- .validate("nonExistingMethod", new Class<?>[]{String.class},
new Object[]{"arg1"});
+ assertThrows(NoSuchMethodException.class, () ->
apacheDubboClientValidatorUnderTest
+ .validate("nonExistingMethod", new Class<?>[]{String.class},
new Object[]{"arg1"}));
}
@Test
@@ -83,13 +85,13 @@ public final class ApacheDubboClientValidatorTest {
.validate("methodOne", new Class<?>[]{String.class}, new
Object[]{"anything"});
}
- @Test(expected = ValidationException.class)
+ @Test
public void testValidateWhenMeetsConstraintThenValidationFailed() throws
Exception {
- apacheDubboClientValidatorUnderTest
+ assertThrows(ValidationException.class, () ->
apacheDubboClientValidatorUnderTest
.validate(
"methodTwo",
new Class<?>[]{MockValidationParameter.class},
- new Object[]{new
MockValidationParameter("NotBeNull")});
+ new Object[]{new
MockValidationParameter("NotBeNull")}));
}
@Test
diff --git
a/shenyu-client/shenyu-client-http/shenyu-client-springcloud/src/test/java/org/apache/shenyu/client/springcloud/init/SpringCloudClientBeanPostProcessorTest.java
b/shenyu-client/shenyu-client-http/shenyu-client-springcloud/src/test/java/org/apache/shenyu/client/springcloud/init/SpringCloudClientBeanPostProcessorTest.java
index 16cd71f..7d352fb 100644
---
a/shenyu-client/shenyu-client-http/shenyu-client-springcloud/src/test/java/org/apache/shenyu/client/springcloud/init/SpringCloudClientBeanPostProcessorTest.java
+++
b/shenyu-client/shenyu-client-http/shenyu-client-springcloud/src/test/java/org/apache/shenyu/client/springcloud/init/SpringCloudClientBeanPostProcessorTest.java
@@ -22,14 +22,14 @@ import
org.apache.shenyu.client.springcloud.annotation.ShenyuSpringCloudClient;
import org.apache.shenyu.register.client.http.utils.RegisterUtils;
import org.apache.shenyu.register.common.config.PropertiesConfig;
import org.apache.shenyu.register.common.config.ShenyuRegisterCenterConfig;
-import org.junit.Before;
-import org.junit.FixMethodOrder;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.MethodSorters;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.MockedStatic;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.mockito.stubbing.Answer;
import org.springframework.core.env.Environment;
import org.springframework.web.bind.annotation.PostMapping;
@@ -40,8 +40,8 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.Optional;
import java.util.Properties;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mockStatic;
import static org.mockito.Mockito.when;
@@ -49,8 +49,8 @@ import static org.mockito.Mockito.when;
/**
* Test for {@link SpringCloudClientBeanPostProcessor}.
*/
-@RunWith(MockitoJUnitRunner.class)
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+@ExtendWith(MockitoExtension.class)
+@TestMethodOrder(MethodOrderer.Alphanumeric.class)
public final class SpringCloudClientBeanPostProcessorTest {
@Mock
@@ -60,7 +60,7 @@ public final class SpringCloudClientBeanPostProcessorTest {
private final SpringCloudClientTestBean springCloudClientTestBean = new
SpringCloudClientTestBean();
- @Before
+ @BeforeEach
public void init() {
when(env.getProperty("spring.application.name")).thenReturn("spring-cloud-test");
}
diff --git
a/shenyu-client/shenyu-client-tars/src/test/java/org/apache/shenyu/client/tars/TarsServiceBeanPostProcessorTest.java
b/shenyu-client/shenyu-client-tars/src/test/java/org/apache/shenyu/client/tars/TarsServiceBeanPostProcessorTest.java
index ad00873..f12009d 100644
---
a/shenyu-client/shenyu-client-tars/src/test/java/org/apache/shenyu/client/tars/TarsServiceBeanPostProcessorTest.java
+++
b/shenyu-client/shenyu-client-tars/src/test/java/org/apache/shenyu/client/tars/TarsServiceBeanPostProcessorTest.java
@@ -24,13 +24,13 @@ import
org.apache.shenyu.client.tars.common.annotation.ShenyuTarsService;
import org.apache.shenyu.register.client.http.utils.RegisterUtils;
import org.apache.shenyu.register.common.config.PropertiesConfig;
import org.apache.shenyu.register.common.config.ShenyuRegisterCenterConfig;
-import org.junit.BeforeClass;
-import org.junit.FixMethodOrder;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.MethodSorters;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.MockedStatic;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import java.util.Optional;
import java.util.Properties;
@@ -41,12 +41,12 @@ import static org.mockito.Mockito.mockStatic;
/**
* Test case for {@link TarsServiceBeanPostProcessor}.
*/
-@RunWith(MockitoJUnitRunner.class)
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+@ExtendWith(MockitoExtension.class)
+@TestMethodOrder(MethodOrderer.Alphanumeric.class)
public final class TarsServiceBeanPostProcessorTest {
private static TarsServiceBeanPostProcessor tarsServiceBeanPostProcessor;
- @BeforeClass
+ @BeforeAll
public static void init() {
Properties properties = new Properties();
properties.setProperty("contextPath", "/tars");
diff --git a/shenyu-common/pom.xml b/shenyu-common/pom.xml
index c8408cf..0eaf944 100644
--- a/shenyu-common/pom.xml
+++ b/shenyu-common/pom.xml
@@ -64,12 +64,6 @@
<artifactId>commons-collections4</artifactId>
</dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter</artifactId>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
diff --git
a/shenyu-common/src/test/java/org/apache/shenyu/common/utils/UpstreamCheckUtilsTest.java
b/shenyu-common/src/test/java/org/apache/shenyu/common/utils/UpstreamCheckUtilsTest.java
index 79b9f3b..7af6636 100644
---
a/shenyu-common/src/test/java/org/apache/shenyu/common/utils/UpstreamCheckUtilsTest.java
+++
b/shenyu-common/src/test/java/org/apache/shenyu/common/utils/UpstreamCheckUtilsTest.java
@@ -27,7 +27,6 @@ import java.net.Socket;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
-
/**
* Test cases for UpstreamCheckUtils.
*/
diff --git
a/shenyu-loadbalancer/src/test/java/org/apache/shenyu/loadbalancer/cache/UpstreamCheckTaskTest.java
b/shenyu-loadbalancer/src/test/java/org/apache/shenyu/loadbalancer/cache/UpstreamCheckTaskTest.java
index 0cde43f..8e0c852 100644
---
a/shenyu-loadbalancer/src/test/java/org/apache/shenyu/loadbalancer/cache/UpstreamCheckTaskTest.java
+++
b/shenyu-loadbalancer/src/test/java/org/apache/shenyu/loadbalancer/cache/UpstreamCheckTaskTest.java
@@ -20,14 +20,15 @@ package org.apache.shenyu.loadbalancer.cache;
import org.apache.shenyu.common.dto.SelectorData;
import org.apache.shenyu.loadbalancer.entity.Upstream;
import org.awaitility.Awaitility;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
import java.util.concurrent.TimeUnit;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -44,7 +45,8 @@ public class UpstreamCheckTaskTest {
/**
* Test run.
*/
- @Test(timeout = 30000)
+ @Test
+ @Timeout(30000)
public void testRun() {
/**
* Mock selectorId1~selectorId4 to let it coverage 4 branch of
`HealthCheckTask#check` method.
diff --git
a/shenyu-loadbalancer/src/test/java/org/apache/shenyu/loadbalancer/factory/LoadBalancerFactoryTest.java
b/shenyu-loadbalancer/src/test/java/org/apache/shenyu/loadbalancer/factory/LoadBalancerFactoryTest.java
index da30c7a..e9f49e3 100644
---
a/shenyu-loadbalancer/src/test/java/org/apache/shenyu/loadbalancer/factory/LoadBalancerFactoryTest.java
+++
b/shenyu-loadbalancer/src/test/java/org/apache/shenyu/loadbalancer/factory/LoadBalancerFactoryTest.java
@@ -18,8 +18,7 @@
package org.apache.shenyu.loadbalancer.factory;
import org.apache.shenyu.loadbalancer.entity.Upstream;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.HashMap;
import java.util.List;
@@ -28,6 +27,8 @@ import java.util.stream.Collectors;
import java.util.stream.IntStream;
import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* The type loadBalance utils test.
*/
@@ -51,7 +52,7 @@ public final class LoadBalancerFactoryTest {
int count = countMap.getOrDefault(result.getUrl(), 0);
countMap.put(result.getUrl(), ++count);
});
- Assert.assertEquals(12, countMap.get("upstream-10").intValue());
+ assertEquals(12, countMap.get("upstream-10").intValue());
}
@Test
@@ -69,7 +70,7 @@ public final class LoadBalancerFactoryTest {
int count = countMap.getOrDefault(result.getUrl(), 0);
countMap.put(result.getUrl(), ++count);
});
- Assert.assertEquals(12, countMap.get("upstream-10").intValue());
+ assertEquals(12, countMap.get("upstream-10").intValue());
}
@Test
@@ -87,6 +88,6 @@ public final class LoadBalancerFactoryTest {
int count = countMap.getOrDefault(result.getUrl(), 0);
countMap.put(result.getUrl(), ++count);
});
- Assert.assertEquals(12, countMap.get("upstream-10").intValue());
+ assertEquals(12, countMap.get("upstream-10").intValue());
}
}
diff --git
a/shenyu-loadbalancer/src/test/java/org/apache/shenyu/loadbalancer/spi/HashLoadBalanceTest.java
b/shenyu-loadbalancer/src/test/java/org/apache/shenyu/loadbalancer/spi/HashLoadBalanceTest.java
index 85a2cf4..9fd1345 100644
---
a/shenyu-loadbalancer/src/test/java/org/apache/shenyu/loadbalancer/spi/HashLoadBalanceTest.java
+++
b/shenyu-loadbalancer/src/test/java/org/apache/shenyu/loadbalancer/spi/HashLoadBalanceTest.java
@@ -18,9 +18,8 @@
package org.apache.shenyu.loadbalancer.spi;
import org.apache.shenyu.loadbalancer.entity.Upstream;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.lang.reflect.Method;
import java.util.List;
@@ -29,6 +28,8 @@ import java.util.concurrent.ConcurrentSkipListMap;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* The type Hash balance test.
*/
@@ -48,7 +49,7 @@ public final class HashLoadBalanceTest {
private ConcurrentSkipListMap<Long, Upstream> treeMapReversed;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
this.hash = HashLoadBalancer.class.getDeclaredMethod("hash",
String.class);
this.hash.setAccessible(true);
@@ -104,7 +105,7 @@ public final class HashLoadBalanceTest {
final Long hashKey = Long.parseLong(hash.invoke(null, ip).toString());
final SortedMap<Long, Upstream> lastRing =
treeMapOrdered.tailMap(hashKey);
final Upstream assertUp = lastRing.get(lastRing.firstKey());
- Assert.assertEquals(assertUp.getUrl(), upstream.getUrl());
+ assertEquals(assertUp.getUrl(), upstream.getUrl());
}
@@ -116,7 +117,7 @@ public final class HashLoadBalanceTest {
final Long hashKey = Long.parseLong(hash.invoke(null, ip).toString());
final SortedMap<Long, Upstream> lastRing =
treeMapDisordered.tailMap(hashKey);
final Upstream assertUp = lastRing.get(lastRing.firstKey());
- Assert.assertEquals(assertUp.getUrl(), upstream.getUrl());
+ assertEquals(assertUp.getUrl(), upstream.getUrl());
}
@@ -128,6 +129,6 @@ public final class HashLoadBalanceTest {
final Long hashKey = Long.parseLong(hash.invoke(null, ip).toString());
final SortedMap<Long, Upstream> lastRing =
treeMapReversed.tailMap(hashKey);
final Upstream assertUp = lastRing.get(lastRing.firstKey());
- Assert.assertEquals(assertUp.getUrl(), divideUpstream.getUrl());
+ assertEquals(assertUp.getUrl(), divideUpstream.getUrl());
}
}
diff --git
a/shenyu-loadbalancer/src/test/java/org/apache/shenyu/loadbalancer/spi/RandomLoadBalanceTest.java
b/shenyu-loadbalancer/src/test/java/org/apache/shenyu/loadbalancer/spi/RandomLoadBalanceTest.java
index eac27a1..8ef15e4 100644
---
a/shenyu-loadbalancer/src/test/java/org/apache/shenyu/loadbalancer/spi/RandomLoadBalanceTest.java
+++
b/shenyu-loadbalancer/src/test/java/org/apache/shenyu/loadbalancer/spi/RandomLoadBalanceTest.java
@@ -18,14 +18,15 @@
package org.apache.shenyu.loadbalancer.spi;
import org.apache.shenyu.loadbalancer.entity.Upstream;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
/**
* The type random balance test.
*/
@@ -37,7 +38,7 @@ public class RandomLoadBalanceTest {
private List<Upstream> randomLoadBalancesWeightReversed;
- @Before
+ @BeforeEach
public void setUp() {
this.randomLoadBalancesWeightDisordered = Stream.of(10, 50, 40)
.map(weight -> Upstream.builder()
@@ -68,20 +69,20 @@ public class RandomLoadBalanceTest {
public void randomLoadBalanceOrderedWeightTest() {
final RandomLoadBalancer randomLoadBalancer = new RandomLoadBalancer();
final Upstream upstreamOrdered =
randomLoadBalancer.select(randomLoadBalancesWeightOrdered, "");
- Assert.assertNotNull(upstreamOrdered);
+ assertNotNull(upstreamOrdered);
}
@Test
public void randomLoadBalanceDisOrderedWeightTest() {
final RandomLoadBalancer randomLoadBalancer = new RandomLoadBalancer();
final Upstream upstreamDisordered =
randomLoadBalancer.select(randomLoadBalancesWeightDisordered, "");
- Assert.assertNotNull(upstreamDisordered);
+ assertNotNull(upstreamDisordered);
}
@Test
public void randomLoadBalanceReversedWeightTest() {
final RandomLoadBalancer randomLoadBalancer = new RandomLoadBalancer();
final Upstream upstreamReversed =
randomLoadBalancer.select(randomLoadBalancesWeightReversed, "");
- Assert.assertNotNull(upstreamReversed);
+ assertNotNull(upstreamReversed);
}
}
diff --git
a/shenyu-loadbalancer/src/test/java/org/apache/shenyu/loadbalancer/spi/RoundRobinLoadBalanceTest.java
b/shenyu-loadbalancer/src/test/java/org/apache/shenyu/loadbalancer/spi/RoundRobinLoadBalanceTest.java
index 532cadd..1ac8571 100644
---
a/shenyu-loadbalancer/src/test/java/org/apache/shenyu/loadbalancer/spi/RoundRobinLoadBalanceTest.java
+++
b/shenyu-loadbalancer/src/test/java/org/apache/shenyu/loadbalancer/spi/RoundRobinLoadBalanceTest.java
@@ -18,8 +18,7 @@
package org.apache.shenyu.loadbalancer.spi;
import org.apache.shenyu.loadbalancer.entity.Upstream;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.HashMap;
import java.util.List;
@@ -28,6 +27,8 @@ import java.util.stream.Collectors;
import java.util.stream.IntStream;
import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* The type Load balance test.
*/
@@ -53,7 +54,7 @@ public final class RoundRobinLoadBalanceTest {
int count = countMap.getOrDefault(result.getUrl(), 0);
countMap.put(result.getUrl(), ++count);
});
- Assert.assertEquals(60, countMap.get("upstream-50").intValue());
+ assertEquals(60, countMap.get("upstream-50").intValue());
}
@Test
@@ -73,7 +74,7 @@ public final class RoundRobinLoadBalanceTest {
int count = countMap.getOrDefault(result.getUrl(), 0);
countMap.put(result.getUrl(), ++count);
});
- Assert.assertEquals(60, countMap.get("upstream-50").intValue());
+ assertEquals(60, countMap.get("upstream-50").intValue());
}
@Test
@@ -93,6 +94,6 @@ public final class RoundRobinLoadBalanceTest {
int count = countMap.getOrDefault(result.getUrl(), 0);
countMap.put(result.getUrl(), ++count);
});
- Assert.assertEquals(60, countMap.get("upstream-50").intValue());
+ assertEquals(60, countMap.get("upstream-50").intValue());
}
}
