Make HTTP middleware easier to use

appengine/gaemiddleware/appengine_test.go

Index: appengine/gaemiddleware/appengine_test.go
diff --git a/appengine/gaemiddleware/appengine_test.go b/appengine/gaemiddleware/appengine_test.go
index a95bc160401b2b597e28ae51485249722fbd3f81..e02a624a7c37fcf1dbe9c6c16919c33cdc9c900d 100644
--- a/appengine/gaemiddleware/appengine_test.go
+++ b/appengine/gaemiddleware/appengine_test.go
@@ -11,6 +11,7 @@ import (
 
 	"github.com/julienschmidt/httprouter"
 	"github.com/luci/luci-go/appengine/gaetesting"
+	"github.com/luci/luci-go/server/router"
 	. "github.com/smartystreets/goconvey/convey"
 	"golang.org/x/net/context"
 )
@@ -23,16 +24,25 @@ func init() {
 func TestRequireCron(t *testing.T) {
 	t.Parallel()
 
+	initialize := func(w http.ResponseWriter, r *http.Request, p httprouter.Params) router.Handler {
+		return func(c *router.Context) {
+			c.Writer = w
+			c.Request = r
+			c.Params = p
+		}
+	}
+
 	Convey("Test RequireCron", t, func() {
 		hit := false
-		f := func(c context.Context, rw http.ResponseWriter, r *http.Request, p httprouter.Params) {
+
+		f := func(c *router.Context) {
 			hit = true
-			rw.Write([]byte("ok"))
+			c.Writer.Write([]byte("ok"))
 		}
 
 		Convey("from non-cron fails", func() {
 			rec := httptest.NewRecorder()
-			gaetesting.BaseTest(RequireCron(f))(rec, &http.Request{}, nil)
+			router.ChainHandlers(initialize(rec, &http.Request{}, nil), gaetesting.BaseTest(), RequireCron(), f)()
 			So(hit, ShouldBeFalse)
 			So(rec.Body.String(), ShouldEqual, "error: must be run from cron")
 			So(rec.Code, ShouldEqual, http.StatusForbidden)
@@ -40,11 +50,11 @@ func TestRequireCron(t *testing.T) {
 
 		Convey("from cron succeeds", func() {
 			rec := httptest.NewRecorder()
-			gaetesting.BaseTest(RequireCron(f))(rec, &http.Request{
+			router.ChainHandlers(initialize(rec, &http.Request{
 				Header: http.Header{
 					http.CanonicalHeaderKey("x-appengine-cron"): []string{"true"},
 				},
-			}, nil)
+			}, nil), gaetesting.BaseTest(), RequireCron(), f)()
 			So(hit, ShouldBeTrue)
 			So(rec.Body.String(), ShouldEqual, "ok")
 			So(rec.Code, ShouldEqual, http.StatusOK)
@@ -55,16 +65,24 @@ func TestRequireCron(t *testing.T) {
 func TestRequireTQ(t *testing.T) {
 	t.Parallel()
 
+	initialize := func(w http.ResponseWriter, r *http.Request, p httprouter.Params) router.Handler {
+		return func(c *router.Context) {
+			c.Writer = w
+			c.Request = r
+			c.Params = p
+		}
+	}
+
 	Convey("Test RequireTQ", t, func() {
 		hit := false
-		f := func(c context.Context, rw http.ResponseWriter, r *http.Request, p httprouter.Params) {
+		f := func(c *router.Context) {
 			hit = true
-			rw.Write([]byte("ok"))
+			c.Writer.Write([]byte("ok"))
 		}
 
 		Convey("from non-tq fails (wat)", func() {
 			rec := httptest.NewRecorder()
-			gaetesting.BaseTest(RequireTaskQueue("wat", f))(rec, &http.Request{}, nil)
+			router.ChainHandlers(initialize(rec, &http.Request{}, nil), gaetesting.BaseTest(), RequireTaskQueue("wat"), f)()
 			So(hit, ShouldBeFalse)
 			So(rec.Body.String(), ShouldEqual, "error: must be run from the correct taskqueue")
 			So(rec.Code, ShouldEqual, http.StatusForbidden)
@@ -72,7 +90,7 @@ func TestRequireTQ(t *testing.T) {
 
 		Convey("from non-tq fails", func() {
 			rec := httptest.NewRecorder()
-			gaetesting.BaseTest(RequireTaskQueue("", f))(rec, &http.Request{}, nil)
+			router.ChainHandlers(initialize(rec, &http.Request{}, nil), gaetesting.BaseTest(), RequireTaskQueue(""), f)()
 			So(hit, ShouldBeFalse)
 			So(rec.Body.String(), ShouldEqual, "error: must be run from the correct taskqueue")
 			So(rec.Code, ShouldEqual, http.StatusForbidden)
@@ -80,11 +98,11 @@ func TestRequireTQ(t *testing.T) {
 
 		Convey("from wrong tq fails (wat)", func() {
 			rec := httptest.NewRecorder()
-			gaetesting.BaseTest(RequireTaskQueue("wat", f))(rec, &http.Request{
+			router.ChainHandlers(initialize(rec, &http.Request{
 				Header: http.Header{
 					http.CanonicalHeaderKey("x-appengine-queuename"): []string{"else"},
 				},
-			}, nil)
+			}, nil), gaetesting.BaseTest(), RequireTaskQueue("wat"), f)()
 			So(hit, ShouldBeFalse)
 			So(rec.Body.String(), ShouldEqual, "error: must be run from the correct taskqueue")
 			So(rec.Code, ShouldEqual, http.StatusForbidden)
@@ -92,11 +110,11 @@ func TestRequireTQ(t *testing.T) {
 
 		Convey("from right tq succeeds (wat)", func() {
 			rec := httptest.NewRecorder()
-			gaetesting.BaseTest(RequireTaskQueue("wat", f))(rec, &http.Request{
+			router.ChainHandlers(initialize(rec, &http.Request{
 				Header: http.Header{
 					http.CanonicalHeaderKey("x-appengine-queuename"): []string{"wat"},
 				},
-			}, nil)
+			}, nil), gaetesting.BaseTest(), RequireTaskQueue("wat"), f)()
 			So(hit, ShouldBeTrue)
 			So(rec.Body.String(), ShouldEqual, "ok")
 			So(rec.Code, ShouldEqual, http.StatusOK)
@@ -104,11 +122,11 @@ func TestRequireTQ(t *testing.T) {
 
 		Convey("from any tq succeeds", func() {
 			rec := httptest.NewRecorder()
-			gaetesting.BaseTest(RequireTaskQueue("", f))(rec, &http.Request{
+			router.ChainHandlers(initialize(rec, &http.Request{
 				Header: http.Header{
 					http.CanonicalHeaderKey("x-appengine-queuename"): []string{"wat"},
 				},
-			}, nil)
+			}, nil), gaetesting.BaseTest(), RequireTaskQueue(""), f)()
 			So(hit, ShouldBeTrue)
 			So(rec.Body.String(), ShouldEqual, "ok")
 			So(rec.Code, ShouldEqual, http.StatusOK)