Skip to content

Commit e636df5

Browse files
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.
1 parent 02cb1de commit e636df5

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

api/src/test/java/io/grpc/NameResolverRegistryTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,23 +100,23 @@ public void getDefaultScheme_noProvider() {
100100
public void newNameResolver_providerReturnsNull_ioGrpcUri() {
101101
NameResolverRegistry registry = new NameResolverRegistry();
102102
registry.register(
103-
new BaseProvider(true, 5, "noScheme") {
103+
new BaseProvider(true, 5, ioGrpcUri.getScheme()) {
104104
@Override
105-
public NameResolver newNameResolver(URI passedUri, NameResolver.Args passedArgs) {
105+
public NameResolver newNameResolver(Uri passedUri, NameResolver.Args passedArgs) {
106106
assertThat(passedUri).isSameInstanceAs(ioGrpcUri);
107107
assertThat(passedArgs).isSameInstanceAs(args);
108108
return null;
109109
}
110110
});
111111
assertThat(registry.asFactory().newNameResolver(ioGrpcUri, args)).isNull();
112-
assertThat(registry.asFactory().getDefaultScheme()).isEqualTo("noScheme");
112+
assertThat(registry.asFactory().getDefaultScheme()).isEqualTo(ioGrpcUri.getScheme());
113113
}
114114

115115
@Test
116116
public void newNameResolver_providerReturnsNull_javaNetUri() {
117117
NameResolverRegistry registry = new NameResolverRegistry();
118118
registry.register(
119-
new BaseProvider(true, 5, "noScheme") {
119+
new BaseProvider(true, 5, javaNetUri.getScheme()) {
120120
@Override
121121
public NameResolver newNameResolver(URI passedUri, NameResolver.Args passedArgs) {
122122
assertThat(passedUri).isSameInstanceAs(javaNetUri);
@@ -125,7 +125,7 @@ public NameResolver newNameResolver(URI passedUri, NameResolver.Args passedArgs)
125125
}
126126
});
127127
assertThat(registry.asFactory().newNameResolver(javaNetUri, args)).isNull();
128-
assertThat(registry.asFactory().getDefaultScheme()).isEqualTo("noScheme");
128+
assertThat(registry.asFactory().getDefaultScheme()).isEqualTo(javaNetUri.getScheme());
129129
}
130130

131131
@Test

0 commit comments

Comments
 (0)