zeromicro/go-zero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix golint issues in core/mapping (#497)

Browse Source
This commit is contained in:
Kevin Wan
2021-02-20 23:18:22 +08:00
committed by GitHub
parent 226513ed60
commit 334ee4213f
8 changed files with 87 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
core/mapping/unmarshaler_test.go
View File

@@ -754,13 +754,13 @@ func TestUnmarshalJsonNumberInt64(t *testing.T) {
strValue := strconv.FormatInt(intValue, 10)
var number = json.Number(strValue)
m := map[string]interface{}{
"Id": number,
"ID": number,
}
var v struct {
Id int64
ID int64
}
assert.Nil(t, UnmarshalKey(m, &v))
assert.Equal(t, intValue, v.Id)
assert.Equal(t, intValue, v.ID)
}
}
@@ -770,13 +770,13 @@ func TestUnmarshalJsonNumberUint64(t *testing.T) {
strValue := strconv.FormatUint(intValue, 10)
var number = json.Number(strValue)
m := map[string]interface{}{
"Id": number,
"ID": number,
}
var v struct {
Id uint64
ID uint64
}
assert.Nil(t, UnmarshalKey(m, &v))
assert.Equal(t, intValue, v.Id)
assert.Equal(t, intValue, v.ID)
}
}
@@ -786,15 +786,15 @@ func TestUnmarshalJsonNumberUint64Ptr(t *testing.T) {
strValue := strconv.FormatUint(intValue, 10)
var number = json.Number(strValue)
m := map[string]interface{}{
"Id": number,
"ID": number,
}
var v struct {
Id *uint64
ID *uint64
}
ast := assert.New(t)
ast.Nil(UnmarshalKey(m, &v))
ast.NotNil(v.Id)
ast.Equal(intValue, *v.Id)
ast.NotNil(v.ID)
ast.Equal(intValue, *v.ID)
}
}
@@ -1061,38 +1061,38 @@ func TestUnmarshalWithOptionsAndSet(t *testing.T) {
func TestUnmarshalNestedKey(t *testing.T) {
var c struct {
Id int `json:"Persons.first.Id"`
ID int `json:"Persons.first.ID"`
}
m := map[string]interface{}{
"Persons": map[string]interface{}{
"first": map[string]interface{}{
"Id": 1,
"ID": 1,
},
},
}
assert.Nil(t, NewUnmarshaler("json").Unmarshal(m, &c))
assert.Equal(t, 1, c.Id)
assert.Equal(t, 1, c.ID)
}
func TestUnmarhsalNestedKeyArray(t *testing.T) {
var c struct {
First []struct {
Id int
ID int
} `json:"Persons.first"`
}
m := map[string]interface{}{
"Persons": map[string]interface{}{
"first": []map[string]interface{}{
{"Id": 1},
{"Id": 2},
{"ID": 1},
{"ID": 2},
},
},
}
assert.Nil(t, NewUnmarshaler("json").Unmarshal(m, &c))
assert.Equal(t, 2, len(c.First))
assert.Equal(t, 1, c.First[0].Id)
assert.Equal(t, 1, c.First[0].ID)
}
func TestUnmarshalAnonymousOptionalRequiredProvided(t *testing.T) {