Merge pull request #119 from swinslow/issue116

builder: Add missing LicenseInfoInFile field

7 files changed, 86 insertions, 30 deletions

diff --git a/builder/build_test.go b/builder/build_test.go
index aa88a00..62be42b 100644
--- a/builder/build_test.go
+++ b/builder/build_test.go
@@ -141,8 +141,12 @@ func TestBuild2_1CreatesDocument(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)
@@ -171,8 +175,12 @@ func TestBuild2_1CreatesDocument(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)
@@ -201,8 +209,12 @@ func TestBuild2_1CreatesDocument(t *testing.T) {
 	if file3.LicenseConcluded != "NOASSERTION" {
 		t.Errorf("expected %v, got %v", "NOASSERTION", file3.LicenseConcluded)
 	}
-	if len(file3.LicenseInfoInFile) != 0 {
-		t.Errorf("expected %v, got %v", 0, len(file3.LicenseInfoInFile))
+	if len(file3.LicenseInfoInFile) != 1 {
+		t.Errorf("expected %v, got %v", 1, len(file3.LicenseInfoInFile))
+	} else {
+		if file3.LicenseInfoInFile[0] != "NOASSERTION" {
+			t.Errorf("expected %v, got %v", "NOASSERTION", file3.LicenseInfoInFile[0])
+		}
 	}
 	if file3.FileCopyrightText != "NOASSERTION" {
 		t.Errorf("expected %v, got %v", "NOASSERTION", file3.FileCopyrightText)
@@ -231,8 +243,12 @@ func TestBuild2_1CreatesDocument(t *testing.T) {
 	if file4.LicenseConcluded != "NOASSERTION" {
 		t.Errorf("expected %v, got %v", "NOASSERTION", file4.LicenseConcluded)
 	}
-	if len(file4.LicenseInfoInFile) != 0 {
-		t.Errorf("expected %v, got %v", 0, len(file4.LicenseInfoInFile))
+	if len(file4.LicenseInfoInFile) != 1 {
+		t.Errorf("expected %v, got %v", 1, len(file4.LicenseInfoInFile))
+	} else {
+		if file4.LicenseInfoInFile[0] != "NOASSERTION" {
+			t.Errorf("expected %v, got %v", "NOASSERTION", file4.LicenseInfoInFile[0])
+		}
 	}
 	if file4.FileCopyrightText != "NOASSERTION" {
 		t.Errorf("expected %v, got %v", "NOASSERTION", file4.FileCopyrightText)
@@ -261,8 +277,12 @@ func TestBuild2_1CreatesDocument(t *testing.T) {
 	if lastfile.LicenseConcluded != "NOASSERTION" {
 		t.Errorf("expected %v, got %v", "NOASSERTION", lastfile.LicenseConcluded)
 	}
-	if len(lastfile.LicenseInfoInFile) != 0 {
-		t.Errorf("expected %v, got %v", 0, len(lastfile.LicenseInfoInFile))
+	if len(lastfile.LicenseInfoInFile) != 1 {
+		t.Errorf("expected %v, got %v", 1, len(lastfile.LicenseInfoInFile))
+	} else {
+		if lastfile.LicenseInfoInFile[0] != "NOASSERTION" {
+			t.Errorf("expected %v, got %v", "NOASSERTION", lastfile.LicenseInfoInFile[0])
+		}
 	}
 	if lastfile.FileCopyrightText != "NOASSERTION" {
 		t.Errorf("expected %v, got %v", "NOASSERTION", lastfile.FileCopyrightText)
@@ -501,8 +521,12 @@ func TestBuild2_2CreatesDocument(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)
@@ -538,8 +562,12 @@ func TestBuild2_2CreatesDocument(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)
@@ -575,8 +603,12 @@ func TestBuild2_2CreatesDocument(t *testing.T) {
 	if file3.LicenseConcluded != "NOASSERTION" {
 		t.Errorf("expected %v, got %v", "NOASSERTION", file3.LicenseConcluded)
 	}
-	if len(file3.LicenseInfoInFile) != 0 {
-		t.Errorf("expected %v, got %v", 0, len(file3.LicenseInfoInFile))
+	if len(file3.LicenseInfoInFile) != 1 {
+		t.Errorf("expected %v, got %v", 1, len(file3.LicenseInfoInFile))
+	} else {
+		if file3.LicenseInfoInFile[0] != "NOASSERTION" {
+			t.Errorf("expected %v, got %v", "NOASSERTION", file3.LicenseInfoInFile[0])
+		}
 	}
 	if file3.FileCopyrightText != "NOASSERTION" {
 		t.Errorf("expected %v, got %v", "NOASSERTION", file3.FileCopyrightText)
@@ -612,8 +644,12 @@ func TestBuild2_2CreatesDocument(t *testing.T) {
 	if file4.LicenseConcluded != "NOASSERTION" {
 		t.Errorf("expected %v, got %v", "NOASSERTION", file4.LicenseConcluded)
 	}
-	if len(file4.LicenseInfoInFile) != 0 {
-		t.Errorf("expected %v, got %v", 0, len(file4.LicenseInfoInFile))
+	if len(file4.LicenseInfoInFile) != 1 {
+		t.Errorf("expected %v, got %v", 1, len(file4.LicenseInfoInFile))
+	} else {
+		if file4.LicenseInfoInFile[0] != "NOASSERTION" {
+			t.Errorf("expected %v, got %v", "NOASSERTION", file4.LicenseInfoInFile[0])
+		}
 	}
 	if file4.FileCopyrightText != "NOASSERTION" {
 		t.Errorf("expected %v, got %v", "NOASSERTION", file4.FileCopyrightText)
@@ -649,8 +685,12 @@ func TestBuild2_2CreatesDocument(t *testing.T) {
 	if lastfile.LicenseConcluded != "NOASSERTION" {
 		t.Errorf("expected %v, got %v", "NOASSERTION", lastfile.LicenseConcluded)
 	}
-	if len(lastfile.LicenseInfoInFile) != 0 {
-		t.Errorf("expected %v, got %v", 0, len(lastfile.LicenseInfoInFile))
+	if len(lastfile.LicenseInfoInFile) != 1 {
+		t.Errorf("expected %v, got %v", 1, len(lastfile.LicenseInfoInFile))
+	} else {
+		if lastfile.LicenseInfoInFile[0] != "NOASSERTION" {
+			t.Errorf("expected %v, got %v", "NOASSERTION", lastfile.LicenseInfoInFile[0])
+		}
 	}
 	if lastfile.FileCopyrightText != "NOASSERTION" {
 		t.Errorf("expected %v, got %v", "NOASSERTION", lastfile.FileCopyrightText)
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)
diff --git a/builder/builder2v2/build_file.go b/builder/builder2v2/build_file.go
index 684a763..ec59f6a 100644
--- a/builder/builder2v2/build_file.go
+++ b/builder/builder2v2/build_file.go
@@ -47,7 +47,7 @@ func BuildFileSection2_2(filePath string, prefix string, fileNumber int) (*spdx.
 			},
 		},
 		LicenseConcluded:  "NOASSERTION",
-		LicenseInfoInFile: []string{},
+		LicenseInfoInFile: []string{"NOASSERTION"},
 		FileCopyrightText: "NOASSERTION",
 	}
 
diff --git a/builder/builder2v2/build_file_test.go b/builder/builder2v2/build_file_test.go
index 60f285c..8a1767e 100644
--- a/builder/builder2v2/build_file_test.go
+++ b/builder/builder2v2/build_file_test.go
@@ -47,8 +47,12 @@ func TestBuilder2_2CanBuildFileSection(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/builder2v2/build_package_test.go b/builder/builder2v2/build_package_test.go
index 6f55abc..85f402e 100644
--- a/builder/builder2v2/build_package_test.go
+++ b/builder/builder2v2/build_package_test.go
@@ -90,8 +90,12 @@ func TestBuilder2_2CanBuildPackageSection(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)