aboutsummaryrefslogtreecommitdiff
path: root/builder/builder2v1
diff options
context:
space:
mode:
authorSteve Winslow <steve@swinslow.net>2022-03-26 16:20:11 -0400
committerSteve Winslow <steve@swinslow.net>2022-03-26 16:20:11 -0400
commit61e7c1bffc8ba89baeeeafa644b03343aba5d51e (patch)
tree2fba7ccc502c3332585ddc37443039a40a86f1fc /builder/builder2v1
parentbea3d05bc9b46c93805a51a4c6b79b9ad7b78800 (diff)
downloadspdx-tools-61e7c1bffc8ba89baeeeafa644b03343aba5d51e.tar.gz
builder: Add missing LicenseInfoInFile field
Signed-off-by: Steve Winslow <steve@swinslow.net>
Diffstat (limited to 'builder/builder2v1')
-rw-r--r--builder/builder2v1/build_file.go2
-rw-r--r--builder/builder2v1/build_file_test.go8
-rw-r--r--builder/builder2v1/build_package_test.go8
3 files changed, 13 insertions, 5 deletions
diff --git a/builder/builder2v1/build_file.go b/builder/builder2v1/build_file.go
index 28bb555..b47268c 100644
--- a/builder/builder2v1/build_file.go
+++ b/builder/builder2v1/build_file.go
@@ -36,7 +36,7 @@ func BuildFileSection2_1(filePath string, prefix string, fileNumber int) (*spdx.
FileChecksumSHA256: ssha256,
FileChecksumMD5: smd5,
LicenseConcluded: "NOASSERTION",
- LicenseInfoInFile: []string{},
+ LicenseInfoInFile: []string{"NOASSERTION"},
FileCopyrightText: "NOASSERTION",
}
diff --git a/builder/builder2v1/build_file_test.go b/builder/builder2v1/build_file_test.go
index 1bdafd3..6ef157a 100644
--- a/builder/builder2v1/build_file_test.go
+++ b/builder/builder2v1/build_file_test.go
@@ -40,8 +40,12 @@ func TestBuilder2_1CanBuildFileSection(t *testing.T) {
if file1.LicenseConcluded != "NOASSERTION" {
t.Errorf("expected %v, got %v", "NOASSERTION", file1.LicenseConcluded)
}
- if len(file1.LicenseInfoInFile) != 0 {
- t.Errorf("expected %v, got %v", 0, len(file1.LicenseInfoInFile))
+ if len(file1.LicenseInfoInFile) != 1 {
+ t.Errorf("expected %v, got %v", 1, len(file1.LicenseInfoInFile))
+ } else {
+ if file1.LicenseInfoInFile[0] != "NOASSERTION" {
+ t.Errorf("expected %v, got %v", "NOASSERTION", file1.LicenseInfoInFile[0])
+ }
}
if file1.FileCopyrightText != "NOASSERTION" {
t.Errorf("expected %v, got %v", "NOASSERTION", file1.FileCopyrightText)
diff --git a/builder/builder2v1/build_package_test.go b/builder/builder2v1/build_package_test.go
index 3ecd1dc..7128834 100644
--- a/builder/builder2v1/build_package_test.go
+++ b/builder/builder2v1/build_package_test.go
@@ -83,8 +83,12 @@ func TestBuilder2_1CanBuildPackageSection(t *testing.T) {
if fileEmpty.LicenseConcluded != "NOASSERTION" {
t.Errorf("expected %v, got %v", "NOASSERTION", fileEmpty.LicenseConcluded)
}
- if len(fileEmpty.LicenseInfoInFile) != 0 {
- t.Errorf("expected %v, got %v", 0, len(fileEmpty.LicenseInfoInFile))
+ if len(fileEmpty.LicenseInfoInFile) != 1 {
+ t.Errorf("expected %v, got %v", 1, len(fileEmpty.LicenseInfoInFile))
+ } else {
+ if fileEmpty.LicenseInfoInFile[0] != "NOASSERTION" {
+ t.Errorf("expected %v, got %v", "NOASSERTION", fileEmpty.LicenseInfoInFile[0])
+ }
}
if fileEmpty.FileCopyrightText != "NOASSERTION" {
t.Errorf("expected %v, got %v", "NOASSERTION", fileEmpty.FileCopyrightText)