Fix test for metadata report (#121)
diff --git a/.travis.yml b/.travis.yml
index 95f5fe3..a321125 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,8 +16,8 @@
install: true
script:
- - ./mvnw --batch-mode --no-transfer-progress --settings .mvn/settings.xml clean install -pl dubbo-maven-address-plugin
- - ./mvnw --batch-mode --no-transfer-progress --settings .mvn/settings.xml clean verify -Pdubbo-integration-test -Djava-image.name=${JAVA_BASE_IMAGE} -Ddubbo.version=2.7.4-SNAPSHOT
+ - ./mvnw --batch-mode --no-transfer-progress --settings .mvn/settings.xml clean install -pl dubbo-maven-address-plugin -U
+ - ./mvnw --batch-mode --no-transfer-progress --settings .mvn/settings.xml clean verify -Pdubbo-integration-test -Djava-image.name=${JAVA_BASE_IMAGE} -Ddubbo.version=2.7.4-SNAPSHOT -U
after_success:
diff --git a/dubbo-samples-metadata-report/dubbo-samples-metadata-report-configcenter/src/test/java/org/apache/dubbo/samples/metadatareport/configcenter/MetadataIT.java b/dubbo-samples-metadata-report/dubbo-samples-metadata-report-configcenter/src/test/java/org/apache/dubbo/samples/metadatareport/configcenter/MetadataIT.java
index b0d87f0..dbf79bb 100644
--- a/dubbo-samples-metadata-report/dubbo-samples-metadata-report-configcenter/src/test/java/org/apache/dubbo/samples/metadatareport/configcenter/MetadataIT.java
+++ b/dubbo-samples-metadata-report/dubbo-samples-metadata-report-configcenter/src/test/java/org/apache/dubbo/samples/metadatareport/configcenter/MetadataIT.java
@@ -58,7 +58,7 @@
* "revision": "1.1.1",
* "application": "metadatareport-configcenter-provider",
* "dynamic": "true",
- * "register": "true",
+ * "register": null,
* "bean.name": "ServiceBean:org.apache.dubbo.samples.metadatareport.configcenter.api.AnnotationService:1.1.1:d-test",
* "group": "d-test",
* "anyhost": "true"
@@ -114,7 +114,6 @@
Assert.assertEquals("false", parameters.get("generic"));
Assert.assertEquals("metadatareport-configcenter-provider", parameters.get("application"));
Assert.assertEquals("true", parameters.get("dynamic"));
- Assert.assertEquals("true", parameters.get("register"));
Assert.assertEquals("true", parameters.get("anyhost"));
Assert.assertEquals(AnnotationService.class.getCanonicalName(), definition.getCanonicalName());
List<MethodDefinition> methods = definition.getMethods();
diff --git a/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-annotation/src/test/java/org/apache/dubbo/samples/metadatareport/local/annotation/MetadataIT.java b/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-annotation/src/test/java/org/apache/dubbo/samples/metadatareport/local/annotation/MetadataIT.java
index 4b82179..30c004a 100644
--- a/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-annotation/src/test/java/org/apache/dubbo/samples/metadatareport/local/annotation/MetadataIT.java
+++ b/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-annotation/src/test/java/org/apache/dubbo/samples/metadatareport/local/annotation/MetadataIT.java
@@ -56,7 +56,7 @@
* "revision": "1.1.8",
* "application": "metadatareport-local-annotaion-provider",
* "dynamic": "true",
- * "register": "true",
+ * "register": null,
* "bean.name": "ServiceBean:org.apache.dubbo.samples.metadatareport.local.annotation.api.AnnotationService:1.1.8:d-test",
* "group": "d-test",
* "anyhost": "true"
@@ -110,7 +110,6 @@
Assert.assertEquals("false", parameters.get("generic"));
Assert.assertEquals("metadatareport-local-annotaion-provider", parameters.get("application"));
Assert.assertEquals("true", parameters.get("dynamic"));
- Assert.assertEquals("true", parameters.get("register"));
Assert.assertEquals("true", parameters.get("anyhost"));
Assert.assertEquals(AnnotationService.class.getCanonicalName(), definition.getCanonicalName());
List<MethodDefinition> methods = definition.getMethods();
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 090b500..3e5a4ca 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
@@ -53,7 +53,7 @@
* "async": "true",
* "application": "metadatareport-local-properties-provider2",
* "dynamic": "true",
- * "register": "true",
+ * "register": null,
* "bean.name": "org.apache.dubbo.samples.metadatareport.local.properties.api.DemoService",
* "anyhost": "true"
* },
@@ -103,7 +103,6 @@
Assert.assertEquals("false", parameters.get("generic"));
Assert.assertEquals("metadatareport-local-properties-provider2", parameters.get("application"));
Assert.assertEquals("true", parameters.get("dynamic"));
- Assert.assertEquals("true", parameters.get("register"));
Assert.assertEquals("true", parameters.get("anyhost"));
Assert.assertEquals(DemoService.class.getCanonicalName(), definition.getCanonicalName());
List<MethodDefinition> methods = definition.getMethods();
diff --git a/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-xml/src/test/java/org/apache/dubbo/samples/metadatareport/local/xml/MetadataIT.java b/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-xml/src/test/java/org/apache/dubbo/samples/metadatareport/local/xml/MetadataIT.java
index 1313d83..1473eaa 100644
--- a/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-xml/src/test/java/org/apache/dubbo/samples/metadatareport/local/xml/MetadataIT.java
+++ b/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-xml/src/test/java/org/apache/dubbo/samples/metadatareport/local/xml/MetadataIT.java
@@ -53,7 +53,7 @@
* "generic": "false",
* "application": "metadatareport-local-xml-provider2",
* "dynamic": "true",
- * "register": "true",
+ * "register": null,
* "bean.name": "org.apache.dubbo.samples.metadatareport.local.xml.api.DemoService",
* "anyhost": "true"
* },
@@ -103,7 +103,6 @@
Assert.assertEquals("false", parameters.get("generic"));
Assert.assertEquals("metadatareport-local-xml-provider2", parameters.get("application"));
Assert.assertEquals("true", parameters.get("dynamic"));
- Assert.assertEquals("true", parameters.get("register"));
Assert.assertEquals("true", parameters.get("anyhost"));
Assert.assertEquals(DemoService.class.getCanonicalName(), definition.getCanonicalName());
List<MethodDefinition> methods = definition.getMethods();
diff --git a/dubbo-samples-multi-registry/src/main/resources/spring/multi-registry-consumer.xml b/dubbo-samples-multi-registry/src/main/resources/spring/multi-registry-consumer.xml
index a813ddb..6a5d94c 100644
--- a/dubbo-samples-multi-registry/src/main/resources/spring/multi-registry-consumer.xml
+++ b/dubbo-samples-multi-registry/src/main/resources/spring/multi-registry-consumer.xml
@@ -25,8 +25,8 @@
<dubbo:application name="multi-registry-consumer"/>
- <dubbo:registry id="beijingRegistry" address="zookeeper://${zookeeper.address:127.0.0.1}:2181" default="false"/>
- <dubbo:registry id="shanghaiRegistry" address="zookeeper://${zookeeper.address:127.0.0.1}:2182"/>
+ <dubbo:registry id="beijingRegistry" address="zookeeper://${zookeeper.address:127.0.0.1}:2181" default="false" />
+ <dubbo:registry id="shanghaiRegistry" address="zookeeper://${zookeeper.address:127.0.0.1}:2182" />
<dubbo:reference id="demoServiceFormDefault" interface="org.apache.dubbo.samples.multi.registry.api.DemoService"/>
<dubbo:reference id="demoServiceFormBeijing" interface="org.apache.dubbo.samples.multi.registry.api.DemoService"
diff --git a/dubbo-samples-multi-registry/src/main/resources/spring/multi-registry-provider.xml b/dubbo-samples-multi-registry/src/main/resources/spring/multi-registry-provider.xml
index a5aea12..eb57f08 100644
--- a/dubbo-samples-multi-registry/src/main/resources/spring/multi-registry-provider.xml
+++ b/dubbo-samples-multi-registry/src/main/resources/spring/multi-registry-provider.xml
@@ -26,7 +26,7 @@
<dubbo:application name="multi-registry-provider"/>
<dubbo:registry id="beijingRegistry" address="zookeeper://${zookeeper.address:127.0.0.1}:2181" default="false"/>
- <dubbo:registry id="shanghaiRegistry" address="zookeeper://${zookeeper.address:127.0.0.1}:2182"/>
+ <dubbo:registry id="shanghaiRegistry" address="zookeeper://${zookeeper.address:127.0.0.1}:2182" />
<dubbo:protocol name="dubbo" port="20890"/>
@@ -35,6 +35,7 @@
<dubbo:service interface="org.apache.dubbo.samples.multi.registry.api.HelloService" ref="helloService"
registry="shanghaiRegistry,beijingRegistry"/>
- <dubbo:service interface="org.apache.dubbo.samples.multi.registry.api.DemoService" ref="demoService"/>
+ <dubbo:service interface="org.apache.dubbo.samples.multi.registry.api.DemoService" ref="demoService"
+ registry="shanghaiRegistry,beijingRegistry"/>
</beans>
