From 8981322b7e8387ddc094355046211b0562c9eaf4 Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Tue, 2 Jul 2019 17:03:27 -0700 Subject: [PATCH] Make httpserver test use more specific scheme matchers --- mux_httpserver_test.go | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/mux_httpserver_test.go b/mux_httpserver_test.go index c46b647a..d5e35e9e 100644 --- a/mux_httpserver_test.go +++ b/mux_httpserver_test.go @@ -11,10 +11,14 @@ import ( ) func TestSchemeMatchers(t *testing.T) { - router := NewRouter() - router.HandleFunc("/", func(rw http.ResponseWriter, r *http.Request) { + httpRouter := NewRouter() + httpRouter.HandleFunc("/", func(rw http.ResponseWriter, r *http.Request) { rw.Write([]byte("hello world")) - }).Schemes("http", "https") + }).Schemes("http") + httpsRouter := NewRouter() + httpsRouter.HandleFunc("/", func(rw http.ResponseWriter, r *http.Request) { + rw.Write([]byte("hello world")) + }).Schemes("https") assertHelloWorldResponse := func(t *testing.T, s *httptest.Server) { resp, err := s.Client().Get(s.URL) @@ -34,12 +38,12 @@ func TestSchemeMatchers(t *testing.T) { } t.Run("httpServer", func(t *testing.T) { - s := httptest.NewServer(router) + s := httptest.NewServer(httpRouter) defer s.Close() assertHelloWorldResponse(t, s) }) t.Run("httpsServer", func(t *testing.T) { - s := httptest.NewTLSServer(router) + s := httptest.NewTLSServer(httpsRouter) defer s.Close() assertHelloWorldResponse(t, s) })