[incubator-servicecomb-java-chassis] 04/04: SCB-315 add common AddressResover configuration to foundation-vertx, and use it in service-registry and config-cc to support dynamic config by user

[ni...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git

commit 99861e106925e7117737bef8a15da29099f28e98
Author: jeho0815 <je...@email.com>
AuthorDate: Tue Jan 30 09:07:10 2018 +0800

    SCB-315 add common AddressResover configuration to foundation-vertx, and use it in service-registry and config-cc to support dynamic config by user
---
 ...stAddressResoverConfig.java => TestAddressResolverConfig.java} | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/TestAddressResoverConfig.java b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/TestAddressResolverConfig.java
similarity index 91%
rename from foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/TestAddressResoverConfig.java
rename to foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/TestAddressResolverConfig.java
index 08d6afa..0163f60 100644
--- a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/TestAddressResoverConfig.java
+++ b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/TestAddressResolverConfig.java
@@ -29,7 +29,7 @@ import org.junit.Test;
 
 import io.vertx.core.dns.AddressResolverOptions;
 
-public class TestAddressResoverConfig {
+public class TestAddressResolverConfig {
 
   @BeforeClass
   public static void classSetup() {
@@ -62,9 +62,11 @@ public class TestAddressResoverConfig {
     ArchaiusUtils.setProperty("addressResolver.rotateServers", true);
     AddressResolverOptions aroc = AddressResolverConfig.getAddressResover("test");
     Assert.assertThat(aroc.getServers(), is(Arrays.asList("8.8.8.8", "8.8.4.4")));
-    Assert.assertEquals("test.svc.local.cluster", aroc.getSearchDomains().get(0));
+    Assert.assertThat(aroc.getSearchDomains(),
+        is(Arrays.asList("test.svc.local.cluster", "svc.local.cluster", "local.cluster")));
     AddressResolverOptions aroc1 = AddressResolverConfig.getAddressResover("test1");
-    Assert.assertEquals("default.svc.local.cluster", aroc1.getSearchDomains().get(0));
+    Assert.assertThat(aroc1.getSearchDomains(),
+        is(Arrays.asList("default.svc.local.cluster", "svc.local.cluster", "local.cluster")));
   }
 
   @Test

-- 
To stop receiving notification emails like this one, please contact
ningjiang@apache.org.