From b4a36ce6a6454c6117daa5841f22ef3b000024e6 Mon Sep 17 00:00:00 2001 From: Menghan Li Date: Thu, 19 Apr 2018 17:16:53 -0700 Subject: [PATCH] go vet: fix composite literal uses unkeyed fields (#2005) --- resolver_conn_wrapper_test.go | 54 +++++++++++++++++------------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/resolver_conn_wrapper_test.go b/resolver_conn_wrapper_test.go index 1109804ba..6f1367a2c 100644 --- a/resolver_conn_wrapper_test.go +++ b/resolver_conn_wrapper_test.go @@ -29,10 +29,10 @@ import ( func TestParseTarget(t *testing.T) { for _, test := range []resolver.Target{ - {"dns", "", "google.com"}, - {"dns", "a.server.com", "google.com"}, - {"dns", "a.server.com", "google.com/?a=b"}, - {"passthrough", "", "/unix/socket/address"}, + {Scheme: "dns", Authority: "", Endpoint: "google.com"}, + {Scheme: "dns", Authority: "a.server.com", Endpoint: "google.com"}, + {Scheme: "dns", Authority: "a.server.com", Endpoint: "google.com/?a=b"}, + {Scheme: "passthrough", Authority: "", Endpoint: "/unix/socket/address"}, } { str := test.Scheme + "://" + test.Authority + "/" + test.Endpoint got := parseTarget(str) @@ -47,32 +47,32 @@ func TestParseTargetString(t *testing.T) { targetStr string want resolver.Target }{ - {"", resolver.Target{"", "", ""}}, - {":///", resolver.Target{"", "", ""}}, - {"a:///", resolver.Target{"a", "", ""}}, - {"://a/", resolver.Target{"", "a", ""}}, - {":///a", resolver.Target{"", "", "a"}}, - {"a://b/", resolver.Target{"a", "b", ""}}, - {"a:///b", resolver.Target{"a", "", "b"}}, - {"://a/b", resolver.Target{"", "a", "b"}}, - {"a://b/c", resolver.Target{"a", "b", "c"}}, - {"dns:///google.com", resolver.Target{"dns", "", "google.com"}}, - {"dns://a.server.com/google.com", resolver.Target{"dns", "a.server.com", "google.com"}}, - {"dns://a.server.com/google.com/?a=b", resolver.Target{"dns", "a.server.com", "google.com/?a=b"}}, + {targetStr: "", want: resolver.Target{Scheme: "", Authority: "", Endpoint: ""}}, + {targetStr: ":///", want: resolver.Target{Scheme: "", Authority: "", Endpoint: ""}}, + {targetStr: "a:///", want: resolver.Target{Scheme: "a", Authority: "", Endpoint: ""}}, + {targetStr: "://a/", want: resolver.Target{Scheme: "", Authority: "a", Endpoint: ""}}, + {targetStr: ":///a", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "a"}}, + {targetStr: "a://b/", want: resolver.Target{Scheme: "a", Authority: "b", Endpoint: ""}}, + {targetStr: "a:///b", want: resolver.Target{Scheme: "a", Authority: "", Endpoint: "b"}}, + {targetStr: "://a/b", want: resolver.Target{Scheme: "", Authority: "a", Endpoint: "b"}}, + {targetStr: "a://b/c", want: resolver.Target{Scheme: "a", Authority: "b", Endpoint: "c"}}, + {targetStr: "dns:///google.com", want: resolver.Target{Scheme: "dns", Authority: "", Endpoint: "google.com"}}, + {targetStr: "dns://a.server.com/google.com", want: resolver.Target{Scheme: "dns", Authority: "a.server.com", Endpoint: "google.com"}}, + {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{"", "", "/"}}, - {"google.com", resolver.Target{"", "", "google.com"}}, - {"google.com/?a=b", resolver.Target{"", "", "google.com/?a=b"}}, - {"/unix/socket/address", resolver.Target{"", "", "/unix/socket/address"}}, + {targetStr: "/", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "/"}}, + {targetStr: "google.com", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "google.com"}}, + {targetStr: "google.com/?a=b", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "google.com/?a=b"}}, + {targetStr: "/unix/socket/address", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "/unix/socket/address"}}, // If we can only parse part of the target. - {"://", resolver.Target{"", "", "://"}}, - {"unix://domain", resolver.Target{"", "", "unix://domain"}}, - {"a:b", resolver.Target{"", "", "a:b"}}, - {"a/b", resolver.Target{"", "", "a/b"}}, - {"a:/b", resolver.Target{"", "", "a:/b"}}, - {"a//b", resolver.Target{"", "", "a//b"}}, - {"a://b", resolver.Target{"", "", "a://b"}}, + {targetStr: "://", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "://"}}, + {targetStr: "unix://domain", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "unix://domain"}}, + {targetStr: "a:b", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "a:b"}}, + {targetStr: "a/b", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "a/b"}}, + {targetStr: "a:/b", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "a:/b"}}, + {targetStr: "a//b", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "a//b"}}, + {targetStr: "a://b", want: resolver.Target{Scheme: "", Authority: "", Endpoint: "a://b"}}, } { got := parseTarget(test.targetStr) if got != test.want {