improve: Add external server checker

Author: ikawaha

checker.go

@@ -52,11 +52,16 @@ type Checker struct {
 	request  *http.Request
 	response *http.Response
 	pcookies map[string]bool
+
+	// Set external to true if testing an external server.
+	// In this case, handler and server are undefined.
+	external bool
+	url      string
 	server   *httptest.Server
 	handler  http.Handler
 }
 
-// New creates an HTTP Checker.
+// New creates an HTTP Checker for testing with the given handler.
 func New(h http.Handler, options ...Option) *Checker {
 	jar, _ := cookiejar.New(nil)
 	ret := &Checker{
@@ -74,6 +79,24 @@ func New(h http.Handler, options ...Option) *Checker {
 	return ret
 }
 
+// NewExternal creates an HTTP Checker for testing an external server specified by url.
+func NewExternal(url string, options ...Option) *Checker {
+	jar, _ := cookiejar.New(nil)
+	ret := &Checker{
+		client: &http.Client{
+			Timeout: DefaultClientTimeout,
+			Jar:     jar,
+		},
+		pcookies: map[string]bool{},
+		external: true,
+		url:      url,
+	}
+	for _, v := range options {
+		v(ret)
+	}
+	return ret
+}
+
 func createServer(handler http.Handler) *httptest.Server {
 	return httptest.NewUnstartedServer(handler)
 }
@@ -119,5 +142,8 @@ func (c *Checker) Test(t TestingT, method, path string) *Tester {
 
 // GetURL returns the server URL.
 func (c *Checker) GetURL() string {
+	if c.external {
+		return c.url
+	}
 	return "http://" + c.server.Listener.Addr().String()
 }

checker_test.go

@@ -5,6 +5,7 @@ import (
 	"encoding/xml"
 	"io"
 	"net/http"
+	"net/http/httptest"
 	"testing"
 	"time"
 
@@ -86,6 +87,24 @@ func TestNew(t *testing.T) {
 	assert.Equal(t, DefaultClientTimeout, checker.client.Timeout)
 }
 
+func TestNewExternal(t *testing.T) {
+	mux := http.NewServeMux()
+	mux.HandleFunc("/some", func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusOK)
+		w.Write([]byte("hello"))
+	})
+	ts := httptest.NewServer(mux)
+	defer ts.Close()
+	checker := NewExternal(ts.URL)
+	require.NotNil(t, checker)
+	assert.Equal(t, DefaultClientTimeout, checker.client.Timeout)
+	assert.True(t, checker.external)
+	checker.Test(t, http.MethodGet, "/some").
+		Check().
+		HasStatus(http.StatusOK).
+		HasBody([]byte("hello"))
+}
+
 func TestCheckerOption_ClientTimeout(t *testing.T) {
 	t.Skip("skip this test because it expects failure.")
 	timeout := 10 * time.Millisecond

tester.go

@@ -66,12 +66,18 @@ func (tt *Tester) Cb(callback func(*http.Response)) {
 // Will run HTTP server
 func (tt *Tester) run() {
 	// log.Println("running server")
+	if tt.external {
+		return
+	}
 	tt.server.Start()
 }
 
 // Will stop HTTP server
 func (tt *Tester) stop() {
 	// log.Println("stopping server")
+	if tt.external {
+		return
+	}
 	tt.server.Close()
 	tt.server = createServer(tt.handler)
 }