Add test for GrpclbNameResolver

grpc · Feb 20, 2020 · 446f3d2 · 446f3d2
1 parent a28394f
commit 446f3d2
Show file tree

Hide file tree

Showing 4 changed files with 348 additions and 7 deletions.
diff --git a/core/src/main/java/io/grpc/internal/DnsNameResolver.java b/core/src/main/java/io/grpc/internal/DnsNameResolver.java
@@ -532,11 +532,12 @@ private static long getNetworkAddressCacheTtlNanos(boolean isAndroid) {
   /**
    * Describes a parsed SRV record.
    */
-  protected static final class SrvRecord {
+  @VisibleForTesting
+  public static final class SrvRecord {
     public final String host;
     public final int port;
 
-    SrvRecord(String host, int port) {
+    public SrvRecord(String host, int port) {
       this.host = host;
       this.port = port;
     }
@@ -569,12 +570,12 @@ public String toString() {
   }
 
   @VisibleForTesting
-  void setAddressResolver(AddressResolver addressResolver) {
+  protected void setAddressResolver(AddressResolver addressResolver) {
     this.addressResolver = addressResolver;
   }
 
   @VisibleForTesting
-  void setResourceResolver(ResourceResolver resourceResolver) {
+  protected void setResourceResolver(ResourceResolver resourceResolver) {
     this.resourceResolver.set(resourceResolver);
   }
 
@@ -600,7 +601,8 @@ interface ResourceResolverFactory {
   /**
    * AddressResolver resolves a hostname into a list of addresses.
    */
-  protected interface AddressResolver {
+  @VisibleForTesting
+  public interface AddressResolver {
     List<InetAddress> resolveAddress(String host) throws Exception;
   }
 
@@ -616,7 +618,8 @@ public List<InetAddress> resolveAddress(String host) throws UnknownHostException
   /**
    * {@link ResourceResolver} is a Dns ResourceRecord resolver.
    */
-  protected interface ResourceResolver {
+  @VisibleForTesting
+  public interface ResourceResolver {
     List<String> resolveTxt(String host) throws Exception;
 
     List<SrvRecord> resolveSrv(String host) throws Exception;

diff --git a/core/src/main/java/io/grpc/internal/GrpcAttributes.java b/core/src/main/java/io/grpc/internal/GrpcAttributes.java
@@ -21,7 +21,6 @@
 import io.grpc.Grpc;
 import io.grpc.NameResolver;
 import io.grpc.SecurityLevel;
-import java.util.List;
 import java.util.Map;
 
 /**

diff --git a/grpclb/src/main/java/io/grpc/grpclb/GrpclbNameResolver.java b/grpclb/src/main/java/io/grpc/grpclb/GrpclbNameResolver.java
@@ -16,6 +16,7 @@
 
 package io.grpc.grpclb;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Stopwatch;
 import io.grpc.Attributes;
 import io.grpc.EquivalentAddressGroup;
@@ -140,4 +141,27 @@ private List<EquivalentAddressGroup> resolveBalancerAddresses() {
     }
     return Collections.unmodifiableList(balancerAddresses);
   }
+
+  @VisibleForTesting
+  @Override
+  protected void setAddressResolver(AddressResolver addressResolver) {
+    super.setAddressResolver(addressResolver);
+  }
+
+  @VisibleForTesting
+  @Override
+  protected void setResourceResolver(ResourceResolver resourceResolver) {
+    super.setResourceResolver(resourceResolver);
+  }
+
+  @VisibleForTesting
+  @Override
+  protected String getHost() {
+    return super.getHost();
+  }
+
+  @VisibleForTesting
+  static void setEnableTxt(boolean enableTxt) {
+    DnsNameResolver.enableTxt = enableTxt;
+  }
 }