natas_hw
/
dubbo
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Degrade some UTs in dubbo-config-spring to use junit 4.

This commit is contained in:
ken.lj 2019-01-23 11:29:14 +08:00
parent d3b2439e5c
commit bfdde7e64b
14 changed files with 190 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dubbo-config/dubbo-config-spring/pom.xml
View File

@ -118,13 +118,14 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

32
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/ConfigTest.java
View File

@ -48,9 +48,9 @@ import org.apache.dubbo.rpc.RpcException;
import org.apache.dubbo.rpc.service.GenericException;
import org.apache.dubbo.rpc.service.GenericService;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@ -58,19 +58,19 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
import java.util.Collection;
import java.util.List;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.junit.matchers.JUnitMatchers.containsString;
/**
* ConfigTest
*/
@Disabled
@Ignore
public class ConfigTest {
private static void unexportService(ServiceConfig<?> config) {
@ -896,7 +896,7 @@ public class ConfigTest {
service.setProtocol(protocol);
service.export();
Assertions.assertEquals(port, service.getExportedUrls().get(0).getPort());
Assert.assertEquals(port, service.getExportedUrls().get(0).getPort());
} finally {
if (StringUtils.isNotEmpty(dubboPort)) {
System.setProperty("dubbo.protocol.dubbo.port", dubboPort);
@ -940,7 +940,7 @@ public class ConfigTest {
demoService.export();
helloService.export();
Assertions.assertEquals(demoService.getExportedUrls().get(0).getPort(),
Assert.assertEquals(demoService.getExportedUrls().get(0).getPort(),
helloService.getExportedUrls().get(0).getPort());
} finally {
unexportService(demoService);
@ -973,7 +973,7 @@ public class ConfigTest {
try {
sc.export();
ref.get();
Assertions.fail();
Assert.fail();
} catch (Exception e) {
e.printStackTrace();
} finally {
@ -1000,7 +1000,7 @@ public class ConfigTest {
Collection<Registry> collection = MockRegistryFactory.getCachedRegistry();
MockRegistry registry = (MockRegistry) collection.iterator().next();
URL url = registry.getRegistered().get(0);
Assertions.assertEquals(Constants.GENERIC_SERIALIZATION_BEAN, url.getParameter(Constants.GENERIC_KEY));
Assert.assertEquals(Constants.GENERIC_SERIALIZATION_BEAN, url.getParameter(Constants.GENERIC_KEY));
} finally {
MockRegistryFactory.cleanCachedRegistry();
service.unexport();
@ -1014,7 +1014,7 @@ public class ConfigTest {
ctx.start();
ServiceConfig serviceConfig = (ServiceConfig) ctx.getBean("dubboDemoService");
URL url = (URL) serviceConfig.getExportedUrls().get(0);
Assertions.assertEquals(Constants.GENERIC_SERIALIZATION_BEAN, url.getParameter(Constants.GENERIC_KEY));
Assert.assertEquals(Constants.GENERIC_SERIALIZATION_BEAN, url.getParameter(Constants.GENERIC_KEY));
} finally {
ctx.destroy();
}

85
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/AnnotationPropertyValuesAdapterTest.java
View File

@ -22,8 +22,8 @@ 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.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.Assert;
import org.junit.Test;
import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.core.convert.converter.Converter;
import org.springframework.core.convert.support.DefaultConversionService;
@ -89,54 +89,53 @@ public class AnnotationPropertyValuesAdapterTest {
// System.out.println(referenceBean);
Assertions.assertEquals(DemoService.class, referenceBean.getInterfaceClass());
Assertions.assertEquals("org.apache.dubbo.config.spring.api.DemoService", referenceBean.getInterface());
Assertions.assertEquals("1.0.0", referenceBean.getVersion());
Assertions.assertEquals("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(true, referenceBean.isInit());
Assertions.assertEquals(true, referenceBean.getLazy());
Assertions.assertEquals(true, referenceBean.getStubevent());
Assertions.assertEquals("reconnect", referenceBean.getReconnect());
Assertions.assertEquals(true, referenceBean.getSticky());
Assert.assertEquals(DemoService.class, referenceBean.getInterfaceClass());
Assert.assertEquals("org.apache.dubbo.config.spring.api.DemoService", referenceBean.getInterface());
Assert.assertEquals("1.0.0", referenceBean.getVersion());
Assert.assertEquals("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(true, referenceBean.isInit());
Assert.assertEquals(true, referenceBean.getLazy());
Assert.assertEquals(true, referenceBean.getStubevent());
Assert.assertEquals("reconnect", referenceBean.getReconnect());
Assert.assertEquals(true, referenceBean.getSticky());
Assertions.assertEquals("javassist", referenceBean.getProxy());
Assert.assertEquals("javassist", referenceBean.getProxy());
Assertions.assertEquals("stub", referenceBean.getStub());
Assertions.assertEquals("failover", referenceBean.getCluster());
Assertions.assertEquals(Integer.valueOf(1), 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(1), referenceBean.getActives());
Assertions.assertEquals(true, referenceBean.getSent());
Assertions.assertEquals("mock", referenceBean.getMock());
Assertions.assertEquals("validation", referenceBean.getValidation());
Assertions.assertEquals(Integer.valueOf(2), referenceBean.getTimeout());
Assertions.assertEquals("cache", referenceBean.getCache());
Assertions.assertEquals("default,default", referenceBean.getFilter());
Assertions.assertEquals("default,default", referenceBean.getListener());
Assertions.assertEquals("protocol", referenceBean.getProtocol());
Assert.assertEquals("stub", referenceBean.getStub());
Assert.assertEquals("failover", referenceBean.getCluster());
Assert.assertEquals(Integer.valueOf(1), 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(1), referenceBean.getActives());
Assert.assertEquals(true, referenceBean.getSent());
Assert.assertEquals("mock", referenceBean.getMock());
Assert.assertEquals("validation", referenceBean.getValidation());
Assert.assertEquals(Integer.valueOf(2), referenceBean.getTimeout());
Assert.assertEquals("cache", referenceBean.getCache());
Assert.assertEquals("default,default", referenceBean.getFilter());
Assert.assertEquals("default,default", referenceBean.getListener());
Map<String, String> data = new LinkedHashMap<String, String>();
data.put("key1", "value1");
Assertions.assertEquals(data, referenceBean.getParameters());
Assert.assertEquals(data, referenceBean.getParameters());
// Bean compare
Assertions.assertEquals(null, referenceBean.getApplication());
Assertions.assertEquals(null, referenceBean.getModule());
Assertions.assertEquals(null, referenceBean.getConsumer());
Assertions.assertEquals(null, referenceBean.getMonitor());
Assertions.assertEquals(null, referenceBean.getRegistry());
Assert.assertEquals(null, referenceBean.getApplication());
Assert.assertEquals(null, referenceBean.getModule());
Assert.assertEquals(null, referenceBean.getConsumer());
Assert.assertEquals(null, referenceBean.getMonitor());
Assert.assertEquals(null, referenceBean.getRegistry());
}

44
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessorTest.java
View File

@ -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.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
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.junit.jupiter.SpringExtension;
import org.springframework.test.context.junit4.SpringRunner;
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
*/
@ExtendWith(SpringExtension.class)
@RunWith(SpringRunner.class)
@ContextConfiguration(
classes = {
ServiceAnnotationTestConfiguration.class,
@ -75,15 +75,15 @@ public class ReferenceAnnotationBeanPostProcessorTest {
DemoService demoService = testBean.getDemoService();
Assertions.assertEquals("Hello,Mercy", demoService.sayName("Mercy"));
Assert.assertEquals("Hello,Mercy", demoService.sayName("Mercy"));
Assertions.assertNotNull(testBean.getDemoServiceFromAncestor());
Assertions.assertNotNull(testBean.getDemoServiceFromParent());
Assertions.assertNotNull(testBean.getDemoService());
Assert.assertNotNull(testBean.getDemoServiceFromAncestor());
Assert.assertNotNull(testBean.getDemoServiceFromParent());
Assert.assertNotNull(testBean.getDemoService());
Assertions.assertEquals("Hello,Mercy", testBean.getDemoServiceFromAncestor().sayName("Mercy"));
Assertions.assertEquals("Hello,Mercy", testBean.getDemoServiceFromParent().sayName("Mercy"));
Assertions.assertEquals("Hello,Mercy", testBean.getDemoService().sayName("Mercy"));
Assert.assertEquals("Hello,Mercy", testBean.getDemoServiceFromAncestor().sayName("Mercy"));
Assert.assertEquals("Hello,Mercy", testBean.getDemoServiceFromParent().sayName("Mercy"));
Assert.assertEquals("Hello,Mercy", testBean.getDemoService().sayName("Mercy"));
}
@ -98,13 +98,13 @@ public class ReferenceAnnotationBeanPostProcessorTest {
Collection<ReferenceBean<?>> referenceBeans = beanPostProcessor.getReferenceBeans();
Assertions.assertEquals(1, referenceBeans.size());
Assert.assertEquals(1, referenceBeans.size());
ReferenceBean<?> referenceBean = referenceBeans.iterator().next();
TestBean testBean = context.getBean(TestBean.class);
Assertions.assertNotNull(referenceBean.get());
Assert.assertNotNull(referenceBean.get());
}
@ -118,19 +118,19 @@ public class ReferenceAnnotationBeanPostProcessorTest {
Map<InjectionMetadata.InjectedElement, ReferenceBean<?>> referenceBeanMap =
beanPostProcessor.getInjectedFieldReferenceBeanMap();
Assertions.assertEquals(1, referenceBeanMap.size());
Assert.assertEquals(1, referenceBeanMap.size());
for (Map.Entry<InjectionMetadata.InjectedElement, ReferenceBean<?>> entry : referenceBeanMap.entrySet()) {
InjectionMetadata.InjectedElement injectedElement = entry.getKey();
Assertions.assertEquals("org.apache.dubbo.config.spring.beans.factory.annotation.AnnotationInjectedBeanPostProcessor$AnnotatedFieldElement",
Assert.assertEquals("org.apache.dubbo.config.spring.beans.factory.annotation.AnnotationInjectedBeanPostProcessor$AnnotatedFieldElement",
injectedElement.getClass().getName());
ReferenceBean<?> referenceBean = entry.getValue();
Assertions.assertEquals("2.5.7", referenceBean.getVersion());
Assertions.assertEquals("dubbo://127.0.0.1:12345", referenceBean.getUrl());
Assert.assertEquals("2.5.7", referenceBean.getVersion());
Assert.assertEquals("dubbo://127.0.0.1:12345", referenceBean.getUrl());
}
@ -146,19 +146,19 @@ public class ReferenceAnnotationBeanPostProcessorTest {
Map<InjectionMetadata.InjectedElement, ReferenceBean<?>> referenceBeanMap =
beanPostProcessor.getInjectedMethodReferenceBeanMap();
Assertions.assertEquals(2, referenceBeanMap.size());
Assert.assertEquals(2, referenceBeanMap.size());
for (Map.Entry<InjectionMetadata.InjectedElement, ReferenceBean<?>> entry : referenceBeanMap.entrySet()) {
InjectionMetadata.InjectedElement injectedElement = entry.getKey();
Assertions.assertEquals("org.apache.dubbo.config.spring.beans.factory.annotation.AnnotationInjectedBeanPostProcessor$AnnotatedMethodElement",
Assert.assertEquals("org.apache.dubbo.config.spring.beans.factory.annotation.AnnotationInjectedBeanPostProcessor$AnnotatedMethodElement",
injectedElement.getClass().getName());
ReferenceBean<?> referenceBean = entry.getValue();
Assertions.assertEquals("2.5.7", referenceBean.getVersion());
Assertions.assertEquals("dubbo://127.0.0.1:12345", referenceBean.getUrl());
Assert.assertEquals("2.5.7", referenceBean.getVersion());
Assert.assertEquals("dubbo://127.0.0.1:12345", referenceBean.getUrl());
}

88
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceBeanBuilderTest.java
View File

@ -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.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
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
*/
@ExtendWith(SpringExtension.class)
@RunWith(SpringJUnit4ClassRunner.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();
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());
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());
// parameters
Map<String, String> parameters = new HashMap<String, String>();
parameters.put("n1", "v1");
parameters.put("n2", "v2");
parameters.put("n3", "v3");
Assertions.assertEquals(parameters, referenceBean.getParameters());
Assert.assertEquals(parameters, referenceBean.getParameters());
// Asserts Null fields
Assertions.assertNull(referenceBean.getApplication());
Assertions.assertNull(referenceBean.getModule());
Assertions.assertNull(referenceBean.getConsumer());
Assertions.assertNull(referenceBean.getMonitor());
Assertions.assertEquals(Collections.emptyList(), referenceBean.getRegistries());
Assert.assertNull(referenceBean.getApplication());
Assert.assertNull(referenceBean.getModule());
Assert.assertNull(referenceBean.getConsumer());
Assert.assertNull(referenceBean.getMonitor());
Assert.assertEquals(Collections.emptyList(), referenceBean.getRegistries());
}
}

23
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceAnnotationBeanPostProcessorTest.java
View File

@ -19,17 +19,16 @@ package org.apache.dubbo.config.spring.beans.factory.annotation;
import org.apache.dubbo.config.spring.ServiceBean;
import org.apache.dubbo.config.spring.api.HelloService;
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.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.springframework.test.context.junit4.SpringRunner;
import java.util.Map;
@ -38,7 +37,7 @@ import java.util.Map;
*
* @since 2.5.8
*/
@ExtendWith(SpringExtension.class)
@RunWith(SpringRunner.class)
@ContextConfiguration(
classes = {
ServiceAnnotationTestConfiguration.class,
@ -53,8 +52,6 @@ public class ServiceAnnotationBeanPostProcessorTest {
@Autowired
private ConfigurableListableBeanFactory beanFactory;
@Disabled
// @Test
@Bean
public ServiceAnnotationBeanPostProcessor serviceAnnotationBeanPostProcessor2
(@Value("${packagesToScan}") String... packagesToScan) {
@ -66,19 +63,19 @@ public class ServiceAnnotationBeanPostProcessorTest {
Map<String, HelloService> helloServicesMap = beanFactory.getBeansOfType(HelloService.class);
Assertions.assertEquals(2, helloServicesMap.size());
Assert.assertEquals(2, helloServicesMap.size());
Map<String, ServiceBean> serviceBeansMap = beanFactory.getBeansOfType(ServiceBean.class);
Assertions.assertEquals(2, serviceBeansMap.size());
Assert.assertEquals(2, serviceBeansMap.size());
Map<String, ServiceAnnotationBeanPostProcessor> beanPostProcessorsMap =
beanFactory.getBeansOfType(ServiceAnnotationBeanPostProcessor.class);
Assertions.assertEquals(2, beanPostProcessorsMap.size());
Assert.assertEquals(2, beanPostProcessorsMap.size());
Assertions.assertTrue(beanPostProcessorsMap.containsKey("serviceAnnotationBeanPostProcessor"));
Assertions.assertTrue(beanPostProcessorsMap.containsKey("serviceAnnotationBeanPostProcessor2"));
Assert.assertTrue(beanPostProcessorsMap.containsKey("serviceAnnotationBeanPostProcessor"));
Assert.assertTrue(beanPostProcessorsMap.containsKey("serviceAnnotationBeanPostProcessor2"));
}

22
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/config/YamlPropertySourceFactoryTest.java
View File

@ -16,23 +16,23 @@
*/
package org.apache.dubbo.config.spring.beans.factory.config;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
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.junit.jupiter.SpringExtension;
import org.springframework.test.context.junit4.SpringRunner;
/**
* {@link YamlPropertySourceFactory} Test
*
* @since 2.6.5
*/
@ExtendWith(SpringExtension.class)
@RunWith(SpringRunner.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() {
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));
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));
}
}

32
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/context/annotation/EnableDubboTest.java
View File

@ -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.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
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.junit.jupiter.SpringExtension;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
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
*/
@ExtendWith(SpringExtension.class)
@RunWith(SpringJUnit4ClassRunner.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");
Assertions.assertEquals("Hello,Mercy", value);
Assert.assertEquals("Hello,Mercy", value);
Class<?> beanClass = AopUtils.getTargetClass(demoService);
// DemoServiceImpl with @Transactional
Assertions.assertEquals(DemoServiceImpl.class, beanClass);
Assert.assertEquals(DemoServiceImpl.class, beanClass);
// Test @Transactional is present or not
Assertions.assertNotNull(findAnnotation(beanClass, Transactional.class));
Assert.assertNotNull(findAnnotation(beanClass, Transactional.class));
AnnotationConfigApplicationContext consumerContext = new AnnotationConfigApplicationContext(TestConsumerConfiguration.class);
@ -87,7 +87,7 @@ public class EnableDubboTest {
value = demoService.sayName("Mercy");
Assertions.assertEquals("Hello,Mercy", value);
Assert.assertEquals("Hello,Mercy", value);
TestConsumerConfiguration.Child child = consumerContext.getBean(TestConsumerConfiguration.Child.class);
@ -95,37 +95,37 @@ public class EnableDubboTest {
demoService = child.getDemoServiceFromChild();
Assertions.assertNotNull(demoService);
Assert.assertNotNull(demoService);
value = demoService.sayName("Mercy");
Assertions.assertEquals("Hello,Mercy", value);
Assert.assertEquals("Hello,Mercy", value);
// From Parent
demoService = child.getDemoServiceFromParent();
Assertions.assertNotNull(demoService);
Assert.assertNotNull(demoService);
value = demoService.sayName("Mercy");
Assertions.assertEquals("Hello,Mercy", value);
Assert.assertEquals("Hello,Mercy", value);
// From Ancestor
demoService = child.getDemoServiceFromAncestor();
Assertions.assertNotNull(demoService);
Assert.assertNotNull(demoService);
value = demoService.sayName("Mercy");
Assertions.assertEquals("Hello,Mercy", value);
Assert.assertEquals("Hello,Mercy", value);
// Test my-registry2 bean presentation
RegistryConfig registryConfig = consumerContext.getBean("my-registry2", RegistryConfig.class);
// Test multiple binding
Assertions.assertEquals("N/A", registryConfig.getAddress());
Assert.assertEquals("N/A", registryConfig.getAddress());
}

30
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/context/properties/DefaultDubboConfigBinderTest.java
View File

@ -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.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
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.junit.jupiter.SpringExtension;
import org.springframework.test.context.junit4.SpringRunner;
@ExtendWith(SpringExtension.class)
@RunWith(SpringRunner.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);
Assertions.assertEquals("hello", applicationConfig.getName());
Assertions.assertEquals("world", applicationConfig.getOwner());
Assert.assertEquals("hello", applicationConfig.getName());
Assert.assertEquals("world", applicationConfig.getOwner());
RegistryConfig registryConfig = new RegistryConfig();
dubboConfigBinder.bind("dubbo.registry", registryConfig);
Assertions.assertEquals("10.20.153.17", registryConfig.getAddress());
Assert.assertEquals("10.20.153.17", registryConfig.getAddress());
ProtocolConfig protocolConfig = new ProtocolConfig();
dubboConfigBinder.bind("dubbo.protocol", protocolConfig);
Assertions.assertEquals(Integer.valueOf(20881), protocolConfig.getPort());
Assert.assertEquals(Integer.valueOf(20881), protocolConfig.getPort());
ConsumerConfig consumerConfig = new ConsumerConfig();
dubboConfigBinder.bind("dubbo.consumer", consumerConfig);
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());
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());
}
}

11
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/properties/DefaultDubboConfigBinderTest.java
View File

@ -21,15 +21,15 @@ import org.apache.dubbo.config.ApplicationConfig;
import org.apache.dubbo.config.ProtocolConfig;
import org.apache.dubbo.config.RegistryConfig;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@ExtendWith(SpringExtension.class)
@RunWith(SpringJUnit4ClassRunner.class)
@TestPropertySource(locations = "classpath:/dubbo.properties")
@ContextConfiguration(classes = DefaultDubboConfigBinder.class)
public class DefaultDubboConfigBinderTest {
@ -37,8 +37,7 @@ public class DefaultDubboConfigBinderTest {
@Autowired
private DubboConfigBinder dubboConfigBinder;
@Disabled
// @Test
@Test
public void testBinder() {
ApplicationConfig applicationConfig = new ApplicationConfig();

2
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/schema/DubboNamespaceHandlerTest.java
View File

@ -111,7 +111,7 @@ public class DubboNamespaceHandlerTest {
@Test
public void testDelayFixedTime() {
ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(ConfigTest.class.getPackage().getName().replace('.', '/') + "/delay-fixed-time.xml");
ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("classpath:/" + ConfigTest.class.getPackage().getName().replace('.', '/') + "/delay-fixed-time.xml");
ctx.start();
assertThat(ctx.getBean(ServiceBean.class).getDelay(), is(300));

1
dubbo-container/dubbo-container-api/pom.xml
View File

@ -47,6 +47,7 @@
<mainClass>org.apache.dubbo.container.Main</mainClass>
</manifest>
</archive>
<forceCreation>true</forceCreation>
</configuration>
</plugin>
</plugins>

2
dubbo-dependencies-bom/pom.xml
View File

@ -120,7 +120,7 @@
<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>
<spring_test_version>4.3.16.RELEASE</spring_test_version>
<gson_version>2.8.5</gson_version>
</properties>

1
pom.xml
View File

@ -389,6 +389,7 @@
<Implementation-Version>${project.version}</Implementation-Version>
</manifestEntries>
</archive>
<forceCreation>true</forceCreation>
</configuration>
</plugin>
<plugin>