Skip to content

Commit 3684c52

Browse files
authored
test: use errors.Is to check for os.ErrNotExist in lockfile cases (#331)
1 parent 6d296d9 commit 3684c52

21 files changed

+105
-21
lines changed

pkg/lockfile/parse-bun-lock_test.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package lockfile_test
22

33
import (
4+
"errors"
5+
"os"
46
"testing"
57

68
"github.com/g-rath/osv-detector/pkg/lockfile"
@@ -11,7 +13,9 @@ func TestParseBunLock_FileDoesNotExist(t *testing.T) {
1113

1214
packages, err := lockfile.ParseBunLock("testdata/bun/does-not-exist")
1315

14-
expectErrContaining(t, err, "could not read")
16+
if !errors.Is(err, os.ErrNotExist) {
17+
t.Errorf("expected \"%v\" error but got \"%v\"", os.ErrNotExist, err)
18+
}
1519
expectPackages(t, packages, []lockfile.PackageDetails{})
1620
}
1721

pkg/lockfile/parse-cargo-lock_test.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package lockfile_test
22

33
import (
4+
"errors"
5+
"os"
46
"testing"
57

68
"github.com/g-rath/osv-detector/pkg/lockfile"
@@ -11,7 +13,9 @@ func TestParseCargoLock_FileDoesNotExist(t *testing.T) {
1113

1214
packages, err := lockfile.ParseCargoLock("testdata/cargo/does-not-exist")
1315

14-
expectErrContaining(t, err, "could not read")
16+
if !errors.Is(err, os.ErrNotExist) {
17+
t.Errorf("expected \"%v\" error but got \"%v\"", os.ErrNotExist, err)
18+
}
1519
expectPackages(t, packages, []lockfile.PackageDetails{})
1620
}
1721

pkg/lockfile/parse-composer-lock_test.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package lockfile_test
22

33
import (
4+
"errors"
5+
"os"
46
"testing"
57

68
"github.com/g-rath/osv-detector/pkg/lockfile"
@@ -11,7 +13,9 @@ func TestParseComposerLock_FileDoesNotExist(t *testing.T) {
1113

1214
packages, err := lockfile.ParseComposerLock("testdata/composer/does-not-exist")
1315

14-
expectErrContaining(t, err, "could not read")
16+
if !errors.Is(err, os.ErrNotExist) {
17+
t.Errorf("expected \"%v\" error but got \"%v\"", os.ErrNotExist, err)
18+
}
1519
expectPackages(t, packages, []lockfile.PackageDetails{})
1620
}
1721

pkg/lockfile/parse-gemfile-lock_test.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package lockfile_test
22

33
import (
4+
"errors"
5+
"os"
46
"testing"
57

68
"github.com/g-rath/osv-detector/pkg/lockfile"
@@ -11,7 +13,9 @@ func TestParseGemfileLock_FileDoesNotExist(t *testing.T) {
1113

1214
packages, err := lockfile.ParseGemfileLock("testdata/bundler/does-not-exist")
1315

14-
expectErrContaining(t, err, "could not read")
16+
if !errors.Is(err, os.ErrNotExist) {
17+
t.Errorf("expected \"%v\" error but got \"%v\"", os.ErrNotExist, err)
18+
}
1519
expectPackages(t, packages, []lockfile.PackageDetails{})
1620
}
1721

pkg/lockfile/parse-go-lock_test.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package lockfile_test
22

33
import (
4+
"errors"
5+
"os"
46
"testing"
57

68
"github.com/g-rath/osv-detector/pkg/lockfile"
@@ -11,7 +13,9 @@ func TestParseGoLock_FileDoesNotExist(t *testing.T) {
1113

1214
packages, err := lockfile.ParseGoLock("testdata/go/does-not-exist")
1315

14-
expectErrContaining(t, err, "could not read")
16+
if !errors.Is(err, os.ErrNotExist) {
17+
t.Errorf("expected \"%v\" error but got \"%v\"", os.ErrNotExist, err)
18+
}
1519
expectPackages(t, packages, []lockfile.PackageDetails{})
1620
}
1721

pkg/lockfile/parse-gradle-lock_test.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package lockfile_test
22

33
import (
4+
"errors"
5+
"os"
46
"testing"
57

68
"github.com/g-rath/osv-detector/pkg/lockfile"
@@ -11,7 +13,9 @@ func TestParseGradleLock_FileDoesNotExist(t *testing.T) {
1113

1214
packages, err := lockfile.ParseGradleLock("testdata/gradle/does-not-exist")
1315

14-
expectErrContaining(t, err, "could not open")
16+
if !errors.Is(err, os.ErrNotExist) {
17+
t.Errorf("expected \"%v\" error but got \"%v\"", os.ErrNotExist, err)
18+
}
1519
expectPackages(t, packages, []lockfile.PackageDetails{})
1620
}
1721

pkg/lockfile/parse-maven-lock_test.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package lockfile_test
22

33
import (
4+
"errors"
5+
"os"
46
"testing"
57

68
"github.com/g-rath/osv-detector/pkg/lockfile"
@@ -11,7 +13,9 @@ func TestParseMavenLock_FileDoesNotExist(t *testing.T) {
1113

1214
packages, err := lockfile.ParseMavenLock("testdata/maven/does-not-exist")
1315

14-
expectErrContaining(t, err, "could not read")
16+
if !errors.Is(err, os.ErrNotExist) {
17+
t.Errorf("expected \"%v\" error but got \"%v\"", os.ErrNotExist, err)
18+
}
1519
expectPackages(t, packages, []lockfile.PackageDetails{})
1620
}
1721

pkg/lockfile/parse-mix-lock_test.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package lockfile_test
22

33
import (
4+
"errors"
5+
"os"
46
"testing"
57

68
"github.com/g-rath/osv-detector/pkg/lockfile"
@@ -11,7 +13,9 @@ func TestParseMixLock_FileDoesNotExist(t *testing.T) {
1113

1214
packages, err := lockfile.ParseMixLock("testdata/mix/does-not-exist")
1315

14-
expectErrContaining(t, err, "could not open")
16+
if !errors.Is(err, os.ErrNotExist) {
17+
t.Errorf("expected \"%v\" error but got \"%v\"", os.ErrNotExist, err)
18+
}
1519
expectPackages(t, packages, []lockfile.PackageDetails{})
1620
}
1721

pkg/lockfile/parse-npm-lock-v1_test.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package lockfile_test
22

33
import (
4+
"errors"
5+
"os"
46
"testing"
57

68
"github.com/g-rath/osv-detector/pkg/lockfile"
@@ -11,7 +13,9 @@ func TestParseNpmLock_v1_FileDoesNotExist(t *testing.T) {
1113

1214
packages, err := lockfile.ParseNpmLock("testdata/npm/does-not-exist")
1315

14-
expectErrContaining(t, err, "could not read")
16+
if !errors.Is(err, os.ErrNotExist) {
17+
t.Errorf("expected \"%v\" error but got \"%v\"", os.ErrNotExist, err)
18+
}
1519
expectPackages(t, packages, []lockfile.PackageDetails{})
1620
}
1721

pkg/lockfile/parse-npm-lock-v2_test.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package lockfile_test
22

33
import (
4+
"errors"
5+
"os"
46
"testing"
57

68
"github.com/g-rath/osv-detector/pkg/lockfile"
@@ -11,7 +13,9 @@ func TestParseNpmLock_v2_FileDoesNotExist(t *testing.T) {
1113

1214
packages, err := lockfile.ParseNpmLock("testdata/npm/does-not-exist")
1315

14-
expectErrContaining(t, err, "could not read")
16+
if !errors.Is(err, os.ErrNotExist) {
17+
t.Errorf("expected \"%v\" error but got \"%v\"", os.ErrNotExist, err)
18+
}
1519
expectPackages(t, packages, []lockfile.PackageDetails{})
1620
}
1721

0 commit comments

Comments
 (0)