zev/mux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gofmt

Browse Source
This commit is contained in:
Quinn Slack
2014-04-17 00:44:35 -07:00
parent 9ede152210
commit 9ee70e572c
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mux.go
View File

@@ -69,7 +69,7 @@ func (r *Router) ServeHTTP(w http.ResponseWriter, req *http.Request) {
if p := cleanPath(req.URL.Path); p != req.URL.Path { if p := cleanPath(req.URL.Path); p != req.URL.Path {
// Added 3 lines (Philip Schlump) - It was droping the query string and #whatever from query. // Added 3 lines (Philip Schlump) - It was droping the query string and #whatever from query.
// This matches with fix in go 1.2 r.c. 4 for same problem. Go Issue: // This matches with fix in go 1.2 r.c. 4 for same problem. Go Issue:
// http://code.google.com/p/go/issues/detail?id=5252 // http://code.google.com/p/go/issues/detail?id=5252
url := *req.URL url := *req.URL
url.Path = p url.Path = p

20
mux_test.go
View File

@@ -22,7 +22,6 @@ type routeTest struct {
shouldMatch bool // whether the request is expected to match the route at all shouldMatch bool // whether the request is expected to match the route at all
} }
func TestHost(t *testing.T) { func TestHost(t *testing.T) {
// newRequestHost a new request with a method, url, and host header // newRequestHost a new request with a method, url, and host header
newRequestHost := func(method, url, host string) *http.Request { newRequestHost := func(method, url, host string) *http.Request {
@@ -673,7 +672,7 @@ func testRoute(t *testing.T, test routeTest) {
func TestKeepContext(t *testing.T) { func TestKeepContext(t *testing.T) {
func1 := func(w http.ResponseWriter, r *http.Request) {} func1 := func(w http.ResponseWriter, r *http.Request) {}
r:= NewRouter() r := NewRouter()
r.HandleFunc("/", func1).Name("func1") r.HandleFunc("/", func1).Name("func1")
req, _ := http.NewRequest("GET", "http://localhost/", nil) req, _ := http.NewRequest("GET", "http://localhost/", nil)
@@ -698,21 +697,20 @@ func TestKeepContext(t *testing.T) {
} }
type TestA301ResponseWriter struct { type TestA301ResponseWriter struct {
hh http.Header hh http.Header
status int status int
} }
func (ho TestA301ResponseWriter) Header() http.Header { func (ho TestA301ResponseWriter) Header() http.Header {
return http.Header(ho.hh) return http.Header(ho.hh)
} }
func (ho TestA301ResponseWriter) Write( b []byte) (int, error) { func (ho TestA301ResponseWriter) Write(b []byte) (int, error) {
return 0, nil return 0, nil
} }
func (ho TestA301ResponseWriter) WriteHeader( code int ) { func (ho TestA301ResponseWriter) WriteHeader(code int) {
ho.status = code ho.status = code
} }
@@ -722,16 +720,16 @@ func Test301Redirect(t *testing.T) {
func1 := func(w http.ResponseWriter, r *http.Request) {} func1 := func(w http.ResponseWriter, r *http.Request) {}
func2 := func(w http.ResponseWriter, r *http.Request) {} func2 := func(w http.ResponseWriter, r *http.Request) {}
r:= NewRouter() r := NewRouter()
r.HandleFunc("/api/", func2).Name("func2") r.HandleFunc("/api/", func2).Name("func2")
r.HandleFunc("/", func1).Name("func1") r.HandleFunc("/", func1).Name("func1")
req, _ := http.NewRequest("GET", "http://localhost//api/?abc=def", nil) req, _ := http.NewRequest("GET", "http://localhost//api/?abc=def", nil)
res := TestA301ResponseWriter{ res := TestA301ResponseWriter{
hh: m, hh: m,
status : 0, status: 0,
} }
r.ServeHTTP(&res, req) r.ServeHTTP(&res, req)
if "http://localhost/api/?abc=def" != res.hh["Location"][0] { if "http://localhost/api/?abc=def" != res.hh["Location"][0] {