refactor: add tests

Author: GamerGirlandCo

path_value_test.go

@@ -40,6 +40,14 @@ func TestPathValue(t *testing.T) {
 			requestPath:  "/users/Gojo/friends/all-of-them/and/more",
 			expectedBody: "Gojo all-of-them/and/more",
 		},
+		{
+			name:         "Named slash path",
+			pattern:      "/foo/bar/{other-stuff:*}/fizz/buzz",
+			method:       "GET",
+			pathKeys:     []string{"other-stuff"},
+			requestPath:  "/foo/bar/one/two/three/fizz/buzz",
+			expectedBody: "one/two/three",
+		},
 	}
 
 	for _, tc := range testCases {
@@ -72,3 +80,19 @@ func TestPathValue(t *testing.T) {
 		})
 	}
 }
+
+func TestPathValueNamedSlashPathEmpty(t *testing.T) {
+	r := NewRouter()
+
+	r.Get("/foo/{path:*}/bar", func(w http.ResponseWriter, r *http.Request) {
+		w.Write([]byte(r.PathValue("path") + ":" + URLParam(r, "path")))
+	})
+
+	ts := httptest.NewServer(r)
+	defer ts.Close()
+
+	_, body := testRequest(t, ts, "GET", "/foo/bar", nil)
+	if body != ":" {
+		t.Fatalf("expecting empty path values, got %q", body)
+	}
+}

tree_test.go

@@ -333,6 +333,65 @@ func TestTreeRegexp(t *testing.T) {
 	}
 }
 
+func TestTreeSlashParam(t *testing.T) {
+	hNested := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {})
+	hGreedy := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {})
+	hEmpty := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {})
+	hEmbeddedEmpty := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {})
+	hTerminal := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {})
+	hRegexp := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {})
+
+	tr := &node{}
+	tr.InsertRoute(mGET, "/foo/bar/{other-stuff:*}/fizz/buzz", hNested)
+	tr.InsertRoute(mGET, "/greedy/{path:*}/bar", hGreedy)
+	tr.InsertRoute(mGET, "/empty/{path:*}/bar", hEmpty)
+	tr.InsertRoute(mGET, "/embedded/prefix-{path:*}/bar", hEmbeddedEmpty)
+	tr.InsertRoute(mGET, "/files/{path:*}", hTerminal)
+	tr.InsertRoute(mGET, "/regexp/{path:.*}/tail", hRegexp)
+
+	tests := []struct {
+		r string
+		h http.Handler
+		k []string
+		v []string
+	}{
+		{r: "/foo/bar/one/two/three/fizz/buzz", h: hNested, k: []string{"other-stuff"}, v: []string{"one/two/three"}},
+		{r: "/greedy/one/bar/two/bar", h: hGreedy, k: []string{"path"}, v: []string{"one/bar/two"}},
+		{r: "/empty/bar", h: hEmpty, k: []string{"path"}, v: []string{""}},
+		{r: "/empty//bar", h: hEmpty, k: []string{"path"}, v: []string{""}},
+		{r: "/embedded/prefix-bar", h: hEmbeddedEmpty, k: []string{"path"}, v: []string{""}},
+		{r: "/files", h: hTerminal, k: []string{"path"}, v: []string{""}},
+		{r: "/files/", h: hTerminal, k: []string{"path"}, v: []string{""}},
+		{r: "/files/a/b", h: hTerminal, k: []string{"path"}, v: []string{"a/b"}},
+		{r: "/regexp/a/b/tail", h: nil, k: []string{}, v: []string{}},
+		{r: "/regexp/abc/tail", h: hRegexp, k: []string{"path"}, v: []string{"abc"}},
+	}
+
+	for i, tt := range tests {
+		rctx := NewRouteContext()
+
+		_, handlers, _ := tr.FindRoute(rctx, mGET, tt.r)
+
+		var handler http.Handler
+		if methodHandler, ok := handlers[mGET]; ok {
+			handler = methodHandler.handler
+		}
+
+		paramKeys := rctx.routeParams.Keys
+		paramValues := rctx.routeParams.Values
+
+		if fmt.Sprintf("%v", tt.h) != fmt.Sprintf("%v", handler) {
+			t.Errorf("input [%d]: find '%s' expecting handler:%v , got:%v", i, tt.r, tt.h, handler)
+		}
+		if !stringSliceEqual(tt.k, paramKeys) {
+			t.Errorf("input [%d]: find '%s' expecting paramKeys:(%d)%v , got:(%d)%v", i, tt.r, len(tt.k), tt.k, len(paramKeys), paramKeys)
+		}
+		if !stringSliceEqual(tt.v, paramValues) {
+			t.Errorf("input [%d]: find '%s' expecting paramValues:(%d)%v , got:(%d)%v", i, tt.r, len(tt.v), tt.v, len(paramValues), paramValues)
+		}
+	}
+}
+
 func TestTreeRegexpRecursive(t *testing.T) {
 	hStub1 := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {})
 	hStub2 := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {})