More generic change to test.

Author: aeijdenberg

mux_test.go

@@ -29,13 +29,13 @@ func (r *routeRegexp) GoString() string {
 type routeTest struct {
 	title          string            // title of the test
 	route          *Route            // the route being tested
+	routeBuilder   func() *Route     // if set, ignore route and call this to build one during test
 	request        *http.Request     // a request to test the route
 	vars           map[string]string // the expected vars of the match
 	host           string            // the expected host of the match
 	path           string            // the expected path of the match
 	pathTemplate   string            // the expected path template to match
 	hostTemplate   string            // the expected host template to match
-	additionalPath string            // additional path to add to route (and parse) during test
 	shouldMatch    bool              // whether the request is expected to match the route at all
 	shouldRedirect bool              // whether the request should result in a redirect
 	shouldPanic    bool              // whether processing should result in a panic
@@ -1397,10 +1397,9 @@ func TestPanicOnCapturingGroups(t *testing.T) {
 
 	tests := []routeTest{
 		{
-			title:          "Test that capturing groups now fail fast",
-			route:          r.NewRoute(),
-			additionalPath: "/{type:(promo|special)}/{promoId}.json",
-			shouldPanic:    true,
+			title:        "Test that capturing groups now fail fast",
+			routeBuilder: func() *Route { return r.NewRoute().Path("/{type:(promo|special)}/{promoId}.json") },
+			shouldPanic:  true,
 		},
 		{
 			title:       "Test that same example works with non-capturing groups",
@@ -1443,17 +1442,16 @@ func testRoute(t *testing.T, test routeTest) {
 
 	request := test.request
 	route := test.route
+	if test.routeBuilder != nil {
+		route = test.routeBuilder()
+	}
 	vars := test.vars
 	shouldMatch := test.shouldMatch
 	host := test.host
 	path := test.path
 	url := test.host + test.path
 	shouldRedirect := test.shouldRedirect
 
-	if len(test.additionalPath) != 0 {
-		route = route.Path(test.additionalPath)
-	}
-
 	var match RouteMatch
 	ok := route.Match(request, &match)
 	if ok != shouldMatch {