mirror/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-08-23 21:53:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

tpl: Extend merge to accept multiple parameters

Browse Source 
Fixes #7595
This commit is contained in:
Cameron Moore
2020-08-27 21:34:45 -05:00
committed by Bjørn Erik Pedersen
parent f9ebaaed1b
commit 047af7cfe5
3 changed files with 106 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
tpl/collections/merge_test.go
View File

@@ -15,82 +15,108 @@ package collections
import (
"bytes"
"fmt"
"reflect"
"runtime"
"strings"
"testing"
"github.com/gohugoio/hugo/common/maps"
"github.com/gohugoio/hugo/deps"
"github.com/gohugoio/hugo/parser"
"github.com/gohugoio/hugo/parser/metadecoders"
qt "github.com/frankban/quicktest"
"github.com/gohugoio/hugo/deps"
)
func TestMerge(t *testing.T) {
ns := New(&deps.Deps{})
simpleMap := map[string]interface{}{"a": 1, "b": 2}
for i, test := range []struct {
name string
dst interface{}
src interface{}
params []interface{}
expect interface{}
isErr bool
}{
{
"basic",
map[string]interface{}{"a": 1, "b": 2},
map[string]interface{}{"a": 42, "c": 3},
map[string]interface{}{"a": 1, "b": 2, "c": 3}, false},
[]interface{}{
map[string]interface{}{"a": 42, "c": 3},
map[string]interface{}{"a": 1, "b": 2},
},
map[string]interface{}{"a": 1, "b": 2, "c": 3}, false,
},
{
"multi",
[]interface{}{
map[string]interface{}{"a": 42, "c": 3, "e": 11},
map[string]interface{}{"a": 1, "b": 2},
map[string]interface{}{"a": 9, "c": 4, "d": 7},
},
map[string]interface{}{"a": 9, "b": 2, "c": 4, "d": 7, "e": 11}, false,
},
{
"basic case insensitive",
map[string]interface{}{"a": 1, "b": 2},
map[string]interface{}{"A": 42, "c": 3},
map[string]interface{}{"a": 1, "b": 2, "c": 3}, false},
[]interface{}{
map[string]interface{}{"A": 42, "c": 3},
map[string]interface{}{"a": 1, "b": 2},
},
map[string]interface{}{"a": 1, "b": 2, "c": 3}, false,
},
{
"nested",
map[string]interface{}{"a": 1, "b": map[string]interface{}{"d": 1, "e": 2}},
map[string]interface{}{"a": 42, "c": 3, "b": map[string]interface{}{"d": 55, "e": 66, "f": 3}},
map[string]interface{}{"a": 1, "b": map[string]interface{}{"d": 1, "e": 2, "f": 3}, "c": 3}, false},
[]interface{}{
map[string]interface{}{"a": 42, "c": 3, "b": map[string]interface{}{"d": 55, "e": 66, "f": 3}},
map[string]interface{}{"a": 1, "b": map[string]interface{}{"d": 1, "e": 2}},
},
map[string]interface{}{"a": 1, "b": map[string]interface{}{"d": 1, "e": 2, "f": 3}, "c": 3}, false,
},
{
// https://github.com/gohugoio/hugo/issues/6633
"params dst",
maps.Params{"a": 1, "b": 2},
map[string]interface{}{"a": 42, "c": 3},
maps.Params{"a": int(1), "b": int(2), "c": int(3)}, false},
[]interface{}{
map[string]interface{}{"a": 42, "c": 3},
maps.Params{"a": 1, "b": 2},
},
maps.Params{"a": int(1), "b": int(2), "c": int(3)}, false,
},
{
"params dst, upper case src",
maps.Params{"a": 1, "b": 2},
map[string]interface{}{"a": 42, "C": 3},
maps.Params{"a": int(1), "b": int(2), "c": int(3)}, false},
[]interface{}{
map[string]interface{}{"a": 42, "C": 3},
maps.Params{"a": 1, "b": 2},
},
maps.Params{"a": int(1), "b": int(2), "c": int(3)}, false,
},
{
"params src",
map[string]interface{}{"a": 1, "c": 2},
maps.Params{"a": 42, "c": 3},
map[string]interface{}{"a": int(1), "c": int(2)}, false},
[]interface{}{
maps.Params{"a": 42, "c": 3},
map[string]interface{}{"a": 1, "c": 2},
},
map[string]interface{}{"a": int(1), "c": int(2)}, false,
},
{
"params src, upper case dst",
map[string]interface{}{"a": 1, "C": 2},
maps.Params{"a": 42, "c": 3},
map[string]interface{}{"a": int(1), "C": int(2)}, false},
[]interface{}{
maps.Params{"a": 42, "c": 3},
map[string]interface{}{"a": 1, "C": 2},
},
map[string]interface{}{"a": int(1), "C": int(2)}, false,
},
{
"nested, params dst",
maps.Params{"a": 1, "b": maps.Params{"d": 1, "e": 2}},
map[string]interface{}{"a": 42, "c": 3, "b": map[string]interface{}{"d": 55, "e": 66, "f": 3}},
maps.Params{"a": 1, "b": maps.Params{"d": 1, "e": 2, "f": 3}, "c": 3}, false},
{"src nil", simpleMap, nil, simpleMap, false},
[]interface{}{
map[string]interface{}{"a": 42, "c": 3, "b": map[string]interface{}{"d": 55, "e": 66, "f": 3}},
maps.Params{"a": 1, "b": maps.Params{"d": 1, "e": 2}},
},
maps.Params{"a": 1, "b": maps.Params{"d": 1, "e": 2, "f": 3}, "c": 3}, false,
},
{"src nil", []interface{}{nil, simpleMap}, simpleMap, false},
// Error cases.
{"dst not a map", "not a map", nil, nil, true},
{"src not a map", simpleMap, "not a map", nil, true},
{"different map types", simpleMap, map[int]interface{}{32: "a"}, nil, true},
{"all nil", nil, nil, nil, true},
{"dst not a map", []interface{}{nil, "not a map"}, nil, true},
{"src not a map", []interface{}{"not a map", simpleMap}, nil, true},
{"different map types", []interface{}{map[int]interface{}{32: "a"}, simpleMap}, nil, true},
{"all nil", []interface{}{nil, nil}, nil, true},
} {
test := test
@@ -101,9 +127,7 @@ func TestMerge(t *testing.T) {
c := qt.New(t)
srcStr, dstStr := fmt.Sprint(test.src), fmt.Sprint(test.dst)
result, err := ns.Merge(test.src, test.dst)
result, err := ns.Merge(test.params...)
if test.isErr {
c.Assert(err, qt.Not(qt.IsNil), errMsg)
@@ -112,14 +136,6 @@ func TestMerge(t *testing.T) {
c.Assert(err, qt.IsNil)
c.Assert(result, qt.DeepEquals, test.expect, errMsg)
// map sort in fmt was fixed in go 1.12.
if !strings.HasPrefix(runtime.Version(), "go1.11") {
// Verify that the original maps are preserved.
c.Assert(fmt.Sprint(test.src), qt.Equals, srcStr)
c.Assert(fmt.Sprint(test.dst), qt.Equals, dstStr)
}
})
}
}
@@ -172,9 +188,9 @@ V22 = "v22_2"
qt.DeepEquals,
map[string]interface{}{
"V1": "v1_1", "V2": "v2_2",
"V2s": map[string]interface{}{"V21": "v21_1", "V22": "v22_2"}})
"V2s": map[string]interface{}{"V21": "v21_1", "V22": "v22_2"},
})
}
}
func TestCaseInsensitiveMapLookup(t *testing.T) {