commit b43f5afc876383b2adc0ec0d3ff1998fe58eeda0
author Tatiana Bradley <tatianabradley@google.com> Fri Apr 21 12:20:21 2023 -0400
committer Tatiana Bradley <tatianabradley@google.com> Mon Apr 24 18:46:43 2023 +0000
tree 74525255264c23ab2979acc01f1b36ab2db789a7
parent ba0df7365da74be61f72c91052f2a31bb0219ffb

internal/vulncheck: cleanup FetchVulnerabilities test

Change-Id: I3a8654ef9e12b7e761cb3f3b5c7aacd4e0a55eae
Reviewed-on: https://go-review.googlesource.com/c/vuln/+/486807
Run-TryBot: Tatiana Bradley <tatianabradley@google.com>
Reviewed-by: Julie Qiu <julieqiu@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Tatiana Bradley <tatianabradley@google.com>

internal/vulncheck/fetch_test.go

diff --git a/internal/vulncheck/fetch_test.go b/internal/vulncheck/fetch_test.go
index 9a8b1c2..fa3b87a 100644
--- a/internal/vulncheck/fetch_test.go
+++ b/internal/vulncheck/fetch_test.go
@@ -6,7 +6,6 @@
 
 import (
 	"context"
-	"log"
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
@@ -16,13 +15,12 @@
 )
 
 func TestFetchVulnerabilities(t *testing.T) {
-	mc, err := client.NewInMemoryClient(
-		[]*osv.Entry{
-			{ID: "a", Affected: []osv.Affected{{Module: osv.Module{Path: "example.mod/a"}, Ranges: []osv.Range{{Type: osv.RangeTypeSemver, Events: []osv.RangeEvent{{Fixed: "2.0.0"}}}}}}},
-			{ID: "b", Affected: []osv.Affected{{Module: osv.Module{Path: "example.mod/b"}, Ranges: []osv.Range{{Type: osv.RangeTypeSemver, Events: []osv.RangeEvent{{Fixed: "1.1.1"}}}}}}},
-			{ID: "c", Affected: []osv.Affected{{Module: osv.Module{Path: "example.mod/d"}, Ranges: []osv.Range{{Type: osv.RangeTypeSemver, Events: []osv.RangeEvent{{Fixed: "2.0.0"}}}}}}},
-			{ID: "e", Affected: []osv.Affected{{Module: osv.Module{Path: "example.mod/e"}, Ranges: []osv.Range{{Type: osv.RangeTypeSemver, Events: []osv.RangeEvent{{Fixed: "2.2.0"}}}}}}},
-		})
+	a := &osv.Entry{ID: "a", Affected: []osv.Affected{{Module: osv.Module{Path: "example.mod/a"}, Ranges: []osv.Range{{Type: osv.RangeTypeSemver, Events: []osv.RangeEvent{{Fixed: "2.0.0"}}}}}}}
+	b := &osv.Entry{ID: "b", Affected: []osv.Affected{{Module: osv.Module{Path: "example.mod/b"}, Ranges: []osv.Range{{Type: osv.RangeTypeSemver, Events: []osv.RangeEvent{{Fixed: "1.1.1"}}}}}}}
+	c := &osv.Entry{ID: "c", Affected: []osv.Affected{{Module: osv.Module{Path: "example.mod/d"}, Ranges: []osv.Range{{Type: osv.RangeTypeSemver, Events: []osv.RangeEvent{{Fixed: "2.0.0"}}}}}}}
+	d := &osv.Entry{ID: "e", Affected: []osv.Affected{{Module: osv.Module{Path: "example.mod/e"}, Ranges: []osv.Range{{Type: osv.RangeTypeSemver, Events: []osv.RangeEvent{{Fixed: "2.2.0"}}}}}}}
+
+	mc, err := client.NewInMemoryClient([]*osv.Entry{a, b, c, d})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -40,24 +38,18 @@
 	want := []*vulncheck.ModVulns{
 		{
 			Module: &vulncheck.Module{Path: "example.mod/a", Version: "v1.0.0"},
-			Vulns: []*osv.Entry{
-				{ID: "a", Affected: []osv.Affected{{Module: osv.Module{Path: "example.mod/a"}, Ranges: []osv.Range{{Type: osv.RangeTypeSemver, Events: []osv.RangeEvent{{Fixed: "2.0.0"}}}}}}},
-			},
+			Vulns:  []*osv.Entry{a},
 		},
 		{
 			Module: &vulncheck.Module{Path: "example.mod/b", Version: "v1.0.4"},
-			Vulns: []*osv.Entry{
-				{ID: "b", Affected: []osv.Affected{{Module: osv.Module{Path: "example.mod/b"}, Ranges: []osv.Range{{Type: osv.RangeTypeSemver, Events: []osv.RangeEvent{{Fixed: "1.1.1"}}}}}}},
-			},
+			Vulns:  []*osv.Entry{b},
 		},
 		{
 			Module: &vulncheck.Module{Path: "example.mod/c", Replace: &vulncheck.Module{Path: "example.mod/d", Version: "v1.0.0"}, Version: "v2.0.0"},
-			Vulns: []*osv.Entry{
-				{ID: "c", Affected: []osv.Affected{{Module: osv.Module{Path: "example.mod/d"}, Ranges: []osv.Range{{Type: osv.RangeTypeSemver, Events: []osv.RangeEvent{{Fixed: "2.0.0"}}}}}}},
-			},
+			Vulns:  []*osv.Entry{c},
 		},
 	}
 	if diff := cmp.Diff(got, want); diff != "" {
-		log.Fatalf("mismatch (-want, +got):\n%s", diff)
+		t.Fatalf("mismatch (-want, +got):\n%s", diff)
 	}
 }