Fix unit tests for name resolver provider returning null for the name resolver (#12621)
Fix unit tests that were meant to test the case of a registered provider
for a scheme returning null for the name resolver. The tests were
passing even with no provider registered for the passed Uri scheme.
diff --git a/api/src/test/java/io/grpc/NameResolverRegistryTest.java b/api/src/test/java/io/grpc/NameResolverRegistryTest.java
index 8191815..76976c3 100644
--- a/api/src/test/java/io/grpc/NameResolverRegistryTest.java
+++ b/api/src/test/java/io/grpc/NameResolverRegistryTest.java
@@ -100,23 +100,23 @@
public void newNameResolver_providerReturnsNull_ioGrpcUri() {
NameResolverRegistry registry = new NameResolverRegistry();
registry.register(
- new BaseProvider(true, 5, "noScheme") {
+ new BaseProvider(true, 5, ioGrpcUri.getScheme()) {
@Override
- public NameResolver newNameResolver(URI passedUri, NameResolver.Args passedArgs) {
+ public NameResolver newNameResolver(Uri passedUri, NameResolver.Args passedArgs) {
assertThat(passedUri).isSameInstanceAs(ioGrpcUri);
assertThat(passedArgs).isSameInstanceAs(args);
return null;
}
});
assertThat(registry.asFactory().newNameResolver(ioGrpcUri, args)).isNull();
- assertThat(registry.asFactory().getDefaultScheme()).isEqualTo("noScheme");
+ assertThat(registry.asFactory().getDefaultScheme()).isEqualTo(ioGrpcUri.getScheme());
}
@Test
public void newNameResolver_providerReturnsNull_javaNetUri() {
NameResolverRegistry registry = new NameResolverRegistry();
registry.register(
- new BaseProvider(true, 5, "noScheme") {
+ new BaseProvider(true, 5, javaNetUri.getScheme()) {
@Override
public NameResolver newNameResolver(URI passedUri, NameResolver.Args passedArgs) {
assertThat(passedUri).isSameInstanceAs(javaNetUri);
@@ -125,7 +125,7 @@
}
});
assertThat(registry.asFactory().newNameResolver(javaNetUri, args)).isNull();
- assertThat(registry.asFactory().getDefaultScheme()).isEqualTo("noScheme");
+ assertThat(registry.asFactory().getDefaultScheme()).isEqualTo(javaNetUri.getScheme());
}
@Test
