From 5f44752c767e102c5615b3492a6ca71800a73a74 Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Fri, 24 Jan 2025 14:33:28 +0100 Subject: [PATCH] chore(test): use require.ErrorContains when possible Signed-off-by: Matthieu MOREL --- pkg/cache/fs_test.go | 6 ++---- pkg/cache/memory_test.go | 15 +++++---------- pkg/cache/redis_test.go | 3 +-- pkg/cache/remote_test.go | 12 ++++-------- pkg/compliance/spec/compliance_test.go | 4 ++-- pkg/db/db_test.go | 3 +-- .../parser/dotnet/core_deps/parse_test.go | 3 +-- .../parser/frameworks/wordpress/parse_test.go | 3 +-- pkg/dependency/parser/java/pom/parse_test.go | 3 +-- pkg/dependency/parser/nuget/config/parse_test.go | 3 +-- .../parser/nuget/packagesprops/parse_test.go | 3 +-- pkg/dependency/parser/ruby/gemspec/parse_test.go | 3 +-- pkg/dependency/parser/rust/binary/parse_test.go | 3 +-- pkg/detector/library/driver_test.go | 3 +-- pkg/detector/ospkg/alma/alma_test.go | 3 +-- pkg/detector/ospkg/alpine/alpine_test.go | 3 +-- pkg/detector/ospkg/amazon/amazon_test.go | 3 +-- pkg/detector/ospkg/azure/azure_test.go | 3 +-- pkg/detector/ospkg/chainguard/chainguard_test.go | 3 +-- pkg/detector/ospkg/debian/debian_test.go | 3 +-- pkg/detector/ospkg/oracle/oracle_test.go | 3 +-- pkg/detector/ospkg/photon/photon_test.go | 3 +-- pkg/detector/ospkg/rocky/rocky_test.go | 3 +-- pkg/detector/ospkg/suse/suse_test.go | 3 +-- pkg/detector/ospkg/ubuntu/ubuntu_test.go | 3 +-- pkg/detector/ospkg/wolfi/wolfi_test.go | 3 +-- pkg/fanal/analyzer/analyzer_test.go | 6 ++---- .../analyzer/buildinfo/content_manifest_test.go | 3 +-- pkg/fanal/analyzer/language/analyze_test.go | 3 +-- .../analyzer/language/dotnet/deps/deps_test.go | 3 +-- pkg/fanal/analyzer/language/java/pom/pom_test.go | 3 +-- .../analyzer/language/nodejs/pkg/pkg_test.go | 3 +-- .../language/python/packaging/packaging_test.go | 3 +-- .../language/ruby/gemspec/gemspec_test.go | 3 +-- .../analyzer/os/amazonlinux/amazonlinux_test.go | 3 +-- pkg/fanal/analyzer/os/debian/debian_test.go | 3 +-- pkg/fanal/analyzer/os/redhatbase/alma_test.go | 3 +-- pkg/fanal/analyzer/os/redhatbase/centos_test.go | 3 +-- pkg/fanal/analyzer/os/redhatbase/fedora_test.go | 3 +-- pkg/fanal/analyzer/os/redhatbase/oracle_test.go | 3 +-- .../analyzer/os/redhatbase/redhatbase_test.go | 3 +-- pkg/fanal/analyzer/os/redhatbase/rocky_test.go | 3 +-- pkg/fanal/analyzer/os/ubuntu/ubuntu_test.go | 3 +-- pkg/fanal/applier/applier_test.go | 3 +-- pkg/fanal/artifact/local/fs_test.go | 3 +-- pkg/fanal/artifact/repo/git_test.go | 3 +-- pkg/fanal/image/image_test.go | 6 ++---- pkg/fanal/image/oci_test.go | 4 +--- pkg/fanal/walker/tar_test.go | 3 +-- pkg/policy/policy_test.go | 6 ++---- pkg/purl/purl_test.go | 3 +-- pkg/result/ignore_test.go | 2 +- pkg/rpc/server/listen_test.go | 3 +-- pkg/rpc/server/server_test.go | 12 ++++-------- 54 files changed, 69 insertions(+), 136 deletions(-) diff --git a/pkg/cache/fs_test.go b/pkg/cache/fs_test.go index 9323391a3af4..819df36ee22f 100644 --- a/pkg/cache/fs_test.go +++ b/pkg/cache/fs_test.go @@ -286,8 +286,7 @@ func TestFSCache_PutBlob(t *testing.T) { err = fs.PutBlob(tt.args.diffID, tt.args.layerInfo) if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr, tt.name) + require.ErrorContains(t, err, tt.wantErr, tt.name) return } else { require.NoError(t, err, tt.name) @@ -366,8 +365,7 @@ func TestFSCache_PutArtifact(t *testing.T) { err = fs.PutArtifact(tt.args.imageID, tt.args.imageConfig) if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr, tt.name) + require.ErrorContains(t, err, tt.wantErr, tt.name) return } else { require.NoError(t, err, tt.name) diff --git a/pkg/cache/memory_test.go b/pkg/cache/memory_test.go index 3d88b565c7f9..ed0494a2ad02 100644 --- a/pkg/cache/memory_test.go +++ b/pkg/cache/memory_test.go @@ -314,8 +314,7 @@ func TestMemoryCache_DeleteBlobs(t *testing.T) { // Check that the blobs are no longer in the cache for _, blobID := range tt.blobIDs { _, err := c.GetBlob(blobID) - require.Error(t, err) - assert.Contains(t, err.Error(), "not found in memory cache") + require.ErrorContains(t, err, "not found in memory cache") } }) } @@ -348,12 +347,10 @@ func TestMemoryCache_Clear(t *testing.T) { require.NoError(t, err) _, err = c.GetArtifact(tt.artifactID) - require.Error(t, err) - assert.Contains(t, err.Error(), "not found in memory cache") + require.ErrorContains(t, err, "not found in memory cache") _, err = c.GetBlob(tt.blobID) - require.Error(t, err) - assert.Contains(t, err.Error(), "not found in memory cache") + require.ErrorContains(t, err, "not found in memory cache") }) } } @@ -385,12 +382,10 @@ func TestMemoryCache_Close(t *testing.T) { require.NoError(t, err) _, err = c.GetArtifact(tt.artifactID) - require.Error(t, err) - assert.Contains(t, err.Error(), "not found in memory cache") + require.ErrorContains(t, err, "not found in memory cache") _, err = c.GetBlob(tt.blobID) - require.Error(t, err) - assert.Contains(t, err.Error(), "not found in memory cache") + require.ErrorContains(t, err, "not found in memory cache") }) } } diff --git a/pkg/cache/redis_test.go b/pkg/cache/redis_test.go index 3cc8bbd702ad..f08d855abd10 100644 --- a/pkg/cache/redis_test.go +++ b/pkg/cache/redis_test.go @@ -537,8 +537,7 @@ func TestRedisCache_DeleteBlobs(t *testing.T) { err = c.DeleteBlobs(tt.args.blobIDs) if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr) + require.ErrorContains(t, err, tt.wantErr) return } require.NoError(t, err) diff --git a/pkg/cache/remote_test.go b/pkg/cache/remote_test.go index 3e1363d5dd4d..867878b99857 100644 --- a/pkg/cache/remote_test.go +++ b/pkg/cache/remote_test.go @@ -152,8 +152,7 @@ func TestRemoteCache_PutArtifact(t *testing.T) { }) err := c.PutArtifact(tt.args.imageID, tt.args.imageInfo) if tt.wantErr != "" { - require.Error(t, err, tt.name) - assert.Contains(t, err.Error(), tt.wantErr, tt.name) + require.ErrorContains(t, err, tt.wantErr, tt.name) return } else { require.NoError(t, err, tt.name) @@ -217,8 +216,7 @@ func TestRemoteCache_PutBlob(t *testing.T) { }) err := c.PutBlob(tt.args.diffID, tt.args.layerInfo) if tt.wantErr != "" { - require.Error(t, err, tt.name) - assert.Contains(t, err.Error(), tt.wantErr, tt.name) + require.ErrorContains(t, err, tt.wantErr, tt.name) return } else { require.NoError(t, err, tt.name) @@ -299,8 +297,7 @@ func TestRemoteCache_MissingBlobs(t *testing.T) { }) gotMissingImage, gotMissingLayerIDs, err := c.MissingBlobs(tt.args.imageID, tt.args.layerIDs) if tt.wantErr != "" { - require.Error(t, err, tt.name) - assert.Contains(t, err.Error(), tt.wantErr, tt.name) + require.ErrorContains(t, err, tt.wantErr, tt.name) return } else { require.NoError(t, err, tt.name) @@ -353,8 +350,7 @@ func TestRemoteCache_PutArtifactInsecure(t *testing.T) { }) err := c.PutArtifact(tt.args.imageID, tt.args.imageInfo) if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr) + require.ErrorContains(t, err, tt.wantErr) return } require.NoError(t, err, tt.name) diff --git a/pkg/compliance/spec/compliance_test.go b/pkg/compliance/spec/compliance_test.go index 0b44702b4159..b49f169ac7a6 100644 --- a/pkg/compliance/spec/compliance_test.go +++ b/pkg/compliance/spec/compliance_test.go @@ -271,7 +271,7 @@ func TestComplianceSpec_LoadFromDiskBundle(t *testing.T) { t.Run("load user specified spec from disk fails", func(t *testing.T) { _, err := spec.GetComplianceSpec("@doesnotexist", "does-not-matter") - assert.Contains(t, err.Error(), "error retrieving compliance spec from path") + require.ErrorContains(t, err, "error retrieving compliance spec from path") }) t.Run("bundle does not exist", func(t *testing.T) { @@ -288,6 +288,6 @@ func TestComplianceSpec_LoadFromDiskBundle(t *testing.T) { t.Run("load spec yaml unmarshal failure", func(t *testing.T) { _, err := spec.GetComplianceSpec("invalid", filepath.Join("testdata", "testcache")) - assert.Contains(t, err.Error(), "spec yaml decode error") + require.ErrorContains(t, err, "spec yaml decode error") }) } diff --git a/pkg/db/db_test.go b/pkg/db/db_test.go index f64c0dc4a5c6..2fd83aa87325 100644 --- a/pkg/db/db_test.go +++ b/pkg/db/db_test.go @@ -127,8 +127,7 @@ func TestClient_NeedsUpdate(t *testing.T) { switch { case tt.wantErr != "": - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr, tt.name) + require.ErrorContains(t, err, tt.wantErr, tt.name) default: require.NoError(t, err, tt.name) } diff --git a/pkg/dependency/parser/dotnet/core_deps/parse_test.go b/pkg/dependency/parser/dotnet/core_deps/parse_test.go index 82bf0e0a1d47..3809bc22df22 100644 --- a/pkg/dependency/parser/dotnet/core_deps/parse_test.go +++ b/pkg/dependency/parser/dotnet/core_deps/parse_test.go @@ -93,8 +93,7 @@ func TestParse(t *testing.T) { got, _, err := NewParser().Parse(f) if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr) + require.ErrorContains(t, err, tt.wantErr) } else { require.NoError(t, err) diff --git a/pkg/dependency/parser/frameworks/wordpress/parse_test.go b/pkg/dependency/parser/frameworks/wordpress/parse_test.go index b717d9cbc50c..40080f3afd29 100644 --- a/pkg/dependency/parser/frameworks/wordpress/parse_test.go +++ b/pkg/dependency/parser/frameworks/wordpress/parse_test.go @@ -37,8 +37,7 @@ func TestParseWordPress(t *testing.T) { got, err := Parse(f) if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr) + require.ErrorContains(t, err, tt.wantErr) return } diff --git a/pkg/dependency/parser/java/pom/parse_test.go b/pkg/dependency/parser/java/pom/parse_test.go index 85e3e92f78fb..e180e53db60e 100644 --- a/pkg/dependency/parser/java/pom/parse_test.go +++ b/pkg/dependency/parser/java/pom/parse_test.go @@ -2160,8 +2160,7 @@ func TestPom_Parse(t *testing.T) { gotPkgs, gotDeps, err := p.Parse(f) if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr) + require.ErrorContains(t, err, tt.wantErr) return } require.NoError(t, err) diff --git a/pkg/dependency/parser/nuget/config/parse_test.go b/pkg/dependency/parser/nuget/config/parse_test.go index f7e6d16a0e10..fbf409d68feb 100644 --- a/pkg/dependency/parser/nuget/config/parse_test.go +++ b/pkg/dependency/parser/nuget/config/parse_test.go @@ -46,8 +46,7 @@ func TestParse(t *testing.T) { got, _, err := config.NewParser().Parse(f) if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr) + require.ErrorContains(t, err, tt.wantErr) return } diff --git a/pkg/dependency/parser/nuget/packagesprops/parse_test.go b/pkg/dependency/parser/nuget/packagesprops/parse_test.go index 16e4e59816d9..801534b69ec7 100644 --- a/pkg/dependency/parser/nuget/packagesprops/parse_test.go +++ b/pkg/dependency/parser/nuget/packagesprops/parse_test.go @@ -70,8 +70,7 @@ func TestParse(t *testing.T) { got, _, err := config.NewParser().Parse(f) if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr) + require.ErrorContains(t, err, tt.wantErr) return } diff --git a/pkg/dependency/parser/ruby/gemspec/parse_test.go b/pkg/dependency/parser/ruby/gemspec/parse_test.go index dbf13826f7e0..317af0a2ce00 100644 --- a/pkg/dependency/parser/ruby/gemspec/parse_test.go +++ b/pkg/dependency/parser/ruby/gemspec/parse_test.go @@ -83,8 +83,7 @@ func TestParse(t *testing.T) { got, _, err := gemspec.NewParser().Parse(f) if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr) + require.ErrorContains(t, err, tt.wantErr) return } assert.Equal(t, tt.want, got) diff --git a/pkg/dependency/parser/rust/binary/parse_test.go b/pkg/dependency/parser/rust/binary/parse_test.go index 1c1eb1c586f2..b49ce3b65047 100644 --- a/pkg/dependency/parser/rust/binary/parse_test.go +++ b/pkg/dependency/parser/rust/binary/parse_test.go @@ -77,8 +77,7 @@ func TestParse(t *testing.T) { got, gotDeps, err := binary.NewParser().Parse(f) if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr) + require.ErrorContains(t, err, tt.wantErr) return } diff --git a/pkg/detector/library/driver_test.go b/pkg/detector/library/driver_test.go index cf8af718f783..dc82b5806701 100644 --- a/pkg/detector/library/driver_test.go +++ b/pkg/detector/library/driver_test.go @@ -220,8 +220,7 @@ func TestDriver_Detect(t *testing.T) { got, err := driver.DetectVulnerabilities("", tt.args.pkgName, tt.args.pkgVer) if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr) + require.ErrorContains(t, err, tt.wantErr) return } diff --git a/pkg/detector/ospkg/alma/alma_test.go b/pkg/detector/ospkg/alma/alma_test.go index c736f4b12c74..220c7886e59d 100644 --- a/pkg/detector/ospkg/alma/alma_test.go +++ b/pkg/detector/ospkg/alma/alma_test.go @@ -165,8 +165,7 @@ func TestScanner_Detect(t *testing.T) { s := alma.NewScanner() got, err := s.Detect(nil, tt.args.osVer, nil, tt.args.pkgs) if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr) + require.ErrorContains(t, err, tt.wantErr) return } require.NoError(t, err) diff --git a/pkg/detector/ospkg/alpine/alpine_test.go b/pkg/detector/ospkg/alpine/alpine_test.go index 9dad87c4b50d..cf8e62dc953e 100644 --- a/pkg/detector/ospkg/alpine/alpine_test.go +++ b/pkg/detector/ospkg/alpine/alpine_test.go @@ -254,8 +254,7 @@ func TestScanner_Detect(t *testing.T) { s := alpine.NewScanner() got, err := s.Detect(nil, tt.args.osVer, tt.args.repo, tt.args.pkgs) if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr) + require.ErrorContains(t, err, tt.wantErr) return } diff --git a/pkg/detector/ospkg/amazon/amazon_test.go b/pkg/detector/ospkg/amazon/amazon_test.go index 98adad931959..10baa8b70599 100644 --- a/pkg/detector/ospkg/amazon/amazon_test.go +++ b/pkg/detector/ospkg/amazon/amazon_test.go @@ -180,8 +180,7 @@ func TestScanner_Detect(t *testing.T) { s := amazon.NewScanner() got, err := s.Detect(nil, tt.args.osVer, nil, tt.args.pkgs) if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr) + require.ErrorContains(t, err, tt.wantErr) return } require.NoError(t, err) diff --git a/pkg/detector/ospkg/azure/azure_test.go b/pkg/detector/ospkg/azure/azure_test.go index cc9f0a92d2af..dd428f197e4d 100644 --- a/pkg/detector/ospkg/azure/azure_test.go +++ b/pkg/detector/ospkg/azure/azure_test.go @@ -187,8 +187,7 @@ func TestScanner_Detect(t *testing.T) { } got, err := s.Detect(nil, tt.args.osVer, nil, tt.args.pkgs) if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr) + require.ErrorContains(t, err, tt.wantErr) return } require.NoError(t, err) diff --git a/pkg/detector/ospkg/chainguard/chainguard_test.go b/pkg/detector/ospkg/chainguard/chainguard_test.go index 0c49077aee3e..cd5d7daea335 100644 --- a/pkg/detector/ospkg/chainguard/chainguard_test.go +++ b/pkg/detector/ospkg/chainguard/chainguard_test.go @@ -196,8 +196,7 @@ func TestScanner_Detect(t *testing.T) { s := chainguard.NewScanner() got, err := s.Detect(nil, "", tt.args.repo, tt.args.pkgs) if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr) + require.ErrorContains(t, err, tt.wantErr) return } diff --git a/pkg/detector/ospkg/debian/debian_test.go b/pkg/detector/ospkg/debian/debian_test.go index 790067c293ff..ef7edbb7a1f4 100644 --- a/pkg/detector/ospkg/debian/debian_test.go +++ b/pkg/detector/ospkg/debian/debian_test.go @@ -118,8 +118,7 @@ func TestScanner_Detect(t *testing.T) { s := debian.NewScanner() got, err := s.Detect(nil, tt.args.osVer, nil, tt.args.pkgs) if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr) + require.ErrorContains(t, err, tt.wantErr) return } diff --git a/pkg/detector/ospkg/oracle/oracle_test.go b/pkg/detector/ospkg/oracle/oracle_test.go index 860c75eba937..d33c42f416f7 100644 --- a/pkg/detector/ospkg/oracle/oracle_test.go +++ b/pkg/detector/ospkg/oracle/oracle_test.go @@ -343,8 +343,7 @@ func TestScanner_Detect(t *testing.T) { s := NewScanner() got, err := s.Detect(nil, tt.args.osVer, nil, tt.args.pkgs) if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr) + require.ErrorContains(t, err, tt.wantErr) return } else { require.NoError(t, err) diff --git a/pkg/detector/ospkg/photon/photon_test.go b/pkg/detector/ospkg/photon/photon_test.go index 8d68ea08680e..c450960f4c11 100644 --- a/pkg/detector/ospkg/photon/photon_test.go +++ b/pkg/detector/ospkg/photon/photon_test.go @@ -97,8 +97,7 @@ func TestScanner_Detect(t *testing.T) { s := photon.NewScanner() got, err := s.Detect(nil, tt.args.osVer, nil, tt.args.pkgs) if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr) + require.ErrorContains(t, err, tt.wantErr) return } require.NoError(t, err) diff --git a/pkg/detector/ospkg/rocky/rocky_test.go b/pkg/detector/ospkg/rocky/rocky_test.go index ce5ad893bfc2..21ef589b35c0 100644 --- a/pkg/detector/ospkg/rocky/rocky_test.go +++ b/pkg/detector/ospkg/rocky/rocky_test.go @@ -125,8 +125,7 @@ func TestScanner_Detect(t *testing.T) { s := rocky.NewScanner() got, err := s.Detect(nil, tt.args.osVer, nil, tt.args.pkgs) if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr) + require.ErrorContains(t, err, tt.wantErr) return } require.NoError(t, err) diff --git a/pkg/detector/ospkg/suse/suse_test.go b/pkg/detector/ospkg/suse/suse_test.go index abd21c6478a7..420eb2a0d0d1 100644 --- a/pkg/detector/ospkg/suse/suse_test.go +++ b/pkg/detector/ospkg/suse/suse_test.go @@ -220,8 +220,7 @@ func TestScanner_Detect(t *testing.T) { s := suse.NewScanner(tt.distribution) got, err := s.Detect(nil, tt.args.osVer, nil, tt.args.pkgs) if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr) + require.ErrorContains(t, err, tt.wantErr) return } require.NoError(t, err) diff --git a/pkg/detector/ospkg/ubuntu/ubuntu_test.go b/pkg/detector/ospkg/ubuntu/ubuntu_test.go index 044ea69b1056..071bbb842240 100644 --- a/pkg/detector/ospkg/ubuntu/ubuntu_test.go +++ b/pkg/detector/ospkg/ubuntu/ubuntu_test.go @@ -182,8 +182,7 @@ func TestScanner_Detect(t *testing.T) { s := ubuntu.NewScanner() got, err := s.Detect(nil, tt.args.osVer, nil, tt.args.pkgs) if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr) + require.ErrorContains(t, err, tt.wantErr) return } sort.Slice(got, func(i, j int) bool { diff --git a/pkg/detector/ospkg/wolfi/wolfi_test.go b/pkg/detector/ospkg/wolfi/wolfi_test.go index 019d6627dc7c..92e9b5fc2d48 100644 --- a/pkg/detector/ospkg/wolfi/wolfi_test.go +++ b/pkg/detector/ospkg/wolfi/wolfi_test.go @@ -196,8 +196,7 @@ func TestScanner_Detect(t *testing.T) { s := wolfi.NewScanner() got, err := s.Detect(nil, "", tt.args.repo, tt.args.pkgs) if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr) + require.ErrorContains(t, err, tt.wantErr) return } diff --git a/pkg/fanal/analyzer/analyzer_test.go b/pkg/fanal/analyzer/analyzer_test.go index d8f93c0aa420..458586447f17 100644 --- a/pkg/fanal/analyzer/analyzer_test.go +++ b/pkg/fanal/analyzer/analyzer_test.go @@ -522,8 +522,7 @@ func TestAnalyzerGroup_AnalyzeFile(t *testing.T) { DisabledAnalyzers: tt.args.disabledAnalyzers, }) if err != nil && tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr) + require.ErrorContains(t, err, tt.wantErr) return } require.NoError(t, err) @@ -549,8 +548,7 @@ func TestAnalyzerGroup_AnalyzeFile(t *testing.T) { wg.Wait() if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr) + require.ErrorContains(t, err, tt.wantErr) return } diff --git a/pkg/fanal/analyzer/buildinfo/content_manifest_test.go b/pkg/fanal/analyzer/buildinfo/content_manifest_test.go index 4ef87bebbeb6..e0be767da0c1 100644 --- a/pkg/fanal/analyzer/buildinfo/content_manifest_test.go +++ b/pkg/fanal/analyzer/buildinfo/content_manifest_test.go @@ -55,8 +55,7 @@ func Test_contentManifestAnalyzer_Analyze(t *testing.T) { }) if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr) + require.ErrorContains(t, err, tt.wantErr) return } diff --git a/pkg/fanal/analyzer/language/analyze_test.go b/pkg/fanal/analyzer/language/analyze_test.go index 6a996fc03172..3f343b6b8366 100644 --- a/pkg/fanal/analyzer/language/analyze_test.go +++ b/pkg/fanal/analyzer/language/analyze_test.go @@ -97,8 +97,7 @@ func TestAnalyze(t *testing.T) { got, err := language.Analyze(tt.args.fileType, tt.args.filePath, tt.args.content, mp) if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr) + require.ErrorContains(t, err, tt.wantErr) return } diff --git a/pkg/fanal/analyzer/language/dotnet/deps/deps_test.go b/pkg/fanal/analyzer/language/dotnet/deps/deps_test.go index d6a86c78084e..c6c7172fb460 100644 --- a/pkg/fanal/analyzer/language/dotnet/deps/deps_test.go +++ b/pkg/fanal/analyzer/language/dotnet/deps/deps_test.go @@ -64,8 +64,7 @@ func Test_depsLibraryAnalyzer_Analyze(t *testing.T) { }) if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr) + require.ErrorContains(t, err, tt.wantErr) return } diff --git a/pkg/fanal/analyzer/language/java/pom/pom_test.go b/pkg/fanal/analyzer/language/java/pom/pom_test.go index ea147a4d1141..53896d518e68 100644 --- a/pkg/fanal/analyzer/language/java/pom/pom_test.go +++ b/pkg/fanal/analyzer/language/java/pom/pom_test.go @@ -191,8 +191,7 @@ func Test_pomAnalyzer_Analyze(t *testing.T) { }, }) if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr) + require.ErrorContains(t, err, tt.wantErr) return } require.NoError(t, err) diff --git a/pkg/fanal/analyzer/language/nodejs/pkg/pkg_test.go b/pkg/fanal/analyzer/language/nodejs/pkg/pkg_test.go index 62eebb5a5f09..3facf662d4a7 100644 --- a/pkg/fanal/analyzer/language/nodejs/pkg/pkg_test.go +++ b/pkg/fanal/analyzer/language/nodejs/pkg/pkg_test.go @@ -89,8 +89,7 @@ func Test_nodePkgLibraryAnalyzer_Analyze(t *testing.T) { }) if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr) + require.ErrorContains(t, err, tt.wantErr) return } diff --git a/pkg/fanal/analyzer/language/python/packaging/packaging_test.go b/pkg/fanal/analyzer/language/python/packaging/packaging_test.go index 47a9cca901b6..663cd52fe8c2 100644 --- a/pkg/fanal/analyzer/language/python/packaging/packaging_test.go +++ b/pkg/fanal/analyzer/language/python/packaging/packaging_test.go @@ -141,8 +141,7 @@ func Test_packagingAnalyzer_Analyze(t *testing.T) { }) if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr) + require.ErrorContains(t, err, tt.wantErr) return } require.NoError(t, err) diff --git a/pkg/fanal/analyzer/language/ruby/gemspec/gemspec_test.go b/pkg/fanal/analyzer/language/ruby/gemspec/gemspec_test.go index 76c91476dd02..46deaa2a0abc 100644 --- a/pkg/fanal/analyzer/language/ruby/gemspec/gemspec_test.go +++ b/pkg/fanal/analyzer/language/ruby/gemspec/gemspec_test.go @@ -92,8 +92,7 @@ func Test_gemspecLibraryAnalyzer_Analyze(t *testing.T) { }) if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr) + require.ErrorContains(t, err, tt.wantErr) return } require.NoError(t, err) diff --git a/pkg/fanal/analyzer/os/amazonlinux/amazonlinux_test.go b/pkg/fanal/analyzer/os/amazonlinux/amazonlinux_test.go index 5ae7bc0d0f79..8cd1f0828f2b 100644 --- a/pkg/fanal/analyzer/os/amazonlinux/amazonlinux_test.go +++ b/pkg/fanal/analyzer/os/amazonlinux/amazonlinux_test.go @@ -95,8 +95,7 @@ func Test_amazonlinuxOSAnalyzer_Analyze(t *testing.T) { ctx := context.Background() got, err := a.Analyze(ctx, tt.input) if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr) + require.ErrorContains(t, err, tt.wantErr) return } else { require.NoError(t, err) diff --git a/pkg/fanal/analyzer/os/debian/debian_test.go b/pkg/fanal/analyzer/os/debian/debian_test.go index 1fa36db41b07..56750d797162 100644 --- a/pkg/fanal/analyzer/os/debian/debian_test.go +++ b/pkg/fanal/analyzer/os/debian/debian_test.go @@ -59,8 +59,7 @@ func Test_debianOSAnalyzer_Analyze(t *testing.T) { Content: f, }) if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr) + require.ErrorContains(t, err, tt.wantErr) return } else { require.NoError(t, err) diff --git a/pkg/fanal/analyzer/os/redhatbase/alma_test.go b/pkg/fanal/analyzer/os/redhatbase/alma_test.go index 7356652a8234..689ed7e6165a 100644 --- a/pkg/fanal/analyzer/os/redhatbase/alma_test.go +++ b/pkg/fanal/analyzer/os/redhatbase/alma_test.go @@ -46,8 +46,7 @@ func Test_almaOSAnalyzer_Analyze(t *testing.T) { Content: f, }) if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr) + require.ErrorContains(t, err, tt.wantErr) return } require.NoError(t, err) diff --git a/pkg/fanal/analyzer/os/redhatbase/centos_test.go b/pkg/fanal/analyzer/os/redhatbase/centos_test.go index bee789865363..f0daab700937 100644 --- a/pkg/fanal/analyzer/os/redhatbase/centos_test.go +++ b/pkg/fanal/analyzer/os/redhatbase/centos_test.go @@ -45,8 +45,7 @@ func Test_centosOSAnalyzer_Analyze(t *testing.T) { Content: f, }) if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr) + require.ErrorContains(t, err, tt.wantErr) return } else { require.NoError(t, err) diff --git a/pkg/fanal/analyzer/os/redhatbase/fedora_test.go b/pkg/fanal/analyzer/os/redhatbase/fedora_test.go index 405bbd5356ba..cbed013b0cef 100644 --- a/pkg/fanal/analyzer/os/redhatbase/fedora_test.go +++ b/pkg/fanal/analyzer/os/redhatbase/fedora_test.go @@ -45,8 +45,7 @@ func Test_fedoraOSAnalyzer_Analyze(t *testing.T) { Content: f, }) if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr) + require.ErrorContains(t, err, tt.wantErr) return } else { require.NoError(t, err) diff --git a/pkg/fanal/analyzer/os/redhatbase/oracle_test.go b/pkg/fanal/analyzer/os/redhatbase/oracle_test.go index 1f3120b47763..be7aa6f8dc76 100644 --- a/pkg/fanal/analyzer/os/redhatbase/oracle_test.go +++ b/pkg/fanal/analyzer/os/redhatbase/oracle_test.go @@ -45,8 +45,7 @@ func Test_oracleOSAnalyzer_Analyze(t *testing.T) { Content: f, }) if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr) + require.ErrorContains(t, err, tt.wantErr) return } else { require.NoError(t, err) diff --git a/pkg/fanal/analyzer/os/redhatbase/redhatbase_test.go b/pkg/fanal/analyzer/os/redhatbase/redhatbase_test.go index b47174523a16..27895e609280 100644 --- a/pkg/fanal/analyzer/os/redhatbase/redhatbase_test.go +++ b/pkg/fanal/analyzer/os/redhatbase/redhatbase_test.go @@ -45,8 +45,7 @@ func Test_redhatOSAnalyzer_Analyze(t *testing.T) { Content: f, }) if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr) + require.ErrorContains(t, err, tt.wantErr) return } else { require.NoError(t, err) diff --git a/pkg/fanal/analyzer/os/redhatbase/rocky_test.go b/pkg/fanal/analyzer/os/redhatbase/rocky_test.go index 7b9f3152ea41..75ab9627e7c1 100644 --- a/pkg/fanal/analyzer/os/redhatbase/rocky_test.go +++ b/pkg/fanal/analyzer/os/redhatbase/rocky_test.go @@ -45,8 +45,7 @@ func Test_rockyOSAnalyzer_Analyze(t *testing.T) { Content: f, }) if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr) + require.ErrorContains(t, err, tt.wantErr) return } require.NoError(t, err) diff --git a/pkg/fanal/analyzer/os/ubuntu/ubuntu_test.go b/pkg/fanal/analyzer/os/ubuntu/ubuntu_test.go index 1aad32e8f124..8c923f33b973 100644 --- a/pkg/fanal/analyzer/os/ubuntu/ubuntu_test.go +++ b/pkg/fanal/analyzer/os/ubuntu/ubuntu_test.go @@ -45,8 +45,7 @@ func Test_ubuntuOSAnalyzer_Analyze(t *testing.T) { Content: f, }) if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr) + require.ErrorContains(t, err, tt.wantErr) return } else { require.NoError(t, err) diff --git a/pkg/fanal/applier/applier_test.go b/pkg/fanal/applier/applier_test.go index baf34975d778..95f4d0e8258a 100644 --- a/pkg/fanal/applier/applier_test.go +++ b/pkg/fanal/applier/applier_test.go @@ -1057,8 +1057,7 @@ func TestApplier_ApplyLayers(t *testing.T) { got, err := a.ApplyLayers(tt.args.imageID, tt.args.layerIDs) if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr, tt.name) + require.ErrorContains(t, err, tt.wantErr, tt.name) } else { require.NoError(t, err, tt.name) } diff --git a/pkg/fanal/artifact/local/fs_test.go b/pkg/fanal/artifact/local/fs_test.go index 93b563e28642..7b7ed4503ac4 100644 --- a/pkg/fanal/artifact/local/fs_test.go +++ b/pkg/fanal/artifact/local/fs_test.go @@ -265,8 +265,7 @@ func TestArtifact_Inspect(t *testing.T) { got, err := a.Inspect(context.Background()) if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr) + require.ErrorContains(t, err, tt.wantErr) return } else { require.NoError(t, err) diff --git a/pkg/fanal/artifact/repo/git_test.go b/pkg/fanal/artifact/repo/git_test.go index e1ffccd17d92..3835e9ae0ae5 100644 --- a/pkg/fanal/artifact/repo/git_test.go +++ b/pkg/fanal/artifact/repo/git_test.go @@ -261,8 +261,7 @@ func Test_newURL(t *testing.T) { t.Run(tt.name, func(t *testing.T) { got, err := newURL(tt.args.rawurl) if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr) + require.ErrorContains(t, err, tt.wantErr) return } else { require.NoError(t, err) diff --git a/pkg/fanal/image/image_test.go b/pkg/fanal/image/image_test.go index 2728ddc45184..555fe79cf509 100644 --- a/pkg/fanal/image/image_test.go +++ b/pkg/fanal/image/image_test.go @@ -397,8 +397,7 @@ func TestNewDockerImageWithPrivateRegistry(t *testing.T) { defer cleanup() if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr, err) + require.ErrorContains(t, err, tt.wantErr, err) } else { require.NoError(t, err) } @@ -488,8 +487,7 @@ func TestNewArchiveImage(t *testing.T) { img, err := NewArchiveImage(tt.args.fileName) switch { case tt.wantErr != "": - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr, tt.name) + require.ErrorContains(t, err, tt.wantErr, tt.name) return default: require.NoError(t, err, tt.name) diff --git a/pkg/fanal/image/oci_test.go b/pkg/fanal/image/oci_test.go index 4256a56ae9f8..a527e34f256f 100644 --- a/pkg/fanal/image/oci_test.go +++ b/pkg/fanal/image/oci_test.go @@ -4,7 +4,6 @@ import ( "path/filepath" "testing" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) @@ -62,8 +61,7 @@ func TestTryOCI(t *testing.T) { t.Run(test.name, func(t *testing.T) { _, err := tryOCI(test.ociImagePath) if test.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), test.wantErr, err) + require.ErrorContains(t, err, test.wantErr, err) } else { require.NoError(t, err) } diff --git a/pkg/fanal/walker/tar_test.go b/pkg/fanal/walker/tar_test.go index 4cbdb782fb48..f00ca1e7e3bc 100644 --- a/pkg/fanal/walker/tar_test.go +++ b/pkg/fanal/walker/tar_test.go @@ -80,8 +80,7 @@ func TestLayerTar_Walk(t *testing.T) { w := walker.NewLayerTar(tt.option) gotOpqDirs, gotWhFiles, err := w.Walk(f, tt.analyzeFn) if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr) + require.ErrorContains(t, err, tt.wantErr) return } require.NoError(t, err) diff --git a/pkg/policy/policy_test.go b/pkg/policy/policy_test.go index a11a0336e3ee..c31de3172cc9 100644 --- a/pkg/policy/policy_test.go +++ b/pkg/policy/policy_test.go @@ -122,8 +122,7 @@ func TestClient_LoadBuiltinPolicies(t *testing.T) { got, err := c.LoadBuiltinChecks() if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr) + require.ErrorContains(t, err, tt.wantErr) return } require.NoError(t, err) @@ -363,8 +362,7 @@ func TestClient_DownloadBuiltinPolicies(t *testing.T) { err = c.DownloadBuiltinChecks(context.Background(), ftypes.RegistryOptions{}) if tt.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tt.wantErr) + require.ErrorContains(t, err, tt.wantErr) return } require.NoError(t, err) diff --git a/pkg/purl/purl_test.go b/pkg/purl/purl_test.go index d5ba15300393..5607551da77c 100644 --- a/pkg/purl/purl_test.go +++ b/pkg/purl/purl_test.go @@ -446,8 +446,7 @@ func TestNewPackageURL(t *testing.T) { t.Run(tc.name, func(t *testing.T) { packageURL, err := purl.New(tc.typ, tc.metadata, tc.pkg) if tc.wantErr != "" { - require.Error(t, err) - assert.Contains(t, err.Error(), tc.wantErr) + require.ErrorContains(t, err, tc.wantErr) return } require.NoError(t, err) diff --git a/pkg/result/ignore_test.go b/pkg/result/ignore_test.go index 68248d7e17b1..466139cebc77 100644 --- a/pkg/result/ignore_test.go +++ b/pkg/result/ignore_test.go @@ -49,7 +49,7 @@ func TestParseIgnoreFile(t *testing.T) { _, _ = f.WriteString("this file is not a yaml file") got, err := ParseIgnoreFile(context.TODO(), f.Name()) - assert.Contains(t, err.Error(), "yaml decode error") + require.ErrorContains(t, err, "yaml decode error") assert.Empty(t, got) }) diff --git a/pkg/rpc/server/listen_test.go b/pkg/rpc/server/listen_test.go index 7f97bdbcb31e..9ec07a66b5e1 100644 --- a/pkg/rpc/server/listen_test.go +++ b/pkg/rpc/server/listen_test.go @@ -101,8 +101,7 @@ func Test_dbWorker_update(t *testing.T) { err = w.update(ctx, "1.2.3", dbDir, tt.skipUpdate, &dbUpdateWg, &requestWg, ftypes.RegistryOptions{}) if tt.wantErr != "" { - require.Error(t, err, tt.name) - assert.Contains(t, err.Error(), tt.wantErr, tt.name) + require.ErrorContains(t, err, tt.wantErr, tt.name) return } require.NoError(t, err, tt.name) diff --git a/pkg/rpc/server/server_test.go b/pkg/rpc/server/server_test.go index 78db0c06aac3..7cf1e4adeb7e 100644 --- a/pkg/rpc/server/server_test.go +++ b/pkg/rpc/server/server_test.go @@ -174,8 +174,7 @@ func TestScanServer_Scan(t *testing.T) { s := NewScanServer(mockDriver) got, err := s.Scan(context.Background(), tt.args.in) if tt.wantErr != "" { - require.Error(t, err, tt.name) - assert.Contains(t, err.Error(), tt.wantErr, tt.name) + require.ErrorContains(t, err, tt.wantErr, tt.name) return } require.NoError(t, err, tt.name) @@ -273,8 +272,7 @@ func TestCacheServer_PutArtifact(t *testing.T) { got, err := s.PutArtifact(context.Background(), tt.args.in) if tt.wantErr != "" { - require.Error(t, err, tt.name) - assert.Contains(t, err.Error(), tt.wantErr, tt.name) + require.ErrorContains(t, err, tt.wantErr, tt.name) return } else { require.NoError(t, err, tt.name) @@ -508,8 +506,7 @@ func TestCacheServer_PutBlob(t *testing.T) { got, err := s.PutBlob(context.Background(), tt.args.in) if tt.wantErr != "" { - require.Error(t, err, tt.name) - assert.Contains(t, err.Error(), tt.wantErr, tt.name) + require.ErrorContains(t, err, tt.wantErr, tt.name) return } else { require.NoError(t, err, tt.name) @@ -573,8 +570,7 @@ func TestCacheServer_MissingBlobs(t *testing.T) { s := NewCacheServer(mockCache) got, err := s.MissingBlobs(tt.args.ctx, tt.args.in) if tt.wantErr != "" { - require.Error(t, err, tt.name) - assert.Contains(t, err.Error(), tt.wantErr, tt.name) + require.ErrorContains(t, err, tt.wantErr, tt.name) return } else { require.NoError(t, err, tt.name)