glenux-archive/spf13--viper
1
0
Fork 0
mirror of https://github.com/spf13/viper synced 2024-06-28 14:49:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added test case for merging configs, where target is null, and source is not null

Browse source
This commit is contained in:
Illarion Kovalchuk 2021-10-14 16:29:39 +03:00 committed by Márk Sági-Kazár
parent 0353c6ea50
commit 97664ba020
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
viper.go
View file

@ -1808,7 +1808,7 @@ func mergeMaps(
v.logger.Trace("merging maps") v.logger.Trace("merging maps")
tsv, ok := sv.(map[string]interface{}) tsv, ok := sv.(map[string]interface{})
if !ok { if !ok {
jww.ERROR.Printf( v.logger.Error(
"Could not cast sv to map[string]interface{}; key=%s, st=%v, tt=%v, sv=%v, tv=%v", "Could not cast sv to map[string]interface{}; key=%s, st=%v, tt=%v, sv=%v, tv=%v",
sk, svType, tvType, sv, tv) sk, svType, tvType, sv, tv)
continue continue

6
viper_test.go
View file

@ -1915,6 +1915,7 @@ fu: bar
var jsonMergeExampleTgt = []byte(` var jsonMergeExampleTgt = []byte(`
{ {
"hello": { "hello": {
"foo": null,
"pop": 123456 "pop": 123456
} }
} }
@ -1923,6 +1924,7 @@ var jsonMergeExampleTgt = []byte(`
var jsonMergeExampleSrc = []byte(` var jsonMergeExampleSrc = []byte(`
{ {
"hello": { "hello": {
"foo": "foo str",
"pop": "pop str" "pop": "pop str"
} }
} }
@ -2014,6 +2016,10 @@ func TestMergeConfigOverrideType(t *testing.T) {
if pop := v.GetString("hello.pop"); pop != "pop str" { if pop := v.GetString("hello.pop"); pop != "pop str" {
t.Fatalf("pop != \"pop str\", = %s", pop) t.Fatalf("pop != \"pop str\", = %s", pop)
} }
if foo := v.GetString("hello.foo"); foo != "foo str" {
t.Fatalf("foo != \"foo str\", = %s", foo)
}
} }
func TestMergeConfigNoMerge(t *testing.T) { func TestMergeConfigNoMerge(t *testing.T) {