zlei6/go-zero
1
0
Fork 0
mirror of https://github.com/zeromicro/go-zero.git synced 2026-05-14 02:10:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: refactor (#4652)

Browse Source
This commit is contained in:
Kevin Wan
2025-02-14 09:41:54 +08:00
committed by GitHub
parent 6a988dc4a9
commit 560c61612c
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
rest/server.go
View File

@@ -119,25 +119,6 @@ func (s *Server) Use(middleware Middleware) {
s.ngin.use(middleware) s.ngin.use(middleware)
} }
// serve is for test purpose, allow developer to do a unit test with
// all defined router without starting an HTTP Server.
//
// For example:
//
// server := MustNewServer(...)
// server.addRoute(...) // router a
// server.addRoute(...) // router b
// server.addRoute(...) // router c
//
// r, _ := http.NewRequest(...)
// w := httptest.NewRecorder(...)
// server.serve(w, r)
// // verify the response
func (s *Server) serve(w http.ResponseWriter, r *http.Request) {
s.ngin.bindRoutes(s.router)
s.router.ServeHTTP(w, r)
}
// ToMiddleware converts the given handler to a Middleware. // ToMiddleware converts the given handler to a Middleware.
func ToMiddleware(handler func(next http.Handler) http.Handler) Middleware { func ToMiddleware(handler func(next http.Handler) http.Handler) Middleware {
return func(handle http.HandlerFunc) http.HandlerFunc { return func(handle http.HandlerFunc) http.HandlerFunc {

27
rest/server_test.go
View File

@@ -231,7 +231,7 @@ func TestWithFileServerMiddleware(t *testing.T) {
req := httptest.NewRequest(http.MethodGet, tt.requestPath, nil) req := httptest.NewRequest(http.MethodGet, tt.requestPath, nil)
rr := httptest.NewRecorder() rr := httptest.NewRecorder()
server.serve(rr, req) serve(server, rr, req)
assert.Equal(t, tt.expectedStatus, rr.Code) assert.Equal(t, tt.expectedStatus, rr.Code)
if len(tt.expectedContent) > 0 { if len(tt.expectedContent) > 0 {
@@ -458,7 +458,7 @@ Port: 54321
// we would need to verify the behavior here. Since we don't have // we would need to verify the behavior here. Since we don't have
// direct access to headers, we'll mock newCorsRouter to capture it. // direct access to headers, we'll mock newCorsRouter to capture it.
w := httptest.NewRecorder() w := httptest.NewRecorder()
svr.serve(w, httptest.NewRequest(http.MethodOptions, "/", nil)) serve(svr, w, httptest.NewRequest(http.MethodOptions, "/", nil))
vals := w.Header().Values("Access-Control-Allow-Headers") vals := w.Header().Values("Access-Control-Allow-Headers")
respHeaders := make(map[string]struct{}) respHeaders := make(map[string]struct{})
@@ -748,7 +748,7 @@ Port: 54321
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
w := httptest.NewRecorder() w := httptest.NewRecorder()
req, _ := http.NewRequest("GET", test.path, nil) req, _ := http.NewRequest("GET", test.path, nil)
svr.serve(w, req) serve(svr, w, req)
assert.Equal(t, test.code, w.Code) assert.Equal(t, test.code, w.Code)
}) })
} }
@@ -765,6 +765,25 @@ func TestServerEmbedFileSystem(t *testing.T) {
req, err := http.NewRequest(http.MethodGet, "/assets/sample.txt", http.NoBody) req, err := http.NewRequest(http.MethodGet, "/assets/sample.txt", http.NoBody)
assert.Nil(t, err) assert.Nil(t, err)
rr := httptest.NewRecorder() rr := httptest.NewRecorder()
server.serve(rr, req) serve(server, rr, req)
assert.Equal(t, sampleContent, rr.Body.String()) assert.Equal(t, sampleContent, rr.Body.String())
} }
// serve is for test purpose, allow developer to do a unit test with
// all defined router without starting an HTTP Server.
//
// For example:
//
// server := MustNewServer(...)
// server.addRoute(...) // router a
// server.addRoute(...) // router b
// server.addRoute(...) // router c
//
// r, _ := http.NewRequest(...)
// w := httptest.NewRecorder(...)
// serve(server, w, r)
// // verify the response
func serve(s *Server, w http.ResponseWriter, r *http.Request) {
s.ngin.bindRoutes(s.router)
s.router.ServeHTTP(w, r)
}