remove useless commit and add more test

gin_integration_test.go

@@ -401,6 +401,8 @@ func TestTreeRunDynamicRouting(t *testing.T) {
 	router.GET("/ab/*xx", func(c *Context) { c.String(http.StatusOK, "/ab/*xx") })
 	router.GET("/", func(c *Context) { c.String(http.StatusOK, "home") })
 	router.GET("/:cc", func(c *Context) { c.String(http.StatusOK, "/:cc") })
+	router.GET("/c1/:dd/e", func(c *Context) { c.String(http.StatusOK, "/c1/:dd/e") })
+	router.GET("/c1/:dd/e1", func(c *Context) { c.String(http.StatusOK, "/c1/:dd/e1") })
 	router.GET("/:cc/cc", func(c *Context) { c.String(http.StatusOK, "/:cc/cc") })
 	router.GET("/:cc/:dd/ee", func(c *Context) { c.String(http.StatusOK, "/:cc/:dd/ee") })
 	router.GET("/:cc/:dd/:ee/ff", func(c *Context) { c.String(http.StatusOK, "/:cc/:dd/:ee/ff") })
@@ -439,6 +441,9 @@ func TestTreeRunDynamicRouting(t *testing.T) {
 	testRequest(t, ts.URL+"/all", "", "/:cc")
 	testRequest(t, ts.URL+"/all/cc", "", "/:cc/cc")
 	testRequest(t, ts.URL+"/a/cc", "", "/:cc/cc")
+	testRequest(t, ts.URL+"/c1/d/e", "", "/c1/:dd/e")
+	testRequest(t, ts.URL+"/c1/d/e1", "", "/c1/:dd/e1")
+	testRequest(t, ts.URL+"/c1/d/ee", "", "/:cc/:dd/ee")
 	testRequest(t, ts.URL+"/c/d/ee", "", "/:cc/:dd/ee")
 	testRequest(t, ts.URL+"/c/d/e/ff", "", "/:cc/:dd/:ee/ff")
 	testRequest(t, ts.URL+"/c/d/e/f/gg", "", "/:cc/:dd/:ee/:ff/gg")
@@ -521,6 +526,11 @@ func TestTreeRunDynamicRouting(t *testing.T) {
 	testRequest(t, ts.URL+"/get/abc/123abf/testss", "", "/get/abc/123abf/:param")
 	testRequest(t, ts.URL+"/get/abc/123abfff/te", "", "/get/abc/123abfff/:param")
 	// 404 not found
+	testRequest(t, ts.URL+"/c/d/e", "404 Not Found")
+	testRequest(t, ts.URL+"/c/d/e1", "404 Not Found")
+	testRequest(t, ts.URL+"/c/d/eee", "404 Not Found")
+	testRequest(t, ts.URL+"/c1/d/eee", "404 Not Found")
+	testRequest(t, ts.URL+"/c1/d/e2", "404 Not Found")
 	testRequest(t, ts.URL+"/cc/dd/ee/ff/gg/hh1", "404 Not Found")
 	testRequest(t, ts.URL+"/a/dd", "404 Not Found")
 	testRequest(t, ts.URL+"/addr/dd/aa", "404 Not Found")

tree.go

@@ -411,7 +411,6 @@ type skippedNode struct {
 // made if a handle exists with an extra (without the) trailing slash for the
 // given path.
 func (n *node) getValue(path string, params *Params, skippedNodes *[]skippedNode, unescape bool) (value nodeValue) {
-	//skippedNodes := make([]skippedNode, 0, countSections(path)) // Caching the latest nodes
 	var globalParamsCount int16
 
 walk: // Outer loop for walking the tree
@@ -449,19 +448,7 @@ walk: // Outer loop for walking the tree
 					}
 				}
 				// If the path at the end of the loop is not equal to '/' and the current node has no child nodes
-				// the current node needs to be equal to the latest matching node
-				/*
-					matched := path != "/" && !n.wildChild
-					if matched {
-						if len(skippedNodes) > 0 {
-							l := len(skippedNodes)
-							n = skippedNodes[l-1].node
-							path = skippedNodes[l-1].path
-							skippedNodes = skippedNodes[:l-1]
-						}
-						//n = latestNode
-					}
-				*/
+				// the current node needs to roll back to last vaild skippedNode
 
 				if path != "/" && !n.wildChild {
 					for l := len(*skippedNodes); l > 0; {
@@ -496,15 +483,6 @@ walk: // Outer loop for walking the tree
 				case param:
 					// fix truncate the parameter
 					// tree_test.go  line: 204
-					/*
-						if matched {
-							path = prefix + path
-							// The saved path is used after the prefix route is intercepted by matching
-							if n.indices == "/" {
-								path = skippedPath[1:]
-							}
-						}
-					*/
 
 					// Find param end (either '/' or path end)
 					end := 0
@@ -590,7 +568,7 @@ walk: // Outer loop for walking the tree
 
 		if path == prefix {
 			// If the current path does not equal '/' and the node does not have a registered handle and the most recently matched node has a child node
-			// the current node needs to be equal to the latest matching node
+			// the current node needs to roll back to last vaild skippedNode
 			if n.handlers == nil && path != "/" {
 				for l := len(*skippedNodes); l > 0; {
 					skippedNode := (*skippedNodes)[l-1]
@@ -636,6 +614,7 @@ walk: // Outer loop for walking the tree
 			return
 		}
 
+		// roll back to last vaild skippedNode
 		if path != "/" {
 			for l := len(*skippedNodes); l > 0; {
 				skippedNode := (*skippedNodes)[l-1]
@@ -651,22 +630,6 @@ walk: // Outer loop for walking the tree
 				}
 			}
 		}
-		/*
-			len(skippedNodes) > 0 && strings.HasSuffix(skippedPath, path) {
-				path = skippedPath
-				// Reduce the number of cycles
-				n, latestNode = latestNode, n
-				// skippedPath cannot execute
-				// example:
-				// * /:cc/cc
-				// call /a/cc 	     expectations:match/200      Actual:match/200
-				// call /a/dd 	     expectations:unmatch/404    Actual: panic
-				// call /addr/dd/aa  expectations:unmatch/404    Actual: panic
-				// skippedPath: It can only be executed if the secondary route is not found
-				skippedPath = ""
-				continue walk
-			}
-		*/
 
 		// Nothing found. We can recommend to redirect to the same URL with an
 		// extra trailing slash if a leaf exists for that path

tree_test.go

@@ -162,6 +162,8 @@ func TestTreeWildcard(t *testing.T) {
 		"/aa/*xx",
 		"/ab/*xx",
 		"/:cc",
+		"/c1/:dd/e",
+		"/c1/:dd/e1",
 		"/:cc/cc",
 		"/:cc/:dd/ee",
 		"/:cc/:dd/:ee/ff",
@@ -243,6 +245,9 @@ func TestTreeWildcard(t *testing.T) {
 		{"/alldd", false, "/:cc", Params{Param{Key: "cc", Value: "alldd"}}},
 		{"/all/cc", false, "/:cc/cc", Params{Param{Key: "cc", Value: "all"}}},
 		{"/a/cc", false, "/:cc/cc", Params{Param{Key: "cc", Value: "a"}}},
+		{"/c1/d/e", false, "/c1/:dd/e", Params{Param{Key: "dd", Value: "d"}}},
+		{"/c1/d/e1", false, "/c1/:dd/e1", Params{Param{Key: "dd", Value: "d"}}},
+		{"/c1/d/ee", false, "/:cc/:dd/ee", Params{Param{Key: "cc", Value: "c1"}, Param{Key: "dd", Value: "d"}}},
 		{"/cc/cc", false, "/:cc/cc", Params{Param{Key: "cc", Value: "cc"}}},
 		{"/ccc/cc", false, "/:cc/cc", Params{Param{Key: "cc", Value: "ccc"}}},
 		{"/deedwjfs/cc", false, "/:cc/cc", Params{Param{Key: "cc", Value: "deedwjfs"}}},