Skip to content

Commit 0704271

Browse files
alexandearalexandear
authored
dev: refactor some test assertions (#4081)
1 parent 615a52b commit 0704271

File tree

11 files changed

+26
-31
lines changed

11 files changed

+26
-31
lines changed

‎pkg/golinters/gocritic_test.go

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package golinters
22

33
import (
44
"log"
5-
"sort"
65
"testing"
76

87
"github.com/stretchr/testify/assert"
@@ -16,9 +15,7 @@ func Test_intersectStringSlice(t *testing.T) {
1615

1716
s3 := intersectStringSlice(s1, s2)
1817

19-
sort.Strings(s3)
20-
21-
assert.Equal(t, s3, []string{"experimental", "opinionated"})
18+
assert.ElementsMatch(t, []string{"experimental", "opinionated"}, s3)
2219
}
2320

2421
func Test_filterByDisableTags(t *testing.T) {
@@ -29,9 +26,7 @@ func Test_filterByDisableTags(t *testing.T) {
2926

3027
filterEnabledChecks := settingsWrapper.filterByDisableTags(enabledChecks, disabledTags)
3128

32-
sort.Strings(filterEnabledChecks)
33-
34-
assert.Equal(t, []string{"appendAssign", "caseOrder"}, filterEnabledChecks)
29+
assert.ElementsMatch(t, filterEnabledChecks, []string{"appendAssign", "caseOrder"})
3530
}
3631

3732
type tLog struct{}

‎pkg/golinters/gofmt_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
diffpkg "github.com/sourcegraph/go-diff/diff"
77
"github.com/stretchr/testify/assert"
88
"github.com/stretchr/testify/mock"
9+
"github.com/stretchr/testify/require"
910

1011
"github.com/golangci/golangci-lint/pkg/logutils"
1112
"github.com/golangci/golangci-lint/pkg/result"
@@ -14,10 +15,10 @@ import (
1415
func testDiffProducesChanges(t *testing.T, log logutils.Log, diff string, expectedChanges ...Change) {
1516
diffs, err := diffpkg.ParseMultiFileDiff([]byte(diff))
1617
if err != nil {
17-
assert.NoError(t, err)
18+
require.NoError(t, err)
1819
}
1920

20-
assert.Len(t, diffs, 1)
21+
require.Len(t, diffs, 1)
2122
hunks := diffs[0].Hunks
2223
assert.NotEmpty(t, hunks)
2324

‎pkg/result/processors/autogenerated_exclude_test.go

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/result/processors/identifier_marker_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"testing"
55

66
"github.com/stretchr/testify/assert"
7+
"github.com/stretchr/testify/require"
78

89
"github.com/golangci/golangci-lint/pkg/result"
910
)
@@ -50,7 +51,7 @@ func TestIdentifierMarker(t *testing.T) {
5051

5152
for _, c := range cases {
5253
out, err := p.Process([]result.Issue{{Text: c.in}})
53-
assert.NoError(t, err)
54+
require.NoError(t, err)
5455
assert.Equal(t, []result.Issue{{Text: c.out}}, out)
5556
}
5657
}

‎pkg/result/processors/nolint_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88

99
"github.com/stretchr/testify/assert"
1010
"github.com/stretchr/testify/mock"
11+
"github.com/stretchr/testify/require"
1112

1213
"github.com/golangci/golangci-lint/pkg/config"
1314
"github.com/golangci/golangci-lint/pkg/golinters"
@@ -173,9 +174,8 @@ func TestNolintInvalidLinterNameWithViolationOnTheSameLine(t *testing.T) {
173174
processedIssues, err := p.Process(issues)
174175
p.Finish()
175176

176-
assert.Len(t, processedIssues, 1)
177+
require.NoError(t, err)
177178
assert.Equal(t, issues, processedIssues)
178-
assert.NoError(t, err)
179179
}
180180

181181
func TestNolintAliases(t *testing.T) {
@@ -288,7 +288,7 @@ func TestNolintUnused(t *testing.T) {
288288
enabledLintersSet := lintersdb.NewEnabledSet(dbManager, lintersdb.NewValidator(dbManager), enabledSetLog, cfg)
289289

290290
enabledLintersMap, err := enabledLintersSet.GetEnabledLintersMap()
291-
assert.NoError(t, err)
291+
require.NoError(t, err)
292292

293293
return NewNolint(log, dbManager, enabledLintersMap)
294294
}
@@ -351,7 +351,7 @@ func TestNolintUnused(t *testing.T) {
351351
enabledLintersSet := lintersdb.NewEnabledSet(dbManager, lintersdb.NewValidator(dbManager), enabledSetLog, cfg)
352352

353353
enabledLintersMap, err := enabledLintersSet.GetEnabledLintersMap()
354-
assert.NoError(t, err)
354+
require.NoError(t, err)
355355
p := NewNolint(log, dbManager, enabledLintersMap)
356356
defer p.Finish()
357357

‎pkg/result/processors/path_prefixer_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func TestPathPrefixer_Process(t *testing.T) {
4747
got, err := p.Process(tt.issues)
4848
require.NoError(t, err)
4949

50-
assert.Equal(t, got, tt.want)
50+
assert.Equal(t, tt.want, got)
5151
})
5252
}
5353
}

‎pkg/result/processors/processor_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"testing"
66

77
"github.com/stretchr/testify/assert"
8+
"github.com/stretchr/testify/require"
89

910
"github.com/golangci/golangci-lint/pkg/result"
1011
)
@@ -38,7 +39,7 @@ func process(t *testing.T, p Processor, issues ...result.Issue) []result.Issue {
3839
t.Helper()
3940

4041
processedIssues, err := p.Process(issues)
41-
assert.NoError(t, err)
42+
require.NoError(t, err)
4243
return processedIssues
4344
}
4445

‎pkg/result/processors/skip_files_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"testing"
88

99
"github.com/stretchr/testify/assert"
10+
"github.com/stretchr/testify/require"
1011

1112
"github.com/golangci/golangci-lint/pkg/result"
1213
)
@@ -21,7 +22,7 @@ func newFileIssue(file string) result.Issue {
2122

2223
func newTestSkipFiles(t *testing.T, patterns ...string) *SkipFiles {
2324
p, err := NewSkipFiles(patterns, "")
24-
assert.NoError(t, err)
25+
require.NoError(t, err)
2526
return p
2627
}
2728

‎pkg/result/processors/sort_results_test.go

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

88
"github.com/stretchr/testify/assert"
9+
"github.com/stretchr/testify/require"
910

1011
"github.com/golangci/golangci-lint/pkg/config"
1112
"github.com/golangci/golangci-lint/pkg/result"
@@ -158,25 +159,19 @@ func TestNoSorting(t *testing.T) {
158159
var sr = NewSortResults(&config.Config{})
159160

160161
results, err := sr.Process(tests)
162+
require.NoError(t, err)
161163
assert.Equal(t, tests, results)
162-
assert.Nil(t, err, nil)
163164
}
164165

165166
func TestSorting(t *testing.T) {
166167
var tests = make([]result.Issue, len(issues))
167168
copy(tests, issues)
168169

169-
var expected = make([]result.Issue, len(issues))
170-
expected[0] = issues[3]
171-
expected[1] = issues[2]
172-
expected[2] = issues[1]
173-
expected[3] = issues[0]
174-
175170
var cfg = config.Config{}
176171
cfg.Output.SortResults = true
177172
var sr = NewSortResults(&cfg)
178173

179174
results, err := sr.Process(tests)
180-
assert.Equal(t, results, expected)
181-
assert.Nil(t, err, nil)
175+
require.NoError(t, err)
176+
assert.Equal(t, []result.Issue{issues[3], issues[2], issues[1], issues[0]}, results)
182177
}

‎test/run_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"path/filepath"
55
"testing"
66

7-
"github.com/stretchr/testify/assert"
7+
"github.com/stretchr/testify/require"
88
_ "github.com/valyala/quicktemplate"
99

1010
"github.com/golangci/golangci-lint/pkg/exitcodes"
@@ -536,7 +536,7 @@ func TestEnabledPresetsAreNotDuplicated(t *testing.T) {
536536
func TestAbsPathDirAnalysis(t *testing.T) {
537537
dir := filepath.Join("testdata_etc", "abspath") // abs paths don't work with testdata dir
538538
absDir, err := filepath.Abs(dir)
539-
assert.NoError(t, err)
539+
require.NoError(t, err)
540540

541541
testshared.NewRunnerBuilder(t).
542542
WithNoConfig().
@@ -555,7 +555,7 @@ func TestAbsPathDirAnalysis(t *testing.T) {
555555
func TestAbsPathFileAnalysis(t *testing.T) {
556556
dir := filepath.Join("testdata_etc", "abspath", "with_issue.go") // abs paths don't work with testdata dir
557557
absDir, err := filepath.Abs(dir)
558-
assert.NoError(t, err)
558+
require.NoError(t, err)
559559

560560
testshared.NewRunnerBuilder(t).
561561
WithNoConfig().

‎test/testshared/runner.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ func InstallGolangciLint(tb testing.TB) string {
349349
tb.Log(string(output))
350350
}
351351

352-
assert.NoError(tb, err, "Can't go install golangci-lint %s", string(output))
352+
require.NoError(tb, err, "Can't go install golangci-lint %s", string(output))
353353
}
354354

355355
abs, err := filepath.Abs(defaultBinaryName())

0 commit comments

Comments
 (0)