lbsadmin/Beego
1
0
Fork 0
mirror of https://github.com/astaxie/beego.git synced 2024-11-22 18:50:54 +00:00
Code Issues Releases Activity

Merge pull request #1780 from goodloop/develop

Browse Source 
fix static pattern match for leaf
This commit is contained in:
astaxie 2016-03-11 09:07:53 +08:00
commit 571f9b4b65
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tree.go
View File

@ -389,7 +389,7 @@ type leafInfo struct {
func (leaf *leafInfo) match(wildcardValues []string, ctx *context.Context) (ok bool) { func (leaf *leafInfo) match(wildcardValues []string, ctx *context.Context) (ok bool) {
//fmt.Println("Leaf:", wildcardValues, leaf.wildcards, leaf.regexps) //fmt.Println("Leaf:", wildcardValues, leaf.wildcards, leaf.regexps)
if leaf.regexps == nil { if leaf.regexps == nil {
if len(wildcardValues) == 0 { // static path if len(wildcardValues) == 0 && len(leaf.wildcards) == 0 { // static path
return true return true
} }
// match * // match *

15
tree_test.go
View File

@ -97,6 +97,21 @@ func TestTreeRouters(t *testing.T) {
} }
} }
func TestStaticPath(t *testing.T) {
tr := NewTree()
tr.AddRouter("/topic/:id", "wildcard")
tr.AddRouter("/topic", "static")
ctx := context.NewContext()
obj := tr.Match("/topic", ctx)
if obj == nil || obj.(string) != "static" {
t.Fatal("/topic is a static route")
}
obj = tr.Match("/topic/1", ctx)
if obj == nil || obj.(string) != "wildcard" {
t.Fatal("/topic/1 is a wildcard route")
}
}
func TestAddTree(t *testing.T) { func TestAddTree(t *testing.T) {
tr := NewTree() tr := NewTree()
tr.AddRouter("/shop/:id/account", "astaxie") tr.AddRouter("/shop/:id/account", "astaxie")