server/beego
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix lint

Browse Source
This commit is contained in:
holooooo 2021-05-25 10:10:06 +08:00
parent a7acd11131
commit 2182081831
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
client/httplib/client_option_test.go
View File

@ -32,6 +32,7 @@ type respCarrier struct {
func (r *respCarrier) SetBytes(bytes []byte) { func (r *respCarrier) SetBytes(bytes []byte) {
r.bytes = bytes r.bytes = bytes
} }
func (r *respCarrier) String() string { func (r *respCarrier) String() string {
return string(r.bytes) return string(r.bytes)
} }
@ -44,7 +45,7 @@ func TestOption_WithEnableCookie(t *testing.T) {
} }
v := "smallfish" v := "smallfish"
var resp = &respCarrier{} resp := &respCarrier{}
err = client.Get(resp, "/cookies/set?k1="+v) err = client.Get(resp, "/cookies/set?k1="+v)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -71,7 +72,7 @@ func TestOption_WithUserAgent(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
var resp = &respCarrier{} resp := &respCarrier{}
err = client.Get(resp, "/headers") err = client.Get(resp, "/headers")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -119,7 +120,7 @@ func TestOption_WithHTTPSetting(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
var resp = &respCarrier{} resp := &respCarrier{}
err = client.Get(resp, "/get") err = client.Get(resp, "/get")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -139,7 +140,7 @@ func TestOption_WithHeader(t *testing.T) {
} }
client.CommonOpts = append(client.CommonOpts, WithHeader("User-Agent", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1650.57 Safari/537.36")) client.CommonOpts = append(client.CommonOpts, WithHeader("User-Agent", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1650.57 Safari/537.36"))
var resp = &respCarrier{} resp := &respCarrier{}
err = client.Get(resp, "/headers") err = client.Get(resp, "/headers")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -162,7 +163,7 @@ func TestOption_WithTokenFactory(t *testing.T) {
return "testauth" return "testauth"
})) }))
var resp = &respCarrier{} resp := &respCarrier{}
err = client.Get(resp, "/headers") err = client.Get(resp, "/headers")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -181,7 +182,7 @@ func TestOption_WithBasicAuth(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
var resp = &respCarrier{} resp := &respCarrier{}
err = client.Get(resp, "/basic-auth/user/passwd", err = client.Get(resp, "/basic-auth/user/passwd",
WithBasicAuth(func() (string, string) { WithBasicAuth(func() (string, string) {
return "user", "passwd" return "user", "passwd"
@ -203,7 +204,7 @@ func TestOption_WithContentType(t *testing.T) {
} }
v := "application/json" v := "application/json"
var resp = &respCarrier{} resp := &respCarrier{}
err = client.Get(resp, "/headers", WithContentType(v)) err = client.Get(resp, "/headers", WithContentType(v))
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -223,7 +224,7 @@ func TestOption_WithParam(t *testing.T) {
} }
v := "smallfish" v := "smallfish"
var resp = &respCarrier{} resp := &respCarrier{}
err = client.Get(resp, "/get", WithParam("username", v)) err = client.Get(resp, "/get", WithParam("username", v))
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)

4
client/httplib/httpclient.go
View File

@ -91,14 +91,14 @@ func (c *Client) handleResponse(value interface{}, req *BeegoHTTPRequest) error
// handleCarrier set http data to value // handleCarrier set http data to value
func (c *Client) handleCarrier(value interface{}, req *BeegoHTTPRequest) error { func (c *Client) handleCarrier(value interface{}, req *BeegoHTTPRequest) error {
resp, err := req.Response() resp, err := req.Response()
defer resp.Body.Close()
if err != nil { if err != nil {
return err return err
} }
defer resp.Body.Close()
if value == nil { if value == nil {
return err return err
} }
if carrier, ok := value.(HTTPResponseCarrier); ok { if carrier, ok := value.(HTTPResponseCarrier); ok {
b, err := req.Bytes() b, err := req.Bytes()
if err != nil { if err != nil {

11
client/httplib/httpclient_test.go
View File

@ -88,7 +88,7 @@ func TestClient_handleCarrier(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
var s = &slideShowResponse{} s := &slideShowResponse{}
err = client.Get(s, "/json") err = client.Get(s, "/json")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -143,7 +143,6 @@ func TestClient_Get(t *testing.T) {
assert.Equal(t, "Sample Slide Show", s.Slideshow.Title) assert.Equal(t, "Sample Slide Show", s.Slideshow.Title)
assert.Equal(t, 2, len(s.Slideshow.Slides)) assert.Equal(t, 2, len(s.Slideshow.Slides))
assert.Equal(t, "Overview", s.Slideshow.Slides[1].Title) assert.Equal(t, "Overview", s.Slideshow.Slides[1].Title)
} }
func TestClient_Post(t *testing.T) { func TestClient_Post(t *testing.T) {
@ -152,7 +151,7 @@ func TestClient_Post(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
var resp = &slideShowResponse{} resp := &slideShowResponse{}
err = client.Get(resp, "/json") err = client.Get(resp, "/json")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -173,7 +172,7 @@ func TestClient_Put(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
var resp = &slideShowResponse{} resp := &slideShowResponse{}
err = client.Get(resp, "/json") err = client.Get(resp, "/json")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -194,7 +193,7 @@ func TestClient_Delete(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
var resp = &slideShowResponse{} resp := &slideShowResponse{}
err = client.Delete(resp, "/delete") err = client.Delete(resp, "/delete")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -210,7 +209,7 @@ func TestClient_Head(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
var resp = &slideShowResponse{} resp := &slideShowResponse{}
err = client.Head(resp, "") err = client.Head(resp, "")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)

2
client/httplib/httplib.go
View File

@ -663,10 +663,10 @@ func (b *BeegoHTTPRequest) ToValue(value interface{}) error {
} }
resp, err := b.Response() resp, err := b.Response()
defer resp.Body.Close()
if err != nil { if err != nil {
return err return err
} }
defer resp.Body.Close()
contentType := strings.Split(resp.Header.Get(contentTypeKey), ";")[0] contentType := strings.Split(resp.Header.Get(contentTypeKey), ";")[0]
// try to parse it as content type // try to parse it as content type