From 6c7e536eeb8cfa25e9db78dc2d4bd8b467d5c08c Mon Sep 17 00:00:00 2001
From: John <john@johng.cn>
Date: Tue, 24 Sep 2019 20:39:00 +0800
Subject: [PATCH] fix issue in gbase64/ghttp

---
 encoding/gbase64/gbase64_test.go   | 23 ++++++++++++++---------
 net/ghttp/ghttp_unit_param_test.go |  7 ++++++-
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/encoding/gbase64/gbase64_test.go b/encoding/gbase64/gbase64_test.go
index 0c3c418c4..e689e9bd4 100644
--- a/encoding/gbase64/gbase64_test.go
+++ b/encoding/gbase64/gbase64_test.go
@@ -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)
 		}
 	})
 }
diff --git a/net/ghttp/ghttp_unit_param_test.go b/net/ghttp/ghttp_unit_param_test.go
index eb5b58b37..26bda8f10 100644
--- a/net/ghttp/ghttp_unit_param_test.go
+++ b/net/ghttp/ghttp_unit_param_test.go
@@ -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 {