go/echo
1
0
Fork 0
mirror of https://github.com/labstack/echo.git synced 2025-06-17 00:17:36 +02:00
Code Issues Releases Activity

Fixed #441, #294

Browse Source 
Signed-off-by: Vishal Rana <vr@labstack.com>
This commit is contained in:
Vishal Rana
2016-04-02 14:19:39 -07:00
parent be5148ae27
commit b5d6c05101
22 changed files with 266 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
router_test.go
View File

@ -277,10 +277,10 @@ func TestRouterStatic(t *testing.T) {
e := New()
r := e.router
path := "/folders/a/files/echo.gif"
r.Add(GET, path, HandlerFunc(func(c Context) error {
r.Add(GET, path, func(c Context) error {
c.Set("path", path)
return nil
}), e)
}, e)
c := NewContext(nil, nil, e)
r.Find(GET, path, c)
c.Handle(c)
@ -290,9 +290,9 @@ func TestRouterStatic(t *testing.T) {
func TestRouterParam(t *testing.T) {
e := New()
r := e.router
r.Add(GET, "/users/:id", HandlerFunc(func(c Context) error {
r.Add(GET, "/users/:id", func(c Context) error {
return nil
}), e)
}, e)
c := NewContext(nil, nil, e)
r.Find(GET, "/users/1", c)
assert.Equal(t, "1", c.P(0))
@ -301,9 +301,9 @@ func TestRouterParam(t *testing.T) {
func TestRouterTwoParam(t *testing.T) {
e := New()
r := e.router
r.Add(GET, "/users/:uid/files/:fid", HandlerFunc(func(Context) error {
r.Add(GET, "/users/:uid/files/:fid", func(Context) error {
return nil
}), e)
}, e)
c := NewContext(nil, nil, e)
r.Find(GET, "/users/1/files/1", c)
@ -316,13 +316,13 @@ func TestRouterParamWithSlash(t *testing.T) {
e := New()
r := e.router
r.Add(GET, "/a/:b/c/d/:e", HandlerFunc(func(c Context) error {
r.Add(GET, "/a/:b/c/d/:e", func(c Context) error {
return nil
}), e)
}, e)
r.Add(GET, "/a/:b/c/:d/:f", HandlerFunc(func(c Context) error {
r.Add(GET, "/a/:b/c/:d/:f", func(c Context) error {
return nil
}), e)
}, e)
c := NewContext(nil, nil, e)
assert.NotPanics(t, func() {
@ -335,15 +335,15 @@ func TestRouterMatchAny(t *testing.T) {
r := e.router
// Routes
r.Add(GET, "/", HandlerFunc(func(Context) error {
r.Add(GET, "/", func(Context) error {
return nil
}), e)
r.Add(GET, "/*", HandlerFunc(func(Context) error {
}, e)
r.Add(GET, "/*", func(Context) error {
return nil
}), e)
r.Add(GET, "/users/*", HandlerFunc(func(Context) error {
}, e)
r.Add(GET, "/users/*", func(Context) error {
return nil
}), e)
}, e)
c := NewContext(nil, nil, e)
r.Find(GET, "/", c)
@ -359,9 +359,9 @@ func TestRouterMatchAny(t *testing.T) {
func TestRouterMicroParam(t *testing.T) {
e := New()
r := e.router
r.Add(GET, "/:a/:b/:c", HandlerFunc(func(c Context) error {
r.Add(GET, "/:a/:b/:c", func(c Context) error {
return nil
}), e)
}, e)
c := NewContext(nil, nil, e)
r.Find(GET, "/1/2/3", c)
assert.Equal(t, "1", c.P(0))
@ -374,9 +374,9 @@ func TestRouterMixParamMatchAny(t *testing.T) {
r := e.router
// Route
r.Add(GET, "/users/:id/*", HandlerFunc(func(c Context) error {
r.Add(GET, "/users/:id/*", func(c Context) error {
return nil
}), e)
}, e)
c := NewContext(nil, nil, e)
r.Find(GET, "/users/joe/comments", c)
@ -389,13 +389,13 @@ func TestRouterMultiRoute(t *testing.T) {
r := e.router
// Routes
r.Add(GET, "/users", HandlerFunc(func(c Context) error {
r.Add(GET, "/users", func(c Context) error {
c.Set("path", "/users")
return nil
}), e)
r.Add(GET, "/users/:id", HandlerFunc(func(c Context) error {
}, e)
r.Add(GET, "/users/:id", func(c Context) error {
return nil
}), e)
}, e)
c := NewContext(nil, nil, e)
// Route > /users
@ -419,34 +419,34 @@ func TestRouterPriority(t *testing.T) {
r := e.router
// Routes
r.Add(GET, "/users", HandlerFunc(func(c Context) error {
r.Add(GET, "/users", func(c Context) error {
c.Set("a", 1)
return nil
}), e)
r.Add(GET, "/users/new", HandlerFunc(func(c Context) error {
}, e)
r.Add(GET, "/users/new", func(c Context) error {
c.Set("b", 2)
return nil
}), e)
r.Add(GET, "/users/:id", HandlerFunc(func(c Context) error {
}, e)
r.Add(GET, "/users/:id", func(c Context) error {
c.Set("c", 3)
return nil
}), e)
r.Add(GET, "/users/dew", HandlerFunc(func(c Context) error {
}, e)
r.Add(GET, "/users/dew", func(c Context) error {
c.Set("d", 4)
return nil
}), e)
r.Add(GET, "/users/:id/files", HandlerFunc(func(c Context) error {
}, e)
r.Add(GET, "/users/:id/files", func(c Context) error {
c.Set("e", 5)
return nil
}), e)
r.Add(GET, "/users/newsee", HandlerFunc(func(c Context) error {
}, e)
r.Add(GET, "/users/newsee", func(c Context) error {
c.Set("f", 6)
return nil
}), e)
r.Add(GET, "/users/*", HandlerFunc(func(c Context) error {
}, e)
r.Add(GET, "/users/*", func(c Context) error {
c.Set("g", 7)
return nil
}), e)
}, e)
c := NewContext(nil, nil, e)
// Route > /users
@ -493,14 +493,14 @@ func TestRouterPriorityNotFound(t *testing.T) {
c := NewContext(nil, nil, e)
// Add
r.Add(GET, "/a/foo", HandlerFunc(func(c Context) error {
r.Add(GET, "/a/foo", func(c Context) error {
c.Set("a", 1)
return nil
}), e)
r.Add(GET, "/a/bar", HandlerFunc(func(c Context) error {
}, e)
r.Add(GET, "/a/bar", func(c Context) error {
c.Set("b", 2)
return nil
}), e)
}, e)
// Find
r.Find(GET, "/a/foo", c)
@ -522,16 +522,16 @@ func TestRouterParamNames(t *testing.T) {
r := e.router
// Routes
r.Add(GET, "/users", HandlerFunc(func(c Context) error {
r.Add(GET, "/users", func(c Context) error {
c.Set("path", "/users")
return nil
}), e)
r.Add(GET, "/users/:id", HandlerFunc(func(c Context) error {
}, e)
r.Add(GET, "/users/:id", func(c Context) error {
return nil
}), e)
r.Add(GET, "/users/:uid/files/:fid", HandlerFunc(func(c Context) error {
}, e)
r.Add(GET, "/users/:uid/files/:fid", func(c Context) error {
return nil
}), e)
}, e)
c := NewContext(nil, nil, e)
// Route > /users
@ -557,9 +557,9 @@ func TestRouterAPI(t *testing.T) {
r := e.router
for _, route := range api {
r.Add(route.Method, route.Path, HandlerFunc(func(c Context) error {
r.Add(route.Method, route.Path, func(c Context) error {
return nil
}), e)
}, e)
}
c := NewContext(nil, nil, e)
for _, route := range api {
@ -579,9 +579,9 @@ func BenchmarkRouterGitHubAPI(b *testing.B) {
// Add routes
for _, route := range api {
r.Add(route.Method, route.Path, HandlerFunc(func(c Context) error {
r.Add(route.Method, route.Path, func(c Context) error {
return nil
}), e)
}, e)
}
// Find routes