Skip to content

Commit bfdde7e

Browse files
chickenljchickenlj
committed
Degrade some UTs in dubbo-config-spring to use junit 4.
1 parent d3b2439 commit bfdde7e

File tree

14 files changed

+192
-194
lines changed

14 files changed

+192
-194
lines changed

‎dubbo-config/dubbo-config-spring/pom.xml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,13 +118,14 @@
118118
<scope>test</scope>
119119
</dependency>
120120
<dependency>
121-
<groupId>org.apache.tomcat.embed</groupId>
122-
<artifactId>tomcat-embed-core</artifactId>
121+
<groupId>junit</groupId>
122+
<artifactId>junit</artifactId>
123+
<version>4.12</version>
123124
<scope>test</scope>
124125
</dependency>
125126
<dependency>
126-
<groupId>org.springframework</groupId>
127-
<artifactId>spring-test</artifactId>
127+
<groupId>org.apache.tomcat.embed</groupId>
128+
<artifactId>tomcat-embed-core</artifactId>
128129
<scope>test</scope>
129130
</dependency>
130131
</dependencies>

‎dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/ConfigTest.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -48,29 +48,29 @@
4848
import org.apache.dubbo.rpc.service.GenericException;
4949
import org.apache.dubbo.rpc.service.GenericService;
5050

51-
import org.junit.jupiter.api.Assertions;
52-
import org.junit.jupiter.api.Disabled;
53-
import org.junit.jupiter.api.Test;
51+
import org.junit.Assert;
52+
import org.junit.Ignore;
53+
import org.junit.Test;
5454
import org.springframework.beans.factory.BeanCreationException;
5555
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
5656
import org.springframework.context.support.ClassPathXmlApplicationContext;
5757

5858
import java.util.Collection;
5959
import java.util.List;
6060

61-
import static org.hamcrest.MatcherAssert.assertThat;
62-
import static org.hamcrest.Matchers.containsString;
63-
import static org.junit.jupiter.api.Assertions.assertEquals;
64-
import static org.junit.jupiter.api.Assertions.assertNotNull;
65-
import static org.junit.jupiter.api.Assertions.assertNull;
66-
import static org.junit.jupiter.api.Assertions.assertTrue;
67-
import static org.junit.jupiter.api.Assertions.fail;
61+
import static org.junit.Assert.assertEquals;
62+
import static org.junit.Assert.assertNotNull;
63+
import static org.junit.Assert.assertNull;
64+
import static org.junit.Assert.assertThat;
65+
import static org.junit.Assert.assertTrue;
66+
import static org.junit.Assert.fail;
67+
import static org.junit.matchers.JUnitMatchers.containsString;
6868

6969

7070
/**
7171
* ConfigTest
7272
*/
73-
@Disabled
73+
@Ignore
7474
public class ConfigTest {
7575

7676
private static void unexportService(ServiceConfig<?> config) {
@@ -896,7 +896,7 @@ public void testDubboProtocolPortOverride() throws Exception {
896896
service.setProtocol(protocol);
897897
service.export();
898898

899-
Assertions.assertEquals(port, service.getExportedUrls().get(0).getPort());
899+
Assert.assertEquals(port, service.getExportedUrls().get(0).getPort());
900900
} finally {
901901
if (StringUtils.isNotEmpty(dubboPort)) {
902902
System.setProperty("dubbo.protocol.dubbo.port", dubboPort);
@@ -940,7 +940,7 @@ public void testProtocolRandomPort() throws Exception {
940940
demoService.export();
941941
helloService.export();
942942

943-
Assertions.assertEquals(demoService.getExportedUrls().get(0).getPort(),
943+
Assert.assertEquals(demoService.getExportedUrls().get(0).getPort(),
944944
helloService.getExportedUrls().get(0).getPort());
945945
} finally {
946946
unexportService(demoService);
@@ -973,7 +973,7 @@ public void testReferGenericExport() throws Exception {
973973
try {
974974
sc.export();
975975
ref.get();
976-
Assertions.fail();
976+
Assert.fail();
977977
} catch (Exception e) {
978978
e.printStackTrace();
979979
} finally {
@@ -1000,7 +1000,7 @@ public void testGenericServiceConfig() throws Exception {
10001000
Collection<Registry> collection = MockRegistryFactory.getCachedRegistry();
10011001
MockRegistry registry = (MockRegistry) collection.iterator().next();
10021002
URL url = registry.getRegistered().get(0);
1003-
Assertions.assertEquals(Constants.GENERIC_SERIALIZATION_BEAN, url.getParameter(Constants.GENERIC_KEY));
1003+
Assert.assertEquals(Constants.GENERIC_SERIALIZATION_BEAN, url.getParameter(Constants.GENERIC_KEY));
10041004
} finally {
10051005
MockRegistryFactory.cleanCachedRegistry();
10061006
service.unexport();
@@ -1014,7 +1014,7 @@ public void testGenericServiceConfigThroughSpring() throws Exception {
10141014
ctx.start();
10151015
ServiceConfig serviceConfig = (ServiceConfig) ctx.getBean("dubboDemoService");
10161016
URL url = (URL) serviceConfig.getExportedUrls().get(0);
1017-
Assertions.assertEquals(Constants.GENERIC_SERIALIZATION_BEAN, url.getParameter(Constants.GENERIC_KEY));
1017+
Assert.assertEquals(Constants.GENERIC_SERIALIZATION_BEAN, url.getParameter(Constants.GENERIC_KEY));
10181018
} finally {
10191019
ctx.destroy();
10201020
}

‎dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/AnnotationPropertyValuesAdapterTest.java‎

Lines changed: 44 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import org.apache.dubbo.config.spring.ReferenceBean;
2323
import org.apache.dubbo.config.spring.api.DemoService;
2424

25-
import org.junit.jupiter.api.Assertions;
26-
import org.junit.jupiter.api.Test;
25+
import org.junit.Assert;
26+
import org.junit.Test;
2727
import org.springframework.core.annotation.AnnotationUtils;
2828
import org.springframework.core.convert.converter.Converter;
2929
import org.springframework.core.convert.support.DefaultConversionService;
@@ -89,54 +89,53 @@ public Map<String, String> convert(String[] source) {
8989

9090
// System.out.println(referenceBean);
9191

92-
Assertions.assertEquals(DemoService.class, referenceBean.getInterfaceClass());
93-
Assertions.assertEquals("org.apache.dubbo.config.spring.api.DemoService", referenceBean.getInterface());
94-
Assertions.assertEquals("1.0.0", referenceBean.getVersion());
95-
Assertions.assertEquals("group", referenceBean.getGroup());
96-
Assertions.assertEquals("dubbo://localhost:12345", referenceBean.getUrl());
97-
Assertions.assertEquals("client", referenceBean.getClient());
98-
Assertions.assertEquals(true, referenceBean.isGeneric());
99-
Assertions.assertEquals(true, referenceBean.isInjvm());
100-
Assertions.assertEquals(false, referenceBean.isCheck());
101-
Assertions.assertEquals(true, referenceBean.isInit());
102-
Assertions.assertEquals(true, referenceBean.getLazy());
103-
Assertions.assertEquals(true, referenceBean.getStubevent());
104-
Assertions.assertEquals("reconnect", referenceBean.getReconnect());
105-
Assertions.assertEquals(true, referenceBean.getSticky());
106-
107-
Assertions.assertEquals("javassist", referenceBean.getProxy());
108-
109-
Assertions.assertEquals("stub", referenceBean.getStub());
110-
Assertions.assertEquals("failover", referenceBean.getCluster());
111-
Assertions.assertEquals(Integer.valueOf(1), referenceBean.getConnections());
112-
Assertions.assertEquals(Integer.valueOf(1), referenceBean.getCallbacks());
113-
Assertions.assertEquals("onconnect", referenceBean.getOnconnect());
114-
Assertions.assertEquals("ondisconnect", referenceBean.getOndisconnect());
115-
Assertions.assertEquals("owner", referenceBean.getOwner());
116-
Assertions.assertEquals("layer", referenceBean.getLayer());
117-
Assertions.assertEquals(Integer.valueOf(1), referenceBean.getRetries());
118-
Assertions.assertEquals("random", referenceBean.getLoadbalance());
119-
Assertions.assertEquals(true, referenceBean.isAsync());
120-
Assertions.assertEquals(Integer.valueOf(1), referenceBean.getActives());
121-
Assertions.assertEquals(true, referenceBean.getSent());
122-
Assertions.assertEquals("mock", referenceBean.getMock());
123-
Assertions.assertEquals("validation", referenceBean.getValidation());
124-
Assertions.assertEquals(Integer.valueOf(2), referenceBean.getTimeout());
125-
Assertions.assertEquals("cache", referenceBean.getCache());
126-
Assertions.assertEquals("default,default", referenceBean.getFilter());
127-
Assertions.assertEquals("default,default", referenceBean.getListener());
128-
Assertions.assertEquals("protocol", referenceBean.getProtocol());
92+
Assert.assertEquals(DemoService.class, referenceBean.getInterfaceClass());
93+
Assert.assertEquals("org.apache.dubbo.config.spring.api.DemoService", referenceBean.getInterface());
94+
Assert.assertEquals("1.0.0", referenceBean.getVersion());
95+
Assert.assertEquals("group", referenceBean.getGroup());
96+
Assert.assertEquals("dubbo://localhost:12345", referenceBean.getUrl());
97+
Assert.assertEquals("client", referenceBean.getClient());
98+
Assert.assertEquals(true, referenceBean.isGeneric());
99+
Assert.assertEquals(true, referenceBean.isInjvm());
100+
Assert.assertEquals(false, referenceBean.isCheck());
101+
Assert.assertEquals(true, referenceBean.isInit());
102+
Assert.assertEquals(true, referenceBean.getLazy());
103+
Assert.assertEquals(true, referenceBean.getStubevent());
104+
Assert.assertEquals("reconnect", referenceBean.getReconnect());
105+
Assert.assertEquals(true, referenceBean.getSticky());
106+
107+
Assert.assertEquals("javassist", referenceBean.getProxy());
108+
109+
Assert.assertEquals("stub", referenceBean.getStub());
110+
Assert.assertEquals("failover", referenceBean.getCluster());
111+
Assert.assertEquals(Integer.valueOf(1), referenceBean.getConnections());
112+
Assert.assertEquals(Integer.valueOf(1), referenceBean.getCallbacks());
113+
Assert.assertEquals("onconnect", referenceBean.getOnconnect());
114+
Assert.assertEquals("ondisconnect", referenceBean.getOndisconnect());
115+
Assert.assertEquals("owner", referenceBean.getOwner());
116+
Assert.assertEquals("layer", referenceBean.getLayer());
117+
Assert.assertEquals(Integer.valueOf(1), referenceBean.getRetries());
118+
Assert.assertEquals("random", referenceBean.getLoadbalance());
119+
Assert.assertEquals(true, referenceBean.isAsync());
120+
Assert.assertEquals(Integer.valueOf(1), referenceBean.getActives());
121+
Assert.assertEquals(true, referenceBean.getSent());
122+
Assert.assertEquals("mock", referenceBean.getMock());
123+
Assert.assertEquals("validation", referenceBean.getValidation());
124+
Assert.assertEquals(Integer.valueOf(2), referenceBean.getTimeout());
125+
Assert.assertEquals("cache", referenceBean.getCache());
126+
Assert.assertEquals("default,default", referenceBean.getFilter());
127+
Assert.assertEquals("default,default", referenceBean.getListener());
129128

130129
Map<String, String> data = new LinkedHashMap<String, String>();
131130
data.put("key1", "value1");
132131

133-
Assertions.assertEquals(data, referenceBean.getParameters());
132+
Assert.assertEquals(data, referenceBean.getParameters());
134133
// Bean compare
135-
Assertions.assertEquals(null, referenceBean.getApplication());
136-
Assertions.assertEquals(null, referenceBean.getModule());
137-
Assertions.assertEquals(null, referenceBean.getConsumer());
138-
Assertions.assertEquals(null, referenceBean.getMonitor());
139-
Assertions.assertEquals(null, referenceBean.getRegistry());
134+
Assert.assertEquals(null, referenceBean.getApplication());
135+
Assert.assertEquals(null, referenceBean.getModule());
136+
Assert.assertEquals(null, referenceBean.getConsumer());
137+
Assert.assertEquals(null, referenceBean.getMonitor());
138+
Assert.assertEquals(null, referenceBean.getRegistry());
140139

141140
}
142141

‎dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessorTest.java‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@
2020
import org.apache.dubbo.config.spring.ReferenceBean;
2121
import org.apache.dubbo.config.spring.api.DemoService;
2222

23-
import org.junit.jupiter.api.Assertions;
24-
import org.junit.jupiter.api.Test;
25-
import org.junit.jupiter.api.extension.ExtendWith;
23+
import org.junit.Assert;
24+
import org.junit.Test;
25+
import org.junit.runner.RunWith;
2626
import org.springframework.beans.factory.annotation.Autowired;
2727
import org.springframework.beans.factory.annotation.InjectionMetadata;
2828
import org.springframework.context.ApplicationContext;
2929
import org.springframework.context.ConfigurableApplicationContext;
3030
import org.springframework.context.annotation.Bean;
3131
import org.springframework.test.context.ContextConfiguration;
3232
import org.springframework.test.context.TestPropertySource;
33-
import org.springframework.test.context.junit.jupiter.SpringExtension;
33+
import org.springframework.test.context.junit4.SpringRunner;
3434

3535
import java.util.Collection;
3636
import java.util.Map;
@@ -42,7 +42,7 @@
4242
*
4343
* @since 2.5.7
4444
*/
45-
@ExtendWith(SpringExtension.class)
45+
@RunWith(SpringRunner.class)
4646
@ContextConfiguration(
4747
classes = {
4848
ServiceAnnotationTestConfiguration.class,
@@ -75,15 +75,15 @@ public void test() throws Exception {
7575

7676
DemoService demoService = testBean.getDemoService();
7777

78-
Assertions.assertEquals("Hello,Mercy", demoService.sayName("Mercy"));
78+
Assert.assertEquals("Hello,Mercy", demoService.sayName("Mercy"));
7979

80-
Assertions.assertNotNull(testBean.getDemoServiceFromAncestor());
81-
Assertions.assertNotNull(testBean.getDemoServiceFromParent());
82-
Assertions.assertNotNull(testBean.getDemoService());
80+
Assert.assertNotNull(testBean.getDemoServiceFromAncestor());
81+
Assert.assertNotNull(testBean.getDemoServiceFromParent());
82+
Assert.assertNotNull(testBean.getDemoService());
8383

84-
Assertions.assertEquals("Hello,Mercy", testBean.getDemoServiceFromAncestor().sayName("Mercy"));
85-
Assertions.assertEquals("Hello,Mercy", testBean.getDemoServiceFromParent().sayName("Mercy"));
86-
Assertions.assertEquals("Hello,Mercy", testBean.getDemoService().sayName("Mercy"));
84+
Assert.assertEquals("Hello,Mercy", testBean.getDemoServiceFromAncestor().sayName("Mercy"));
85+
Assert.assertEquals("Hello,Mercy", testBean.getDemoServiceFromParent().sayName("Mercy"));
86+
Assert.assertEquals("Hello,Mercy", testBean.getDemoService().sayName("Mercy"));
8787

8888
}
8989

@@ -98,13 +98,13 @@ public void testGetReferenceBeans() {
9898

9999
Collection<ReferenceBean<?>> referenceBeans = beanPostProcessor.getReferenceBeans();
100100

101-
Assertions.assertEquals(1, referenceBeans.size());
101+
Assert.assertEquals(1, referenceBeans.size());
102102

103103
ReferenceBean<?> referenceBean = referenceBeans.iterator().next();
104104

105105
TestBean testBean = context.getBean(TestBean.class);
106106

107-
Assertions.assertNotNull(referenceBean.get());
107+
Assert.assertNotNull(referenceBean.get());
108108

109109
}
110110

@@ -118,19 +118,19 @@ public void testGetInjectedFieldReferenceBeanMap() {
118118
Map<InjectionMetadata.InjectedElement, ReferenceBean<?>> referenceBeanMap =
119119
beanPostProcessor.getInjectedFieldReferenceBeanMap();
120120

121-
Assertions.assertEquals(1, referenceBeanMap.size());
121+
Assert.assertEquals(1, referenceBeanMap.size());
122122

123123
for (Map.Entry<InjectionMetadata.InjectedElement, ReferenceBean<?>> entry : referenceBeanMap.entrySet()) {
124124

125125
InjectionMetadata.InjectedElement injectedElement = entry.getKey();
126126

127-
Assertions.assertEquals("org.apache.dubbo.config.spring.beans.factory.annotation.AnnotationInjectedBeanPostProcessor$AnnotatedFieldElement",
127+
Assert.assertEquals("org.apache.dubbo.config.spring.beans.factory.annotation.AnnotationInjectedBeanPostProcessor$AnnotatedFieldElement",
128128
injectedElement.getClass().getName());
129129

130130
ReferenceBean<?> referenceBean = entry.getValue();
131131

132-
Assertions.assertEquals("2.5.7", referenceBean.getVersion());
133-
Assertions.assertEquals("dubbo://127.0.0.1:12345", referenceBean.getUrl());
132+
Assert.assertEquals("2.5.7", referenceBean.getVersion());
133+
Assert.assertEquals("dubbo://127.0.0.1:12345", referenceBean.getUrl());
134134

135135
}
136136

@@ -146,19 +146,19 @@ public void testGetInjectedMethodReferenceBeanMap() {
146146
Map<InjectionMetadata.InjectedElement, ReferenceBean<?>> referenceBeanMap =
147147
beanPostProcessor.getInjectedMethodReferenceBeanMap();
148148

149-
Assertions.assertEquals(2, referenceBeanMap.size());
149+
Assert.assertEquals(2, referenceBeanMap.size());
150150

151151
for (Map.Entry<InjectionMetadata.InjectedElement, ReferenceBean<?>> entry : referenceBeanMap.entrySet()) {
152152

153153
InjectionMetadata.InjectedElement injectedElement = entry.getKey();
154154

155-
Assertions.assertEquals("org.apache.dubbo.config.spring.beans.factory.annotation.AnnotationInjectedBeanPostProcessor$AnnotatedMethodElement",
155+
Assert.assertEquals("org.apache.dubbo.config.spring.beans.factory.annotation.AnnotationInjectedBeanPostProcessor$AnnotatedMethodElement",
156156
injectedElement.getClass().getName());
157157

158158
ReferenceBean<?> referenceBean = entry.getValue();
159159

160-
Assertions.assertEquals("2.5.7", referenceBean.getVersion());
161-
Assertions.assertEquals("dubbo://127.0.0.1:12345", referenceBean.getUrl());
160+
Assert.assertEquals("2.5.7", referenceBean.getVersion());
161+
Assert.assertEquals("dubbo://127.0.0.1:12345", referenceBean.getUrl());
162162

163163
}
164164

0 commit comments

Comments
 (0)
⚡