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

fix lint and fix test case

Browse Source
This commit is contained in:
Jason li 2021-01-07 21:38:50 +08:00
parent 187c2da5a1
commit 5b46a08b79
4 changed files with 54 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
server/web/namespace_test.go
View File

@ -15,6 +15,7 @@
package web package web
import ( import (
"fmt"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"strconv" "strconv"
@ -30,11 +31,17 @@ type ExampleController struct {
} }
func (m ExampleController) Ping() { func (m ExampleController) Ping() {
m.Ctx.Output.Body([]byte(exampleBody)) err := m.Ctx.Output.Body([]byte(exampleBody))
if err != nil {
fmt.Println(err)
}
} }
func (m ExampleController) ping() { func (m ExampleController) ping() {
m.Ctx.Output.Body([]byte(exampleBody)) err := m.Ctx.Output.Body([]byte(exampleBody))
if err != nil {
fmt.Println(err)
}
} }
func TestNamespaceGet(t *testing.T) { func TestNamespaceGet(t *testing.T) {
@ -182,10 +189,10 @@ func TestNamespaceInside(t *testing.T) {
} }
func TestNamespaceRouterGet(t *testing.T) { func TestNamespaceRouterGet(t *testing.T) {
r, _ := http.NewRequest(http.MethodGet, "/v1/user", nil) r, _ := http.NewRequest(http.MethodGet, "/router/user", nil)
w := httptest.NewRecorder() w := httptest.NewRecorder()
ns := NewNamespace("/v1") ns := NewNamespace("/router")
ns.RouterGet("/user", ExampleController.Ping) ns.RouterGet("/user", ExampleController.Ping)
AddNamespace(ns) AddNamespace(ns)
BeeApp.Handlers.ServeHTTP(w, r) BeeApp.Handlers.ServeHTTP(w, r)
@ -195,10 +202,10 @@ func TestNamespaceRouterGet(t *testing.T) {
} }
func TestNamespaceRouterPost(t *testing.T) { func TestNamespaceRouterPost(t *testing.T) {
r, _ := http.NewRequest(http.MethodPost, "/v1/user", nil) r, _ := http.NewRequest(http.MethodPost, "/router/user", nil)
w := httptest.NewRecorder() w := httptest.NewRecorder()
ns := NewNamespace("/v1") ns := NewNamespace("/router")
ns.RouterPost("/user", ExampleController.Ping) ns.RouterPost("/user", ExampleController.Ping)
AddNamespace(ns) AddNamespace(ns)
BeeApp.Handlers.ServeHTTP(w, r) BeeApp.Handlers.ServeHTTP(w, r)
@ -208,10 +215,10 @@ func TestNamespaceRouterPost(t *testing.T) {
} }
func TestNamespaceRouterDelete(t *testing.T) { func TestNamespaceRouterDelete(t *testing.T) {
r, _ := http.NewRequest(http.MethodDelete, "/v1/user", nil) r, _ := http.NewRequest(http.MethodDelete, "/router/user", nil)
w := httptest.NewRecorder() w := httptest.NewRecorder()
ns := NewNamespace("/v1") ns := NewNamespace("/router")
ns.RouterDelete("/user", ExampleController.Ping) ns.RouterDelete("/user", ExampleController.Ping)
AddNamespace(ns) AddNamespace(ns)
BeeApp.Handlers.ServeHTTP(w, r) BeeApp.Handlers.ServeHTTP(w, r)
@ -221,10 +228,10 @@ func TestNamespaceRouterDelete(t *testing.T) {
} }
func TestNamespaceRouterPut(t *testing.T) { func TestNamespaceRouterPut(t *testing.T) {
r, _ := http.NewRequest(http.MethodPut, "/v1/user", nil) r, _ := http.NewRequest(http.MethodPut, "/router/user", nil)
w := httptest.NewRecorder() w := httptest.NewRecorder()
ns := NewNamespace("/v1") ns := NewNamespace("/router")
ns.RouterPut("/user", ExampleController.Ping) ns.RouterPut("/user", ExampleController.Ping)
AddNamespace(ns) AddNamespace(ns)
BeeApp.Handlers.ServeHTTP(w, r) BeeApp.Handlers.ServeHTTP(w, r)
@ -234,10 +241,10 @@ func TestNamespaceRouterPut(t *testing.T) {
} }
func TestNamespaceRouterHead(t *testing.T) { func TestNamespaceRouterHead(t *testing.T) {
r, _ := http.NewRequest(http.MethodHead, "/v1/user", nil) r, _ := http.NewRequest(http.MethodHead, "/router/user", nil)
w := httptest.NewRecorder() w := httptest.NewRecorder()
ns := NewNamespace("/v1") ns := NewNamespace("/router")
ns.RouterHead("/user", ExampleController.Ping) ns.RouterHead("/user", ExampleController.Ping)
AddNamespace(ns) AddNamespace(ns)
BeeApp.Handlers.ServeHTTP(w, r) BeeApp.Handlers.ServeHTTP(w, r)
@ -247,10 +254,10 @@ func TestNamespaceRouterHead(t *testing.T) {
} }
func TestNamespaceRouterOptions(t *testing.T) { func TestNamespaceRouterOptions(t *testing.T) {
r, _ := http.NewRequest(http.MethodOptions, "/v1/user", nil) r, _ := http.NewRequest(http.MethodOptions, "/router/user", nil)
w := httptest.NewRecorder() w := httptest.NewRecorder()
ns := NewNamespace("/v1") ns := NewNamespace("/router")
ns.RouterOptions("/user", ExampleController.Ping) ns.RouterOptions("/user", ExampleController.Ping)
AddNamespace(ns) AddNamespace(ns)
BeeApp.Handlers.ServeHTTP(w, r) BeeApp.Handlers.ServeHTTP(w, r)
@ -260,10 +267,10 @@ func TestNamespaceRouterOptions(t *testing.T) {
} }
func TestNamespaceRouterPatch(t *testing.T) { func TestNamespaceRouterPatch(t *testing.T) {
r, _ := http.NewRequest(http.MethodPatch, "/v1/user", nil) r, _ := http.NewRequest(http.MethodPatch, "/router/user", nil)
w := httptest.NewRecorder() w := httptest.NewRecorder()
ns := NewNamespace("/v1") ns := NewNamespace("/router")
ns.RouterPatch("/user", ExampleController.Ping) ns.RouterPatch("/user", ExampleController.Ping)
AddNamespace(ns) AddNamespace(ns)
BeeApp.Handlers.ServeHTTP(w, r) BeeApp.Handlers.ServeHTTP(w, r)
@ -273,13 +280,13 @@ func TestNamespaceRouterPatch(t *testing.T) {
} }
func TestNamespaceRouterAny(t *testing.T) { func TestNamespaceRouterAny(t *testing.T) {
ns := NewNamespace("/v1") ns := NewNamespace("/router")
ns.RouterAny("/user", ExampleController.Ping) ns.RouterAny("/user", ExampleController.Ping)
AddNamespace(ns) AddNamespace(ns)
for method, _ := range HTTPMETHOD { for method := range HTTPMETHOD {
w := httptest.NewRecorder() w := httptest.NewRecorder()
r, _ := http.NewRequest(method, "/v1/user", nil) r, _ := http.NewRequest(method, "/router/user", nil)
BeeApp.Handlers.ServeHTTP(w, r) BeeApp.Handlers.ServeHTTP(w, r)
if w.Body.String() != exampleBody { if w.Body.String() != exampleBody {
t.Errorf("TestNamespaceRouterAny can't run, get the response is " + w.Body.String()) t.Errorf("TestNamespaceRouterAny can't run, get the response is " + w.Body.String())
@ -288,107 +295,107 @@ func TestNamespaceRouterAny(t *testing.T) {
} }
func TestNamespaceNSRouterGet(t *testing.T) { func TestNamespaceNSRouterGet(t *testing.T) {
r, _ := http.NewRequest(http.MethodGet, "/v1/user", nil) r, _ := http.NewRequest(http.MethodGet, "/router/user", nil)
w := httptest.NewRecorder() w := httptest.NewRecorder()
ns := NewNamespace("/v1") ns := NewNamespace("/router")
NSRouterGet("/user", ExampleController.Ping)(ns) NSRouterGet("/user", ExampleController.Ping)(ns)
AddNamespace(ns) AddNamespace(ns)
BeeApp.Handlers.ServeHTTP(w, r) BeeApp.Handlers.ServeHTTP(w, r)
if w.Body.String() != exampleBody { if w.Body.String() != exampleBody {
t.Errorf("TestNamespaceRouterGet can't run, get the response is " + w.Body.String()) t.Errorf("TestNamespaceNSRouterGet can't run, get the response is " + w.Body.String())
} }
} }
func TestNamespaceNSRouterPost(t *testing.T) { func TestNamespaceNSRouterPost(t *testing.T) {
r, _ := http.NewRequest(http.MethodPost, "/v1/user", nil) r, _ := http.NewRequest(http.MethodPost, "/router/user", nil)
w := httptest.NewRecorder() w := httptest.NewRecorder()
ns := NewNamespace("/v1") ns := NewNamespace("/router")
NSRouterPost("/user", ExampleController.Ping)(ns) NSRouterPost("/user", ExampleController.Ping)(ns)
AddNamespace(ns) AddNamespace(ns)
BeeApp.Handlers.ServeHTTP(w, r) BeeApp.Handlers.ServeHTTP(w, r)
if w.Body.String() != exampleBody { if w.Body.String() != exampleBody {
t.Errorf("TestNamespaceRouterPost can't run, get the response is " + w.Body.String()) t.Errorf("TestNamespaceNSRouterPost can't run, get the response is " + w.Body.String())
} }
} }
func TestNamespaceNSRouterDelete(t *testing.T) { func TestNamespaceNSRouterDelete(t *testing.T) {
r, _ := http.NewRequest(http.MethodDelete, "/v1/user", nil) r, _ := http.NewRequest(http.MethodDelete, "/router/user", nil)
w := httptest.NewRecorder() w := httptest.NewRecorder()
ns := NewNamespace("/v1") ns := NewNamespace("/router")
NSRouterDelete("/user", ExampleController.Ping)(ns) NSRouterDelete("/user", ExampleController.Ping)(ns)
AddNamespace(ns) AddNamespace(ns)
BeeApp.Handlers.ServeHTTP(w, r) BeeApp.Handlers.ServeHTTP(w, r)
if w.Body.String() != exampleBody { if w.Body.String() != exampleBody {
t.Errorf("TestNamespaceRouterDelete can't run, get the response is " + w.Body.String()) t.Errorf("TestNamespaceNSRouterDelete can't run, get the response is " + w.Body.String())
} }
} }
func TestNamespaceNSRouterPut(t *testing.T) { func TestNamespaceNSRouterPut(t *testing.T) {
r, _ := http.NewRequest(http.MethodPut, "/v1/user", nil) r, _ := http.NewRequest(http.MethodPut, "/router/user", nil)
w := httptest.NewRecorder() w := httptest.NewRecorder()
ns := NewNamespace("/v1") ns := NewNamespace("/router")
NSRouterPut("/user", ExampleController.Ping)(ns) NSRouterPut("/user", ExampleController.Ping)(ns)
AddNamespace(ns) AddNamespace(ns)
BeeApp.Handlers.ServeHTTP(w, r) BeeApp.Handlers.ServeHTTP(w, r)
if w.Body.String() != exampleBody { if w.Body.String() != exampleBody {
t.Errorf("TestNamespaceRouterPut can't run, get the response is " + w.Body.String()) t.Errorf("TestNamespaceNSRouterPut can't run, get the response is " + w.Body.String())
} }
} }
func TestNamespaceNSRouterHead(t *testing.T) { func TestNamespaceNSRouterHead(t *testing.T) {
r, _ := http.NewRequest(http.MethodHead, "/v1/user", nil) r, _ := http.NewRequest(http.MethodHead, "/router/user", nil)
w := httptest.NewRecorder() w := httptest.NewRecorder()
ns := NewNamespace("/v1") ns := NewNamespace("/router")
NSRouterHead("/user", ExampleController.Ping)(ns) NSRouterHead("/user", ExampleController.Ping)(ns)
AddNamespace(ns) AddNamespace(ns)
BeeApp.Handlers.ServeHTTP(w, r) BeeApp.Handlers.ServeHTTP(w, r)
if w.Body.String() != exampleBody { if w.Body.String() != exampleBody {
t.Errorf("TestNamespaceRouterHead can't run, get the response is " + w.Body.String()) t.Errorf("TestNamespaceNSRouterHead can't run, get the response is " + w.Body.String())
} }
} }
func TestNamespaceNSRouterOptions(t *testing.T) { func TestNamespaceNSRouterOptions(t *testing.T) {
r, _ := http.NewRequest(http.MethodOptions, "/v1/user", nil) r, _ := http.NewRequest(http.MethodOptions, "/router/user", nil)
w := httptest.NewRecorder() w := httptest.NewRecorder()
ns := NewNamespace("/v1") ns := NewNamespace("/router")
NSRouterOptions("/user", ExampleController.Ping)(ns) NSRouterOptions("/user", ExampleController.Ping)(ns)
AddNamespace(ns) AddNamespace(ns)
BeeApp.Handlers.ServeHTTP(w, r) BeeApp.Handlers.ServeHTTP(w, r)
if w.Body.String() != exampleBody { if w.Body.String() != exampleBody {
t.Errorf("TestNamespaceRouterOptions can't run, get the response is " + w.Body.String()) t.Errorf("TestNamespaceNSRouterOptions can't run, get the response is " + w.Body.String())
} }
} }
func TestNamespaceNSRouterPatch(t *testing.T) { func TestNamespaceNSRouterPatch(t *testing.T) {
r, _ := http.NewRequest(http.MethodPatch, "/v1/user", nil) r, _ := http.NewRequest(http.MethodPatch, "/router/user", nil)
w := httptest.NewRecorder() w := httptest.NewRecorder()
ns := NewNamespace("/v1") ns := NewNamespace("/router")
NSRouterPatch("/user", ExampleController.Ping)(ns) NSRouterPatch("/user", ExampleController.Ping)(ns)
AddNamespace(ns) AddNamespace(ns)
BeeApp.Handlers.ServeHTTP(w, r) BeeApp.Handlers.ServeHTTP(w, r)
if w.Body.String() != exampleBody { if w.Body.String() != exampleBody {
t.Errorf("TestNamespaceRouterPatch can't run, get the response is " + w.Body.String()) t.Errorf("TestNamespaceNSRouterPatch can't run, get the response is " + w.Body.String())
} }
} }
func TestNamespaceNSRouterAny(t *testing.T) { func TestNamespaceNSRouterAny(t *testing.T) {
ns := NewNamespace("/v1") ns := NewNamespace("/router")
NSRouterAny("/user", ExampleController.Ping)(ns) NSRouterAny("/user", ExampleController.Ping)(ns)
AddNamespace(ns) AddNamespace(ns)
for method, _ := range HTTPMETHOD { for method := range HTTPMETHOD {
w := httptest.NewRecorder() w := httptest.NewRecorder()
r, _ := http.NewRequest(method, "/v1/user", nil) r, _ := http.NewRequest(method, "/router/user", nil)
BeeApp.Handlers.ServeHTTP(w, r) BeeApp.Handlers.ServeHTTP(w, r)
if w.Body.String() != exampleBody { if w.Body.String() != exampleBody {
t.Errorf("TestNamespaceRouterAny can't run, get the response is " + w.Body.String()) t.Errorf("TestNamespaceNSRouterAny can't run, get the response is " + w.Body.String())
} }
} }
} }

2
server/web/router.go
View File

@ -478,7 +478,7 @@ func (p *ControllerRegister) AddRouterMethod(method, pattern string, f interface
} }
route.methods = methods route.methods = methods
for method, _ := range methods { for method := range methods {
p.addToRouter(method, pattern, route) p.addToRouter(method, pattern, route)
} }
} }

2
server/web/router_test.go
View File

@ -912,7 +912,7 @@ func TestRouterRouterAny(t *testing.T) {
handler := NewControllerRegister() handler := NewControllerRegister()
handler.RouterAny("/user", ExampleController.Ping) handler.RouterAny("/user", ExampleController.Ping)
for method, _ := range HTTPMETHOD { for method := range HTTPMETHOD {
w := httptest.NewRecorder() w := httptest.NewRecorder()
r, _ := http.NewRequest(method, "/user", nil) r, _ := http.NewRequest(method, "/user", nil)
handler.ServeHTTP(w, r) handler.ServeHTTP(w, r)

2
server/web/server_test.go
View File

@ -100,7 +100,7 @@ func TestServerRouterDelete(t *testing.T) {
func TestServerRouterAny(t *testing.T) { func TestServerRouterAny(t *testing.T) {
RouterAny("/user", ExampleController.Ping) RouterAny("/user", ExampleController.Ping)
for method, _ := range HTTPMETHOD { for method := range HTTPMETHOD {
r, _ := http.NewRequest(method, "/user", nil) r, _ := http.NewRequest(method, "/user", nil)
w := httptest.NewRecorder() w := httptest.NewRecorder()
BeeApp.Handlers.ServeHTTP(w, r) BeeApp.Handlers.ServeHTTP(w, r)