From 1d54391e79c848766c67b399ec7658e35d16ac18 Mon Sep 17 00:00:00 2001 From: Keith Zantow Date: Wed, 22 Feb 2023 12:30:41 -0500 Subject: [PATCH] chore: fix cataloger_test (#1603) Signed-off-by: Keith Zantow --- syft/pkg/cataloger/binary/cataloger_test.go | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/syft/pkg/cataloger/binary/cataloger_test.go b/syft/pkg/cataloger/binary/cataloger_test.go index a73144e5de5..41f3348faf4 100644 --- a/syft/pkg/cataloger/binary/cataloger_test.go +++ b/syft/pkg/cataloger/binary/cataloger_test.go @@ -179,10 +179,8 @@ func Test_Cataloger_DefaultClassifiers_PositiveCases(t *testing.T) { Version: "5.12.5", Type: "binary", PURL: "pkg:generic/perl@5.12.5", - Locations: singleLocation("perl"), - Metadata: pkg.BinaryMetadata{ - Classifier: "perl-binary", - }, + Locations: locations("perl"), + Metadata: metadata("perl-binary"), }, }, { @@ -193,10 +191,8 @@ func Test_Cataloger_DefaultClassifiers_PositiveCases(t *testing.T) { Version: "5.20.0", Type: "binary", PURL: "pkg:generic/perl@5.20.0", - Locations: singleLocation("perl"), - Metadata: pkg.BinaryMetadata{ - Classifier: "perl-binary", - }, + Locations: locations("perl"), + Metadata: metadata("perl-binary"), }, }, { @@ -207,10 +203,8 @@ func Test_Cataloger_DefaultClassifiers_PositiveCases(t *testing.T) { Version: "5.37.8", Type: "binary", PURL: "pkg:generic/perl@5.37.8", - Locations: singleLocation("perl"), - Metadata: pkg.BinaryMetadata{ - Classifier: "perl-binary", - }, + Locations: locations("perl"), + Metadata: metadata("perl-binary"), }, }, { @@ -635,6 +629,8 @@ func (p *panicyResolver) FileMetadataByLocation(_ source.Location) (source.FileM return source.FileMetadata{}, errors.New("not implemented") } +var _ source.FileResolver = (*panicyResolver)(nil) + func Test_Cataloger_ResilientToErrors(t *testing.T) { c := NewCataloger()