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

fix issue in gbase64/ghttp

Browse Source
This commit is contained in:
John
2019-09-24 20:39:00 +08:00
parent 36c2648be8
commit 6c7e536eeb
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
encoding/gbase64/gbase64_test.go
View File

@ -12,11 +12,11 @@ import (
"github.com/gogf/gf/test/gtest"
)
type testpair struct {
type testPair struct {
decoded, encoded string
}
var pairs = []testpair{
var pairs = []testPair{
// RFC 3548 examples
{"\x14\xfb\x9c\x03\xd9\x7e", "FPucA9l+"},
{"\x14\xfb\x9c\x03\xd9", "FPucA9k="},
@ -45,15 +45,20 @@ var pairs = []testpair{
func TestBase64(t *testing.T) {
gtest.Case(t, func() {
for k := range pairs {
// []byte
// Encode
gtest.Assert(gbase64.Encode([]byte(pairs[k].decoded)), []byte(pairs[k].encoded))
e1, _ := gbase64.Decode([]byte(pairs[k].encoded))
gtest.Assert(e1, []byte(pairs[k].decoded))
gtest.Assert(gbase64.EncodeToString([]byte(pairs[k].decoded)), pairs[k].encoded)
gtest.Assert(gbase64.EncodeString(pairs[k].decoded), pairs[k].encoded)
// string
gtest.Assert(gbase64.EncodeString([]byte(pairs[k].decoded)), pairs[k].encoded)
e2, _ := gbase64.DecodeString(pairs[k].encoded)
gtest.Assert(e2, []byte(pairs[k].decoded))
// Decode
r1, _ := gbase64.Decode([]byte(pairs[k].encoded))
gtest.Assert(r1, []byte(pairs[k].decoded))
r2, _ := gbase64.DecodeString(pairs[k].encoded)
gtest.Assert(r2, []byte(pairs[k].decoded))
r3, _ := gbase64.DecodeToString(pairs[k].encoded)
gtest.Assert(r3, pairs[k].decoded)
}
})
}

7
net/ghttp/ghttp_unit_param_test.go
View File

@ -133,7 +133,12 @@ func Test_Params_Basic(t *testing.T) {
r.Response.Write(r.GetRaw())
})
s.BindHandler("/json", func(r *ghttp.Request) {
r.Response.Write(r.GetJson().Get("name"))
j, err := r.GetJson()
if err != nil {
r.Response.Write(err)
return
}
r.Response.Write(j.Get("name"))
})
s.BindHandler("/struct", func(r *ghttp.Request) {
if m := r.GetQueryMap(); len(m) > 0 {