This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.0 by this push:
new 44f2f6b [3.0] Add tests for reference tag attribute (#8113)
44f2f6b is described below
commit 44f2f6b0d7de00c2b892d150e6ef97010847f643
Author: Gong Dewei <[email protected]>
AuthorDate: Wed Jun 23 10:46:56 2021 +0800
[3.0] Add tests for reference tag attribute (#8113)
* Add tests for reference tag attribute
* Increase shutdown timeout
* Improve ShutdownTelnetHandlerTest
---
.../src/test/java/org/apache/dubbo/config/spring/ConfigTest.java | 1 +
.../annotation/ReferenceAnnotationBeanPostProcessorTest.java | 8 ++++++--
.../resources/org/apache/dubbo/config/spring/init-reference.xml | 4 ++--
.../org/apache/dubbo/qos/legacy/ShutdownTelnetHandlerTest.java | 3 ++-
4 files changed, 11 insertions(+), 5 deletions(-)
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 d7274ba..bfc9217 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
@@ -488,6 +488,7 @@ public class ConfigTest {
ReferenceConfig referenceConfig =
referenceBean.getReferenceConfig();
// reference parameters
Assertions.assertNotNull(referenceConfig.getParameters().get("connec.timeout"));
+ Assertions.assertEquals("demo_tag", referenceConfig.getTag());
//methods
Assertions.assertEquals(1,
referenceConfig.getMethods().size());
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 72d939e..ec301e6 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
@@ -124,7 +124,7 @@ public class ReferenceAnnotationBeanPostProcessorTest {
private HelloService helloService;
// #5 ReferenceBean (Field Injection #3)
- @DubboReference(version = "2", url = "dubbo://127.0.0.1:12345?version=2")
+ @DubboReference(version = "2", url = "dubbo://127.0.0.1:12345?version=2",
tag = "demo_tag")
private HelloService helloService2;
@@ -276,7 +276,11 @@ public class ReferenceAnnotationBeanPostProcessorTest {
Assertions.assertEquals(demoServiceFromParentReferenceBean.getKey(),
demoServiceReferenceBean.getKey());
Assertions.assertEquals(demoServiceFromParentReferenceBean.getReferenceConfig(),
demoServiceReferenceBean.getReferenceConfig());
-
Assertions.assertNotNull(referenceBeanManager.getById("helloService2"));
+ ReferenceBean helloService2Bean =
referenceBeanManager.getById("helloService2");
+ Assertions.assertNotNull(helloService2Bean);
+ Assertions.assertNotNull(helloService2Bean.getReferenceConfig());
+ Assertions.assertEquals("demo_tag",
helloService2Bean.getReferenceConfig().getTag());
+
Assertions.assertNotNull(referenceBeanManager.getById("myDemoService"));
}
diff --git
a/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/init-reference.xml
b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/init-reference.xml
index 63ff2b6..962ff19 100644
---
a/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/init-reference.xml
+++
b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/init-reference.xml
@@ -37,7 +37,7 @@
<!-- service reference configuration -->
<dubbo:reference id="demoService"
interface="org.apache.dubbo.config.spring.api.DemoService" group="demo"
version="1.2.3"
url="dubbo://127.0.0.1:20813" init="true"
timeout="${call.timeout:foo100}"
- scope="remote" protocol="dubbo" registry="my-registry"
consumer="my-consumer" >
+ scope="remote" protocol="dubbo" registry="my-registry"
consumer="my-consumer" tag="demo_tag" >
<dubbo:parameter key="connec.timeout"
value="${connection.timeout:foo1000}"/>
<dubbo:method name="sayName" retry="${sayName.retry:foo-retry}"
oninvoke="notifyService.onInvoke"
onreturn="notifyService.onReturn"
onthrow="notifyService.onThrow">
@@ -45,4 +45,4 @@
<dubbo:parameter key="access-token" value="my-token" />
</dubbo:method>
</dubbo:reference>
-</beans>
\ No newline at end of file
+</beans>
diff --git
a/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/legacy/ShutdownTelnetHandlerTest.java
b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/legacy/ShutdownTelnetHandlerTest.java
index f86ff1c..7e8ccd6 100644
---
a/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/legacy/ShutdownTelnetHandlerTest.java
+++
b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/legacy/ShutdownTelnetHandlerTest.java
@@ -50,7 +50,8 @@ public class ShutdownTelnetHandlerTest {
long start = System.currentTimeMillis();
String result = handler.telnet(mockChannel, "-t " + sleepTime);
long end = System.currentTimeMillis();
- assertTrue(result.contains("Application has shutdown successfully") &&
(end - start) > sleepTime);
+ assertTrue(result.contains("Application has shutdown successfully"),
result);
+ assertTrue((end - start) > sleepTime, "sleepTime: " + sleepTime + ",
execTime: " + (end - start));
}
