working on test

Author: ejona86

xds/src/main/java/io/grpc/xds/ClusterResolverLoadBalancer.java

@@ -19,7 +19,6 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 import static io.grpc.xds.XdsLbPolicies.PRIORITY_POLICY_NAME;
 
-import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableMap;
 import io.grpc.Attributes;
 import io.grpc.EquivalentAddressGroup;
@@ -73,11 +72,6 @@ final class ClusterResolverLoadBalancer extends LoadBalancer {
   private final LoadBalancer delegate;
   private ClusterState clusterState;
 
-  ClusterResolverLoadBalancer(Helper helper) {
-    this(helper, LoadBalancerRegistry.getDefaultRegistry());
-  }
-
-  @VisibleForTesting
   ClusterResolverLoadBalancer(Helper helper, LoadBalancerRegistry lbRegistry) {
     this.delegate = lbRegistry.getProvider(PRIORITY_POLICY_NAME).newLoadBalancer(helper);
     this.lbRegistry = checkNotNull(lbRegistry, "lbRegistry");

xds/src/main/java/io/grpc/xds/ClusterResolverLoadBalancerProvider.java

@@ -25,6 +25,7 @@
 import io.grpc.LoadBalancer;
 import io.grpc.LoadBalancer.Helper;
 import io.grpc.LoadBalancerProvider;
+import io.grpc.LoadBalancerRegistry;
 import io.grpc.NameResolver.ConfigOrError;
 import io.grpc.Status;
 import io.grpc.xds.EnvoyServerProtoData.OutlierDetection;
@@ -41,6 +42,15 @@
  */
 @Internal
 public final class ClusterResolverLoadBalancerProvider extends LoadBalancerProvider {
+  private final LoadBalancerRegistry lbRegistry;
+
+  public ClusterResolverLoadBalancerProvider() {
+    this.lbRegistry = null;
+  }
+
+  ClusterResolverLoadBalancerProvider(LoadBalancerRegistry lbRegistry) {
+    this.lbRegistry = checkNotNull(lbRegistry, "lbRegistry");
+  }
 
   @Override
   public boolean isAvailable() {
@@ -65,7 +75,11 @@ public ConfigOrError parseLoadBalancingPolicyConfig(Map<String, ?> rawLoadBalanc
 
   @Override
   public LoadBalancer newLoadBalancer(Helper helper) {
-    return new ClusterResolverLoadBalancer(helper);
+    LoadBalancerRegistry lbRegistry = this.lbRegistry;
+    if (lbRegistry == null) {
+      lbRegistry = LoadBalancerRegistry.getDefaultRegistry();
+    }
+    return new ClusterResolverLoadBalancer(helper, lbRegistry);
   }
 
   static final class ClusterResolverConfig {