You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@dubbo.apache.org by al...@apache.org on 2021/04/01 11:21:24 UTC
[dubbo-samples] branch master updated: Improve consumer metadata
checking tests compatible with dubbo 3 (#294)
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git
The following commit(s) were added to refs/heads/master by this push:
new 31be929 Improve consumer metadata checking tests compatible with dubbo 3 (#294)
31be929 is described below
commit 31be929161882e640c1da8a7cfa40af2f6f93c9c
Author: Gong Dewei <ky...@qq.com>
AuthorDate: Thu Apr 1 19:21:14 2021 +0800
Improve consumer metadata checking tests compatible with dubbo 3 (#294)
* set reference init to true, make sure init it in dubbo starting
* fix error when run testWithoutRule after testWithAppRuleWithSufficientTimeout
---
.../configcenter/action/AnnotationAction.java | 2 +-
.../local/annotation/action/AnnotationAction.java | 2 +-
.../main/resources/spring/metadata-consumer.xml | 2 +-
.../local/properties/MetadataIT.java | 1 +
.../main/resources/spring/metadata-consumer.xml | 2 +-
.../dubbo/samples/governance/DemoServiceIT.java | 29 +++++++++++-----------
.../annotation/action/AnnotationAction.java | 2 +-
.../main/resources/spring/simplified-consumer.xml | 2 +-
.../main/resources/spring/simplified-consumer.xml | 2 +-
.../main/resources/spring/simplified-consumer.xml | 2 +-
10 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/dubbo-samples-metadata-report/dubbo-samples-metadata-report-configcenter/src/main/java/org/apache/dubbo/samples/metadatareport/configcenter/action/AnnotationAction.java b/dubbo-samples-metadata-report/dubbo-samples-metadata-report-configcenter/src/main/java/org/apache/dubbo/samples/metadatareport/configcenter/action/AnnotationAction.java
index 642bf56..cd79919 100644
--- a/dubbo-samples-metadata-report/dubbo-samples-metadata-report-configcenter/src/main/java/org/apache/dubbo/samples/metadatareport/configcenter/action/AnnotationAction.java
+++ b/dubbo-samples-metadata-report/dubbo-samples-metadata-report-configcenter/src/main/java/org/apache/dubbo/samples/metadatareport/configcenter/action/AnnotationAction.java
@@ -27,7 +27,7 @@ import org.springframework.stereotype.Component;
@Component("annotationAction")
public class AnnotationAction {
- @Reference(version = "1.1.1", group = "d-test")
+ @Reference(version = "1.1.1", group = "d-test", init = true)
private AnnotationService annotationService;
public String doSayHello(String name) {
diff --git a/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-annotation/src/main/java/org/apache/dubbo/samples/metadatareport/local/annotation/action/AnnotationAction.java b/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-annotation/src/main/java/org/apache/dubbo/samples/metadatareport/local/annotation/action/AnnotationAction.java
index a24a8cd..677e458 100644
--- a/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-annotation/src/main/java/org/apache/dubbo/samples/metadatareport/local/annotation/action/AnnotationAction.java
+++ b/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-annotation/src/main/java/org/apache/dubbo/samples/metadatareport/local/annotation/action/AnnotationAction.java
@@ -27,7 +27,7 @@ import org.springframework.stereotype.Component;
@Component("annotationAction")
public class AnnotationAction {
- @Reference(version = "1.1.8", group = "d-test")
+ @Reference(version = "1.1.8", group = "d-test", init = true)
private AnnotationService annotationService;
public String doSayHello(String name) {
diff --git a/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-properties/src/main/resources/spring/metadata-consumer.xml b/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-properties/src/main/resources/spring/metadata-consumer.xml
index 43373eb..04a7874 100644
--- a/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-properties/src/main/resources/spring/metadata-consumer.xml
+++ b/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-properties/src/main/resources/spring/metadata-consumer.xml
@@ -29,6 +29,6 @@
<dubbo:metadata-report address="zookeeper://${zookeeper.address:127.0.0.1}:2181"/>
- <dubbo:reference id="demoService"
+ <dubbo:reference id="demoService" init="true"
interface="org.apache.dubbo.samples.metadatareport.local.properties.api.DemoService"/>
</beans>
diff --git a/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-properties/src/test/java/org/apache/dubbo/samples/metadatareport/local/properties/MetadataIT.java b/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-properties/src/test/java/org/apache/dubbo/samples/metadatareport/local/properties/MetadataIT.java
index 2f69ff3..42f5c93 100644
--- a/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-properties/src/test/java/org/apache/dubbo/samples/metadatareport/local/properties/MetadataIT.java
+++ b/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-properties/src/test/java/org/apache/dubbo/samples/metadatareport/local/properties/MetadataIT.java
@@ -131,6 +131,7 @@ public class MetadataIT {
*/
@Test
public void testConsumerMetadata() throws Exception {
+
//wait for consumer metadata report finish
Thread.sleep(1000);
diff --git a/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-xml/src/main/resources/spring/metadata-consumer.xml b/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-xml/src/main/resources/spring/metadata-consumer.xml
index 1da0837..90bcc53 100644
--- a/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-xml/src/main/resources/spring/metadata-consumer.xml
+++ b/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-xml/src/main/resources/spring/metadata-consumer.xml
@@ -30,6 +30,6 @@
<dubbo:metadata-report address="zookeeper://${zookeeper.address:127.0.0.1}:2181" group="dubbo3" cycle-report="false"
retry-period="4590" sync-report="true" retry-times="23"/>
- <dubbo:reference id="demoService" interface="org.apache.dubbo.samples.metadatareport.local.xml.api.DemoService"/>
+ <dubbo:reference id="demoService" interface="org.apache.dubbo.samples.metadatareport.local.xml.api.DemoService" init="true"/>
</beans>
diff --git a/dubbo-samples-nacos/dubbo-samples-nacos-override/src/test/java/org/apache/dubbo/samples/governance/DemoServiceIT.java b/dubbo-samples-nacos/dubbo-samples-nacos-override/src/test/java/org/apache/dubbo/samples/governance/DemoServiceIT.java
index 9ac0a91..bc9b435 100644
--- a/dubbo-samples-nacos/dubbo-samples-nacos-override/src/test/java/org/apache/dubbo/samples/governance/DemoServiceIT.java
+++ b/dubbo-samples-nacos/dubbo-samples-nacos-override/src/test/java/org/apache/dubbo/samples/governance/DemoServiceIT.java
@@ -21,35 +21,36 @@ import org.apache.dubbo.rpc.RpcException;
import org.apache.dubbo.samples.governance.api.DemoService;
import org.apache.dubbo.samples.governance.util.NacosUtils;
import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/spring/dubbo-demo-consumer.xml"})
public class DemoServiceIT {
- @Autowired
- private DemoService demoService;
@Test(expected = RpcException.class)
- public void testWithoutRule() throws Exception {
- Thread.sleep(2000);
- demoService.sayHello("world", 3000);
+ public void testWithoutRule() throws Throwable {
+ ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("classpath:/spring/dubbo-demo-consumer.xml");
+ context.start();
+ try {
+ Thread.sleep(2000);
+ DemoService demoService = (DemoService) context.getBean("demoService");
+ demoService.sayHello("world", 3000);
+ } finally {
+ context.close();
+ }
}
@Test
public void testWithAppRuleWithSufficientTimeout() throws Throwable {
+ ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("classpath:/spring/dubbo-demo-consumer.xml");
+ context.start();
try {
NacosUtils.writeAppRule();
Thread.sleep(2000);
+ DemoService demoService = (DemoService) context.getBean("demoService");
Assert.assertTrue(demoService.sayHello("world", 1000).startsWith("Hello world"));
} finally {
NacosUtils.clearAppRule();
+ context.close();
}
}
}
diff --git a/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-annotation/src/main/java/org/apache/dubbo/samples/simplified/annotation/action/AnnotationAction.java b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-annotation/src/main/java/org/apache/dubbo/samples/simplified/annotation/action/AnnotationAction.java
index 33f67bd..f074409 100644
--- a/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-annotation/src/main/java/org/apache/dubbo/samples/simplified/annotation/action/AnnotationAction.java
+++ b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-annotation/src/main/java/org/apache/dubbo/samples/simplified/annotation/action/AnnotationAction.java
@@ -27,7 +27,7 @@ import org.springframework.stereotype.Component;
@Component("annotationAction")
public class AnnotationAction {
- @Reference(version = "1.1.8", group = "d-test", owner = "vvvanno", retries = 4, actives = 6, timeout = 4500)
+ @Reference(version = "1.1.8", group = "d-test", owner = "vvvanno", retries = 4, actives = 6, timeout = 4500, init = true)
private AnnotationService annotationService;
public String doSayHello(String name) {
diff --git a/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-nosimple/src/main/resources/spring/simplified-consumer.xml b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-nosimple/src/main/resources/spring/simplified-consumer.xml
index 9ff56df..6c2b79a 100644
--- a/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-nosimple/src/main/resources/spring/simplified-consumer.xml
+++ b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-nosimple/src/main/resources/spring/simplified-consumer.xml
@@ -31,5 +31,5 @@
check="true"/>
<dubbo:reference id="demoService" interface="org.apache.dubbo.samples.simplified.registry.nosimple.api.DemoService"
- owner="vvv" retries="4" actives="6" timeout="4500" version="1.2.3" group="dubbo-simple"/>
+ owner="vvv" retries="4" actives="6" timeout="4500" version="1.2.3" group="dubbo-simple" init="true"/>
</beans>
diff --git a/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/src/main/resources/spring/simplified-consumer.xml b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/src/main/resources/spring/simplified-consumer.xml
index 3cc449f..90fc7f0 100644
--- a/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/src/main/resources/spring/simplified-consumer.xml
+++ b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/src/main/resources/spring/simplified-consumer.xml
@@ -26,5 +26,5 @@
<dubbo:reference id="demoService"
interface="org.apache.dubbo.samples.simplified.registry.properties.api.DemoService"
- owner="vvv" retries="4" actives="6" timeout="4500" version="1.2.3" group="dubbo-simple"/>
+ owner="vvv" retries="4" actives="6" timeout="4500" version="1.2.3" group="dubbo-simple" init="true"/>
</beans>
diff --git a/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-xml/src/main/resources/spring/simplified-consumer.xml b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-xml/src/main/resources/spring/simplified-consumer.xml
index 303f3f6..73976ff 100644
--- a/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-xml/src/main/resources/spring/simplified-consumer.xml
+++ b/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-xml/src/main/resources/spring/simplified-consumer.xml
@@ -28,5 +28,5 @@
<dubbo:registry address="zookeeper://${zookeeper.address:127.0.0.1}:2181" check="true" simplified="true"/>
<dubbo:reference id="demoService" interface="org.apache.dubbo.samples.simplified.registry.xml.api.DemoService"
- owner="vvv" retries="4" actives="6" timeout="4500" version="1.2.3" group="dubbo-simple"/>
+ owner="vvv" retries="4" actives="6" timeout="4500" version="1.2.3" group="dubbo-simple" init="true"/>
</beans>
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org