@@ -25,23 +25,11 @@ import (
2525 "google.golang.org/grpc/internal"
2626 "google.golang.org/grpc/resolver"
2727
28- _ "google.golang.org/grpc/internal/resolver/dns" // Register the default (dns) resolver for fallback tests.
28+ // Register resolvers used by the validation tests.
29+ _ "google.golang.org/grpc/internal/resolver/dns"
30+ _ "google.golang.org/grpc/internal/resolver/passthrough"
2931)
3032
31- // testResolverBuilder is a minimal resolver.Builder used only to register
32- // schemes for ValidateTargetURI tests.
33- type testResolverBuilder struct { scheme string }
34-
35- func (b * testResolverBuilder ) Build (resolver.Target , resolver.ClientConn , resolver.BuildOptions ) (resolver.Resolver , error ) {
36- return nil , nil
37- }
38-
39- func (b * testResolverBuilder ) Scheme () string { return b .scheme }
40-
41- func init () {
42- resolver .Register (& testResolverBuilder {scheme : "iresolver-test" })
43- }
44-
4533func TestValidateTargetURI (t * testing.T ) {
4634 tests := []struct {
4735 desc string
@@ -50,12 +38,12 @@ func TestValidateTargetURI(t *testing.T) {
5038 }{
5139 {
5240 desc : "registered scheme with authority and endpoint" ,
53- target : "iresolver-test :///endpoint" ,
41+ target : "dns :///endpoint" ,
5442 wantErr : false ,
5543 },
5644 {
5745 desc : "uppercase registered scheme is canonicalized to lowercase" ,
58- target : "IRESOLVER-TEST :///endpoint" ,
46+ target : "DNS :///endpoint" ,
5947 wantErr : false ,
6048 },
6149 {
@@ -75,7 +63,7 @@ func TestValidateTargetURI(t *testing.T) {
7563 },
7664 {
7765 desc : "registered-scheme opaque form falls back to default scheme" ,
78- target : "iresolver-test :endpoint" ,
66+ target : "dns :endpoint" ,
7967 wantErr : false ,
8068 },
8169 {
@@ -119,7 +107,7 @@ func TestValidateTargetURI(t *testing.T) {
119107
120108func TestValidateTargetURI_UserSetDefaultScheme (t * testing.T ) {
121109 oldDefaultScheme := resolver .GetDefaultScheme ()
122- resolver .SetDefaultScheme ("iresolver-test " )
110+ resolver .SetDefaultScheme ("passthrough " )
123111 defer func () {
124112 // Reset the default scheme as though it was never set by the user.
125113 resolver .SetDefaultScheme (oldDefaultScheme )
0 commit comments