Skip to content

Commit 635d777

Browse files
committed
Update lint rules, force testify/assert for tests
Use testify's assert instead of the standard library's testing helpers.
1 parent b9f3962 commit 635d777

File tree

5 files changed

+21
-13
lines changed

5 files changed

+21
-13
lines changed

.golangci.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,16 @@ linters-settings:
1919
recommendations:
2020
- errors
2121
forbidigo:
22+
analyze-types: true
2223
forbid:
2324
- ^fmt.Print(f|ln)?$
2425
- ^log.(Panic|Fatal|Print)(f|ln)?$
2526
- ^os.Exit$
2627
- ^panic$
2728
- ^print(ln)?$
29+
- p: ^testing.T.(Error|Errorf|Fatal|Fatalf|Fail|FailNow)$
30+
pkg: ^testing$
31+
msg: "use testify/assert instead"
2832
varnamelen:
2933
max-distance: 12
3034
min-name-length: 2
@@ -127,9 +131,12 @@ issues:
127131
exclude-dirs-use-default: false
128132
exclude-rules:
129133
# Allow complex tests and examples, better to be self contained
130-
- path: (examples|main\.go|_test\.go)
134+
- path: (examples|main\.go)
131135
linters:
136+
- gocognit
132137
- forbidigo
138+
- path: _test\.go
139+
linters:
133140
- gocognit
134141

135142
# Allow forbidden identifiers in CLI commands

base_lexer_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func TestLexer(t *testing.T) {
2020
l := &baseLexer{value: value}
2121
field, err := l.readField()
2222
assert.NoError(t, err)
23-
assert.Equalf(t, field, "aaa", "%s: aaa not parsed, got: '%v'", k, field)
23+
assert.Equalf(t, "aaa", field, "%s: aaa not parsed, got: '%v'", k, field)
2424
}
2525
})
2626

@@ -36,7 +36,7 @@ func TestLexer(t *testing.T) {
3636
t.Run("first line", func(t *testing.T) {
3737
field, err := lex.readField()
3838
assert.NoError(t, err)
39-
assert.Equal(t, field, "aaa")
39+
assert.Equal(t, "aaa", field)
4040

4141
value, err := lex.readUint64Field()
4242
assert.NoError(t, err)
@@ -48,23 +48,23 @@ func TestLexer(t *testing.T) {
4848
t.Run("second line", func(t *testing.T) {
4949
field, err := lex.readField()
5050
assert.NoError(t, err)
51-
assert.Equal(t, field, "f1")
51+
assert.Equal(t, "f1", field)
5252

5353
field, err = lex.readField()
5454
assert.NoError(t, err)
55-
assert.Equal(t, field, "f2")
55+
assert.Equal(t, "f2", field)
5656

5757
field, err = lex.readField()
5858
assert.NoError(t, err)
59-
assert.Equal(t, field, "")
59+
assert.Empty(t, field)
6060

6161
assert.NoError(t, lex.nextLine())
6262
})
6363

6464
t.Run("last line", func(t *testing.T) {
6565
field, err := lex.readField()
6666
assert.NoError(t, err)
67-
assert.Equal(t, field, "last")
67+
assert.Equal(t, "last", field)
6868
})
6969
})
7070
}

extmap_test.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ func TestTransportCCExtMap(t *testing.T) {
4747
URI: uri,
4848
}
4949

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

unmarshal_test.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -362,9 +362,7 @@ func TestUnmarshalRepeatTimes(t *testing.T) {
362362
assert.Equal(t, RepeatTimesSDPExpected, string(actual))
363363

364364
err = sd.UnmarshalString(TimingSDP + "r=\r\n")
365-
if !assert.ErrorIs(t, err, errSDPInvalidValue) {
366-
assert.NoError(t, err)
367-
}
365+
assert.ErrorIs(t, err, errSDPInvalidValue)
368366
}
369367

370368
func TestUnmarshalTimeZones(t *testing.T) {

util_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ func TestCodecMultipleValues(t *testing.T) {
261261
)
262262

263263
_, err := sd.GetPayloadTypeForCodec(Codec{Name: "VP8/90000"})
264-
assert.ErrorIs(t, test.expectedError, err)
264+
assert.ErrorIs(t, err, test.expectedError)
265265
})
266266
}
267267
}

0 commit comments

Comments
 (0)