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

format coding style (#983)

Browse Source
This commit is contained in:
Kevin Wan
2021-09-01 19:52:56 +08:00
committed by GitHub
parent 76fc1ef460
commit 407a6cbf9c
1 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
rest/httpx/responses_test.go
View File

@@ -25,19 +25,19 @@ func TestError(t *testing.T) {
) )
tests := []struct { tests := []struct {
name string name string
input string input string
errorHandler func(error) (int, interface{}) errorHandler func(error) (int, interface{})
expectHaveBody bool expectHasBody bool
expectBody string expectBody string
expectCode int expectCode int
}{ }{
{ {
name: "default error handler", name: "default error handler",
input: body, input: body,
expectHaveBody: true, expectHasBody: true,
expectBody: body, expectBody: body,
expectCode: http.StatusBadRequest, expectCode: http.StatusBadRequest,
}, },
{ {
name: "customized error handler return string", name: "customized error handler return string",
@@ -45,9 +45,9 @@ func TestError(t *testing.T) {
errorHandler: func(err error) (int, interface{}) { errorHandler: func(err error) (int, interface{}) {
return http.StatusForbidden, err.Error() return http.StatusForbidden, err.Error()
}, },
expectHaveBody: true, expectHasBody: true,
expectBody: wrappedBody, expectBody: wrappedBody,
expectCode: http.StatusForbidden, expectCode: http.StatusForbidden,
}, },
{ {
name: "customized error handler return error", name: "customized error handler return error",
@@ -55,9 +55,9 @@ func TestError(t *testing.T) {
errorHandler: func(err error) (int, interface{}) { errorHandler: func(err error) (int, interface{}) {
return http.StatusForbidden, err return http.StatusForbidden, err
}, },
expectHaveBody: true, expectHasBody: true,
expectBody: body, expectBody: body,
expectCode: http.StatusForbidden, expectCode: http.StatusForbidden,
}, },
{ {
name: "customized error handler return nil", name: "customized error handler return nil",
@@ -65,9 +65,9 @@ func TestError(t *testing.T) {
errorHandler: func(err error) (int, interface{}) { errorHandler: func(err error) (int, interface{}) {
return http.StatusForbidden, nil return http.StatusForbidden, nil
}, },
expectHaveBody: false, expectHasBody: false,
expectBody: "", expectBody: "",
expectCode: http.StatusForbidden, expectCode: http.StatusForbidden,
}, },
} }
@@ -89,7 +89,7 @@ func TestError(t *testing.T) {
} }
Error(&w, errors.New(test.input)) Error(&w, errors.New(test.input))
assert.Equal(t, test.expectCode, w.code) assert.Equal(t, test.expectCode, w.code)
assert.Equal(t, test.expectHaveBody, w.haveBody) assert.Equal(t, test.expectHasBody, w.hasBody)
assert.Equal(t, test.expectBody, strings.TrimSpace(w.builder.String())) assert.Equal(t, test.expectBody, strings.TrimSpace(w.builder.String()))
}) })
} }
@@ -137,7 +137,7 @@ func TestWriteJsonLessWritten(t *testing.T) {
type tracedResponseWriter struct { type tracedResponseWriter struct {
headers map[string][]string headers map[string][]string
builder strings.Builder builder strings.Builder
haveBody bool hasBody bool
code int code int
lessWritten bool lessWritten bool
timeout bool timeout bool
@@ -156,7 +156,8 @@ func (w *tracedResponseWriter) Write(bytes []byte) (n int, err error) {
if w.lessWritten { if w.lessWritten {
n -= 1 n -= 1
} }
w.haveBody = true w.hasBody = true
return return
} }