aboutsummaryrefslogtreecommitdiff
path: root/builder
diff options
context:
space:
mode:
authorCatalin Stratu <catalinstratu45@gmail.com>2022-03-14 15:47:57 +0200
committerCatalin Stratu <catalinstratu45@gmail.com>2022-03-15 11:24:39 +0200
commitafab6dd30beb70ad7dbc8d5f602e5f52d12abc85 (patch)
tree5dd0ccf4686120011acb2657426e4446df00bdcc /builder
parent673cb49f3e5472b269747dc14ef132caf9032050 (diff)
downloadspdx-tools-afab6dd30beb70ad7dbc8d5f602e5f52d12abc85.tar.gz
test fixes
Signed-off-by: Catalin Stratu <catalinstratu45@gmail.com>
Diffstat (limited to 'builder')
-rw-r--r--builder/build_test.go24
-rw-r--r--builder/builder2v1/build_file_test.go4
-rw-r--r--builder/builder2v1/build_package_test.go14
3 files changed, 21 insertions, 21 deletions
diff --git a/builder/build_test.go b/builder/build_test.go
index 1ea7fd5..aa88a00 100644
--- a/builder/build_test.go
+++ b/builder/build_test.go
@@ -123,8 +123,8 @@ func TestBuild2_1CreatesDocument(t *testing.T) {
if fileEmpty == nil {
t.Fatalf("expected non-nil file, got nil")
}
- if fileEmpty.FileName != "/emptyfile.testdata.txt" {
- t.Errorf("expected %v, got %v", "/emptyfile.testdata.txt", fileEmpty.FileName)
+ if fileEmpty.FileName != "./emptyfile.testdata.txt" {
+ t.Errorf("expected %v, got %v", "./emptyfile.testdata.txt", fileEmpty.FileName)
}
if fileEmpty.FileSPDXIdentifier != spdx.ElementID("File0") {
t.Errorf("expected %v, got %v", "File0", fileEmpty.FileSPDXIdentifier)
@@ -153,8 +153,8 @@ func TestBuild2_1CreatesDocument(t *testing.T) {
if file1 == nil {
t.Fatalf("expected non-nil file, got nil")
}
- if file1.FileName != "/file1.testdata.txt" {
- t.Errorf("expected %v, got %v", "/file1.testdata.txt", file1.FileName)
+ if file1.FileName != "./file1.testdata.txt" {
+ t.Errorf("expected %v, got %v", "./file1.testdata.txt", file1.FileName)
}
if file1.FileSPDXIdentifier != spdx.ElementID("File1") {
t.Errorf("expected %v, got %v", "File1", file1.FileSPDXIdentifier)
@@ -183,8 +183,8 @@ func TestBuild2_1CreatesDocument(t *testing.T) {
if file3 == nil {
t.Fatalf("expected non-nil file, got nil")
}
- if file3.FileName != "/file3.testdata.txt" {
- t.Errorf("expected %v, got %v", "/file3.testdata.txt", file3.FileName)
+ if file3.FileName != "./file3.testdata.txt" {
+ t.Errorf("expected %v, got %v", "./file3.testdata.txt", file3.FileName)
}
if file3.FileSPDXIdentifier != spdx.ElementID("File2") {
t.Errorf("expected %v, got %v", "File2", file3.FileSPDXIdentifier)
@@ -213,8 +213,8 @@ func TestBuild2_1CreatesDocument(t *testing.T) {
if file4 == nil {
t.Fatalf("expected non-nil file, got nil")
}
- if file4.FileName != "/folder1/file4.testdata.txt" {
- t.Errorf("expected %v, got %v", "folder1/file4.testdata.txt", file4.FileName)
+ if file4.FileName != "./folder1/file4.testdata.txt" {
+ t.Errorf("expected %v, got %v", "./folder1/file4.testdata.txt", file4.FileName)
}
if file4.FileSPDXIdentifier != spdx.ElementID("File3") {
t.Errorf("expected %v, got %v", "File3", file4.FileSPDXIdentifier)
@@ -243,8 +243,8 @@ func TestBuild2_1CreatesDocument(t *testing.T) {
if lastfile == nil {
t.Fatalf("expected non-nil file, got nil")
}
- if lastfile.FileName != "/lastfile.testdata.txt" {
- t.Errorf("expected %v, got %v", "/lastfile.testdata.txt", lastfile.FileName)
+ if lastfile.FileName != "./lastfile.testdata.txt" {
+ t.Errorf("expected %v, got %v", "./lastfile.testdata.txt", lastfile.FileName)
}
if lastfile.FileSPDXIdentifier != spdx.ElementID("File4") {
t.Errorf("expected %v, got %v", "File4", lastfile.FileSPDXIdentifier)
@@ -551,7 +551,7 @@ func TestBuild2_2CreatesDocument(t *testing.T) {
t.Fatalf("expected non-nil file, got nil")
}
if file3.FileName != "./file3.testdata.txt" {
- t.Errorf("expected %v, got %v", "/file3.testdata.txt", file3.FileName)
+ t.Errorf("expected %v, got %v", "./file3.testdata.txt", file3.FileName)
}
if file3.FileSPDXIdentifier != spdx.ElementID("File2") {
t.Errorf("expected %v, got %v", "File2", file3.FileSPDXIdentifier)
@@ -588,7 +588,7 @@ func TestBuild2_2CreatesDocument(t *testing.T) {
t.Fatalf("expected non-nil file, got nil")
}
if file4.FileName != "./folder1/file4.testdata.txt" {
- t.Errorf("expected %v, got %v", "folder1/file4.testdata.txt", file4.FileName)
+ t.Errorf("expected %v, got %v", "./folder1/file4.testdata.txt", file4.FileName)
}
if file4.FileSPDXIdentifier != spdx.ElementID("File3") {
t.Errorf("expected %v, got %v", "File3", file4.FileSPDXIdentifier)
diff --git a/builder/builder2v1/build_file_test.go b/builder/builder2v1/build_file_test.go
index 1bdafd3..e0846c0 100644
--- a/builder/builder2v1/build_file_test.go
+++ b/builder/builder2v1/build_file_test.go
@@ -22,8 +22,8 @@ func TestBuilder2_1CanBuildFileSection(t *testing.T) {
if file1 == nil {
t.Fatalf("expected non-nil file, got nil")
}
- if file1.FileName != "/file1.testdata.txt" {
- t.Errorf("expected %v, got %v", "/file1.testdata.txt", file1.FileName)
+ if file1.FileName != "./file1.testdata.txt" {
+ t.Errorf("expected %v, got %v", "./file1.testdata.txt", file1.FileName)
}
if file1.FileSPDXIdentifier != spdx.ElementID("File17") {
t.Errorf("expected %v, got %v", "File17", file1.FileSPDXIdentifier)
diff --git a/builder/builder2v1/build_package_test.go b/builder/builder2v1/build_package_test.go
index 8902932..3ecd1dc 100644
--- a/builder/builder2v1/build_package_test.go
+++ b/builder/builder2v1/build_package_test.go
@@ -65,8 +65,8 @@ func TestBuilder2_1CanBuildPackageSection(t *testing.T) {
if fileEmpty == nil {
t.Fatalf("expected non-nil file, got nil")
}
- if fileEmpty.FileName != "/emptyfile.testdata.txt" {
- t.Errorf("expected %v, got %v", "/emptyfile.testdata.txt", fileEmpty.FileName)
+ if fileEmpty.FileName != "./emptyfile.testdata.txt" {
+ t.Errorf("expected %v, got %v", "./emptyfile.testdata.txt", fileEmpty.FileName)
}
if fileEmpty.FileSPDXIdentifier != spdx.ElementID("File0") {
t.Errorf("expected %v, got %v", "File0", fileEmpty.FileSPDXIdentifier)
@@ -113,31 +113,31 @@ func TestBuilder2_1CanIgnoreFiles(t *testing.T) {
t.Fatalf("expected %d, got %d", 5, len(pkg.Files))
}
- want := "/dontscan.txt"
+ want := "./dontscan.txt"
got := pkg.Files[spdx.ElementID("File0")].FileName
if want != got {
t.Errorf("expected %v, got %v", want, got)
}
- want = "/keep/keep.txt"
+ want = "./keep/keep.txt"
got = pkg.Files[spdx.ElementID("File1")].FileName
if want != got {
t.Errorf("expected %v, got %v", want, got)
}
- want = "/keep.txt"
+ want = "./keep.txt"
got = pkg.Files[spdx.ElementID("File2")].FileName
if want != got {
t.Errorf("expected %v, got %v", want, got)
}
- want = "/subdir/keep/dontscan.txt"
+ want = "./subdir/keep/dontscan.txt"
got = pkg.Files[spdx.ElementID("File3")].FileName
if want != got {
t.Errorf("expected %v, got %v", want, got)
}
- want = "/subdir/keep/keep.txt"
+ want = "./subdir/keep/keep.txt"
got = pkg.Files[spdx.ElementID("File4")].FileName
if want != got {
t.Errorf("expected %v, got %v", want, got)