Allow SPDX Identifier matches to be additive to all subsequent find f…

…unctions Signed-off-by: Matt Rutkowski <[email protected]>
CycloneDX · Jun 12, 2024 · 1256b05 · 1256b05
1 parent 618061a
commit 1256b05
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/identifier/identifier_test.go b/identifier/identifier_test.go
@@ -515,13 +515,13 @@ func Test_identifyLicensesInString(t *testing.T) {
 			err := IdentifyLicensesInString(&identifierResults, tt.args.input, options, licenseLibrary)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("identifyLicensesInString() error = %v, wantErr %v", err, tt.wantErr)
-			} else if d := cmp.Diff(tt.want.Matches, got.Matches, cmp.AllowUnexported(Match{})); d != "" {
+			} else if d := cmp.Diff(tt.want.Matches, identifierResults.Matches, cmp.AllowUnexported(Match{})); d != "" {
 				t.Errorf("Didn't get expected result: (-want, +got): %v", d)
-			} else if d := cmp.Diff(tt.want.CopyRightStatements, got.CopyRightStatements); d != "" {
+			} else if d := cmp.Diff(tt.want.CopyRightStatements, identifierResults.CopyRightStatements); d != "" {
 				t.Errorf("Didn't get expected result: (-want, +got): %v", d)
-			} else if d := cmp.Diff(tt.want.Blocks, got.Blocks); d != "" {
+			} else if d := cmp.Diff(tt.want.Blocks, identifierResults.Blocks); d != "" {
 				t.Errorf("Didn't get expected result: (-want, +got): %v", d)
-			} else if d := cmp.Diff(tt.want.Hash, got.Hash); d != "" {
+			} else if d := cmp.Diff(tt.want.Hash, identifierResults.Hash); d != "" {
 				t.Errorf("Didn't get expected result: (-want, +got): %v", d)
 			}
 		})
@@ -609,9 +609,9 @@ func Test_identifyLicensesInStringPreChecks(t *testing.T) {
 			err := IdentifyLicensesInString(&identifierResults, tt.input, options, ll)
 			if err != nil {
 				t.Errorf("identifyLicensesInString() error = %v", err)
-			} else if d := cmp.Diff(tt.want.Matches, got.Matches, cmp.AllowUnexported(Match{})); d != "" {
+			} else if d := cmp.Diff(tt.want.Matches, identifierResults.Matches, cmp.AllowUnexported(Match{})); d != "" {
 				t.Errorf("Didn't get expected result: (-want, +got): %v", d)
-			} else if d := cmp.Diff(tt.want.Blocks, got.Blocks); d != "" {
+			} else if d := cmp.Diff(tt.want.Blocks, identifierResults.Blocks); d != "" {
 				t.Errorf("Didn't get expected result: (-want, +got): %v", d)
 			}
 		})