From 769b38ac448c679aa23aefa2fe5741c145bfe9fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Comb=C3=BCchen?= Date: Mon, 4 Mar 2024 14:35:25 +0100 Subject: [PATCH] test: use local logger instance in tests (#63) --- lib/ecosystems/enrich_cyclonedx_test.go | 6 ++++-- lib/ecosystems/enrich_spdx_test.go | 2 ++ lib/snyk/enrich_test.go | 6 ++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/ecosystems/enrich_cyclonedx_test.go b/lib/ecosystems/enrich_cyclonedx_test.go index 000a07e..797f844 100644 --- a/lib/ecosystems/enrich_cyclonedx_test.go +++ b/lib/ecosystems/enrich_cyclonedx_test.go @@ -30,8 +30,6 @@ import ( "github.com/snyk/parlay/lib/sbom" ) -var logger = zerolog.Nop() - func TestEnrichSBOM_CycloneDX(t *testing.T) { httpmock.Activate() defer httpmock.DeactivateAndReset() @@ -67,6 +65,7 @@ func TestEnrichSBOM_CycloneDX(t *testing.T) { }, } doc := &sbom.SBOMDocument{BOM: bom} + logger := zerolog.Nop() EnrichSBOM(doc, &logger) @@ -114,6 +113,7 @@ func TestEnrichSBOM_CycloneDX_NestedComps(t *testing.T) { }, } doc := &sbom.SBOMDocument{BOM: bom} + logger := zerolog.Nop() EnrichSBOM(doc, &logger) @@ -146,6 +146,7 @@ func TestEnrichSBOMWithoutLicense(t *testing.T) { }, } doc := &sbom.SBOMDocument{BOM: bom} + logger := zerolog.Nop() EnrichSBOM(doc, &logger) @@ -191,6 +192,7 @@ func TestEnrichLicense(t *testing.T) { func TestEnrichBlankSBOM(t *testing.T) { bom := new(cdx.BOM) doc := &sbom.SBOMDocument{BOM: bom} + logger := zerolog.Nop() EnrichSBOM(doc, &logger) diff --git a/lib/ecosystems/enrich_spdx_test.go b/lib/ecosystems/enrich_spdx_test.go index 114d4fc..76f7497 100644 --- a/lib/ecosystems/enrich_spdx_test.go +++ b/lib/ecosystems/enrich_spdx_test.go @@ -21,6 +21,7 @@ import ( "testing" "github.com/jarcoal/httpmock" + "github.com/rs/zerolog" "github.com/spdx/tools-golang/spdx/v2/common" "github.com/spdx/tools-golang/spdx/v2/v2_3" "github.com/stretchr/testify/assert" @@ -60,6 +61,7 @@ func TestEnrichSBOM_SPDX(t *testing.T) { }, } doc := &sbom.SBOMDocument{BOM: bom} + logger := zerolog.Nop() EnrichSBOM(doc, &logger) diff --git a/lib/snyk/enrich_test.go b/lib/snyk/enrich_test.go index 1e2b161..19a13a4 100644 --- a/lib/snyk/enrich_test.go +++ b/lib/snyk/enrich_test.go @@ -13,8 +13,6 @@ import ( "github.com/snyk/parlay/lib/sbom" ) -var logger = zerolog.Nop() - func TestEnrichSBOM_CycloneDXWithVulnerabilities(t *testing.T) { teardown := setupTestEnv(t) defer teardown() @@ -30,6 +28,7 @@ func TestEnrichSBOM_CycloneDXWithVulnerabilities(t *testing.T) { }, } doc := &sbom.SBOMDocument{BOM: bom} + logger := zerolog.Nop() EnrichSBOM(doc, &logger) @@ -63,6 +62,7 @@ func TestEnrichSBOM_CycloneDXWithVulnerabilities_NestedComponents(t *testing.T) }, } doc := &sbom.SBOMDocument{BOM: bom} + logger := zerolog.Nop() EnrichSBOM(doc, &logger) @@ -85,6 +85,7 @@ func TestEnrichSBOM_CycloneDXWithoutVulnerabilities(t *testing.T) { }, } doc := &sbom.SBOMDocument{BOM: bom} + logger := zerolog.Nop() EnrichSBOM(doc, &logger) @@ -112,6 +113,7 @@ func TestEnrichSBOM_SPDXWithVulnerabilities(t *testing.T) { }, } doc := &sbom.SBOMDocument{BOM: bom} + logger := zerolog.Nop() EnrichSBOM(doc, &logger)