tests(ws_reverseproxy): use test suite instead of unit tests of function

Author: yeqown

go.mod

@@ -1,9 +1,7 @@
 module github.com/yeqown/fasthttp-reverse-proxy/v2
 
 require (
-	github.com/andybalholm/brotli v1.0.3 // indirect
 	github.com/fasthttp/websocket v1.4.3
-	github.com/klauspost/compress v1.13.6 // indirect
 	github.com/stretchr/testify v1.7.0
 	github.com/valyala/fasthttp v1.30.0
 	github.com/yeqown/log v1.1.1

go.sum

@@ -1,16 +1,14 @@
 github.com/andybalholm/brotli v1.0.0/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
+github.com/andybalholm/brotli v1.0.2 h1:JKnhI/XQ75uFBTiuzXpzFrUriDPiZjlOSzh6wXogP0E=
 github.com/andybalholm/brotli v1.0.2/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
-github.com/andybalholm/brotli v1.0.3 h1:fpcw+r1N1h0Poc1F/pHbW40cUm/lMEQslZtCkBQ0UnM=
-github.com/andybalholm/brotli v1.0.3/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/fasthttp/websocket v1.4.3 h1:qjhRJ/rTy4KB8oBxljEC00SDt6HUY9jLRfM601SUdS4=
 github.com/fasthttp/websocket v1.4.3/go.mod h1:5r4oKssgS7W6Zn6mPWap3NWzNPJNzUUh3baWTOhcYQk=
 github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/klauspost/compress v1.10.4/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
+github.com/klauspost/compress v1.13.4 h1:0zhec2I8zGnjWcKyLl6i3gPqKANCCn5e9xmviEEeX6s=
 github.com/klauspost/compress v1.13.4/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
-github.com/klauspost/compress v1.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc=
-github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

ws_reverseproxy.go

@@ -6,6 +6,7 @@ import (
 	"io"
 	"net"
 	"net/http"
+	"strings"
 
 	"github.com/yeqown/log"
 
@@ -39,6 +40,7 @@ type WSReverseProxy struct {
 // Deprecated.
 // NewWSReverseProxyWith is recommended.
 func NewWSReverseProxy(host, path string) *WSReverseProxy {
+	path = strings.TrimPrefix(path, "/")
 	wsproxy, err := NewWSReverseProxyWith(
 		WithURL_OptionWS(fmt.Sprintf("%s://%s/%s", "ws", host, path)),
 	)

ws_reverseproxy_test.go

@@ -1,12 +1,14 @@
 package proxy
 
 import (
+	"fmt"
 	"net/http"
 	"testing"
 	"time"
 
 	"github.com/fasthttp/websocket"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/suite"
 	"github.com/valyala/fasthttp"
 	"github.com/yeqown/log"
 )
@@ -18,9 +20,21 @@ func BenchmarkNewWSReverseProxy(b *testing.B) {
 	}
 }
 
-func runBackend(addr string) {
+type wsTestSuite struct {
+	suite.Suite
+
+	server fasthttp.Server
+}
+
+func (w *wsTestSuite) SetupSuite() {
+	go w.backendProc(":8080")
+
+	time.Sleep(3 * time.Second)
+}
+
+func (w *wsTestSuite) backendProc(addr string) {
 	upgrader := websocket.FastHTTPUpgrader{}
-	entry := logger.WithField("func", "runBackend")
+	entry := logger.WithField("func", "backendProc")
 	echoHdl := func(ctx *fasthttp.RequestCtx) {
 		entry.
 			WithFields(log.Fields{
@@ -70,9 +84,9 @@ func runBackend(addr string) {
 	}
 }
 
-func doRequest(t *testing.T) {
+func executeAndAssert(t *testing.T, port int) {
 	// client
-	conn, resp, err := websocket.DefaultDialer.Dial("ws://localhost:8081", nil)
+	conn, resp, err := websocket.DefaultDialer.Dial(fmt.Sprintf("ws://localhost:%d",port), nil)
 	assert.Nil(t, err)
 	assert.Equal(t, http.StatusSwitchingProtocols, resp.StatusCode)
 	t.Logf("got resp: %+v", resp)
@@ -91,7 +105,7 @@ func doRequest(t *testing.T) {
 	assert.Equal(t, data, p)
 }
 
-func runProxy(p *WSReverseProxy, addr string) {
+func reverseProxyProc(p *WSReverseProxy, addr string) {
 	reqHdl := func(ctx *fasthttp.RequestCtx) {
 		p.ServeHTTP(ctx)
 	}
@@ -101,43 +115,27 @@ func runProxy(p *WSReverseProxy, addr string) {
 	}
 }
 
-func Test_NewWSReverseProxy(t *testing.T) {
-	go runBackend(":8080")
-	time.Sleep(3 * time.Second)
-
-	// constructs a websocket proxy server
+func (w *wsTestSuite) Test_NewWSReverseProxy() {
 	var p *WSReverseProxy
-	assert.NotPanics(t, func() {
+	assert.NotPanics(w.T(), func() {
 		p = NewWSReverseProxy("localhost:8080", "/echo")
-	}, "compatiable old version API failed")
-	assert.NotNil(t, p)
-
-	// star and serve
-	go runProxy(p, ":8081")
+	}, "compatible old version API failed")
+	assert.NotNil(w.T(), p)
 
-	doRequest(t)
+	go reverseProxyProc(p, ":8081")
+	executeAndAssert(w.T(), 8081)
 }
 
-func Test_NewWSReverseProxyWith(t *testing.T) {
-	go runBackend(":8080")
-
-	time.Sleep(3 * time.Second)
-	// constructs a websocket proxy server
+func (w *wsTestSuite)Test_NewWSReverseProxyWith() {
 	p, err := NewWSReverseProxyWith(WithURL_OptionWS("ws://localhost:8080/echo"))
-	assert.Nil(t, err)
-	assert.NotNil(t, p)
-
-	// star and serve
-	go runProxy(p, ":8081")
+	assert.Nil(w.T(), err)
+	assert.NotNil(w.T(), p)
 
-	doRequest(t)
+	go reverseProxyProc(p, ":8082")
+	executeAndAssert(w.T(), 8082)
 }
 
-func Test_NewWSReverseProxyWith_WithForwardHeadersHandler(t *testing.T) {
-	go runBackend(":8080")
-
-	time.Sleep(3 * time.Second)
-	// constructs a websocket proxy server
+func (w *wsTestSuite) Test_NewWSReverseProxyWith_WithForwardHeadersHandler() {
 	p, err := NewWSReverseProxyWith(
 		WithURL_OptionWS("ws://localhost:8080/echo"),
 		WithForwardHeadersHandlers_OptionWS(func(ctx *fasthttp.RequestCtx) (forwardHeader http.Header) {
@@ -146,11 +144,12 @@ func Test_NewWSReverseProxyWith_WithForwardHeadersHandler(t *testing.T) {
 			}
 		}),
 	)
-	assert.Nil(t, err)
+	assert.Nil(w.T(), err)
 
-	// star and serve
-	go runProxy(p, ":8081")
-
-	// doRequest
-	doRequest(t)
+	go reverseProxyProc(p, ":8083")
+	executeAndAssert(w.T(), 8083)
 }
+
+func Test_wsTestSuite(t *testing.T) {
+	suite.Run(t, new(wsTestSuite))
+}