This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
commit cedba72024848fa3ceae1d1e6f89e6960b284fb5 Author: ken.lj <[email protected]> AuthorDate: Sun Dec 23 21:46:06 2018 +0800 fix UT --- .../dubbo/rpc/cluster/configurator/parser/ConfigParserTest.java | 6 +----- dubbo-cluster/src/test/resources/AppAnyServices.yml | 2 +- dubbo-cluster/src/test/resources/AppMultiServices.yml | 2 +- dubbo-cluster/src/test/resources/AppNoService.yml | 2 +- dubbo-cluster/src/test/resources/ConsumerSpecificProviders.yml | 2 +- dubbo-cluster/src/test/resources/ServiceGroupVersion.yml | 2 +- dubbo-cluster/src/test/resources/ServiceMultiApps.yml | 2 +- dubbo-cluster/src/test/resources/ServiceNoApp.yml | 2 +- dubbo-cluster/src/test/resources/ServiceNoRule.yml | 2 +- 9 files changed, 9 insertions(+), 13 deletions(-) diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/ConfigParserTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/ConfigParserTest.java index 809437f..0c365c0 100644 --- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/ConfigParserTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/ConfigParserTest.java @@ -107,17 +107,13 @@ public class ConfigParserTest { String yamlFile = streamToString(yamlStream); List<URL> urls = ConfigParser.parseConfigurators(yamlFile); Assert.assertNotNull(urls); - Assert.assertEquals(2, urls.size()); + Assert.assertEquals(4, urls.size()); URL url = urls.get(0); Assert.assertEquals("127.0.0.1", url.getAddress()); Assert.assertEquals("service1", url.getServiceInterface()); Assert.assertEquals(6666, url.getParameter(Constants.TIMEOUT_KEY, 0)); Assert.assertEquals("random", url.getParameter(Constants.LOADBALANCE_KEY)); Assert.assertEquals(url.getParameter(Constants.APPLICATION_KEY), "demo-consumer"); - - List<URL> urls2 = ConfigParser.parseConfigurators(yamlFile); - Assert.assertNotNull(urls2); - Assert.assertEquals(0, urls2.size()); } diff --git a/dubbo-cluster/src/test/resources/AppAnyServices.yml b/dubbo-cluster/src/test/resources/AppAnyServices.yml index 947faea..e1b401c 100644 --- a/dubbo-cluster/src/test/resources/AppAnyServices.yml +++ b/dubbo-cluster/src/test/resources/AppAnyServices.yml @@ -19,7 +19,7 @@ # Application scope, apply to all services. --- -apiVersion: v2.7 +configVersion: v2.7 scope: application key: demo-consumer configs: diff --git a/dubbo-cluster/src/test/resources/AppMultiServices.yml b/dubbo-cluster/src/test/resources/AppMultiServices.yml index f7f9098..bc6d6bc 100644 --- a/dubbo-cluster/src/test/resources/AppMultiServices.yml +++ b/dubbo-cluster/src/test/resources/AppMultiServices.yml @@ -19,7 +19,7 @@ # Application scope, apply to the specified services --- -apiVersion: v2.7 +configVersion: v2.7 scope: application key: demo-consumer configs: diff --git a/dubbo-cluster/src/test/resources/AppNoService.yml b/dubbo-cluster/src/test/resources/AppNoService.yml index ee8dca3..4b6a236 100644 --- a/dubbo-cluster/src/test/resources/AppNoService.yml +++ b/dubbo-cluster/src/test/resources/AppNoService.yml @@ -19,7 +19,7 @@ # Application scope, no service means apply to all --- -apiVersion: v2.7 +configVersion: v2.7 scope: application key: demo-consumer configs: diff --git a/dubbo-cluster/src/test/resources/ConsumerSpecificProviders.yml b/dubbo-cluster/src/test/resources/ConsumerSpecificProviders.yml index 1e9be4f..2da6a22 100644 --- a/dubbo-cluster/src/test/resources/ConsumerSpecificProviders.yml +++ b/dubbo-cluster/src/test/resources/ConsumerSpecificProviders.yml @@ -19,7 +19,7 @@ # Application scope, no service means apply to all --- -apiVersion: v2.7 +configVersion: v2.7 scope: application key: demo-consumer configs: diff --git a/dubbo-cluster/src/test/resources/ServiceGroupVersion.yml b/dubbo-cluster/src/test/resources/ServiceGroupVersion.yml index 1c09d0d..6d48c5c 100644 --- a/dubbo-cluster/src/test/resources/ServiceGroupVersion.yml +++ b/dubbo-cluster/src/test/resources/ServiceGroupVersion.yml @@ -19,7 +19,7 @@ # Service scope, without any app --- -apiVersion: v2.7 +configVersion: v2.7 scope: service key: testgroup/servicekey:1.0.0 configs: diff --git a/dubbo-cluster/src/test/resources/ServiceMultiApps.yml b/dubbo-cluster/src/test/resources/ServiceMultiApps.yml index 6cf3a19..43ed62a 100644 --- a/dubbo-cluster/src/test/resources/ServiceMultiApps.yml +++ b/dubbo-cluster/src/test/resources/ServiceMultiApps.yml @@ -19,7 +19,7 @@ # Service scope, with multiple apps --- -apiVersion: v2.7 +configVersion: v2.7 scope: service key: serviceKey configs: diff --git a/dubbo-cluster/src/test/resources/ServiceNoApp.yml b/dubbo-cluster/src/test/resources/ServiceNoApp.yml index 1a5f191..5009c61 100644 --- a/dubbo-cluster/src/test/resources/ServiceNoApp.yml +++ b/dubbo-cluster/src/test/resources/ServiceNoApp.yml @@ -19,7 +19,7 @@ # Service scope, without any app --- -apiVersion: v2.7 +configVersion: v2.7 scope: service key: serviceKey configs: diff --git a/dubbo-cluster/src/test/resources/ServiceNoRule.yml b/dubbo-cluster/src/test/resources/ServiceNoRule.yml index 7dd21fe..b320878 100644 --- a/dubbo-cluster/src/test/resources/ServiceNoRule.yml +++ b/dubbo-cluster/src/test/resources/ServiceNoRule.yml @@ -19,7 +19,7 @@ # Service scope, without specific App --- -apiVersion: v2.7 +configVersion: v2.7 scope: service key: serviceKey configs:
