This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new f0f124d Remove usage of classes in Junit 4
f0f124d is described below
commit f0f124d7c1eff79f7b2645fe2fa02fdb13677ce9
Author: ken.lj <[email protected]>
AuthorDate: Tue Jan 22 18:37:01 2019 +0800
Remove usage of classes in Junit 4
---
.../org/apache/dubbo/rpc/cluster/RouterTest.java | 12 +--
dubbo-config/dubbo-config-spring/pom.xml | 1 -
.../org/apache/dubbo/config/spring/ConfigTest.java | 2 -
.../ReferenceAnnotationBeanPostProcessorTest.java | 44 +++++------
.../annotation/ReferenceBeanBuilderTest.java | 88 +++++++++++-----------
.../annotation/ServiceBeanNameBuilderTest.java | 10 +--
.../config/YamlPropertySourceFactoryTest.java | 22 +++---
.../DubboComponentScanRegistrarTest.java | 8 +-
.../DubboComponentScanRegistrarTest.java | 24 +++---
.../DubboConfigBindingRegistrarTest.java | 12 +--
.../DubboConfigBindingsRegistrarTest.java | 8 +-
.../context/annotation/EnableDubboConfigTest.java | 26 +++----
.../context/annotation/EnableDubboTest.java | 32 ++++----
.../properties/DefaultDubboConfigBinderTest.java | 30 ++++----
.../properties/DefaultDubboConfigBinderTest.java | 2 -
dubbo-dependencies-bom/pom.xml | 9 +++
.../identifier/MetadataIdentifierTest.java | 9 ++-
dubbo-rpc/dubbo-rpc-hessian/pom.xml | 1 -
18 files changed, 172 insertions(+), 168 deletions(-)
diff --git
a/dubbo-compatible/src/test/java/org/apache/dubbo/rpc/cluster/RouterTest.java
b/dubbo-compatible/src/test/java/org/apache/dubbo/rpc/cluster/RouterTest.java
index 10c9bcc..5288c53 100644
---
a/dubbo-compatible/src/test/java/org/apache/dubbo/rpc/cluster/RouterTest.java
+++
b/dubbo-compatible/src/test/java/org/apache/dubbo/rpc/cluster/RouterTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.dubbo.rpc.cluster;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import java.util.ArrayList;
import java.util.Collections;
@@ -31,7 +31,7 @@ public class RouterTest {
private static List<Router> routers = new ArrayList<>();
- @BeforeClass
+ @BeforeAll
public static void setUp () {
CompatibleRouter compatibleRouter = new CompatibleRouter();
routers.add(compatibleRouter);
@@ -45,9 +45,9 @@ public class RouterTest {
public void testCompareTo () {
try {
Collections.sort(routers);
- Assert.assertTrue(true);
+ Assertions.assertTrue(true);
} catch (Exception e) {
- Assert.assertFalse(false);
+ Assertions.assertFalse(false);
}
}
}
diff --git a/dubbo-config/dubbo-config-spring/pom.xml
b/dubbo-config/dubbo-config-spring/pom.xml
index 5997e16..f8f5577 100644
--- a/dubbo-config/dubbo-config-spring/pom.xml
+++ b/dubbo-config/dubbo-config-spring/pom.xml
@@ -125,7 +125,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>5.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/ConfigTest.java
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/ConfigTest.java
index 2950fcd..1d3d1b1 100644
---
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/ConfigTest.java
+++
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/ConfigTest.java
@@ -48,8 +48,6 @@ import org.apache.dubbo.rpc.RpcException;
import org.apache.dubbo.rpc.service.GenericException;
import org.apache.dubbo.rpc.service.GenericService;
-import org.junit.Assert;
-import org.junit.Ignore;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
diff --git
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessorTest.java
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessorTest.java
index 6f62678..4de062c 100644
---
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessorTest.java
+++
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessorTest.java
@@ -20,9 +20,9 @@ import org.apache.dubbo.config.annotation.Reference;
import org.apache.dubbo.config.spring.ReferenceBean;
import org.apache.dubbo.config.spring.api.DemoService;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.InjectionMetadata;
import org.springframework.context.ApplicationContext;
@@ -30,7 +30,7 @@ import
org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
import java.util.Collection;
import java.util.Map;
@@ -42,7 +42,7 @@ import static
org.apache.dubbo.config.spring.beans.factory.annotation.ReferenceA
*
* @since 2.5.7
*/
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
@ContextConfiguration(
classes = {
ServiceAnnotationTestConfiguration.class,
@@ -75,15 +75,15 @@ public class ReferenceAnnotationBeanPostProcessorTest {
DemoService demoService = testBean.getDemoService();
- Assert.assertEquals("Hello,Mercy", demoService.sayName("Mercy"));
+ Assertions.assertEquals("Hello,Mercy", demoService.sayName("Mercy"));
- Assert.assertNotNull(testBean.getDemoServiceFromAncestor());
- Assert.assertNotNull(testBean.getDemoServiceFromParent());
- Assert.assertNotNull(testBean.getDemoService());
+ Assertions.assertNotNull(testBean.getDemoServiceFromAncestor());
+ Assertions.assertNotNull(testBean.getDemoServiceFromParent());
+ Assertions.assertNotNull(testBean.getDemoService());
- Assert.assertEquals("Hello,Mercy",
testBean.getDemoServiceFromAncestor().sayName("Mercy"));
- Assert.assertEquals("Hello,Mercy",
testBean.getDemoServiceFromParent().sayName("Mercy"));
- Assert.assertEquals("Hello,Mercy",
testBean.getDemoService().sayName("Mercy"));
+ Assertions.assertEquals("Hello,Mercy",
testBean.getDemoServiceFromAncestor().sayName("Mercy"));
+ Assertions.assertEquals("Hello,Mercy",
testBean.getDemoServiceFromParent().sayName("Mercy"));
+ Assertions.assertEquals("Hello,Mercy",
testBean.getDemoService().sayName("Mercy"));
}
@@ -98,13 +98,13 @@ public class ReferenceAnnotationBeanPostProcessorTest {
Collection<ReferenceBean<?>> referenceBeans =
beanPostProcessor.getReferenceBeans();
- Assert.assertEquals(1, referenceBeans.size());
+ Assertions.assertEquals(1, referenceBeans.size());
ReferenceBean<?> referenceBean = referenceBeans.iterator().next();
TestBean testBean = context.getBean(TestBean.class);
- Assert.assertNotNull(referenceBean.get());
+ Assertions.assertNotNull(referenceBean.get());
}
@@ -118,19 +118,19 @@ public class ReferenceAnnotationBeanPostProcessorTest {
Map<InjectionMetadata.InjectedElement, ReferenceBean<?>>
referenceBeanMap =
beanPostProcessor.getInjectedFieldReferenceBeanMap();
- Assert.assertEquals(1, referenceBeanMap.size());
+ Assertions.assertEquals(1, referenceBeanMap.size());
for (Map.Entry<InjectionMetadata.InjectedElement, ReferenceBean<?>>
entry : referenceBeanMap.entrySet()) {
InjectionMetadata.InjectedElement injectedElement = entry.getKey();
-
Assert.assertEquals("org.apache.dubbo.config.spring.beans.factory.annotation.AnnotationInjectedBeanPostProcessor$AnnotatedFieldElement",
+
Assertions.assertEquals("org.apache.dubbo.config.spring.beans.factory.annotation.AnnotationInjectedBeanPostProcessor$AnnotatedFieldElement",
injectedElement.getClass().getName());
ReferenceBean<?> referenceBean = entry.getValue();
- Assert.assertEquals("2.5.7", referenceBean.getVersion());
- Assert.assertEquals("dubbo://127.0.0.1:12345",
referenceBean.getUrl());
+ Assertions.assertEquals("2.5.7", referenceBean.getVersion());
+ Assertions.assertEquals("dubbo://127.0.0.1:12345",
referenceBean.getUrl());
}
@@ -146,19 +146,19 @@ public class ReferenceAnnotationBeanPostProcessorTest {
Map<InjectionMetadata.InjectedElement, ReferenceBean<?>>
referenceBeanMap =
beanPostProcessor.getInjectedMethodReferenceBeanMap();
- Assert.assertEquals(2, referenceBeanMap.size());
+ Assertions.assertEquals(2, referenceBeanMap.size());
for (Map.Entry<InjectionMetadata.InjectedElement, ReferenceBean<?>>
entry : referenceBeanMap.entrySet()) {
InjectionMetadata.InjectedElement injectedElement = entry.getKey();
-
Assert.assertEquals("org.apache.dubbo.config.spring.beans.factory.annotation.AnnotationInjectedBeanPostProcessor$AnnotatedMethodElement",
+
Assertions.assertEquals("org.apache.dubbo.config.spring.beans.factory.annotation.AnnotationInjectedBeanPostProcessor$AnnotatedMethodElement",
injectedElement.getClass().getName());
ReferenceBean<?> referenceBean = entry.getValue();
- Assert.assertEquals("2.5.7", referenceBean.getVersion());
- Assert.assertEquals("dubbo://127.0.0.1:12345",
referenceBean.getUrl());
+ Assertions.assertEquals("2.5.7", referenceBean.getVersion());
+ Assertions.assertEquals("dubbo://127.0.0.1:12345",
referenceBean.getUrl());
}
diff --git
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceBeanBuilderTest.java
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceBeanBuilderTest.java
index 27f6c96..f909ac5 100644
---
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceBeanBuilderTest.java
+++
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceBeanBuilderTest.java
@@ -20,13 +20,13 @@ package
org.apache.dubbo.config.spring.beans.factory.annotation;
import org.apache.dubbo.config.annotation.Reference;
import org.apache.dubbo.config.spring.ReferenceBean;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
import java.util.Collections;
import java.util.HashMap;
@@ -43,7 +43,7 @@ import static
org.springframework.util.ReflectionUtils.findField;
* @see Reference
* @since 2.6.4
*/
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
@ContextConfiguration(classes = ReferenceBeanBuilderTest.class)
public class ReferenceBeanBuilderTest {
@@ -75,52 +75,52 @@ public class ReferenceBeanBuilderTest {
ReferenceBeanBuilder beanBuilder =
ReferenceBeanBuilder.create(reference, context.getClassLoader(), context);
beanBuilder.interfaceClass(CharSequence.class);
ReferenceBean referenceBean = beanBuilder.build();
- Assert.assertEquals(CharSequence.class,
referenceBean.getInterfaceClass());
- Assert.assertEquals("1.0.0", referenceBean.getVersion());
- Assert.assertEquals("TEST_GROUP", referenceBean.getGroup());
- Assert.assertEquals("dubbo://localhost:12345", referenceBean.getUrl());
- Assert.assertEquals("client", referenceBean.getClient());
- Assert.assertEquals(true, referenceBean.isGeneric());
- Assert.assertEquals(true, referenceBean.isInjvm());
- Assert.assertEquals(false, referenceBean.isCheck());
- Assert.assertEquals(null, referenceBean.isInit());
- Assert.assertEquals(true, referenceBean.getLazy());
- Assert.assertEquals(true, referenceBean.getStubevent());
- Assert.assertEquals("reconnect", referenceBean.getReconnect());
- Assert.assertEquals(true, referenceBean.getSticky());
- Assert.assertEquals("javassist", referenceBean.getProxy());
- Assert.assertEquals("java.lang.CharSequence", referenceBean.getStub());
- Assert.assertEquals("failover", referenceBean.getCluster());
- Assert.assertEquals(Integer.valueOf(3),
referenceBean.getConnections());
- Assert.assertEquals(Integer.valueOf(1), referenceBean.getCallbacks());
- Assert.assertEquals("onconnect", referenceBean.getOnconnect());
- Assert.assertEquals("ondisconnect", referenceBean.getOndisconnect());
- Assert.assertEquals("owner", referenceBean.getOwner());
- Assert.assertEquals("layer", referenceBean.getLayer());
- Assert.assertEquals(Integer.valueOf(1), referenceBean.getRetries());
- Assert.assertEquals("random", referenceBean.getLoadbalance());
- Assert.assertEquals(true, referenceBean.isAsync());
- Assert.assertEquals(Integer.valueOf(3), referenceBean.getActives());
- Assert.assertEquals(true, referenceBean.getSent());
- Assert.assertEquals("mock", referenceBean.getMock());
- Assert.assertEquals("validation", referenceBean.getValidation());
- Assert.assertEquals(Integer.valueOf(3), referenceBean.getTimeout());
- Assert.assertEquals("cache", referenceBean.getCache());
- Assert.assertEquals("echo,generic,accesslog",
referenceBean.getFilter());
- Assert.assertEquals("deprecated", referenceBean.getListener());
+ Assertions.assertEquals(CharSequence.class,
referenceBean.getInterfaceClass());
+ Assertions.assertEquals("1.0.0", referenceBean.getVersion());
+ Assertions.assertEquals("TEST_GROUP", referenceBean.getGroup());
+ Assertions.assertEquals("dubbo://localhost:12345",
referenceBean.getUrl());
+ Assertions.assertEquals("client", referenceBean.getClient());
+ Assertions.assertEquals(true, referenceBean.isGeneric());
+ Assertions.assertEquals(true, referenceBean.isInjvm());
+ Assertions.assertEquals(false, referenceBean.isCheck());
+ Assertions.assertEquals(null, referenceBean.isInit());
+ Assertions.assertEquals(true, referenceBean.getLazy());
+ Assertions.assertEquals(true, referenceBean.getStubevent());
+ Assertions.assertEquals("reconnect", referenceBean.getReconnect());
+ Assertions.assertEquals(true, referenceBean.getSticky());
+ Assertions.assertEquals("javassist", referenceBean.getProxy());
+ Assertions.assertEquals("java.lang.CharSequence",
referenceBean.getStub());
+ Assertions.assertEquals("failover", referenceBean.getCluster());
+ Assertions.assertEquals(Integer.valueOf(3),
referenceBean.getConnections());
+ Assertions.assertEquals(Integer.valueOf(1),
referenceBean.getCallbacks());
+ Assertions.assertEquals("onconnect", referenceBean.getOnconnect());
+ Assertions.assertEquals("ondisconnect",
referenceBean.getOndisconnect());
+ Assertions.assertEquals("owner", referenceBean.getOwner());
+ Assertions.assertEquals("layer", referenceBean.getLayer());
+ Assertions.assertEquals(Integer.valueOf(1),
referenceBean.getRetries());
+ Assertions.assertEquals("random", referenceBean.getLoadbalance());
+ Assertions.assertEquals(true, referenceBean.isAsync());
+ Assertions.assertEquals(Integer.valueOf(3),
referenceBean.getActives());
+ Assertions.assertEquals(true, referenceBean.getSent());
+ Assertions.assertEquals("mock", referenceBean.getMock());
+ Assertions.assertEquals("validation", referenceBean.getValidation());
+ Assertions.assertEquals(Integer.valueOf(3),
referenceBean.getTimeout());
+ Assertions.assertEquals("cache", referenceBean.getCache());
+ Assertions.assertEquals("echo,generic,accesslog",
referenceBean.getFilter());
+ Assertions.assertEquals("deprecated", referenceBean.getListener());
// parameters
Map<String, String> parameters = new HashMap<String, String>();
parameters.put("n1", "v1");
parameters.put("n2", "v2");
parameters.put("n3", "v3");
- Assert.assertEquals(parameters, referenceBean.getParameters());
+ Assertions.assertEquals(parameters, referenceBean.getParameters());
// Asserts Null fields
- Assert.assertNull(referenceBean.getApplication());
- Assert.assertNull(referenceBean.getModule());
- Assert.assertNull(referenceBean.getConsumer());
- Assert.assertNull(referenceBean.getMonitor());
- Assert.assertEquals(Collections.emptyList(),
referenceBean.getRegistries());
+ Assertions.assertNull(referenceBean.getApplication());
+ Assertions.assertNull(referenceBean.getModule());
+ Assertions.assertNull(referenceBean.getConsumer());
+ Assertions.assertNull(referenceBean.getMonitor());
+ Assertions.assertEquals(Collections.emptyList(),
referenceBean.getRegistries());
}
}
diff --git
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceBeanNameBuilderTest.java
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceBeanNameBuilderTest.java
index 5d42160..b3616cd 100644
---
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceBeanNameBuilderTest.java
+++
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceBeanNameBuilderTest.java
@@ -21,8 +21,8 @@ import org.apache.dubbo.config.annotation.Reference;
import org.apache.dubbo.config.annotation.Service;
import org.apache.dubbo.config.spring.api.DemoService;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.mock.env.MockEnvironment;
import org.springframework.util.ReflectionUtils;
@@ -53,14 +53,14 @@ public class ServiceBeanNameBuilderTest {
@Test
public void testRequiredAttributes() {
ServiceBeanNameBuilder builder =
ServiceBeanNameBuilder.create(INTERFACE_CLASS, environment);
-
Assert.assertEquals("ServiceBean:org.apache.dubbo.config.spring.api.DemoService",
builder.build());
+
Assertions.assertEquals("ServiceBean:org.apache.dubbo.config.spring.api.DemoService",
builder.build());
}
@Test
public void testServiceAnnotation() {
Service service =
AnnotationUtils.getAnnotation(ServiceBeanNameBuilderTest.class, Service.class);
ServiceBeanNameBuilder builder =
ServiceBeanNameBuilder.create(service, INTERFACE_CLASS, environment);
- Assert.assertEquals(BEAN_NAME,
+ Assertions.assertEquals(BEAN_NAME,
builder.build());
}
@@ -68,7 +68,7 @@ public class ServiceBeanNameBuilderTest {
public void testReferenceAnnotation() {
Reference reference =
AnnotationUtils.getAnnotation(ReflectionUtils.findField(ServiceBeanNameBuilderTest.class,
"INTERFACE_CLASS"), Reference.class);
ServiceBeanNameBuilder builder =
ServiceBeanNameBuilder.create(reference, INTERFACE_CLASS, environment);
- Assert.assertEquals(BEAN_NAME,
+ Assertions.assertEquals(BEAN_NAME,
builder.build());
}
diff --git
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/config/YamlPropertySourceFactoryTest.java
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/config/YamlPropertySourceFactoryTest.java
index a9861d3..76815ea 100644
---
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/config/YamlPropertySourceFactoryTest.java
+++
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/config/YamlPropertySourceFactoryTest.java
@@ -16,23 +16,23 @@
*/
package org.apache.dubbo.config.spring.beans.factory.config;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.PropertySource;
import org.springframework.core.env.Environment;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
/**
* {@link YamlPropertySourceFactory} Test
*
* @since 2.6.5
*/
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
@PropertySource(name = "yaml-source", value =
{"classpath:/META-INF/dubbo.yml"}, factory = YamlPropertySourceFactory.class)
@Configuration
@ContextConfiguration(classes = YamlPropertySourceFactoryTest.class)
@@ -61,11 +61,11 @@ public class YamlPropertySourceFactoryTest {
@Test
public void testProperty() {
- Assert.assertEquals(isDefault,
environment.getProperty("dubbo.consumer.default", Boolean.class));
- Assert.assertEquals(client,
environment.getProperty("dubbo.consumer.client", String.class));
- Assert.assertEquals(threadPool,
environment.getProperty("dubbo.consumer.threadpool", String.class));
- Assert.assertEquals(coreThreads,
environment.getProperty("dubbo.consumer.corethreads", Integer.class));
- Assert.assertEquals(threads,
environment.getProperty("dubbo.consumer.threads", Integer.class));
- Assert.assertEquals(queues,
environment.getProperty("dubbo.consumer.queues", Integer.class));
+ Assertions.assertEquals(isDefault,
environment.getProperty("dubbo.consumer.default", Boolean.class));
+ Assertions.assertEquals(client,
environment.getProperty("dubbo.consumer.client", String.class));
+ Assertions.assertEquals(threadPool,
environment.getProperty("dubbo.consumer.threadpool", String.class));
+ Assertions.assertEquals(coreThreads,
environment.getProperty("dubbo.consumer.corethreads", Integer.class));
+ Assertions.assertEquals(threads,
environment.getProperty("dubbo.consumer.threads", Integer.class));
+ Assertions.assertEquals(queues,
environment.getProperty("dubbo.consumer.queues", Integer.class));
}
}
diff --git
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/DubboComponentScanRegistrarTest.java
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/DubboComponentScanRegistrarTest.java
index 96f32cb..a6d219a 100644
---
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/DubboComponentScanRegistrarTest.java
+++
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/DubboComponentScanRegistrarTest.java
@@ -22,9 +22,9 @@ import
org.apache.dubbo.config.spring.context.annotation.consumer.ConsumerConfig
import
org.apache.dubbo.config.spring.context.annotation.provider.DemoServiceImpl;
import
org.apache.dubbo.config.spring.context.annotation.provider.ProviderConfiguration;
-import org.junit.Assert;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.aop.support.AopUtils;
import
org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -39,12 +39,12 @@ import static
org.springframework.core.annotation.AnnotationUtils.findAnnotation
*/
public class DubboComponentScanRegistrarTest {
- @Before
+ @BeforeEach
public void setUp() {
ConfigManager.getInstance().clear();
}
- @After
+ @AfterEach
public void tearDown() {
ConfigManager.getInstance().clear();
}
diff --git
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/context/annotation/DubboComponentScanRegistrarTest.java
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/context/annotation/DubboComponentScanRegistrarTest.java
index fd26a0e..5d28adf 100644
---
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/context/annotation/DubboComponentScanRegistrarTest.java
+++
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/context/annotation/DubboComponentScanRegistrarTest.java
@@ -22,8 +22,8 @@ import
org.apache.dubbo.config.spring.context.annotation.consumer.ConsumerConfig
import
org.apache.dubbo.config.spring.context.annotation.provider.DemoServiceImpl;
import
org.apache.dubbo.config.spring.context.annotation.provider.ProviderConfiguration;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.springframework.aop.support.AopUtils;
import
org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.transaction.annotation.Transactional;
@@ -50,15 +50,15 @@ public class DubboComponentScanRegistrarTest {
String value = demoService.sayName("Mercy");
- Assert.assertEquals("Hello,Mercy", value);
+ Assertions.assertEquals("Hello,Mercy", value);
Class<?> beanClass = AopUtils.getTargetClass(demoService);
// DemoServiceImpl with @Transactional
- Assert.assertEquals(DemoServiceImpl.class, beanClass);
+ Assertions.assertEquals(DemoServiceImpl.class, beanClass);
// Test @Transactional is present or not
- Assert.assertNotNull(findAnnotation(beanClass, Transactional.class));
+ Assertions.assertNotNull(findAnnotation(beanClass,
Transactional.class));
AnnotationConfigApplicationContext consumerContext = new
AnnotationConfigApplicationContext();
@@ -72,7 +72,7 @@ public class DubboComponentScanRegistrarTest {
value = demoService.sayName("Mercy");
- Assert.assertEquals("Hello,Mercy", value);
+ Assertions.assertEquals("Hello,Mercy", value);
ConsumerConfiguration.Child child =
consumerContext.getBean(ConsumerConfiguration.Child.class);
@@ -80,31 +80,31 @@ public class DubboComponentScanRegistrarTest {
demoService = child.getDemoServiceFromChild();
- Assert.assertNotNull(demoService);
+ Assertions.assertNotNull(demoService);
value = demoService.sayName("Mercy");
- Assert.assertEquals("Hello,Mercy", value);
+ Assertions.assertEquals("Hello,Mercy", value);
// From Parent
demoService = child.getDemoServiceFromParent();
- Assert.assertNotNull(demoService);
+ Assertions.assertNotNull(demoService);
value = demoService.sayName("Mercy");
- Assert.assertEquals("Hello,Mercy", value);
+ Assertions.assertEquals("Hello,Mercy", value);
// From Ancestor
demoService = child.getDemoServiceFromAncestor();
- Assert.assertNotNull(demoService);
+ Assertions.assertNotNull(demoService);
value = demoService.sayName("Mercy");
- Assert.assertEquals("Hello,Mercy", value);
+ Assertions.assertEquals("Hello,Mercy", value);
providerContext.close();
consumerContext.close();
diff --git
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/context/annotation/DubboConfigBindingRegistrarTest.java
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/context/annotation/DubboConfigBindingRegistrarTest.java
index 7ec73df..48c06d4 100644
---
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/context/annotation/DubboConfigBindingRegistrarTest.java
+++
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/context/annotation/DubboConfigBindingRegistrarTest.java
@@ -20,8 +20,8 @@ import org.apache.dubbo.config.ApplicationConfig;
import
org.apache.dubbo.config.spring.context.annotation.DubboConfigBindingRegistrar;
import
org.apache.dubbo.config.spring.context.annotation.EnableDubboConfigBinding;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import
org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.PropertySource;
@@ -43,7 +43,7 @@ public class DubboConfigBindingRegistrarTest {
ApplicationConfig applicationConfig =
context.getBean("applicationBean", ApplicationConfig.class);
- Assert.assertEquals("dubbo-demo-application",
applicationConfig.getName());
+ Assertions.assertEquals("dubbo-demo-application",
applicationConfig.getName());
}
@@ -59,15 +59,15 @@ public class DubboConfigBindingRegistrarTest {
ApplicationConfig applicationConfig =
context.getBean("applicationBean", ApplicationConfig.class);
- Assert.assertEquals("dubbo-demo-application",
applicationConfig.getName());
+ Assertions.assertEquals("dubbo-demo-application",
applicationConfig.getName());
applicationConfig = context.getBean("applicationBean2",
ApplicationConfig.class);
- Assert.assertEquals("dubbo-demo-application2",
applicationConfig.getName());
+ Assertions.assertEquals("dubbo-demo-application2",
applicationConfig.getName());
applicationConfig = context.getBean("applicationBean3",
ApplicationConfig.class);
- Assert.assertEquals("dubbo-demo-application3",
applicationConfig.getName());
+ Assertions.assertEquals("dubbo-demo-application3",
applicationConfig.getName());
}
diff --git
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/context/annotation/DubboConfigBindingsRegistrarTest.java
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/context/annotation/DubboConfigBindingsRegistrarTest.java
index 6cae40d..f097829 100644
---
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/context/annotation/DubboConfigBindingsRegistrarTest.java
+++
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/context/annotation/DubboConfigBindingsRegistrarTest.java
@@ -21,8 +21,8 @@ import
org.apache.dubbo.config.spring.context.annotation.DubboConfigBindingsRegi
import
org.apache.dubbo.config.spring.context.annotation.EnableDubboConfigBinding;
import
org.apache.dubbo.config.spring.context.annotation.EnableDubboConfigBindings;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import
org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.PropertySource;
@@ -44,9 +44,9 @@ public class DubboConfigBindingsRegistrarTest {
ApplicationConfig applicationConfig =
context.getBean("applicationBean", ApplicationConfig.class);
- Assert.assertEquals("dubbo-demo-application",
applicationConfig.getName());
+ Assertions.assertEquals("dubbo-demo-application",
applicationConfig.getName());
- Assert.assertEquals(2,
context.getBeansOfType(ApplicationConfig.class).size());
+ Assertions.assertEquals(2,
context.getBeansOfType(ApplicationConfig.class).size());
}
diff --git
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/context/annotation/EnableDubboConfigTest.java
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/context/annotation/EnableDubboConfigTest.java
index 41306be..fba8743 100644
---
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/context/annotation/EnableDubboConfigTest.java
+++
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/context/annotation/EnableDubboConfigTest.java
@@ -25,8 +25,8 @@ import org.apache.dubbo.config.ProviderConfig;
import org.apache.dubbo.config.RegistryConfig;
import org.apache.dubbo.config.spring.context.annotation.EnableDubboConfig;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import
org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.PropertySource;
@@ -46,33 +46,33 @@ public class EnableDubboConfigTest {
// application
ApplicationConfig applicationConfig =
context.getBean("applicationBean", ApplicationConfig.class);
- Assert.assertEquals("dubbo-demo-application",
applicationConfig.getName());
+ Assertions.assertEquals("dubbo-demo-application",
applicationConfig.getName());
// module
ModuleConfig moduleConfig = context.getBean("moduleBean",
ModuleConfig.class);
- Assert.assertEquals("dubbo-demo-module", moduleConfig.getName());
+ Assertions.assertEquals("dubbo-demo-module", moduleConfig.getName());
// registry
RegistryConfig registryConfig = context.getBean(RegistryConfig.class);
- Assert.assertEquals("zookeeper://192.168.99.100:32770",
registryConfig.getAddress());
+ Assertions.assertEquals("zookeeper://192.168.99.100:32770",
registryConfig.getAddress());
// protocol
ProtocolConfig protocolConfig = context.getBean(ProtocolConfig.class);
- Assert.assertEquals("dubbo", protocolConfig.getName());
- Assert.assertEquals(Integer.valueOf(20880), protocolConfig.getPort());
+ Assertions.assertEquals("dubbo", protocolConfig.getName());
+ Assertions.assertEquals(Integer.valueOf(20880),
protocolConfig.getPort());
// monitor
MonitorConfig monitorConfig = context.getBean(MonitorConfig.class);
- Assert.assertEquals("zookeeper://127.0.0.1:32770",
monitorConfig.getAddress());
+ Assertions.assertEquals("zookeeper://127.0.0.1:32770",
monitorConfig.getAddress());
// provider
ProviderConfig providerConfig = context.getBean(ProviderConfig.class);
- Assert.assertEquals("127.0.0.1", providerConfig.getHost());
+ Assertions.assertEquals("127.0.0.1", providerConfig.getHost());
// consumer
ConsumerConfig consumerConfig = context.getBean(ConsumerConfig.class);
- Assert.assertEquals("netty", consumerConfig.getClient());
+ Assertions.assertEquals("netty", consumerConfig.getClient());
}
@@ -85,13 +85,13 @@ public class EnableDubboConfigTest {
// application
ApplicationConfig applicationConfig =
context.getBean("applicationBean", ApplicationConfig.class);
- Assert.assertEquals("dubbo-demo-application",
applicationConfig.getName());
+ Assertions.assertEquals("dubbo-demo-application",
applicationConfig.getName());
ApplicationConfig applicationBean2 =
context.getBean("applicationBean2", ApplicationConfig.class);
- Assert.assertEquals("dubbo-demo-application2",
applicationBean2.getName());
+ Assertions.assertEquals("dubbo-demo-application2",
applicationBean2.getName());
ApplicationConfig applicationBean3 =
context.getBean("applicationBean3", ApplicationConfig.class);
- Assert.assertEquals("dubbo-demo-application3",
applicationBean3.getName());
+ Assertions.assertEquals("dubbo-demo-application3",
applicationBean3.getName());
}
diff --git
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/context/annotation/EnableDubboTest.java
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/context/annotation/EnableDubboTest.java
index 1366a35..bc882e0 100644
---
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/context/annotation/EnableDubboTest.java
+++
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/context/annotation/EnableDubboTest.java
@@ -22,9 +22,9 @@ import
org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
import
org.apache.dubbo.config.spring.context.annotation.consumer.test.TestConsumerConfiguration;
import
org.apache.dubbo.config.spring.context.annotation.provider.DemoServiceImpl;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.aop.support.AopUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Primary;
import org.springframework.context.annotation.PropertySource;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.TransactionException;
@@ -50,7 +50,7 @@ import static
org.springframework.core.annotation.AnnotationUtils.findAnnotation
*
* @since 2.5.8
*/
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
@ContextConfiguration(classes = {EnableDubboTest.class})
@TestPropertySource(locations =
"classpath:/META-INF/dubbb-provider.properties",
properties = "demo.service.version = 2.5.7")
@@ -69,15 +69,15 @@ public class EnableDubboTest {
String value = demoService.sayName("Mercy");
- Assert.assertEquals("Hello,Mercy", value);
+ Assertions.assertEquals("Hello,Mercy", value);
Class<?> beanClass = AopUtils.getTargetClass(demoService);
// DemoServiceImpl with @Transactional
- Assert.assertEquals(DemoServiceImpl.class, beanClass);
+ Assertions.assertEquals(DemoServiceImpl.class, beanClass);
// Test @Transactional is present or not
- Assert.assertNotNull(findAnnotation(beanClass, Transactional.class));
+ Assertions.assertNotNull(findAnnotation(beanClass,
Transactional.class));
AnnotationConfigApplicationContext consumerContext = new
AnnotationConfigApplicationContext(TestConsumerConfiguration.class);
@@ -87,7 +87,7 @@ public class EnableDubboTest {
value = demoService.sayName("Mercy");
- Assert.assertEquals("Hello,Mercy", value);
+ Assertions.assertEquals("Hello,Mercy", value);
TestConsumerConfiguration.Child child =
consumerContext.getBean(TestConsumerConfiguration.Child.class);
@@ -95,37 +95,37 @@ public class EnableDubboTest {
demoService = child.getDemoServiceFromChild();
- Assert.assertNotNull(demoService);
+ Assertions.assertNotNull(demoService);
value = demoService.sayName("Mercy");
- Assert.assertEquals("Hello,Mercy", value);
+ Assertions.assertEquals("Hello,Mercy", value);
// From Parent
demoService = child.getDemoServiceFromParent();
- Assert.assertNotNull(demoService);
+ Assertions.assertNotNull(demoService);
value = demoService.sayName("Mercy");
- Assert.assertEquals("Hello,Mercy", value);
+ Assertions.assertEquals("Hello,Mercy", value);
// From Ancestor
demoService = child.getDemoServiceFromAncestor();
- Assert.assertNotNull(demoService);
+ Assertions.assertNotNull(demoService);
value = demoService.sayName("Mercy");
- Assert.assertEquals("Hello,Mercy", value);
+ Assertions.assertEquals("Hello,Mercy", value);
// Test my-registry2 bean presentation
RegistryConfig registryConfig =
consumerContext.getBean("my-registry2", RegistryConfig.class);
// Test multiple binding
- Assert.assertEquals("N/A", registryConfig.getAddress());
+ Assertions.assertEquals("N/A", registryConfig.getAddress());
}
diff --git
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/context/properties/DefaultDubboConfigBinderTest.java
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/context/properties/DefaultDubboConfigBinderTest.java
index 1caddb0..25e3a55 100644
---
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/context/properties/DefaultDubboConfigBinderTest.java
+++
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/context/properties/DefaultDubboConfigBinderTest.java
@@ -25,18 +25,18 @@ import
org.apache.dubbo.config.spring.beans.factory.config.YamlPropertySourceFac
import
org.apache.dubbo.config.spring.context.properties.DefaultDubboConfigBinder;
import org.apache.dubbo.config.spring.context.properties.DubboConfigBinder;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.PropertySource;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
@TestPropertySource(locations = "classpath:/dubbo.properties")
@PropertySource(name = "yaml-source", value =
{"classpath:/META-INF/dubbo.yml"}, factory = YamlPropertySourceFactory.class)
@Configuration
@@ -69,26 +69,26 @@ public class DefaultDubboConfigBinderTest {
ApplicationConfig applicationConfig = new ApplicationConfig();
dubboConfigBinder.bind("dubbo.application", applicationConfig);
- Assert.assertEquals("hello", applicationConfig.getName());
- Assert.assertEquals("world", applicationConfig.getOwner());
+ Assertions.assertEquals("hello", applicationConfig.getName());
+ Assertions.assertEquals("world", applicationConfig.getOwner());
RegistryConfig registryConfig = new RegistryConfig();
dubboConfigBinder.bind("dubbo.registry", registryConfig);
- Assert.assertEquals("10.20.153.17", registryConfig.getAddress());
+ Assertions.assertEquals("10.20.153.17", registryConfig.getAddress());
ProtocolConfig protocolConfig = new ProtocolConfig();
dubboConfigBinder.bind("dubbo.protocol", protocolConfig);
- Assert.assertEquals(Integer.valueOf(20881), protocolConfig.getPort());
+ Assertions.assertEquals(Integer.valueOf(20881),
protocolConfig.getPort());
ConsumerConfig consumerConfig = new ConsumerConfig();
dubboConfigBinder.bind("dubbo.consumer", consumerConfig);
- Assert.assertEquals(isDefault, consumerConfig.isDefault());
- Assert.assertEquals(client, consumerConfig.getClient());
- Assert.assertEquals(threadPool, consumerConfig.getThreadpool());
- Assert.assertEquals(coreThreads, consumerConfig.getCorethreads());
- Assert.assertEquals(threads, consumerConfig.getThreads());
- Assert.assertEquals(queues, consumerConfig.getQueues());
+ Assertions.assertEquals(isDefault, consumerConfig.isDefault());
+ Assertions.assertEquals(client, consumerConfig.getClient());
+ Assertions.assertEquals(threadPool, consumerConfig.getThreadpool());
+ Assertions.assertEquals(coreThreads, consumerConfig.getCorethreads());
+ Assertions.assertEquals(threads, consumerConfig.getThreads());
+ Assertions.assertEquals(queues, consumerConfig.getQueues());
}
}
diff --git
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/properties/DefaultDubboConfigBinderTest.java
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/properties/DefaultDubboConfigBinderTest.java
index 58e9da9..10e9ac6 100644
---
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/properties/DefaultDubboConfigBinderTest.java
+++
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/properties/DefaultDubboConfigBinderTest.java
@@ -21,10 +21,8 @@ import org.apache.dubbo.config.ApplicationConfig;
import org.apache.dubbo.config.ProtocolConfig;
import org.apache.dubbo.config.RegistryConfig;
-import org.junit.Assert;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index 093105e..d006cc3 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -120,6 +120,8 @@
<activation_version>1.2.0</activation_version>
<hessian_lite_version>3.2.3</hessian_lite_version>
<swagger_version>1.5.19</swagger_version>
+ <spring_test_version>5.1.3.RELEASE</spring_test_version>
+
<gson_version>2.8.5</gson_version>
</properties>
@@ -458,6 +460,13 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>${spring_test_version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>${gson_version}</version>
diff --git
a/dubbo-metadata-report/dubbo-metadata-report-api/src/test/java/org/apache/dubbo/metadata/identifier/MetadataIdentifierTest.java
b/dubbo-metadata-report/dubbo-metadata-report-api/src/test/java/org/apache/dubbo/metadata/identifier/MetadataIdentifierTest.java
index d9a3454..40fab45 100644
---
a/dubbo-metadata-report/dubbo-metadata-report-api/src/test/java/org/apache/dubbo/metadata/identifier/MetadataIdentifierTest.java
+++
b/dubbo-metadata-report/dubbo-metadata-report-api/src/test/java/org/apache/dubbo/metadata/identifier/MetadataIdentifierTest.java
@@ -17,8 +17,9 @@
package org.apache.dubbo.metadata.identifier;
import org.apache.dubbo.common.Constants;
-import org.junit.Assert;
-import org.junit.Test;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
/**
* 2019/1/7
@@ -33,10 +34,10 @@ public class MetadataIdentifierTest {
String application = "vic.zk.md";
MetadataIdentifier providerMetadataIdentifier = new
MetadataIdentifier(interfaceName, version, group, Constants.PROVIDER_SIDE,
application);
System.out.println(providerMetadataIdentifier.getUniqueKey(MetadataIdentifier.KeyTypeEnum.PATH));
-
Assert.assertEquals(providerMetadataIdentifier.getUniqueKey(MetadataIdentifier.KeyTypeEnum.PATH),
"metadata" + Constants.PATH_SEPARATOR + interfaceName +
Constants.PATH_SEPARATOR + (version == null ? "" : (version +
Constants.PATH_SEPARATOR))
+
Assertions.assertEquals(providerMetadataIdentifier.getUniqueKey(MetadataIdentifier.KeyTypeEnum.PATH),
"metadata" + Constants.PATH_SEPARATOR + interfaceName +
Constants.PATH_SEPARATOR + (version == null ? "" : (version +
Constants.PATH_SEPARATOR))
+ (group == null ? "" : (group + Constants.PATH_SEPARATOR)) +
Constants.PROVIDER_SIDE + Constants.PATH_SEPARATOR + application);
System.out.println(providerMetadataIdentifier.getUniqueKey(MetadataIdentifier.KeyTypeEnum.UNIQUE_KEY));
-
Assert.assertEquals(providerMetadataIdentifier.getUniqueKey(MetadataIdentifier.KeyTypeEnum.UNIQUE_KEY),
+
Assertions.assertEquals(providerMetadataIdentifier.getUniqueKey(MetadataIdentifier.KeyTypeEnum.UNIQUE_KEY),
interfaceName + MetadataIdentifier.SEPARATOR + (version ==
null ? "" : version + MetadataIdentifier.SEPARATOR) + (group == null ? "" :
group + MetadataIdentifier.SEPARATOR) + Constants.PROVIDER_SIDE +
MetadataIdentifier.SEPARATOR + application);
}
}
diff --git a/dubbo-rpc/dubbo-rpc-hessian/pom.xml
b/dubbo-rpc/dubbo-rpc-hessian/pom.xml
index 5eb5b47..0eed79d 100644
--- a/dubbo-rpc/dubbo-rpc-hessian/pom.xml
+++ b/dubbo-rpc/dubbo-rpc-hessian/pom.xml
@@ -56,7 +56,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>5.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>
