Skip to content

Commit 3673c2c

Browse files
nhooyrnhooyr
committed
Use basic test assertions
1 parent 9c5bfab commit 3673c2c

File tree

12 files changed

+206
-269
lines changed

12 files changed

+206
-269
lines changed

‎accept_js.go‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package websocket
2+
3+
import (
4+
"net/http"
5+
6+
"golang.org/x/xerrors"
7+
)
8+
9+
// AcceptOptions represents Accept's options.
10+
type AcceptOptions struct {
11+
Subprotocols []string
12+
InsecureSkipVerify bool
13+
CompressionOptions *CompressionOptions
14+
}
15+
16+
// Accept is stubbed out for Wasm.
17+
func Accept(w http.ResponseWriter, r *http.Request, opts *AcceptOptions) (*Conn, error) {
18+
return nil, xerrors.New("unimplemented")
19+
}

‎accept_test.go‎

Lines changed: 19 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212

1313
"golang.org/x/xerrors"
1414

15-
"nhooyr.io/websocket/internal/test/cmp"
15+
"nhooyr.io/websocket/internal/test/assert"
1616
)
1717

1818
func TestAccept(t *testing.T) {
@@ -25,9 +25,7 @@ func TestAccept(t *testing.T) {
2525
r := httptest.NewRequest("GET", "/", nil)
2626

2727
_, err := Accept(w, r, nil)
28-
if !cmp.ErrorContains(err, "protocol violation") {
29-
t.Fatal(err)
30-
}
28+
assert.Contains(t, err, "protocol violation")
3129
})
3230

3331
t.Run("badOrigin", func(t *testing.T) {
@@ -42,9 +40,7 @@ func TestAccept(t *testing.T) {
4240
r.Header.Set("Origin", "harhar.com")
4341

4442
_, err := Accept(w, r, nil)
45-
if !cmp.ErrorContains(err, `request Origin "harhar.com" is not authorized for Host`) {
46-
t.Fatal(err)
47-
}
43+
assert.Contains(t, err, `request Origin "harhar.com" is not authorized for Host`)
4844
})
4945

5046
t.Run("badCompression", func(t *testing.T) {
@@ -61,9 +57,7 @@ func TestAccept(t *testing.T) {
6157
r.Header.Set("Sec-WebSocket-Extensions", "permessage-deflate; harharhar")
6258

6359
_, err := Accept(w, r, nil)
64-
if !cmp.ErrorContains(err, `unsupported permessage-deflate parameter`) {
65-
t.Fatal(err)
66-
}
60+
assert.Contains(t, err, `unsupported permessage-deflate parameter`)
6761
})
6862

6963
t.Run("requireHttpHijacker", func(t *testing.T) {
@@ -77,9 +71,7 @@ func TestAccept(t *testing.T) {
7771
r.Header.Set("Sec-WebSocket-Key", "meow123")
7872

7973
_, err := Accept(w, r, nil)
80-
if !cmp.ErrorContains(err, `http.ResponseWriter does not implement http.Hijacker`) {
81-
t.Fatal(err)
82-
}
74+
assert.Contains(t, err, `http.ResponseWriter does not implement http.Hijacker`)
8375
})
8476

8577
t.Run("badHijack", func(t *testing.T) {
@@ -99,9 +91,7 @@ func TestAccept(t *testing.T) {
9991
r.Header.Set("Sec-WebSocket-Key", "meow123")
10092

10193
_, err := Accept(w, r, nil)
102-
if !cmp.ErrorContains(err, `failed to hijack connection`) {
103-
t.Fatal(err)
104-
}
94+
assert.Contains(t, err, `failed to hijack connection`)
10595
})
10696
}
10797

@@ -193,8 +183,10 @@ func Test_verifyClientHandshake(t *testing.T) {
193183
}
194184

195185
_, err := verifyClientRequest(httptest.NewRecorder(), r)
196-
if tc.success != (err == nil) {
197-
t.Fatalf("unexpected error value: %v", err)
186+
if tc.success {
187+
assert.Success(t, err)
188+
} else {
189+
assert.Error(t, err)
198190
}
199191
})
200192
}
@@ -244,9 +236,7 @@ func Test_selectSubprotocol(t *testing.T) {
244236
r.Header.Set("Sec-WebSocket-Protocol", strings.Join(tc.clientProtocols, ","))
245237

246238
negotiated := selectSubprotocol(r, tc.serverProtocols)
247-
if !cmp.Equal(tc.negotiated, negotiated) {
248-
t.Fatalf("unexpected negotiated: %v", cmp.Diff(tc.negotiated, negotiated))
249-
}
239+
assert.Equal(t, "negotiated", tc.negotiated, negotiated)
250240
})
251241
}
252242
}
@@ -300,8 +290,10 @@ func Test_authenticateOrigin(t *testing.T) {
300290
r.Header.Set("Origin", tc.origin)
301291

302292
err := authenticateOrigin(r)
303-
if tc.success != (err == nil) {
304-
t.Fatalf("unexpected error value: %v", err)
293+
if tc.success {
294+
assert.Success(t, err)
295+
} else {
296+
assert.Error(t, err)
305297
}
306298
})
307299
}
@@ -373,21 +365,13 @@ func Test_acceptCompression(t *testing.T) {
373365
w := httptest.NewRecorder()
374366
copts, err := acceptCompression(r, w, tc.mode)
375367
if tc.error {
376-
if err == nil {
377-
t.Fatalf("expected error: %v", copts)
378-
}
368+
assert.Error(t, err)
379369
return
380370
}
381371

382-
if err != nil {
383-
t.Fatal(err)
384-
}
385-
if !cmp.Equal(tc.expCopts, copts) {
386-
t.Fatalf("unexpected compression options: %v", cmp.Diff(tc.expCopts, copts))
387-
}
388-
if !cmp.Equal(tc.respSecWebSocketExtensions, w.Header().Get("Sec-WebSocket-Extensions")) {
389-
t.Fatalf("unexpected respHeader: %v", cmp.Diff(tc.respSecWebSocketExtensions, w.Header().Get("Sec-WebSocket-Extensions")))
390-
}
372+
assert.Success(t, err)
373+
assert.Equal(t, "compression options", tc.expCopts, copts)
374+
assert.Equal(t, "Sec-WebSocket-Extensions", tc.respSecWebSocketExtensions, w.Header().Get("Sec-WebSocket-Extensions"))
391375
})
392376
}
393377
}

‎autobahn_test.go‎

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919

2020
"nhooyr.io/websocket"
2121
"nhooyr.io/websocket/internal/errd"
22+
"nhooyr.io/websocket/internal/test/assert"
2223
"nhooyr.io/websocket/internal/test/wstest"
2324
)
2425

@@ -45,42 +46,34 @@ func TestAutobahn(t *testing.T) {
4546
defer cancel()
4647

4748
wstestURL, closeFn, err := wstestClientServer(ctx)
48-
if err != nil {
49-
t.Fatal(err)
50-
}
49+
assert.Success(t, err)
5150
defer closeFn()
5251

5352
err = waitWS(ctx, wstestURL)
54-
if err != nil {
55-
t.Fatal(err)
56-
}
53+
assert.Success(t, err)
5754

5855
cases, err := wstestCaseCount(ctx, wstestURL)
59-
if err != nil {
60-
t.Fatal(err)
61-
}
56+
assert.Success(t, err)
6257

6358
t.Run("cases", func(t *testing.T) {
6459
for i := 1; i <= cases; i++ {
6560
i := i
6661
t.Run("", func(t *testing.T) {
62+
t.Parallel()
63+
6764
ctx, cancel := context.WithTimeout(context.Background(), time.Minute*5)
6865
defer cancel()
6966

7067
c, _, err := websocket.Dial(ctx, fmt.Sprintf(wstestURL+"/runCase?case=%v&agent=main", i), nil)
71-
if err != nil {
72-
t.Fatal(err)
73-
}
68+
assert.Success(t, err)
7469
err = wstest.EchoLoop(ctx, c)
7570
t.Logf("echoLoop: %v", err)
7671
})
7772
}
7873
})
7974

8075
c, _, err := websocket.Dial(ctx, fmt.Sprintf(wstestURL+"/updateReports?agent=main"), nil)
81-
if err != nil {
82-
t.Fatal(err)
83-
}
76+
assert.Success(t, err)
8477
c.Close(websocket.StatusNormalClosure, "")
8578

8679
checkWSTestIndex(t, "./ci/out/wstestClientReports/index.json")
@@ -172,18 +165,14 @@ func wstestCaseCount(ctx context.Context, url string) (cases int, err error) {
172165

173166
func checkWSTestIndex(t *testing.T, path string) {
174167
wstestOut, err := ioutil.ReadFile(path)
175-
if err != nil {
176-
t.Fatal(err)
177-
}
168+
assert.Success(t, err)
178169

179170
var indexJSON map[string]map[string]struct {
180171
Behavior string `json:"behavior"`
181172
BehaviorClose string `json:"behaviorClose"`
182173
}
183174
err = json.Unmarshal(wstestOut, &indexJSON)
184-
if err != nil {
185-
t.Fatal(err)
186-
}
175+
assert.Success(t, err)
187176

188177
for _, tests := range indexJSON {
189178
for test, result := range tests {

‎close_test.go‎

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"strings"
99
"testing"
1010

11-
"nhooyr.io/websocket/internal/test/cmp"
11+
"nhooyr.io/websocket/internal/test/assert"
1212
)
1313

1414
func TestCloseError(t *testing.T) {
@@ -51,8 +51,10 @@ func TestCloseError(t *testing.T) {
5151
t.Parallel()
5252

5353
_, err := tc.ce.bytesErr()
54-
if tc.success != (err == nil) {
55-
t.Fatalf("unexpected error value (wanted err == nil == %v): %v", tc.success, err)
54+
if tc.success {
55+
assert.Success(t, err)
56+
} else {
57+
assert.Error(t, err)
5658
}
5759
})
5860
}
@@ -63,10 +65,7 @@ func TestCloseError(t *testing.T) {
6365
Code: StatusInternalError,
6466
Reason: "meow",
6567
}.Error()
66-
67-
if (act) != exp {
68-
t.Fatal(cmp.Diff(exp, act))
69-
}
68+
assert.Equal(t, "CloseError.Error()", exp, act)
7069
})
7170
}
7271

@@ -114,14 +113,10 @@ func Test_parseClosePayload(t *testing.T) {
114113

115114
ce, err := parseClosePayload(tc.p)
116115
if tc.success {
117-
if err != nil {
118-
t.Fatal(err)
119-
}
120-
if !cmp.Equal(tc.ce, ce) {
121-
t.Fatalf("expected %v but got %v", tc.ce, ce)
122-
}
123-
} else if err == nil {
124-
t.Errorf("expected error: %v %v", ce, err)
116+
assert.Success(t, err)
117+
assert.Equal(t, "close payload", tc.ce, ce)
118+
} else {
119+
assert.Error(t, err)
125120
}
126121
})
127122
}
@@ -168,9 +163,7 @@ func Test_validWireCloseCode(t *testing.T) {
168163
t.Parallel()
169164

170165
act := validWireCloseCode(tc.code)
171-
if !cmp.Equal(tc.valid, act) {
172-
t.Fatalf("unexpected valid: %v", cmp.Diff(tc.valid, act))
173-
}
166+
assert.Equal(t, "wire close code", tc.valid, act)
174167
})
175168
}
176169
}
@@ -208,9 +201,7 @@ func TestCloseStatus(t *testing.T) {
208201
t.Parallel()
209202

210203
act := CloseStatus(tc.in)
211-
if !cmp.Equal(tc.exp, act) {
212-
t.Fatalf("unexpected closeStatus: %v", cmp.Diff(tc.exp, act))
213-
}
204+
assert.Equal(t, "close status", tc.exp, act)
214205
})
215206
}
216207
}

‎compress_test.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"strings"
77
"testing"
88

9+
"nhooyr.io/websocket/internal/test/assert"
910
"nhooyr.io/websocket/internal/test/xrand"
1011
)
1112

@@ -23,10 +24,7 @@ func Test_slidingWindow(t *testing.T) {
2324
r := newSlidingWindow(windowLength)
2425
r.write([]byte(input))
2526

26-
if cap(r.buf) != windowLength {
27-
t.Fatalf("sliding window length changed somehow: %q and windowLength %d", input, windowLength)
28-
}
29-
27+
assert.Equal(t, "window length", windowLength, cap(r.buf))
3028
if !strings.HasSuffix(input, string(r.buf)) {
3129
t.Fatalf("r.buf is not a suffix of input: %q and %q", input, r.buf)
3230
}

0 commit comments

Comments
 (0)