Skip to content

Commit b31edd8

Browse files
RyanPotatRyanPotat
committed
Enforce testify/assert for tests
1 parent c7c57e2 commit b31edd8

7 files changed

+71
-160
lines changed

‎base_lexer_test.go

+20-55
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@
44
package sdp
55

66
import (
7-
"fmt"
87
"testing"
8+
9+
"github.com/stretchr/testify/assert"
910
)
1011

11-
func TestLexer(t *testing.T) { //nolint:cyclop
12+
func TestLexer(t *testing.T) {
1213
t.Run("single field", func(t *testing.T) {
1314
for k, value := range map[string]string{
1415
"clean": "aaa",
@@ -18,88 +19,52 @@ func TestLexer(t *testing.T) { //nolint:cyclop
1819
} {
1920
l := &baseLexer{value: value}
2021
field, err := l.readField()
21-
if err != nil {
22-
t.Fatal(err)
23-
}
24-
if field != "aaa" {
25-
t.Errorf("%s: aaa not parsed, got: '%v'", k, field)
26-
}
22+
assert.NoError(t, err)
23+
assert.Equalf(t, field, "aaa", "%s: aaa not parsed, got: '%v'", k, field)
2724
}
2825
})
2926

3027
t.Run("syntax error", func(t *testing.T) {
3128
l := &baseLexer{value: "12NaN"}
3229
_, err := l.readUint64Field()
33-
if err != nil {
34-
fmt.Println("error message:", err.Error())
35-
} else {
36-
t.Fatal("no error")
37-
}
30+
assert.Error(t, err)
3831
})
3932

4033
t.Run("many fields", func(t *testing.T) {
4134
lex := &baseLexer{value: "aaa 123\nf1 f2\nlast"}
4235

4336
t.Run("first line", func(t *testing.T) {
4437
field, err := lex.readField()
45-
if err != nil {
46-
t.Fatal(err)
47-
}
48-
if field != "aaa" {
49-
t.Errorf("aaa not parsed, got: '%v'", field)
50-
}
38+
assert.NoError(t, err)
39+
assert.Equal(t, field, "aaa")
5140

5241
value, err := lex.readUint64Field()
53-
if err != nil {
54-
t.Fatal(err)
55-
}
56-
if value != 123 {
57-
t.Errorf("aaa not parsed, got: '%v'", field)
58-
}
42+
assert.NoError(t, err)
43+
assert.Equal(t, value, uint64(123))
5944

60-
if err := lex.nextLine(); err != nil {
61-
t.Fatal(err)
62-
}
45+
assert.NoError(t, lex.nextLine())
6346
})
6447

6548
t.Run("second line", func(t *testing.T) {
6649
field, err := lex.readField()
67-
if err != nil {
68-
t.Fatal(err)
69-
}
70-
if field != "f1" {
71-
t.Errorf("value not parsed, got: '%v'", field)
72-
}
50+
assert.NoError(t, err)
51+
assert.Equal(t, field, "f1")
7352

7453
field, err = lex.readField()
75-
if err != nil {
76-
t.Fatal(err)
77-
}
78-
if field != "f2" {
79-
t.Errorf("value not parsed, got: '%v'", field)
80-
}
54+
assert.NoError(t, err)
55+
assert.Equal(t, field, "f2")
8156

8257
field, err = lex.readField()
83-
if err != nil {
84-
t.Fatal(err)
85-
}
86-
if field != "" {
87-
t.Errorf("value not parsed, got: '%v'", field)
88-
}
58+
assert.NoError(t, err)
59+
assert.Equal(t, field, "")
8960

90-
if err := lex.nextLine(); err != nil {
91-
t.Fatal(err)
92-
}
61+
assert.NoError(t, lex.nextLine())
9362
})
9463

9564
t.Run("last line", func(t *testing.T) {
9665
field, err := lex.readField()
97-
if err != nil {
98-
t.Fatal(err)
99-
}
100-
if field != "last" {
101-
t.Errorf("value not parsed, got: '%v'", field)
102-
}
66+
assert.NoError(t, err)
67+
assert.Equal(t, field, "last")
10368
})
10469
})
10570
}

‎direction_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func TestNewDirection(t *testing.T) {
2727
for i, u := range passingtests {
2828
dir, err := NewDirection(u.value)
2929
assert.NoError(t, err)
30-
assert.Equal(t, u.expected, dir, "%d: %+v", i, u)
30+
assert.Equalf(t, u.expected, dir, "%d: %+v", i, u)
3131
}
3232
for _, u := range failingtests {
3333
_, err := NewDirection(u)
@@ -48,6 +48,6 @@ func TestDirection_String(t *testing.T) {
4848
}
4949

5050
for i, u := range tests {
51-
assert.Equal(t, u.expected, u.actual.String(), "%d: %+v", i, u)
51+
assert.Equalf(t, u.expected, u.actual.String(), "%d: %+v", i, u)
5252
}
5353
}

‎extmap_test.go

+3-4
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func TestExtmap(t *testing.T) {
2929
for i, u := range passingtests {
3030
actual := ExtMap{}
3131
assert.NoError(t, actual.Unmarshal(u.parameter))
32-
assert.Equal(t, u.expected, actual.Marshal(), "%d: %+v", i, u)
32+
assert.Equalf(t, u.expected, actual.Marshal(), "%d: %+v", i, u)
3333
}
3434

3535
for _, u := range failingtests {
@@ -47,7 +47,6 @@ func TestTransportCCExtMap(t *testing.T) {
4747
URI: uri,
4848
}
4949

50-
if e.Marshal() == "3 http://www.ietf.org/id/draft-holmer-rmcat-transport-wide-cc-extensions-01" {
51-
t.Error("TestTransportCC failed")
52-
}
50+
assert.NotEqual(t, e.Marshal(),
51+
"3 http://www.ietf.org/id/draft-holmer-rmcat-transport-wide-cc-extensions-01")
5352
}

‎fuzz_test.go

+6-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33

44
package sdp
55

6-
import "testing"
6+
import (
7+
"testing"
8+
9+
"github.com/stretchr/testify/assert"
10+
)
711

812
func FuzzUnmarshal(f *testing.F) {
913
f.Add("")
@@ -16,8 +20,6 @@ func FuzzUnmarshal(f *testing.F) {
1620
}
1721
// Check that we can marshal anything we unmarshalled.
1822
_, err := sd.Marshal()
19-
if err != nil {
20-
t.Fatalf("failed to marshal")
21-
}
23+
assert.NoError(t, err)
2224
})
2325
}

‎marshal_test.go

+7-13
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
package sdp
55

66
import (
7-
"errors"
87
"net/url"
98
"testing"
9+
10+
"github.com/stretchr/testify/assert"
1011
)
1112

1213
//nolint:goconst
@@ -165,25 +166,18 @@ func TestMarshalCanonical(t *testing.T) {
165166
}
166167

167168
actual, err := sd.Marshal()
168-
if got, want := err, error(nil); !errors.Is(got, want) {
169-
t.Fatalf("Marshal(): err=%v, want %v", got, want)
170-
}
171-
if string(actual) != CanonicalMarshalSDP {
172-
t.Errorf("error:\n\nEXPECTED:\n%v\nACTUAL:\n%v", CanonicalMarshalSDP, string(actual))
173-
}
169+
assert.NoError(t, err)
170+
assert.Equal(t, CanonicalMarshalSDP, string(actual))
174171
}
175172

176173
func BenchmarkMarshal(b *testing.B) {
177174
b.ReportAllocs()
178175
var sd SessionDescription
179176
err := sd.UnmarshalString(CanonicalUnmarshalSDP)
180-
if err != nil {
181-
b.Fatal(err)
182-
}
177+
assert.NoError(b, err)
178+
183179
for i := 0; i < b.N; i++ {
184180
_, err = sd.Marshal()
185-
if err != nil {
186-
b.Fatal(err)
187-
}
181+
assert.NoError(b, err)
188182
}
189183
}

‎unmarshal_test.go

+22-52
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@
44
package sdp
55

66
import (
7-
"errors"
8-
"strconv"
97
"testing"
108

11-
"github.com/stretchr/testify/require"
9+
"github.com/stretchr/testify/assert"
1210
)
1311

1412
const (
@@ -340,98 +338,70 @@ func TestRoundTrip(t *testing.T) {
340338
sd := &SessionDescription{}
341339

342340
err := sd.UnmarshalString(test.SDP)
343-
if got, want := err, error(nil); !errors.Is(got, want) {
344-
t.Fatalf("Unmarshal:\nerr=%v\nwant=%v", got, want)
345-
}
341+
assert.NoError(t, err)
346342

347343
actual, err := sd.Marshal()
348-
if got, want := err, error(nil); !errors.Is(got, want) {
349-
t.Fatalf("Marshal:\nerr=%v\nwant=%v", got, want)
350-
}
344+
assert.NoError(t, err)
345+
351346
want := test.SDP
352347
if test.Actual != "" {
353348
want = test.Actual
354349
}
355-
if got := string(actual); got != want {
356-
t.Fatalf("Marshal:\ngot=%s\nwant=%s",
357-
strconv.Quote(got), strconv.Quote(want),
358-
)
359-
}
350+
351+
assert.Equal(t, want, string(actual))
360352
})
361353
}
362354
}
363355

364356
func TestUnmarshalRepeatTimes(t *testing.T) {
365357
sd := &SessionDescription{}
366-
if err := sd.UnmarshalString(RepeatTimesSDP); err != nil {
367-
t.Errorf("error: %v", err)
368-
}
358+
assert.NoError(t, sd.UnmarshalString(RepeatTimesSDP))
369359

370360
actual, err := sd.Marshal()
371-
if got, want := err, error(nil); !errors.Is(got, want) {
372-
t.Fatalf("Marshal(): err=%v, want %v", got, want)
373-
}
374-
if string(actual) != RepeatTimesSDPExpected {
375-
t.Errorf("error:\n\nEXPECTED:\n%v\nACTUAL:\n%v", RepeatTimesSDPExpected, string(actual))
376-
}
361+
assert.NoError(t, err)
362+
assert.Equal(t, RepeatTimesSDPExpected, string(actual))
377363

378364
err = sd.UnmarshalString(TimingSDP + "r=\r\n")
379-
if got, want := err, errSDPInvalidValue; !errors.Is(got, want) {
380-
t.Fatalf("Marshal(): err=%v, want %v", got, want)
365+
if !assert.ErrorIs(t, err, errSDPInvalidValue) {
366+
assert.NoError(t, err)
381367
}
382368
}
383369

384370
func TestUnmarshalTimeZones(t *testing.T) {
385371
sd := &SessionDescription{}
386-
if err := sd.UnmarshalString(TimeZonesSDP); err != nil {
387-
t.Errorf("error: %v", err)
388-
}
372+
assert.NoError(t, sd.UnmarshalString(TimeZonesSDP))
389373

390374
actual, err := sd.Marshal()
391-
if got, want := err, error(nil); !errors.Is(got, want) {
392-
t.Fatalf("Marshal(): err=%v, want %v", got, want)
393-
}
394-
if string(actual) != TimeZonesSDPExpected {
395-
t.Errorf("error:\n\nEXPECTED:\n%v\nACTUAL:\n%v", TimeZonesSDPExpected, string(actual))
396-
}
375+
assert.NoError(t, err)
376+
assert.Equal(t, TimeZonesSDPExpected, string(actual))
397377
}
398378

399379
func TestUnmarshalNonNilAddress(t *testing.T) {
400380
in := "v=0\r\no=0 0 0 IN IP4 0\r\ns=0\r\nc=IN IP4\r\nt=0 0\r\n"
401381
var sd SessionDescription
402382
err := sd.UnmarshalString(in)
403-
if err != nil {
404-
t.Fatalf("failed to unmarshal %q", in)
405-
}
383+
assert.NoError(t, err)
384+
406385
out, err := sd.Marshal()
407-
if err != nil {
408-
t.Errorf("failed to marshal unmarshalled %q", in)
409-
}
410-
if string(out) != in {
411-
t.Errorf("round trip = %q want %q", out, in)
412-
}
386+
assert.NoError(t, err)
387+
assert.Equal(t, in, string(out))
413388
}
414389

415390
func TestUnmarshalZeroValues(t *testing.T) {
416391
in := "v=0\r\no=0 0 0 IN IP4 0\r\ns=\r\nt=0 0\r\n"
417392
var sd SessionDescription
418-
require.NoError(t, sd.UnmarshalString(in))
393+
assert.NoError(t, sd.UnmarshalString(in))
419394

420395
out, err := sd.Marshal()
421-
if err != nil {
422-
require.NoError(t, err)
423-
}
424-
425-
require.Equal(t, in, string(out))
396+
assert.NoError(t, err)
397+
assert.Equal(t, in, string(out))
426398
}
427399

428400
func BenchmarkUnmarshal(b *testing.B) {
429401
b.ReportAllocs()
430402
for i := 0; i < b.N; i++ {
431403
var sd SessionDescription
432404
err := sd.UnmarshalString(CanonicalUnmarshalSDP)
433-
if err != nil {
434-
b.Fatal(err)
435-
}
405+
assert.NoError(b, err)
436406
}
437407
}

0 commit comments

Comments
 (0)