grpc
/
grpc-go
mirror of https://github.com/grpc/grpc-go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

go vet: fix composite literal uses unkeyed fields (#2005)

This commit is contained in:
Menghan Li 2018-04-19 17:16:53 -07:00 committed by GitHub
parent d27df52a27
commit b4a36ce6a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
resolver_conn_wrapper_test.go
View File

@ -29,10 +29,10 @@ import (
func TestParseTarget(t *testing.T) { func TestParseTarget(t *testing.T) {
for _, test := range []resolver.Target{ for _, test := range []resolver.Target{
{"dns", "", "google.com"}, {Scheme: "dns", Authority: "", Endpoint: "google.com"},
{"dns", "a.server.com", "google.com"}, {Scheme: "dns", Authority: "a.server.com", Endpoint: "google.com"},
{"dns", "a.server.com", "google.com/?a=b"}, {Scheme: "dns", Authority: "a.server.com", Endpoint: "google.com/?a=b"},
{"passthrough", "", "/unix/socket/address"}, {Scheme: "passthrough", Authority: "", Endpoint: "/unix/socket/address"},
} { } {
str := test.Scheme + "://" + test.Authority + "/" + test.Endpoint str := test.Scheme + "://" + test.Authority + "/" + test.Endpoint
got := parseTarget(str) got := parseTarget(str)
@ -47,32 +47,32 @@ func TestParseTargetString(t *testing.T) {
targetStr string targetStr string
want resolver.Target want resolver.Target
}{ }{
{"", resolver.Target{"", "", ""}}, {targetStr: "", want: resolver.Target{Scheme: "", Authority: "", Endpoint: ""}},
{":///", resolver.Target{"", "", ""}}, {targetStr: ":///", want: resolver.Target{Scheme: "", Authority: "", Endpoint: ""}},
{"a:///", resolver.Target{"a", "", ""}}, {targetStr: "a:///", want: resolver.Target{Scheme: "a", Authority: "", Endpoint: ""}},
{"://a/", resolver.Target{"", "a", ""}}, {targetStr: "://a/", want: resolver.Target{Scheme: "", Authority: "a", Endpoint: ""}},
{":///a", resolver.Target{"", "", "a"}}, {targetStr: ":///a", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "a"}},
{"a://b/", resolver.Target{"a", "b", ""}}, {targetStr: "a://b/", want: resolver.Target{Scheme: "a", Authority: "b", Endpoint: ""}},
{"a:///b", resolver.Target{"a", "", "b"}}, {targetStr: "a:///b", want: resolver.Target{Scheme: "a", Authority: "", Endpoint: "b"}},
{"://a/b", resolver.Target{"", "a", "b"}}, {targetStr: "://a/b", want: resolver.Target{Scheme: "", Authority: "a", Endpoint: "b"}},
{"a://b/c", resolver.Target{"a", "b", "c"}}, {targetStr: "a://b/c", want: resolver.Target{Scheme: "a", Authority: "b", Endpoint: "c"}},
{"dns:///google.com", resolver.Target{"dns", "", "google.com"}}, {targetStr: "dns:///google.com", want: resolver.Target{Scheme: "dns", Authority: "", Endpoint: "google.com"}},
{"dns://a.server.com/google.com", resolver.Target{"dns", "a.server.com", "google.com"}}, {targetStr: "dns://a.server.com/google.com", want: resolver.Target{Scheme: "dns", Authority: "a.server.com", Endpoint: "google.com"}},
{"dns://a.server.com/google.com/?a=b", resolver.Target{"dns", "a.server.com", "google.com/?a=b"}}, {targetStr: "dns://a.server.com/google.com/?a=b", want: resolver.Target{Scheme: "dns", Authority: "a.server.com", Endpoint: "google.com/?a=b"}},
{"/", resolver.Target{"", "", "/"}}, {targetStr: "/", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "/"}},
{"google.com", resolver.Target{"", "", "google.com"}}, {targetStr: "google.com", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "google.com"}},
{"google.com/?a=b", resolver.Target{"", "", "google.com/?a=b"}}, {targetStr: "google.com/?a=b", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "google.com/?a=b"}},
{"/unix/socket/address", resolver.Target{"", "", "/unix/socket/address"}}, {targetStr: "/unix/socket/address", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "/unix/socket/address"}},
// If we can only parse part of the target. // If we can only parse part of the target.
{"://", resolver.Target{"", "", "://"}}, {targetStr: "://", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "://"}},
{"unix://domain", resolver.Target{"", "", "unix://domain"}}, {targetStr: "unix://domain", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "unix://domain"}},
{"a:b", resolver.Target{"", "", "a:b"}}, {targetStr: "a:b", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "a:b"}},
{"a/b", resolver.Target{"", "", "a/b"}}, {targetStr: "a/b", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "a/b"}},
{"a:/b", resolver.Target{"", "", "a:/b"}}, {targetStr: "a:/b", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "a:/b"}},
{"a//b", resolver.Target{"", "", "a//b"}}, {targetStr: "a//b", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "a//b"}},
{"a://b", resolver.Target{"", "", "a://b"}}, {targetStr: "a://b", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "a://b"}},
} { } {
got := parseTarget(test.targetStr) got := parseTarget(test.targetStr)
if got != test.want { if got != test.want {