Skip to content

Commit 715575d

Browse files
mmorel-35mmorel-35
authored
chore: use require.ErrorContains when possible (#8291)
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
1 parent 509e030 commit 715575d

File tree

54 files changed

+69
-136
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+69
-136
lines changed

‎pkg/cache/fs_test.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -286,8 +286,7 @@ func TestFSCache_PutBlob(t *testing.T) {
286286

287287
err = fs.PutBlob(tt.args.diffID, tt.args.layerInfo)
288288
if tt.wantErr != "" {
289-
require.Error(t, err)
290-
assert.Contains(t, err.Error(), tt.wantErr, tt.name)
289+
require.ErrorContains(t, err, tt.wantErr, tt.name)
291290
return
292291
} else {
293292
require.NoError(t, err, tt.name)
@@ -366,8 +365,7 @@ func TestFSCache_PutArtifact(t *testing.T) {
366365

367366
err = fs.PutArtifact(tt.args.imageID, tt.args.imageConfig)
368367
if tt.wantErr != "" {
369-
require.Error(t, err)
370-
assert.Contains(t, err.Error(), tt.wantErr, tt.name)
368+
require.ErrorContains(t, err, tt.wantErr, tt.name)
371369
return
372370
} else {
373371
require.NoError(t, err, tt.name)

‎pkg/cache/memory_test.go

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -314,8 +314,7 @@ func TestMemoryCache_DeleteBlobs(t *testing.T) {
314314
// Check that the blobs are no longer in the cache
315315
for _, blobID := range tt.blobIDs {
316316
_, err := c.GetBlob(blobID)
317-
require.Error(t, err)
318-
assert.Contains(t, err.Error(), "not found in memory cache")
317+
require.ErrorContains(t, err, "not found in memory cache")
319318
}
320319
})
321320
}
@@ -348,12 +347,10 @@ func TestMemoryCache_Clear(t *testing.T) {
348347
require.NoError(t, err)
349348

350349
_, err = c.GetArtifact(tt.artifactID)
351-
require.Error(t, err)
352-
assert.Contains(t, err.Error(), "not found in memory cache")
350+
require.ErrorContains(t, err, "not found in memory cache")
353351

354352
_, err = c.GetBlob(tt.blobID)
355-
require.Error(t, err)
356-
assert.Contains(t, err.Error(), "not found in memory cache")
353+
require.ErrorContains(t, err, "not found in memory cache")
357354
})
358355
}
359356
}
@@ -385,12 +382,10 @@ func TestMemoryCache_Close(t *testing.T) {
385382
require.NoError(t, err)
386383

387384
_, err = c.GetArtifact(tt.artifactID)
388-
require.Error(t, err)
389-
assert.Contains(t, err.Error(), "not found in memory cache")
385+
require.ErrorContains(t, err, "not found in memory cache")
390386

391387
_, err = c.GetBlob(tt.blobID)
392-
require.Error(t, err)
393-
assert.Contains(t, err.Error(), "not found in memory cache")
388+
require.ErrorContains(t, err, "not found in memory cache")
394389
})
395390
}
396391
}

‎pkg/cache/redis_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -537,8 +537,7 @@ func TestRedisCache_DeleteBlobs(t *testing.T) {
537537

538538
err = c.DeleteBlobs(tt.args.blobIDs)
539539
if tt.wantErr != "" {
540-
require.Error(t, err)
541-
assert.Contains(t, err.Error(), tt.wantErr)
540+
require.ErrorContains(t, err, tt.wantErr)
542541
return
543542
}
544543
require.NoError(t, err)

‎pkg/cache/remote_test.go

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,7 @@ func TestRemoteCache_PutArtifact(t *testing.T) {
152152
})
153153
err := c.PutArtifact(tt.args.imageID, tt.args.imageInfo)
154154
if tt.wantErr != "" {
155-
require.Error(t, err, tt.name)
156-
assert.Contains(t, err.Error(), tt.wantErr, tt.name)
155+
require.ErrorContains(t, err, tt.wantErr, tt.name)
157156
return
158157
} else {
159158
require.NoError(t, err, tt.name)
@@ -217,8 +216,7 @@ func TestRemoteCache_PutBlob(t *testing.T) {
217216
})
218217
err := c.PutBlob(tt.args.diffID, tt.args.layerInfo)
219218
if tt.wantErr != "" {
220-
require.Error(t, err, tt.name)
221-
assert.Contains(t, err.Error(), tt.wantErr, tt.name)
219+
require.ErrorContains(t, err, tt.wantErr, tt.name)
222220
return
223221
} else {
224222
require.NoError(t, err, tt.name)
@@ -299,8 +297,7 @@ func TestRemoteCache_MissingBlobs(t *testing.T) {
299297
})
300298
gotMissingImage, gotMissingLayerIDs, err := c.MissingBlobs(tt.args.imageID, tt.args.layerIDs)
301299
if tt.wantErr != "" {
302-
require.Error(t, err, tt.name)
303-
assert.Contains(t, err.Error(), tt.wantErr, tt.name)
300+
require.ErrorContains(t, err, tt.wantErr, tt.name)
304301
return
305302
} else {
306303
require.NoError(t, err, tt.name)
@@ -353,8 +350,7 @@ func TestRemoteCache_PutArtifactInsecure(t *testing.T) {
353350
})
354351
err := c.PutArtifact(tt.args.imageID, tt.args.imageInfo)
355352
if tt.wantErr != "" {
356-
require.Error(t, err)
357-
assert.Contains(t, err.Error(), tt.wantErr)
353+
require.ErrorContains(t, err, tt.wantErr)
358354
return
359355
}
360356
require.NoError(t, err, tt.name)

‎pkg/compliance/spec/compliance_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ func TestComplianceSpec_LoadFromDiskBundle(t *testing.T) {
271271

272272
t.Run("load user specified spec from disk fails", func(t *testing.T) {
273273
_, err := spec.GetComplianceSpec("@doesnotexist", "does-not-matter")
274-
assert.Contains(t, err.Error(), "error retrieving compliance spec from path")
274+
require.ErrorContains(t, err, "error retrieving compliance spec from path")
275275
})
276276

277277
t.Run("bundle does not exist", func(t *testing.T) {
@@ -288,6 +288,6 @@ func TestComplianceSpec_LoadFromDiskBundle(t *testing.T) {
288288

289289
t.Run("load spec yaml unmarshal failure", func(t *testing.T) {
290290
_, err := spec.GetComplianceSpec("invalid", filepath.Join("testdata", "testcache"))
291-
assert.Contains(t, err.Error(), "spec yaml decode error")
291+
require.ErrorContains(t, err, "spec yaml decode error")
292292
})
293293
}

‎pkg/db/db_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,7 @@ func TestClient_NeedsUpdate(t *testing.T) {
127127

128128
switch {
129129
case tt.wantErr != "":
130-
require.Error(t, err)
131-
assert.Contains(t, err.Error(), tt.wantErr, tt.name)
130+
require.ErrorContains(t, err, tt.wantErr, tt.name)
132131
default:
133132
require.NoError(t, err, tt.name)
134133
}

‎pkg/dependency/parser/dotnet/core_deps/parse_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,7 @@ func TestParse(t *testing.T) {
9393

9494
got, _, err := NewParser().Parse(f)
9595
if tt.wantErr != "" {
96-
require.Error(t, err)
97-
assert.Contains(t, err.Error(), tt.wantErr)
96+
require.ErrorContains(t, err, tt.wantErr)
9897
} else {
9998
require.NoError(t, err)
10099

‎pkg/dependency/parser/frameworks/wordpress/parse_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ func TestParseWordPress(t *testing.T) {
3737

3838
got, err := Parse(f)
3939
if tt.wantErr != "" {
40-
require.Error(t, err)
41-
assert.Contains(t, err.Error(), tt.wantErr)
40+
require.ErrorContains(t, err, tt.wantErr)
4241
return
4342
}
4443

‎pkg/dependency/parser/java/pom/parse_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2160,8 +2160,7 @@ func TestPom_Parse(t *testing.T) {
21602160

21612161
gotPkgs, gotDeps, err := p.Parse(f)
21622162
if tt.wantErr != "" {
2163-
require.Error(t, err)
2164-
assert.Contains(t, err.Error(), tt.wantErr)
2163+
require.ErrorContains(t, err, tt.wantErr)
21652164
return
21662165
}
21672166
require.NoError(t, err)

‎pkg/dependency/parser/nuget/config/parse_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ func TestParse(t *testing.T) {
4646

4747
got, _, err := config.NewParser().Parse(f)
4848
if tt.wantErr != "" {
49-
require.Error(t, err)
50-
assert.Contains(t, err.Error(), tt.wantErr)
49+
require.ErrorContains(t, err, tt.wantErr)
5150
return
5251
}
5352

‎pkg/dependency/parser/nuget/packagesprops/parse_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,7 @@ func TestParse(t *testing.T) {
7070

7171
got, _, err := config.NewParser().Parse(f)
7272
if tt.wantErr != "" {
73-
require.Error(t, err)
74-
assert.Contains(t, err.Error(), tt.wantErr)
73+
require.ErrorContains(t, err, tt.wantErr)
7574
return
7675
}
7776

‎pkg/dependency/parser/ruby/gemspec/parse_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,7 @@ func TestParse(t *testing.T) {
8383

8484
got, _, err := gemspec.NewParser().Parse(f)
8585
if tt.wantErr != "" {
86-
require.Error(t, err)
87-
assert.Contains(t, err.Error(), tt.wantErr)
86+
require.ErrorContains(t, err, tt.wantErr)
8887
return
8988
}
9089
assert.Equal(t, tt.want, got)

‎pkg/dependency/parser/rust/binary/parse_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@ func TestParse(t *testing.T) {
7777

7878
got, gotDeps, err := binary.NewParser().Parse(f)
7979
if tt.wantErr != "" {
80-
require.Error(t, err)
81-
assert.Contains(t, err.Error(), tt.wantErr)
80+
require.ErrorContains(t, err, tt.wantErr)
8281
return
8382
}
8483

‎pkg/detector/library/driver_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,7 @@ func TestDriver_Detect(t *testing.T) {
220220

221221
got, err := driver.DetectVulnerabilities("", tt.args.pkgName, tt.args.pkgVer)
222222
if tt.wantErr != "" {
223-
require.Error(t, err)
224-
assert.Contains(t, err.Error(), tt.wantErr)
223+
require.ErrorContains(t, err, tt.wantErr)
225224
return
226225
}
227226

‎pkg/detector/ospkg/alma/alma_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,7 @@ func TestScanner_Detect(t *testing.T) {
165165
s := alma.NewScanner()
166166
got, err := s.Detect(nil, tt.args.osVer, nil, tt.args.pkgs)
167167
if tt.wantErr != "" {
168-
require.Error(t, err)
169-
assert.Contains(t, err.Error(), tt.wantErr)
168+
require.ErrorContains(t, err, tt.wantErr)
170169
return
171170
}
172171
require.NoError(t, err)

‎pkg/detector/ospkg/alpine/alpine_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,7 @@ func TestScanner_Detect(t *testing.T) {
254254
s := alpine.NewScanner()
255255
got, err := s.Detect(nil, tt.args.osVer, tt.args.repo, tt.args.pkgs)
256256
if tt.wantErr != "" {
257-
require.Error(t, err)
258-
assert.Contains(t, err.Error(), tt.wantErr)
257+
require.ErrorContains(t, err, tt.wantErr)
259258
return
260259
}
261260

‎pkg/detector/ospkg/amazon/amazon_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,7 @@ func TestScanner_Detect(t *testing.T) {
180180
s := amazon.NewScanner()
181181
got, err := s.Detect(nil, tt.args.osVer, nil, tt.args.pkgs)
182182
if tt.wantErr != "" {
183-
require.Error(t, err)
184-
assert.Contains(t, err.Error(), tt.wantErr)
183+
require.ErrorContains(t, err, tt.wantErr)
185184
return
186185
}
187186
require.NoError(t, err)

‎pkg/detector/ospkg/azure/azure_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,7 @@ func TestScanner_Detect(t *testing.T) {
187187
}
188188
got, err := s.Detect(nil, tt.args.osVer, nil, tt.args.pkgs)
189189
if tt.wantErr != "" {
190-
require.Error(t, err)
191-
assert.Contains(t, err.Error(), tt.wantErr)
190+
require.ErrorContains(t, err, tt.wantErr)
192191
return
193192
}
194193
require.NoError(t, err)

‎pkg/detector/ospkg/chainguard/chainguard_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,7 @@ func TestScanner_Detect(t *testing.T) {
196196
s := chainguard.NewScanner()
197197
got, err := s.Detect(nil, "", tt.args.repo, tt.args.pkgs)
198198
if tt.wantErr != "" {
199-
require.Error(t, err)
200-
assert.Contains(t, err.Error(), tt.wantErr)
199+
require.ErrorContains(t, err, tt.wantErr)
201200
return
202201
}
203202

‎pkg/detector/ospkg/debian/debian_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,7 @@ func TestScanner_Detect(t *testing.T) {
118118
s := debian.NewScanner()
119119
got, err := s.Detect(nil, tt.args.osVer, nil, tt.args.pkgs)
120120
if tt.wantErr != "" {
121-
require.Error(t, err)
122-
assert.Contains(t, err.Error(), tt.wantErr)
121+
require.ErrorContains(t, err, tt.wantErr)
123122
return
124123
}
125124

‎pkg/detector/ospkg/oracle/oracle_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,8 +343,7 @@ func TestScanner_Detect(t *testing.T) {
343343
s := NewScanner()
344344
got, err := s.Detect(nil, tt.args.osVer, nil, tt.args.pkgs)
345345
if tt.wantErr != "" {
346-
require.Error(t, err)
347-
assert.Contains(t, err.Error(), tt.wantErr)
346+
require.ErrorContains(t, err, tt.wantErr)
348347
return
349348
} else {
350349
require.NoError(t, err)

‎pkg/detector/ospkg/photon/photon_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,7 @@ func TestScanner_Detect(t *testing.T) {
9797
s := photon.NewScanner()
9898
got, err := s.Detect(nil, tt.args.osVer, nil, tt.args.pkgs)
9999
if tt.wantErr != "" {
100-
require.Error(t, err)
101-
assert.Contains(t, err.Error(), tt.wantErr)
100+
require.ErrorContains(t, err, tt.wantErr)
102101
return
103102
}
104103
require.NoError(t, err)

‎pkg/detector/ospkg/rocky/rocky_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,7 @@ func TestScanner_Detect(t *testing.T) {
125125
s := rocky.NewScanner()
126126
got, err := s.Detect(nil, tt.args.osVer, nil, tt.args.pkgs)
127127
if tt.wantErr != "" {
128-
require.Error(t, err)
129-
assert.Contains(t, err.Error(), tt.wantErr)
128+
require.ErrorContains(t, err, tt.wantErr)
130129
return
131130
}
132131
require.NoError(t, err)

‎pkg/detector/ospkg/suse/suse_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,7 @@ func TestScanner_Detect(t *testing.T) {
220220
s := suse.NewScanner(tt.distribution)
221221
got, err := s.Detect(nil, tt.args.osVer, nil, tt.args.pkgs)
222222
if tt.wantErr != "" {
223-
require.Error(t, err)
224-
assert.Contains(t, err.Error(), tt.wantErr)
223+
require.ErrorContains(t, err, tt.wantErr)
225224
return
226225
}
227226
require.NoError(t, err)

‎pkg/detector/ospkg/ubuntu/ubuntu_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,7 @@ func TestScanner_Detect(t *testing.T) {
182182
s := ubuntu.NewScanner()
183183
got, err := s.Detect(nil, tt.args.osVer, nil, tt.args.pkgs)
184184
if tt.wantErr != "" {
185-
require.Error(t, err)
186-
assert.Contains(t, err.Error(), tt.wantErr)
185+
require.ErrorContains(t, err, tt.wantErr)
187186
return
188187
}
189188
sort.Slice(got, func(i, j int) bool {

‎pkg/detector/ospkg/wolfi/wolfi_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,7 @@ func TestScanner_Detect(t *testing.T) {
196196
s := wolfi.NewScanner()
197197
got, err := s.Detect(nil, "", tt.args.repo, tt.args.pkgs)
198198
if tt.wantErr != "" {
199-
require.Error(t, err)
200-
assert.Contains(t, err.Error(), tt.wantErr)
199+
require.ErrorContains(t, err, tt.wantErr)
201200
return
202201
}
203202

‎pkg/fanal/analyzer/analyzer_test.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -522,8 +522,7 @@ func TestAnalyzerGroup_AnalyzeFile(t *testing.T) {
522522
DisabledAnalyzers: tt.args.disabledAnalyzers,
523523
})
524524
if err != nil && tt.wantErr != "" {
525-
require.Error(t, err)
526-
assert.Contains(t, err.Error(), tt.wantErr)
525+
require.ErrorContains(t, err, tt.wantErr)
527526
return
528527
}
529528
require.NoError(t, err)
@@ -549,8 +548,7 @@ func TestAnalyzerGroup_AnalyzeFile(t *testing.T) {
549548

550549
wg.Wait()
551550
if tt.wantErr != "" {
552-
require.Error(t, err)
553-
assert.Contains(t, err.Error(), tt.wantErr)
551+
require.ErrorContains(t, err, tt.wantErr)
554552
return
555553
}
556554

‎pkg/fanal/analyzer/buildinfo/content_manifest_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ func Test_contentManifestAnalyzer_Analyze(t *testing.T) {
5555
})
5656

5757
if tt.wantErr != "" {
58-
require.Error(t, err)
59-
assert.Contains(t, err.Error(), tt.wantErr)
58+
require.ErrorContains(t, err, tt.wantErr)
6059
return
6160
}
6261

‎pkg/fanal/analyzer/language/analyze_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,7 @@ func TestAnalyze(t *testing.T) {
9797

9898
got, err := language.Analyze(tt.args.fileType, tt.args.filePath, tt.args.content, mp)
9999
if tt.wantErr != "" {
100-
require.Error(t, err)
101-
assert.Contains(t, err.Error(), tt.wantErr)
100+
require.ErrorContains(t, err, tt.wantErr)
102101
return
103102
}
104103

‎pkg/fanal/analyzer/language/dotnet/deps/deps_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,7 @@ func Test_depsLibraryAnalyzer_Analyze(t *testing.T) {
6464
})
6565

6666
if tt.wantErr != "" {
67-
require.Error(t, err)
68-
assert.Contains(t, err.Error(), tt.wantErr)
67+
require.ErrorContains(t, err, tt.wantErr)
6968
return
7069
}
7170

‎pkg/fanal/analyzer/language/java/pom/pom_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,7 @@ func Test_pomAnalyzer_Analyze(t *testing.T) {
191191
},
192192
})
193193
if tt.wantErr != "" {
194-
require.Error(t, err)
195-
assert.Contains(t, err.Error(), tt.wantErr)
194+
require.ErrorContains(t, err, tt.wantErr)
196195
return
197196
}
198197
require.NoError(t, err)

0 commit comments

Comments
 (0)