bingyi/gf
1
0
Fork 0
mirror of https://gitee.com/johng/gf synced 2026-06-07 02:12:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove deprecated functions and fix corresponding unit test cases

Browse Source
This commit is contained in:
John
2019-09-06 17:59:55 +08:00
parent 13e528abb6
commit 96106ace92
16 changed files with 161 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
encoding/gjson/gjson_z_unit_basic_test.go
View File

@ -107,19 +107,13 @@ func Test_ViolenceCheck(t *testing.T) {
func Test_GetVar(t *testing.T) {
data := []byte(`{"n":123456789, "m":{"k":"v"}, "a":[1,2,3]}`)
gtest.Case(t, func() {
var m map[string]string
var n int
var a []int
j, err := gjson.DecodeToJson(data)
gtest.Assert(err, nil)
j.GetVar("n", &n)
j.GetVar("m", &m)
j.GetVar("a", &a)
gtest.Assert(n, "123456789")
gtest.Assert(m, g.Map{"k": "v"})
gtest.Assert(a, g.Slice{1, 2, 3})
gtest.Assert(j.GetVar("n").String(), "123456789")
gtest.Assert(j.GetVar("m").Map(), g.Map{"k": "v"})
gtest.Assert(j.GetVar("a").Interfaces(), g.Slice{1, 2, 3})
gtest.Assert(j.GetVar("a").Slice(), g.Slice{1, 2, 3})
gtest.Assert(j.GetVar("a").Array(), g.Slice{1, 2, 3})
})
}
@ -340,8 +334,8 @@ func Test_Convert2(t *testing.T) {
gtest.Assert(j.GetJsons("name1"), nil)
gtest.Assert(j.GetJsonMap("name1"), nil)
gtest.Assert(j.Contains("name1"), false)
gtest.Assert(j.GetVar("name1", &name) == nil, true)
gtest.Assert(j.GetVar("name", &name) == nil, false)
gtest.Assert(j.GetVar("name1").IsNil(), true)
gtest.Assert(j.GetVar("name").IsNil(), false)
gtest.Assert(j.Len("name1"), -1)
gtest.Assert(j.GetTime("time").Format("2006-01-02"), "2019-06-12")
gtest.Assert(j.GetGTime("time").Format("Y-m-d"), "2019-06-12")
@ -350,7 +344,7 @@ func Test_Convert2(t *testing.T) {
err := j.ToStruct(&name)
gtest.Assert(err, nil)
gtest.Assert(name.Name, "gf")
j.Dump()
//j.Dump()
gtest.Assert(err, nil)
j = gjson.New(`{"person":{"name":"gf"}}`)
@ -359,7 +353,7 @@ func Test_Convert2(t *testing.T) {
gtest.Assert(name.Name, "gf")
j = gjson.New(`{"name":"gf""}`)
j.Dump()
//j.Dump()
gtest.Assert(err, nil)
j = gjson.New(`[1,2,3]`)

18
encoding/gparser/gparser_unit_basic_test.go
View File

@ -89,19 +89,13 @@ func Test_ViolenceCheck(t *testing.T) {
func Test_GetVar(t *testing.T) {
data := []byte(`{"n":123456789, "m":{"k":"v"}, "a":[1,2,3]}`)
gtest.Case(t, func() {
var m map[string]string
var n int
var a []int
j := gparser.New(data)
gtest.AssertNE(j, nil)
j.GetVar("n", &n)
j.GetVar("m", &m)
j.GetVar("a", &a)
gtest.Assert(n, "123456789")
gtest.Assert(m, g.Map{"k": "v"})
gtest.Assert(a, g.Slice{1, 2, 3})
gtest.Assert(j.GetVar("n").String(), "123456789")
gtest.Assert(j.GetVar("m").Map(), g.Map{"k": "v"})
gtest.Assert(j.GetVar("a").Interfaces(), g.Slice{1, 2, 3})
gtest.Assert(j.GetVar("a").Slice(), g.Slice{1, 2, 3})
gtest.Assert(j.GetVar("a").Array(), g.Slice{1, 2, 3})
})
}
@ -240,7 +234,7 @@ func Test_Convert(t *testing.T) {
err = p.ToStruct(&name)
gtest.Assert(err, nil)
gtest.Assert(name.Name, "gf")
p.Dump()
//p.Dump()
p = gparser.New(`[0,1,2]`)
gtest.Assert(p.ToArray()[0], 0)