fix more unit tests

sanjaypujare · Oct 5, 2023 · 6a1093b · 6a1093b
1 parent da667a9
commit 6a1093b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/api/src/main/java/io/grpc/ManagedChannelRegistry.java b/api/src/main/java/io/grpc/ManagedChannelRegistry.java
@@ -24,7 +24,6 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.logging.Level;
@@ -162,7 +161,7 @@ ManagedChannelBuilder<?> newChannelBuilder(NameResolverRegistry nameResolverRegi
         .getNameResolverProvider(nameResolverRegistry, target);
 
     Collection<Class<? extends SocketAddress>> nameResolverSocketAddressTypes
-      = (nameResolverProvider != null)
+        = (nameResolverProvider != null)
         ? nameResolverProvider.getProducedSocketAddressTypes() :
         Collections.emptySet();
     List<ManagedChannelProvider> providers = providers();

diff --git a/api/src/test/java/io/grpc/NameResolverRegistryTest.java b/api/src/test/java/io/grpc/NameResolverRegistryTest.java
@@ -203,12 +203,14 @@ public void newNameResolver_noProvider() {
   public void baseProviders() {
     Map<String, NameResolverProvider> providers =
             NameResolverRegistry.getDefaultRegistry().providers();
-    assertThat(providers).hasSize(1);
+    assertThat(providers).hasSize(2);
     // 2 name resolvers from grpclb and core, higher priority one is returned.
     assertThat(providers.get("dns").getClass().getName())
         .isEqualTo("io.grpc.grpclb.SecretGrpclbNameResolverProvider$Provider");
     assertThat(NameResolverRegistry.getDefaultRegistry().asFactory().getDefaultScheme())
         .isEqualTo("dns");
+    assertThat(providers.get("inprocess").getClass().getName())
+        .isEqualTo("io.grpc.inprocess.InProcessNameResolverProvider");
   }
 
   @Test

diff --git a/core/src/main/java/io/grpc/internal/ManagedChannelImpl.java b/core/src/main/java/io/grpc/internal/ManagedChannelImpl.java
@@ -718,8 +718,8 @@ private static NameResolver getNameResolver(
         = nameResolverProvider.getProducedSocketAddressTypes();
     if (!channelTransportSocketAddressTypes.containsAll(nameResolverSocketAddressTypes)) {
       throw new IllegalArgumentException(String.format(
-          "Address types of NameResolver '%s' for '%s' not supported by transport address types %s, nameResolverAddressTypes are %s",
-          nameResolverProvider.getDefaultScheme(), target, channelTransportSocketAddressTypes, nameResolverSocketAddressTypes));
+          "Address types of NameResolver '%s' for '%s' not supported by transport",
+          nameResolverProvider.getDefaultScheme(), target));
     }
     // Finding a NameResolver. Try using the target string as the URI. If that fails, try prepending
     // "dns:///".