Make HTTP middleware easier to use

server/prpc/server_test.go

 // Copyright 2016 The LUCI Authors. All rights reserved.
 // Use of this source code is governed under the Apache License, Version 2.0
 // that can be found in the LICENSE file.
 
 package prpc
 
 import (
         "bytes"
         "net/http"
         "net/http/httptest"
         "strconv"
         "testing"
 
-        "github.com/julienschmidt/httprouter"
         "golang.org/x/net/context"
         "google.golang.org/grpc"
         "google.golang.org/grpc/codes"
 
         "github.com/luci/luci-go/common/prpc"
         prpccommon "github.com/luci/luci-go/common/prpc"
         "github.com/luci/luci-go/server/auth"
-        "github.com/luci/luci-go/server/middleware"
+        "github.com/luci/luci-go/server/router"
 
         . "github.com/smartystreets/goconvey/convey"
 )
 
 type greeterService struct{}
 
 func (s *greeterService) SayHello(c context.Context, req *HelloRequest) (*HelloReply, error) {
         if req.Name == "" {
                 return nil, grpc.Errorf(codes.InvalidArgument, "Name unspecified")
         }
@@ skipping 25 matching lines @@
                 Convey("Register Calc service", func() {
                         RegisterCalcServer(&server, &calcService{})
                         So(server.ServiceNames(), ShouldResemble, []string{
                                 "prpc.Calc",
                                 "prpc.Greeter",
                         })
                 })
 
                 Convey("Handlers", func() {
                         c := context.Background()
-                        r := httprouter.New()
-                        server.InstallHandlers(r, middleware.TestingBase(c))
+                        r := router.New()
+                        server.InstallHandlers(r, []router.Handler{router.HandlerWithContext(c)})
                         res := httptest.NewRecorder()
                         hiMsg := bytes.NewBufferString(`name: "Lucy"`)
                         req, err := http.NewRequest("POST", "/prpc/prpc.Greeter/SayHello", hiMsg)
                         So(err, ShouldBeNil)
                         req.Header.Set("Content-Type", mtPRPCText)
 
                         invalidArgument := strconv.Itoa(int(codes.InvalidArgument))
                         unimplemented := strconv.Itoa(int(codes.Unimplemented))
 
                         Convey("Works", func() {
@@ skipping 93 matching lines @@
                                                 r.ServeHTTP(res, req)
                                                 So(res.Code, ShouldEqual, http.StatusOK)
                                                 So(res.Header().Get(prpc.HeaderGRPCCode), ShouldEqual, "0")
                                                 So(res.Header().Get("Access-Control-Allow-Origin"), ShouldEqual, "")
                                         })
                                 })
                         })
                 })
         })
 }