From e231bf0c8403e1d6a53e1d00db6e138b29abdce4 Mon Sep 17 00:00:00 2001 From: thinkerou Date: Fri, 2 Nov 2018 12:48:01 +0800 Subject: [PATCH] fix vet warning: github.com/gin-gonic/gin/internal.Param composite literal uses unkeyed fields --- tree_test.go | 54 ++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/tree_test.go b/tree_test.go index d345e29b..e7365475 100644 --- a/tree_test.go +++ b/tree_test.go @@ -172,19 +172,19 @@ func TestTreeWildcard(t *testing.T) { checkRequests(t, tree, testRequests{ {"/", false, "/", nil}, - {"/cmd/test/", false, "/cmd/:tool/", internal.Params{internal.Param{"tool", "test"}}}, - {"/cmd/test", true, "", internal.Params{internal.Param{"tool", "test"}}}, - {"/cmd/test/3", false, "/cmd/:tool/:sub", internal.Params{internal.Param{"tool", "test"}, internal.Param{"sub", "3"}}}, - {"/src/", false, "/src/*filepath", internal.Params{internal.Param{"filepath", "/"}}}, - {"/src/some/file.png", false, "/src/*filepath", internal.Params{internal.Param{"filepath", "/some/file.png"}}}, + {"/cmd/test/", false, "/cmd/:tool/", internal.Params{internal.Param{Key:"tool", Value:"test"}}}, + {"/cmd/test", true, "", internal.Params{internal.Param{Key:"tool", Value:"test"}}}, + {"/cmd/test/3", false, "/cmd/:tool/:sub", internal.Params{internal.Param{Key:"tool", Value:"test"}, internal.Param{Key:"sub", Value:"3"}}}, + {"/src/", false, "/src/*filepath", internal.Params{internal.Param{Key:"filepath", Value:"/"}}}, + {"/src/some/file.png", false, "/src/*filepath", internal.Params{internal.Param{Key:"filepath", Value:"/some/file.png"}}}, {"/search/", false, "/search/", nil}, - {"/search/someth!ng+in+ünìcodé", false, "/search/:query", internal.Params{internal.Param{"query", "someth!ng+in+ünìcodé"}}}, - {"/search/someth!ng+in+ünìcodé/", true, "", internal.Params{internal.Param{"query", "someth!ng+in+ünìcodé"}}}, - {"/user_gopher", false, "/user_:name", internal.Params{internal.Param{"name", "gopher"}}}, - {"/user_gopher/about", false, "/user_:name/about", internal.Params{internal.Param{"name", "gopher"}}}, - {"/files/js/inc/framework.js", false, "/files/:dir/*filepath", internal.Params{internal.Param{"dir", "js"}, internal.Param{"filepath", "/inc/framework.js"}}}, - {"/info/gordon/public", false, "/info/:user/public", internal.Params{internal.Param{"user", "gordon"}}}, - {"/info/gordon/project/go", false, "/info/:user/project/:project", internal.Params{internal.Param{"user", "gordon"}, internal.Param{"project", "go"}}}, + {"/search/someth!ng+in+ünìcodé", false, "/search/:query", internal.Params{internal.Param{Key:"query", Value:"someth!ng+in+ünìcodé"}}}, + {"/search/someth!ng+in+ünìcodé/", true, "", internal.Params{internal.Param{Key:"query", Value:"someth!ng+in+ünìcodé"}}}, + {"/user_gopher", false, "/user_:name", internal.Params{internal.Param{Key:"name", Value:"gopher"}}}, + {"/user_gopher/about", false, "/user_:name/about", internal.Params{internal.Param{Key:"name", Value:"gopher"}}}, + {"/files/js/inc/framework.js", false, "/files/:dir/*filepath", internal.Params{internal.Param{Key:"dir", Value:"js"}, internal.Param{Key:"filepath", Value:"/inc/framework.js"}}}, + {"/info/gordon/public", false, "/info/:user/public", internal.Params{internal.Param{Key:"user", Value:"gordon"}}}, + {"/info/gordon/project/go", false, "/info/:user/project/:project", internal.Params{internal.Param{Key:"user", Value:"gordon"}, internal.Param{Key:"project", Value:"go"}}}, }) checkPriorities(t, tree) @@ -211,18 +211,18 @@ func TestUnescapeParameters(t *testing.T) { unescape := true checkRequests(t, tree, testRequests{ {"/", false, "/", nil}, - {"/cmd/test/", false, "/cmd/:tool/", internal.Params{internal.Param{"tool", "test"}}}, - {"/cmd/test", true, "", internal.Params{internal.Param{"tool", "test"}}}, - {"/src/some/file.png", false, "/src/*filepath", internal.Params{internal.Param{"filepath", "/some/file.png"}}}, - {"/src/some/file+test.png", false, "/src/*filepath", internal.Params{internal.Param{"filepath", "/some/file test.png"}}}, - {"/src/some/file++++%%%%test.png", false, "/src/*filepath", internal.Params{internal.Param{"filepath", "/some/file++++%%%%test.png"}}}, - {"/src/some/file%2Ftest.png", false, "/src/*filepath", internal.Params{internal.Param{"filepath", "/some/file/test.png"}}}, - {"/search/someth!ng+in+ünìcodé", false, "/search/:query", internal.Params{internal.Param{"query", "someth!ng in ünìcodé"}}}, - {"/info/gordon/project/go", false, "/info/:user/project/:project", internal.Params{internal.Param{"user", "gordon"}, internal.Param{"project", "go"}}}, - {"/info/slash%2Fgordon", false, "/info/:user", internal.Params{internal.Param{"user", "slash/gordon"}}}, - {"/info/slash%2Fgordon/project/Project%20%231", false, "/info/:user/project/:project", internal.Params{internal.Param{"user", "slash/gordon"}, internal.Param{"project", "Project #1"}}}, - {"/info/slash%%%%", false, "/info/:user", internal.Params{internal.Param{"user", "slash%%%%"}}}, - {"/info/slash%%%%2Fgordon/project/Project%%%%20%231", false, "/info/:user/project/:project", internal.Params{internal.Param{"user", "slash%%%%2Fgordon"}, internal.Param{"project", "Project%%%%20%231"}}}, + {"/cmd/test/", false, "/cmd/:tool/", internal.Params{internal.Param{Key:"tool", Value:"test"}}}, + {"/cmd/test", true, "", internal.Params{internal.Param{Key:"tool", Value:"test"}}}, + {"/src/some/file.png", false, "/src/*filepath", internal.Params{internal.Param{Key:"filepath", Value:"/some/file.png"}}}, + {"/src/some/file+test.png", false, "/src/*filepath", internal.Params{internal.Param{Key:"filepath", Value:"/some/file test.png"}}}, + {"/src/some/file++++%%%%test.png", false, "/src/*filepath", internal.Params{internal.Param{Key:"filepath", Value:"/some/file++++%%%%test.png"}}}, + {"/src/some/file%2Ftest.png", false, "/src/*filepath", internal.Params{internal.Param{Key:"filepath", Value:"/some/file/test.png"}}}, + {"/search/someth!ng+in+ünìcodé", false, "/search/:query", internal.Params{internal.Param{Key:"query", Value:"someth!ng in ünìcodé"}}}, + {"/info/gordon/project/go", false, "/info/:user/project/:project", internal.Params{internal.Param{Key:"user", Value:"gordon"}, internal.Param{Key:"project", Value:"go"}}}, + {"/info/slash%2Fgordon", false, "/info/:user", internal.Params{internal.Param{Key:"user", Value:"slash/gordon"}}}, + {"/info/slash%2Fgordon/project/Project%20%231", false, "/info/:user/project/:project", internal.Params{internal.Param{Key:"user", Value:"slash/gordon"}, internal.Param{Key:"project", Value:"Project #1"}}}, + {"/info/slash%%%%", false, "/info/:user", internal.Params{internal.Param{Key:"user", Value:"slash%%%%"}}}, + {"/info/slash%%%%2Fgordon/project/Project%%%%20%231", false, "/info/:user/project/:project", internal.Params{internal.Param{Key:"user", Value:"slash%%%%2Fgordon"}, internal.Param{Key:"project", Value:"Project%%%%20%231"}}}, }, unescape) checkPriorities(t, tree) @@ -328,9 +328,9 @@ func TestTreeDupliatePath(t *testing.T) { checkRequests(t, tree, testRequests{ {"/", false, "/", nil}, {"/doc/", false, "/doc/", nil}, - {"/src/some/file.png", false, "/src/*filepath", internal.Params{internal.Param{"filepath", "/some/file.png"}}}, - {"/search/someth!ng+in+ünìcodé", false, "/search/:query", internal.Params{internal.Param{"query", "someth!ng+in+ünìcodé"}}}, - {"/user_gopher", false, "/user_:name", internal.Params{internal.Param{"name", "gopher"}}}, + {"/src/some/file.png", false, "/src/*filepath", internal.Params{internal.Param{Key:"filepath", Value:"/some/file.png"}}}, + {"/search/someth!ng+in+ünìcodé", false, "/search/:query", internal.Params{internal.Param{Key:"query", Value:"someth!ng+in+ünìcodé"}}}, + {"/user_gopher", false, "/user_:name", internal.Params{internal.Param{Key:"name", Value:"gopher"}}}, }) }