Run gofmt -s

This commit is contained in:
Bjørn Erik Pedersen 2019-03-23 20:15:06 +01:00
parent 597e418cb0
commit d30e845485
No known key found for this signature in database
GPG key ID: 330E6E2BD4859D8F
7 changed files with 19 additions and 19 deletions

View file

@ -47,11 +47,11 @@ const (
var defaultCacheConfigs = map[string]cacheConfig{ var defaultCacheConfigs = map[string]cacheConfig{
cacheKeyGetJSON: defaultCacheConfig, cacheKeyGetJSON: defaultCacheConfig,
cacheKeyGetCSV: defaultCacheConfig, cacheKeyGetCSV: defaultCacheConfig,
cacheKeyImages: cacheConfig{ cacheKeyImages: {
MaxAge: -1, MaxAge: -1,
Dir: resourcesGenDir, Dir: resourcesGenDir,
}, },
cacheKeyAssets: cacheConfig{ cacheKeyAssets: {
MaxAge: -1, MaxAge: -1,
Dir: resourcesGenDir, Dir: resourcesGenDir,
}, },

View file

@ -72,7 +72,7 @@ func TestUnmarshalToInterface(t *testing.T) {
{`#+a: b`, ORG, expect}, {`#+a: b`, ORG, expect},
{`a = "b"`, TOML, expect}, {`a = "b"`, TOML, expect},
{`a: "b"`, YAML, expect}, {`a: "b"`, YAML, expect},
{`a,b,c`, CSV, [][]string{[]string{"a", "b", "c"}}}, {`a,b,c`, CSV, [][]string{{"a", "b", "c"}}},
{"a: Easy!\nb:\n c: 2\n d: [3, 4]", YAML, map[string]interface{}{"a": "Easy!", "b": map[string]interface{}{"c": 2, "d": []interface{}{3, 4}}}}, {"a: Easy!\nb:\n c: 2\n d: [3, 4]", YAML, map[string]interface{}{"a": "Easy!", "b": map[string]interface{}{"c": 2, "d": []interface{}{3, 4}}}},
// errors // errors
{`a = "`, TOML, false}, {`a = "`, TOML, false},

View file

@ -37,8 +37,8 @@ func TestComplement(t *testing.T) {
ns := New(&deps.Deps{}) ns := New(&deps.Deps{})
s1 := []TstX{TstX{A: "a"}, TstX{A: "b"}, TstX{A: "d"}, TstX{A: "e"}} s1 := []TstX{{A: "a"}, {A: "b"}, {A: "d"}, {A: "e"}}
s2 := []TstX{TstX{A: "b"}, TstX{A: "e"}} s2 := []TstX{{A: "b"}, {A: "e"}}
xa, xb, xd, xe := &StructWithSlice{A: "a"}, &StructWithSlice{A: "b"}, &StructWithSlice{A: "d"}, &StructWithSlice{A: "e"} xa, xb, xd, xe := &StructWithSlice{A: "a"}, &StructWithSlice{A: "b"}, &StructWithSlice{A: "d"}, &StructWithSlice{A: "e"}
@ -58,15 +58,15 @@ func TestComplement(t *testing.T) {
{[]interface{}{"a", "b", nil}, []interface{}{[]string{"a", "d"}}, []interface{}{"b", nil}}, {[]interface{}{"a", "b", nil}, []interface{}{[]string{"a", "d"}}, []interface{}{"b", nil}},
{[]int{1, 2, 3, 4, 5}, []interface{}{[]int{1, 3}, []string{"a", "b"}, []int{1, 2}}, []int{4, 5}}, {[]int{1, 2, 3, 4, 5}, []interface{}{[]int{1, 3}, []string{"a", "b"}, []int{1, 2}}, []int{4, 5}},
{[]int{1, 2, 3, 4, 5}, []interface{}{[]int64{1, 3}}, []int{2, 4, 5}}, {[]int{1, 2, 3, 4, 5}, []interface{}{[]int64{1, 3}}, []int{2, 4, 5}},
{s1, []interface{}{s2}, []TstX{TstX{A: "a"}, TstX{A: "d"}}}, {s1, []interface{}{s2}, []TstX{{A: "a"}, {A: "d"}}},
{sp1, []interface{}{sp2}, []*StructWithSlice{xa, xd}}, {sp1, []interface{}{sp2}, []*StructWithSlice{xa, xd}},
{sp1_2, []interface{}{sp2_2}, StructWithSlicePointers{xa, xd}}, {sp1_2, []interface{}{sp2_2}, StructWithSlicePointers{xa, xd}},
// Errors // Errors
{[]string{"a", "b", "c"}, []interface{}{"error"}, false}, {[]string{"a", "b", "c"}, []interface{}{"error"}, false},
{"error", []interface{}{[]string{"c", "d"}, []string{"a", "b"}}, false}, {"error", []interface{}{[]string{"c", "d"}, []string{"a", "b"}}, false},
{[]string{"a", "b", "c"}, []interface{}{[][]string{[]string{"c", "d"}}}, false}, {[]string{"a", "b", "c"}, []interface{}{[][]string{{"c", "d"}}}, false},
{[]interface{}{[][]string{[]string{"c", "d"}}}, []interface{}{[]string{"c", "d"}, []string{"a", "b"}}, false}, {[]interface{}{[][]string{{"c", "d"}}}, []interface{}{[]string{"c", "d"}, []string{"a", "b"}}, false},
} { } {
errMsg := fmt.Sprintf("[%d]", i) errMsg := fmt.Sprintf("[%d]", i)

View file

@ -30,8 +30,8 @@ func TestSymDiff(t *testing.T) {
ns := New(&deps.Deps{}) ns := New(&deps.Deps{})
s1 := []TstX{TstX{A: "a"}, TstX{A: "b"}} s1 := []TstX{{A: "a"}, {A: "b"}}
s2 := []TstX{TstX{A: "a"}, TstX{A: "e"}} s2 := []TstX{{A: "a"}, {A: "e"}}
xa, xb, xd, xe := &StructWithSlice{A: "a"}, &StructWithSlice{A: "b"}, &StructWithSlice{A: "d"}, &StructWithSlice{A: "e"} xa, xb, xd, xe := &StructWithSlice{A: "a"}, &StructWithSlice{A: "b"}, &StructWithSlice{A: "d"}, &StructWithSlice{A: "e"}
@ -48,7 +48,7 @@ func TestSymDiff(t *testing.T) {
{[]interface{}{"a", "b", nil}, []interface{}{"a"}, []interface{}{"b", nil}}, {[]interface{}{"a", "b", nil}, []interface{}{"a"}, []interface{}{"b", nil}},
{[]int{1, 2, 3}, []int{3, 4}, []int{1, 2, 4}}, {[]int{1, 2, 3}, []int{3, 4}, []int{1, 2, 4}},
{[]int{1, 2, 3}, []int64{3, 4}, []int{1, 2, 4}}, {[]int{1, 2, 3}, []int64{3, 4}, []int{1, 2, 4}},
{s1, s2, []TstX{TstX{A: "b"}, TstX{A: "e"}}}, {s1, s2, []TstX{{A: "b"}, {A: "e"}}},
{sp1, sp2, []*StructWithSlice{xa, xd}}, {sp1, sp2, []*StructWithSlice{xa, xd}},
// Errors // Errors

View file

@ -74,8 +74,8 @@ func TestShortcodesTemplate(t *testing.T) {
s := &shortcodeTemplates{ s := &shortcodeTemplates{
variants: []shortcodeVariant{ variants: []shortcodeVariant{
shortcodeVariant{variants: []string{"a", "b", "c"}}, {variants: []string{"a", "b", "c"}},
shortcodeVariant{variants: []string{"a", "b", "d"}}, {variants: []string{"a", "b", "d"}},
}, },
} }

View file

@ -119,21 +119,21 @@ func TestUnmarshal(t *testing.T) {
assert.Equal("Ford", first[1]) assert.Equal("Ford", first[1])
}}, }},
{testContentResource{key: "r1", content: `a;b;c`, mime: media.CSVType}, map[string]interface{}{"delimiter": ";"}, func(r [][]string) { {testContentResource{key: "r1", content: `a;b;c`, mime: media.CSVType}, map[string]interface{}{"delimiter": ";"}, func(r [][]string) {
assert.Equal(r, [][]string{[]string{"a", "b", "c"}}) assert.Equal(r, [][]string{{"a", "b", "c"}})
}}, }},
{"a,b,c", nil, func(r [][]string) { {"a,b,c", nil, func(r [][]string) {
assert.Equal(r, [][]string{[]string{"a", "b", "c"}}) assert.Equal(r, [][]string{{"a", "b", "c"}})
}}, }},
{"a;b;c", map[string]interface{}{"delimiter": ";"}, func(r [][]string) { {"a;b;c", map[string]interface{}{"delimiter": ";"}, func(r [][]string) {
assert.Equal(r, [][]string{[]string{"a", "b", "c"}}) assert.Equal(r, [][]string{{"a", "b", "c"}})
}}, }},
{testContentResource{key: "r1", content: ` {testContentResource{key: "r1", content: `
% This is a comment % This is a comment
a;b;c`, mime: media.CSVType}, map[string]interface{}{"DElimiter": ";", "Comment": "%"}, func(r [][]string) { a;b;c`, mime: media.CSVType}, map[string]interface{}{"DElimiter": ";", "Comment": "%"}, func(r [][]string) {
assert.Equal(r, [][]string{[]string{"a", "b", "c"}}) assert.Equal(r, [][]string{{"a", "b", "c"}})
}}, }},
// errors // errors

View file

@ -160,11 +160,11 @@ func TestAbsURLUnqoted(t *testing.T) {
tr := transform.New(NewAbsURLTransformer(testBaseURL)) tr := transform.New(NewAbsURLTransformer(testBaseURL))
apply(t.Errorf, tr, []test{ apply(t.Errorf, tr, []test{
test{ {
content: `Link: <a href=/asdf>ASDF</a>`, content: `Link: <a href=/asdf>ASDF</a>`,
expected: `Link: <a href=http://base/asdf>ASDF</a>`, expected: `Link: <a href=http://base/asdf>ASDF</a>`,
}, },
test{ {
content: `Link: <a href=/asdf >ASDF</a>`, content: `Link: <a href=/asdf >ASDF</a>`,
expected: `Link: <a href=http://base/asdf >ASDF</a>`, expected: `Link: <a href=http://base/asdf >ASDF</a>`,
}, },