Skip to content

Commit d3a217f

Browse files
committed
Refactor compression tests to use httptest.NewRequest
1 parent 8a4848f commit d3a217f

File tree

1 file changed

+11
-16
lines changed

1 file changed

+11
-16
lines changed

router/internal/middleware/compression_test.go

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
package middleware
22

33
import (
4-
"compress/gzip"
4+
"bytes"
55
"io"
66
"net/http"
77
"net/http/httptest"
88
"strings"
99
"testing"
1010

11+
"compress/gzip"
12+
1113
"github.com/stretchr/testify/require"
1214
"go.uber.org/zap"
1315
)
@@ -45,8 +47,7 @@ func TestHandleCompression(t *testing.T) {
4547
w.WriteHeader(http.StatusOK)
4648
})
4749

48-
req, err := http.NewRequest(tc.method, "/", strings.NewReader("test"))
49-
require.NoError(t, err)
50+
req := httptest.NewRequest(tc.method, "/", strings.NewReader("test"))
5051

5152
HandleCompression(zap.NewNop())(next).ServeHTTP(recorder, req)
5253

@@ -64,8 +65,7 @@ func TestHandleCompression(t *testing.T) {
6465
w.WriteHeader(http.StatusOK)
6566
})
6667

67-
req, err := http.NewRequest(http.MethodPost, "/", strings.NewReader("test"))
68-
require.NoError(t, err)
68+
req := httptest.NewRequest(http.MethodPost, "/", strings.NewReader("test"))
6969
req.Header.Set("Content-Encoding", "gzip, deflate")
7070

7171
HandleCompression(zap.NewNop())(next).ServeHTTP(recorder, req)
@@ -92,16 +92,14 @@ func TestHandleCompression(t *testing.T) {
9292

9393
// create gzip compressed request
9494

95-
var sb strings.Builder
96-
w := gzip.NewWriter(&sb)
95+
var buf bytes.Buffer
96+
w := gzip.NewWriter(&buf)
9797

9898
_, err := w.Write([]byte("test"))
9999
require.NoError(t, err)
100-
101100
require.NoError(t, w.Close())
102101

103-
req, err := http.NewRequest(http.MethodPost, "/", strings.NewReader(sb.String()))
104-
require.NoError(t, err)
102+
req := httptest.NewRequest(http.MethodPost, "/", &buf)
105103
req.Header.Set("Content-Encoding", "gzip")
106104

107105
HandleCompression(zap.NewNop())(next).ServeHTTP(recorder, req)
@@ -118,8 +116,7 @@ func TestHandleCompression(t *testing.T) {
118116
w.WriteHeader(http.StatusOK)
119117
})
120118

121-
req, err := http.NewRequest(http.MethodPost, "/", strings.NewReader("test"))
122-
require.NoError(t, err)
119+
req := httptest.NewRequest(http.MethodPost, "/", strings.NewReader("test"))
123120
req.Header.Set("Content-Encoding", "gzip")
124121

125122
HandleCompression(zap.NewNop())(next).ServeHTTP(recorder, req)
@@ -136,8 +133,7 @@ func TestHandleCompression(t *testing.T) {
136133
w.WriteHeader(http.StatusOK)
137134
})
138135

139-
req, err := http.NewRequest(http.MethodPost, "/", strings.NewReader("test"))
140-
require.NoError(t, err)
136+
req := httptest.NewRequest(http.MethodPost, "/", strings.NewReader("test"))
141137
req.Header.Set("Content-Encoding", "deflate")
142138

143139
HandleCompression(zap.NewNop())(next).ServeHTTP(recorder, req)
@@ -155,8 +151,7 @@ func TestHandleCompression(t *testing.T) {
155151
w.WriteHeader(http.StatusOK)
156152
})
157153

158-
req, err := http.NewRequest(http.MethodPost, "/", strings.NewReader("test"))
159-
require.NoError(t, err)
154+
req := httptest.NewRequest(http.MethodPost, "/", strings.NewReader("test"))
160155

161156
HandleCompression(zap.NewNop())(next).ServeHTTP(recorder, req)
162157

0 commit comments

Comments
 (0)