From af6bdbcbc40ddd5152f84b8405c23e73332b2a16 Mon Sep 17 00:00:00 2001 From: Epicadk Date: Mon, 30 Nov 2020 17:46:34 +0530 Subject: [PATCH] Remove Redudant Prefixes #47 --- builder/build.go | 8 +- builder/build_test.go | 324 +++++----- builder/builder2v1/build_file.go | 16 +- builder/builder2v1/build_file_test.go | 24 +- builder/builder2v1/build_package.go | 24 +- builder/builder2v1/build_package_test.go | 66 +- builder/builder2v2/build_file.go | 16 +- builder/builder2v2/build_file_test.go | 24 +- builder/builder2v2/build_package.go | 24 +- builder/builder2v2/build_package_test.go | 66 +- examples/1-load/example_load.go | 8 +- examples/5-report/example_report.go | 6 +- examples/6-licensediff/example_licensediff.go | 4 +- idsearcher/idsearcher.go | 24 +- idsearcher/idsearcher_test.go | 108 ++-- licensediff/licensediff.go | 12 +- licensediff/licensediff_test.go | 568 +++++++++--------- rdfloader/parser2v2/parse_annotation.go | 8 +- rdfloader/parser2v2/parse_annotation_test.go | 20 +- rdfloader/parser2v2/parse_file.go | 30 +- rdfloader/parser2v2/parse_file_test.go | 115 ++-- .../parser2v2/parse_other_license_info.go | 8 +- .../parse_other_license_info_test.go | 16 +- rdfloader/parser2v2/parse_package.go | 68 +-- rdfloader/parser2v2/parse_package_test.go | 66 +- rdfloader/parser2v2/parse_relationship.go | 8 +- .../parser2v2/parse_relationship_test.go | 4 +- rdfloader/parser2v2/parse_review.go | 4 +- rdfloader/parser2v2/parse_review_test.go | 8 +- rdfloader/parser2v2/parse_snippet_info.go | 22 +- .../parser2v2/parse_snippet_info_test.go | 6 +- rdfloader/parser2v2/parse_spdx_document.go | 2 +- reporter/reporter_test.go | 96 +-- spdx/annotation.go | 16 +- spdx/file.go | 46 +- spdx/other_license.go | 16 +- spdx/package.go | 110 ++-- spdx/relationship.go | 4 +- spdx/review.go | 8 +- spdx/snippet.go | 42 +- spdxlib/described_elements_test.go | 60 +- tvloader/parser2v1/parse_annotation.go | 8 +- tvloader/parser2v1/parse_annotation_test.go | 17 +- .../parser2v1/parse_creation_info_test.go | 4 +- tvloader/parser2v1/parse_file.go | 22 +- tvloader/parser2v1/parse_file_test.go | 140 +++-- tvloader/parser2v1/parse_other_license.go | 8 +- .../parser2v1/parse_other_license_test.go | 86 +-- tvloader/parser2v1/parse_package.go | 56 +- tvloader/parser2v1/parse_package_test.go | 175 +++--- tvloader/parser2v1/parse_relationship.go | 2 +- tvloader/parser2v1/parse_relationship_test.go | 4 +- tvloader/parser2v1/parse_review.go | 4 +- tvloader/parser2v1/parse_review_test.go | 90 ++- tvloader/parser2v1/parse_snippet.go | 20 +- tvloader/parser2v1/parse_snippet_test.go | 145 +++-- tvloader/parser2v2/parse_annotation.go | 8 +- tvloader/parser2v2/parse_annotation_test.go | 16 +- .../parser2v2/parse_creation_info_test.go | 4 +- tvloader/parser2v2/parse_file.go | 24 +- tvloader/parser2v2/parse_file_test.go | 144 ++--- tvloader/parser2v2/parse_other_license.go | 8 +- .../parser2v2/parse_other_license_test.go | 86 +-- tvloader/parser2v2/parse_package.go | 58 +- tvloader/parser2v2/parse_package_test.go | 180 +++--- tvloader/parser2v2/parse_relationship.go | 2 +- tvloader/parser2v2/parse_relationship_test.go | 4 +- tvloader/parser2v2/parse_review.go | 4 +- tvloader/parser2v2/parse_review_test.go | 80 +-- tvloader/parser2v2/parse_snippet.go | 22 +- tvloader/parser2v2/parse_snippet_test.go | 150 ++--- tvsaver/saver2v1/save_annotation.go | 14 +- tvsaver/saver2v1/save_annotation_test.go | 36 +- tvsaver/saver2v1/save_document.go | 2 +- tvsaver/saver2v1/save_document_test.go | 126 ++-- tvsaver/saver2v1/save_file.go | 38 +- tvsaver/saver2v1/save_file_test.go | 78 +-- tvsaver/saver2v1/save_other_license.go | 14 +- tvsaver/saver2v1/save_other_license_test.go | 12 +- tvsaver/saver2v1/save_package.go | 100 +-- tvsaver/saver2v1/save_package_test.go | 194 +++--- tvsaver/saver2v1/save_relationship.go | 4 +- tvsaver/saver2v1/save_relationship_test.go | 8 +- tvsaver/saver2v1/save_review.go | 8 +- tvsaver/saver2v1/save_review_test.go | 10 +- tvsaver/saver2v1/save_snippet.go | 32 +- tvsaver/saver2v1/save_snippet_test.go | 30 +- tvsaver/saver2v2/save_annotation.go | 14 +- tvsaver/saver2v2/save_annotation_test.go | 36 +- tvsaver/saver2v2/save_document.go | 2 +- tvsaver/saver2v2/save_document_test.go | 126 ++-- tvsaver/saver2v2/save_file.go | 40 +- tvsaver/saver2v2/save_file_test.go | 80 +-- tvsaver/saver2v2/save_other_license.go | 14 +- tvsaver/saver2v2/save_other_license_test.go | 12 +- tvsaver/saver2v2/save_package.go | 102 ++-- tvsaver/saver2v2/save_package_test.go | 200 +++--- tvsaver/saver2v2/save_relationship.go | 4 +- tvsaver/saver2v2/save_relationship_test.go | 8 +- tvsaver/saver2v2/save_review.go | 8 +- tvsaver/saver2v2/save_review_test.go | 10 +- tvsaver/saver2v2/save_snippet.go | 34 +- tvsaver/saver2v2/save_snippet_test.go | 32 +- utils/verification.go | 8 +- utils/verification_test.go | 144 ++--- 105 files changed, 2624 insertions(+), 2632 deletions(-) diff --git a/builder/build.go b/builder/build.go index f70f9112..9e67b31b 100644 --- a/builder/build.go +++ b/builder/build.go @@ -55,7 +55,7 @@ func Build2_1(packageName string, dirRoot string, config *Config2_1) (*spdx.Docu return nil, err } - ci, err := builder2v1.BuildCreationInfoSection2_1(packageName, pkg.PackageVerificationCode, config.NamespacePrefix, config.CreatorType, config.Creator, config.TestValues) + ci, err := builder2v1.BuildCreationInfoSection2_1(packageName, pkg.VerificationCode, config.NamespacePrefix, config.CreatorType, config.Creator, config.TestValues) if err != nil { return nil, err } @@ -67,7 +67,7 @@ func Build2_1(packageName string, dirRoot string, config *Config2_1) (*spdx.Docu doc := &spdx.Document2_1{ CreationInfo: ci, - Packages: map[spdx.ElementID]*spdx.Package2_1{pkg.PackageSPDXIdentifier: pkg}, + Packages: map[spdx.ElementID]*spdx.Package2_1{pkg.SPDXIdentifier: pkg}, Relationships: []*spdx.Relationship2_1{rln}, } @@ -119,7 +119,7 @@ func Build2_2(packageName string, dirRoot string, config *Config2_2) (*spdx.Docu return nil, err } - ci, err := builder2v2.BuildCreationInfoSection2_2(packageName, pkg.PackageVerificationCode, config.NamespacePrefix, config.CreatorType, config.Creator, config.TestValues) + ci, err := builder2v2.BuildCreationInfoSection2_2(packageName, pkg.VerificationCode, config.NamespacePrefix, config.CreatorType, config.Creator, config.TestValues) if err != nil { return nil, err } @@ -131,7 +131,7 @@ func Build2_2(packageName string, dirRoot string, config *Config2_2) (*spdx.Docu doc := &spdx.Document2_2{ CreationInfo: ci, - Packages: map[spdx.ElementID]*spdx.Package2_2{pkg.PackageSPDXIdentifier: pkg}, + Packages: map[spdx.ElementID]*spdx.Package2_2{pkg.SPDXIdentifier: pkg}, Relationships: []*spdx.Relationship2_2{rln}, } diff --git a/builder/build_test.go b/builder/build_test.go index cf59d456..0a19df22 100644 --- a/builder/build_test.go +++ b/builder/build_test.go @@ -78,32 +78,32 @@ func TestBuild2_1CreatesDocument(t *testing.T) { if pkg == nil { t.Fatalf("expected non-nil pkg, got nil") } - if pkg.PackageName != "project1" { - t.Errorf("expected %v, got %v", "project1", pkg.PackageName) + if pkg.Name != "project1" { + t.Errorf("expected %v, got %v", "project1", pkg.Name) } - if pkg.PackageSPDXIdentifier != spdx.ElementID("Package-project1") { - t.Errorf("expected %v, got %v", "Package-project1", pkg.PackageSPDXIdentifier) + if pkg.SPDXIdentifier != spdx.ElementID("Package-project1") { + t.Errorf("expected %v, got %v", "Package-project1", pkg.SPDXIdentifier) } - if pkg.PackageDownloadLocation != "NOASSERTION" { - t.Errorf("expected %v, got %v", "NOASSERTION", pkg.PackageDownloadLocation) + if pkg.DownloadLocation != "NOASSERTION" { + t.Errorf("expected %v, got %v", "NOASSERTION", pkg.DownloadLocation) } if pkg.FilesAnalyzed != true { t.Errorf("expected %v, got %v", true, pkg.FilesAnalyzed) } - if pkg.PackageVerificationCode != wantVerificationCode { - t.Errorf("expected %v, got %v", wantVerificationCode, pkg.PackageVerificationCode) + if pkg.VerificationCode != wantVerificationCode { + t.Errorf("expected %v, got %v", wantVerificationCode, pkg.VerificationCode) } - if pkg.PackageLicenseConcluded != "NOASSERTION" { - t.Errorf("expected %v, got %v", "NOASSERTION", pkg.PackageLicenseConcluded) + if pkg.LicenseConcluded != "NOASSERTION" { + t.Errorf("expected %v, got %v", "NOASSERTION", pkg.LicenseConcluded) } - if len(pkg.PackageLicenseInfoFromFiles) != 0 { - t.Errorf("expected %v, got %v", 0, len(pkg.PackageLicenseInfoFromFiles)) + if len(pkg.LicenseInfoFromFiles) != 0 { + t.Errorf("expected %v, got %v", 0, len(pkg.LicenseInfoFromFiles)) } - if pkg.PackageLicenseDeclared != "NOASSERTION" { - t.Errorf("expected %v, got %v", "NOASSERTION", pkg.PackageLicenseDeclared) + if pkg.LicenseDeclared != "NOASSERTION" { + t.Errorf("expected %v, got %v", "NOASSERTION", pkg.LicenseDeclared) } - if pkg.PackageCopyrightText != "NOASSERTION" { - t.Errorf("expected %v, got %v", "NOASSERTION", pkg.PackageCopyrightText) + if pkg.CopyrightText != "NOASSERTION" { + t.Errorf("expected %v, got %v", "NOASSERTION", pkg.CopyrightText) } // check Files section @@ -123,20 +123,20 @@ 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.Name != "/emptyfile.testdata.txt" { + t.Errorf("expected %v, got %v", "/emptyfile.testdata.txt", fileEmpty.Name) } - if fileEmpty.FileSPDXIdentifier != spdx.ElementID("File0") { - t.Errorf("expected %v, got %v", "File0", fileEmpty.FileSPDXIdentifier) + if fileEmpty.SPDXIdentifier != spdx.ElementID("File0") { + t.Errorf("expected %v, got %v", "File0", fileEmpty.SPDXIdentifier) } - if fileEmpty.FileChecksumSHA1 != "da39a3ee5e6b4b0d3255bfef95601890afd80709" { - t.Errorf("expected %v, got %v", "da39a3ee5e6b4b0d3255bfef95601890afd80709", fileEmpty.FileChecksumSHA1) + if fileEmpty.ChecksumSHA1 != "da39a3ee5e6b4b0d3255bfef95601890afd80709" { + t.Errorf("expected %v, got %v", "da39a3ee5e6b4b0d3255bfef95601890afd80709", fileEmpty.ChecksumSHA1) } - if fileEmpty.FileChecksumSHA256 != "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" { - t.Errorf("expected %v, got %v", "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", fileEmpty.FileChecksumSHA256) + if fileEmpty.ChecksumSHA256 != "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" { + t.Errorf("expected %v, got %v", "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", fileEmpty.ChecksumSHA256) } - if fileEmpty.FileChecksumMD5 != "d41d8cd98f00b204e9800998ecf8427e" { - t.Errorf("expected %v, got %v", "d41d8cd98f00b204e9800998ecf8427e", fileEmpty.FileChecksumMD5) + if fileEmpty.ChecksumMD5 != "d41d8cd98f00b204e9800998ecf8427e" { + t.Errorf("expected %v, got %v", "d41d8cd98f00b204e9800998ecf8427e", fileEmpty.ChecksumMD5) } if fileEmpty.LicenseConcluded != "NOASSERTION" { t.Errorf("expected %v, got %v", "NOASSERTION", fileEmpty.LicenseConcluded) @@ -144,8 +144,8 @@ func TestBuild2_1CreatesDocument(t *testing.T) { if len(fileEmpty.LicenseInfoInFile) != 0 { t.Errorf("expected %v, got %v", 0, len(fileEmpty.LicenseInfoInFile)) } - if fileEmpty.FileCopyrightText != "NOASSERTION" { - t.Errorf("expected %v, got %v", "NOASSERTION", fileEmpty.FileCopyrightText) + if fileEmpty.CopyrightText != "NOASSERTION" { + t.Errorf("expected %v, got %v", "NOASSERTION", fileEmpty.CopyrightText) } // check file1.testdata.txt @@ -153,20 +153,20 @@ 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.Name != "/file1.testdata.txt" { + t.Errorf("expected %v, got %v", "/file1.testdata.txt", file1.Name) } - if file1.FileSPDXIdentifier != spdx.ElementID("File1") { - t.Errorf("expected %v, got %v", "File1", file1.FileSPDXIdentifier) + if file1.SPDXIdentifier != spdx.ElementID("File1") { + t.Errorf("expected %v, got %v", "File1", file1.SPDXIdentifier) } - if file1.FileChecksumSHA1 != "024f870eb6323f532515f7a09d5646a97083b819" { - t.Errorf("expected %v, got %v", "024f870eb6323f532515f7a09d5646a97083b819", file1.FileChecksumSHA1) + if file1.ChecksumSHA1 != "024f870eb6323f532515f7a09d5646a97083b819" { + t.Errorf("expected %v, got %v", "024f870eb6323f532515f7a09d5646a97083b819", file1.ChecksumSHA1) } - if file1.FileChecksumSHA256 != "b14e44284ca477b4c0db34b15ca4c454b2947cce7883e22321cf2984050e15bf" { - t.Errorf("expected %v, got %v", "b14e44284ca477b4c0db34b15ca4c454b2947cce7883e22321cf2984050e15bf", file1.FileChecksumSHA256) + if file1.ChecksumSHA256 != "b14e44284ca477b4c0db34b15ca4c454b2947cce7883e22321cf2984050e15bf" { + t.Errorf("expected %v, got %v", "b14e44284ca477b4c0db34b15ca4c454b2947cce7883e22321cf2984050e15bf", file1.ChecksumSHA256) } - if file1.FileChecksumMD5 != "37c8208479dfe42d2bb29debd6e32d4a" { - t.Errorf("expected %v, got %v", "37c8208479dfe42d2bb29debd6e32d4a", file1.FileChecksumMD5) + if file1.ChecksumMD5 != "37c8208479dfe42d2bb29debd6e32d4a" { + t.Errorf("expected %v, got %v", "37c8208479dfe42d2bb29debd6e32d4a", file1.ChecksumMD5) } if file1.LicenseConcluded != "NOASSERTION" { t.Errorf("expected %v, got %v", "NOASSERTION", file1.LicenseConcluded) @@ -174,8 +174,8 @@ func TestBuild2_1CreatesDocument(t *testing.T) { if len(file1.LicenseInfoInFile) != 0 { t.Errorf("expected %v, got %v", 0, len(file1.LicenseInfoInFile)) } - if file1.FileCopyrightText != "NOASSERTION" { - t.Errorf("expected %v, got %v", "NOASSERTION", file1.FileCopyrightText) + if file1.CopyrightText != "NOASSERTION" { + t.Errorf("expected %v, got %v", "NOASSERTION", file1.CopyrightText) } // check file3.testdata.txt @@ -183,20 +183,20 @@ 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.Name != "/file3.testdata.txt" { + t.Errorf("expected %v, got %v", "/file3.testdata.txt", file3.Name) } - if file3.FileSPDXIdentifier != spdx.ElementID("File2") { - t.Errorf("expected %v, got %v", "File2", file3.FileSPDXIdentifier) + if file3.SPDXIdentifier != spdx.ElementID("File2") { + t.Errorf("expected %v, got %v", "File2", file3.SPDXIdentifier) } - if file3.FileChecksumSHA1 != "a46114b70e163614f01c64adf44cdd438f158fce" { - t.Errorf("expected %v, got %v", "a46114b70e163614f01c64adf44cdd438f158fce", file3.FileChecksumSHA1) + if file3.ChecksumSHA1 != "a46114b70e163614f01c64adf44cdd438f158fce" { + t.Errorf("expected %v, got %v", "a46114b70e163614f01c64adf44cdd438f158fce", file3.ChecksumSHA1) } - if file3.FileChecksumSHA256 != "9fc181b9892720a15df1a1e561860318db40621bd4040ccdf18e110eb01d04b4" { - t.Errorf("expected %v, got %v", "9fc181b9892720a15df1a1e561860318db40621bd4040ccdf18e110eb01d04b4", file3.FileChecksumSHA256) + if file3.ChecksumSHA256 != "9fc181b9892720a15df1a1e561860318db40621bd4040ccdf18e110eb01d04b4" { + t.Errorf("expected %v, got %v", "9fc181b9892720a15df1a1e561860318db40621bd4040ccdf18e110eb01d04b4", file3.ChecksumSHA256) } - if file3.FileChecksumMD5 != "3e02d3ab9c58eec6911dbba37570934f" { - t.Errorf("expected %v, got %v", "3e02d3ab9c58eec6911dbba37570934f", file3.FileChecksumMD5) + if file3.ChecksumMD5 != "3e02d3ab9c58eec6911dbba37570934f" { + t.Errorf("expected %v, got %v", "3e02d3ab9c58eec6911dbba37570934f", file3.ChecksumMD5) } if file3.LicenseConcluded != "NOASSERTION" { t.Errorf("expected %v, got %v", "NOASSERTION", file3.LicenseConcluded) @@ -204,8 +204,8 @@ func TestBuild2_1CreatesDocument(t *testing.T) { if len(file3.LicenseInfoInFile) != 0 { t.Errorf("expected %v, got %v", 0, len(file3.LicenseInfoInFile)) } - if file3.FileCopyrightText != "NOASSERTION" { - t.Errorf("expected %v, got %v", "NOASSERTION", file3.FileCopyrightText) + if file3.CopyrightText != "NOASSERTION" { + t.Errorf("expected %v, got %v", "NOASSERTION", file3.CopyrightText) } // check folder1/file4.testdata.txt @@ -213,20 +213,20 @@ 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.Name != "/folder1/file4.testdata.txt" { + t.Errorf("expected %v, got %v", "folder1/file4.testdata.txt", file4.Name) } - if file4.FileSPDXIdentifier != spdx.ElementID("File3") { - t.Errorf("expected %v, got %v", "File3", file4.FileSPDXIdentifier) + if file4.SPDXIdentifier != spdx.ElementID("File3") { + t.Errorf("expected %v, got %v", "File3", file4.SPDXIdentifier) } - if file4.FileChecksumSHA1 != "e623d7d7d782a7c8323c4d436acee4afab34320f" { - t.Errorf("expected %v, got %v", "e623d7d7d782a7c8323c4d436acee4afab34320f", file4.FileChecksumSHA1) + if file4.ChecksumSHA1 != "e623d7d7d782a7c8323c4d436acee4afab34320f" { + t.Errorf("expected %v, got %v", "e623d7d7d782a7c8323c4d436acee4afab34320f", file4.ChecksumSHA1) } - if file4.FileChecksumSHA256 != "574fa42c5e0806c0f8906a44884166540206f021527729407cd5326838629c59" { - t.Errorf("expected %v, got %v", "574fa42c5e0806c0f8906a44884166540206f021527729407cd5326838629c59", file4.FileChecksumSHA256) + if file4.ChecksumSHA256 != "574fa42c5e0806c0f8906a44884166540206f021527729407cd5326838629c59" { + t.Errorf("expected %v, got %v", "574fa42c5e0806c0f8906a44884166540206f021527729407cd5326838629c59", file4.ChecksumSHA256) } - if file4.FileChecksumMD5 != "96e6a25d35df5b1c477710ef4d0c7210" { - t.Errorf("expected %v, got %v", "96e6a25d35df5b1c477710ef4d0c7210", file4.FileChecksumMD5) + if file4.ChecksumMD5 != "96e6a25d35df5b1c477710ef4d0c7210" { + t.Errorf("expected %v, got %v", "96e6a25d35df5b1c477710ef4d0c7210", file4.ChecksumMD5) } if file4.LicenseConcluded != "NOASSERTION" { t.Errorf("expected %v, got %v", "NOASSERTION", file4.LicenseConcluded) @@ -234,8 +234,8 @@ func TestBuild2_1CreatesDocument(t *testing.T) { if len(file4.LicenseInfoInFile) != 0 { t.Errorf("expected %v, got %v", 0, len(file4.LicenseInfoInFile)) } - if file4.FileCopyrightText != "NOASSERTION" { - t.Errorf("expected %v, got %v", "NOASSERTION", file4.FileCopyrightText) + if file4.CopyrightText != "NOASSERTION" { + t.Errorf("expected %v, got %v", "NOASSERTION", file4.CopyrightText) } // check lastfile.testdata.txt @@ -243,20 +243,20 @@ 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.Name != "/lastfile.testdata.txt" { + t.Errorf("expected %v, got %v", "/lastfile.testdata.txt", lastfile.Name) } - if lastfile.FileSPDXIdentifier != spdx.ElementID("File4") { - t.Errorf("expected %v, got %v", "File4", lastfile.FileSPDXIdentifier) + if lastfile.SPDXIdentifier != spdx.ElementID("File4") { + t.Errorf("expected %v, got %v", "File4", lastfile.SPDXIdentifier) } - if lastfile.FileChecksumSHA1 != "26d6221d682d9ba59116f9753a701f34271c8ce1" { - t.Errorf("expected %v, got %v", "26d6221d682d9ba59116f9753a701f34271c8ce1", lastfile.FileChecksumSHA1) + if lastfile.ChecksumSHA1 != "26d6221d682d9ba59116f9753a701f34271c8ce1" { + t.Errorf("expected %v, got %v", "26d6221d682d9ba59116f9753a701f34271c8ce1", lastfile.ChecksumSHA1) } - if lastfile.FileChecksumSHA256 != "0a4bdaf990e9b330ff72022dd78110ae98b60e08337cf2105b89856373416805" { - t.Errorf("expected %v, got %v", "0a4bdaf990e9b330ff72022dd78110ae98b60e08337cf2105b89856373416805", lastfile.FileChecksumSHA256) + if lastfile.ChecksumSHA256 != "0a4bdaf990e9b330ff72022dd78110ae98b60e08337cf2105b89856373416805" { + t.Errorf("expected %v, got %v", "0a4bdaf990e9b330ff72022dd78110ae98b60e08337cf2105b89856373416805", lastfile.ChecksumSHA256) } - if lastfile.FileChecksumMD5 != "f60baa793870d9085461ad6bbab50b7f" { - t.Errorf("expected %v, got %v", "f60baa793870d9085461ad6bbab50b7f", lastfile.FileChecksumMD5) + if lastfile.ChecksumMD5 != "f60baa793870d9085461ad6bbab50b7f" { + t.Errorf("expected %v, got %v", "f60baa793870d9085461ad6bbab50b7f", lastfile.ChecksumMD5) } if lastfile.LicenseConcluded != "NOASSERTION" { t.Errorf("expected %v, got %v", "NOASSERTION", lastfile.LicenseConcluded) @@ -264,8 +264,8 @@ func TestBuild2_1CreatesDocument(t *testing.T) { if len(lastfile.LicenseInfoInFile) != 0 { t.Errorf("expected %v, got %v", 0, len(lastfile.LicenseInfoInFile)) } - if lastfile.FileCopyrightText != "NOASSERTION" { - t.Errorf("expected %v, got %v", "NOASSERTION", lastfile.FileCopyrightText) + if lastfile.CopyrightText != "NOASSERTION" { + t.Errorf("expected %v, got %v", "NOASSERTION", lastfile.CopyrightText) } // check Relationship section -- should be a relationship for doc DESCRIBES pkg @@ -332,31 +332,31 @@ func TestBuild2_1CanIgnoreFiles(t *testing.T) { } want := "/dontscan.txt" - got := pkg.Files[spdx.ElementID("File0")].FileName + got := pkg.Files[spdx.ElementID("File0")].Name if want != got { t.Errorf("expected %v, got %v", want, got) } want = "/keep/keep.txt" - got = pkg.Files[spdx.ElementID("File1")].FileName + got = pkg.Files[spdx.ElementID("File1")].Name if want != got { t.Errorf("expected %v, got %v", want, got) } want = "/keep.txt" - got = pkg.Files[spdx.ElementID("File2")].FileName + got = pkg.Files[spdx.ElementID("File2")].Name if want != got { t.Errorf("expected %v, got %v", want, got) } want = "/subdir/keep/dontscan.txt" - got = pkg.Files[spdx.ElementID("File3")].FileName + got = pkg.Files[spdx.ElementID("File3")].Name if want != got { t.Errorf("expected %v, got %v", want, got) } want = "/subdir/keep/keep.txt" - got = pkg.Files[spdx.ElementID("File4")].FileName + got = pkg.Files[spdx.ElementID("File4")].Name if want != got { t.Errorf("expected %v, got %v", want, got) } @@ -431,32 +431,32 @@ func TestBuild2_2CreatesDocument(t *testing.T) { if pkg == nil { t.Fatalf("expected non-nil pkg, got nil") } - if pkg.PackageName != "project1" { - t.Errorf("expected %v, got %v", "project1", pkg.PackageName) + if pkg.Name != "project1" { + t.Errorf("expected %v, got %v", "project1", pkg.Name) } - if pkg.PackageSPDXIdentifier != spdx.ElementID("Package-project1") { - t.Errorf("expected %v, got %v", "Package-project1", pkg.PackageSPDXIdentifier) + if pkg.SPDXIdentifier != spdx.ElementID("Package-project1") { + t.Errorf("expected %v, got %v", "Package-project1", pkg.SPDXIdentifier) } - if pkg.PackageDownloadLocation != "NOASSERTION" { - t.Errorf("expected %v, got %v", "NOASSERTION", pkg.PackageDownloadLocation) + if pkg.DownloadLocation != "NOASSERTION" { + t.Errorf("expected %v, got %v", "NOASSERTION", pkg.DownloadLocation) } if pkg.FilesAnalyzed != true { t.Errorf("expected %v, got %v", true, pkg.FilesAnalyzed) } - if pkg.PackageVerificationCode != wantVerificationCode { - t.Errorf("expected %v, got %v", wantVerificationCode, pkg.PackageVerificationCode) + if pkg.VerificationCode != wantVerificationCode { + t.Errorf("expected %v, got %v", wantVerificationCode, pkg.VerificationCode) } - if pkg.PackageLicenseConcluded != "NOASSERTION" { - t.Errorf("expected %v, got %v", "NOASSERTION", pkg.PackageLicenseConcluded) + if pkg.LicenseConcluded != "NOASSERTION" { + t.Errorf("expected %v, got %v", "NOASSERTION", pkg.LicenseConcluded) } - if len(pkg.PackageLicenseInfoFromFiles) != 0 { - t.Errorf("expected %v, got %v", 0, len(pkg.PackageLicenseInfoFromFiles)) + if len(pkg.LicenseInfoFromFiles) != 0 { + t.Errorf("expected %v, got %v", 0, len(pkg.LicenseInfoFromFiles)) } - if pkg.PackageLicenseDeclared != "NOASSERTION" { - t.Errorf("expected %v, got %v", "NOASSERTION", pkg.PackageLicenseDeclared) + if pkg.LicenseDeclared != "NOASSERTION" { + t.Errorf("expected %v, got %v", "NOASSERTION", pkg.LicenseDeclared) } - if pkg.PackageCopyrightText != "NOASSERTION" { - t.Errorf("expected %v, got %v", "NOASSERTION", pkg.PackageCopyrightText) + if pkg.CopyrightText != "NOASSERTION" { + t.Errorf("expected %v, got %v", "NOASSERTION", pkg.CopyrightText) } // check Files section @@ -476,20 +476,20 @@ func TestBuild2_2CreatesDocument(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.Name != "/emptyfile.testdata.txt" { + t.Errorf("expected %v, got %v", "/emptyfile.testdata.txt", fileEmpty.Name) } - if fileEmpty.FileSPDXIdentifier != spdx.ElementID("File0") { - t.Errorf("expected %v, got %v", "File0", fileEmpty.FileSPDXIdentifier) + if fileEmpty.SPDXIdentifier != spdx.ElementID("File0") { + t.Errorf("expected %v, got %v", "File0", fileEmpty.SPDXIdentifier) } - if fileEmpty.FileChecksumSHA1 != "da39a3ee5e6b4b0d3255bfef95601890afd80709" { - t.Errorf("expected %v, got %v", "da39a3ee5e6b4b0d3255bfef95601890afd80709", fileEmpty.FileChecksumSHA1) + if fileEmpty.ChecksumSHA1 != "da39a3ee5e6b4b0d3255bfef95601890afd80709" { + t.Errorf("expected %v, got %v", "da39a3ee5e6b4b0d3255bfef95601890afd80709", fileEmpty.ChecksumSHA1) } - if fileEmpty.FileChecksumSHA256 != "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" { - t.Errorf("expected %v, got %v", "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", fileEmpty.FileChecksumSHA256) + if fileEmpty.ChecksumSHA256 != "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" { + t.Errorf("expected %v, got %v", "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", fileEmpty.ChecksumSHA256) } - if fileEmpty.FileChecksumMD5 != "d41d8cd98f00b204e9800998ecf8427e" { - t.Errorf("expected %v, got %v", "d41d8cd98f00b204e9800998ecf8427e", fileEmpty.FileChecksumMD5) + if fileEmpty.ChecksumMD5 != "d41d8cd98f00b204e9800998ecf8427e" { + t.Errorf("expected %v, got %v", "d41d8cd98f00b204e9800998ecf8427e", fileEmpty.ChecksumMD5) } if fileEmpty.LicenseConcluded != "NOASSERTION" { t.Errorf("expected %v, got %v", "NOASSERTION", fileEmpty.LicenseConcluded) @@ -497,8 +497,8 @@ func TestBuild2_2CreatesDocument(t *testing.T) { if len(fileEmpty.LicenseInfoInFile) != 0 { t.Errorf("expected %v, got %v", 0, len(fileEmpty.LicenseInfoInFile)) } - if fileEmpty.FileCopyrightText != "NOASSERTION" { - t.Errorf("expected %v, got %v", "NOASSERTION", fileEmpty.FileCopyrightText) + if fileEmpty.CopyrightText != "NOASSERTION" { + t.Errorf("expected %v, got %v", "NOASSERTION", fileEmpty.CopyrightText) } // check file1.testdata.txt @@ -506,20 +506,20 @@ func TestBuild2_2CreatesDocument(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.Name != "/file1.testdata.txt" { + t.Errorf("expected %v, got %v", "/file1.testdata.txt", file1.Name) } - if file1.FileSPDXIdentifier != spdx.ElementID("File1") { - t.Errorf("expected %v, got %v", "File1", file1.FileSPDXIdentifier) + if file1.SPDXIdentifier != spdx.ElementID("File1") { + t.Errorf("expected %v, got %v", "File1", file1.SPDXIdentifier) } - if file1.FileChecksumSHA1 != "024f870eb6323f532515f7a09d5646a97083b819" { - t.Errorf("expected %v, got %v", "024f870eb6323f532515f7a09d5646a97083b819", file1.FileChecksumSHA1) + if file1.ChecksumSHA1 != "024f870eb6323f532515f7a09d5646a97083b819" { + t.Errorf("expected %v, got %v", "024f870eb6323f532515f7a09d5646a97083b819", file1.ChecksumSHA1) } - if file1.FileChecksumSHA256 != "b14e44284ca477b4c0db34b15ca4c454b2947cce7883e22321cf2984050e15bf" { - t.Errorf("expected %v, got %v", "b14e44284ca477b4c0db34b15ca4c454b2947cce7883e22321cf2984050e15bf", file1.FileChecksumSHA256) + if file1.ChecksumSHA256 != "b14e44284ca477b4c0db34b15ca4c454b2947cce7883e22321cf2984050e15bf" { + t.Errorf("expected %v, got %v", "b14e44284ca477b4c0db34b15ca4c454b2947cce7883e22321cf2984050e15bf", file1.ChecksumSHA256) } - if file1.FileChecksumMD5 != "37c8208479dfe42d2bb29debd6e32d4a" { - t.Errorf("expected %v, got %v", "37c8208479dfe42d2bb29debd6e32d4a", file1.FileChecksumMD5) + if file1.ChecksumMD5 != "37c8208479dfe42d2bb29debd6e32d4a" { + t.Errorf("expected %v, got %v", "37c8208479dfe42d2bb29debd6e32d4a", file1.ChecksumMD5) } if file1.LicenseConcluded != "NOASSERTION" { t.Errorf("expected %v, got %v", "NOASSERTION", file1.LicenseConcluded) @@ -527,8 +527,8 @@ func TestBuild2_2CreatesDocument(t *testing.T) { if len(file1.LicenseInfoInFile) != 0 { t.Errorf("expected %v, got %v", 0, len(file1.LicenseInfoInFile)) } - if file1.FileCopyrightText != "NOASSERTION" { - t.Errorf("expected %v, got %v", "NOASSERTION", file1.FileCopyrightText) + if file1.CopyrightText != "NOASSERTION" { + t.Errorf("expected %v, got %v", "NOASSERTION", file1.CopyrightText) } // check file3.testdata.txt @@ -536,20 +536,20 @@ func TestBuild2_2CreatesDocument(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.Name != "/file3.testdata.txt" { + t.Errorf("expected %v, got %v", "/file3.testdata.txt", file3.Name) } - if file3.FileSPDXIdentifier != spdx.ElementID("File2") { - t.Errorf("expected %v, got %v", "File2", file3.FileSPDXIdentifier) + if file3.SPDXIdentifier != spdx.ElementID("File2") { + t.Errorf("expected %v, got %v", "File2", file3.SPDXIdentifier) } - if file3.FileChecksumSHA1 != "a46114b70e163614f01c64adf44cdd438f158fce" { - t.Errorf("expected %v, got %v", "a46114b70e163614f01c64adf44cdd438f158fce", file3.FileChecksumSHA1) + if file3.ChecksumSHA1 != "a46114b70e163614f01c64adf44cdd438f158fce" { + t.Errorf("expected %v, got %v", "a46114b70e163614f01c64adf44cdd438f158fce", file3.ChecksumSHA1) } - if file3.FileChecksumSHA256 != "9fc181b9892720a15df1a1e561860318db40621bd4040ccdf18e110eb01d04b4" { - t.Errorf("expected %v, got %v", "9fc181b9892720a15df1a1e561860318db40621bd4040ccdf18e110eb01d04b4", file3.FileChecksumSHA256) + if file3.ChecksumSHA256 != "9fc181b9892720a15df1a1e561860318db40621bd4040ccdf18e110eb01d04b4" { + t.Errorf("expected %v, got %v", "9fc181b9892720a15df1a1e561860318db40621bd4040ccdf18e110eb01d04b4", file3.ChecksumSHA256) } - if file3.FileChecksumMD5 != "3e02d3ab9c58eec6911dbba37570934f" { - t.Errorf("expected %v, got %v", "3e02d3ab9c58eec6911dbba37570934f", file3.FileChecksumMD5) + if file3.ChecksumMD5 != "3e02d3ab9c58eec6911dbba37570934f" { + t.Errorf("expected %v, got %v", "3e02d3ab9c58eec6911dbba37570934f", file3.ChecksumMD5) } if file3.LicenseConcluded != "NOASSERTION" { t.Errorf("expected %v, got %v", "NOASSERTION", file3.LicenseConcluded) @@ -557,8 +557,8 @@ func TestBuild2_2CreatesDocument(t *testing.T) { if len(file3.LicenseInfoInFile) != 0 { t.Errorf("expected %v, got %v", 0, len(file3.LicenseInfoInFile)) } - if file3.FileCopyrightText != "NOASSERTION" { - t.Errorf("expected %v, got %v", "NOASSERTION", file3.FileCopyrightText) + if file3.CopyrightText != "NOASSERTION" { + t.Errorf("expected %v, got %v", "NOASSERTION", file3.CopyrightText) } // check folder1/file4.testdata.txt @@ -566,20 +566,20 @@ func TestBuild2_2CreatesDocument(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.Name != "/folder1/file4.testdata.txt" { + t.Errorf("expected %v, got %v", "folder1/file4.testdata.txt", file4.Name) } - if file4.FileSPDXIdentifier != spdx.ElementID("File3") { - t.Errorf("expected %v, got %v", "File3", file4.FileSPDXIdentifier) + if file4.SPDXIdentifier != spdx.ElementID("File3") { + t.Errorf("expected %v, got %v", "File3", file4.SPDXIdentifier) } - if file4.FileChecksumSHA1 != "e623d7d7d782a7c8323c4d436acee4afab34320f" { - t.Errorf("expected %v, got %v", "e623d7d7d782a7c8323c4d436acee4afab34320f", file4.FileChecksumSHA1) + if file4.ChecksumSHA1 != "e623d7d7d782a7c8323c4d436acee4afab34320f" { + t.Errorf("expected %v, got %v", "e623d7d7d782a7c8323c4d436acee4afab34320f", file4.ChecksumSHA1) } - if file4.FileChecksumSHA256 != "574fa42c5e0806c0f8906a44884166540206f021527729407cd5326838629c59" { - t.Errorf("expected %v, got %v", "574fa42c5e0806c0f8906a44884166540206f021527729407cd5326838629c59", file4.FileChecksumSHA256) + if file4.ChecksumSHA256 != "574fa42c5e0806c0f8906a44884166540206f021527729407cd5326838629c59" { + t.Errorf("expected %v, got %v", "574fa42c5e0806c0f8906a44884166540206f021527729407cd5326838629c59", file4.ChecksumSHA256) } - if file4.FileChecksumMD5 != "96e6a25d35df5b1c477710ef4d0c7210" { - t.Errorf("expected %v, got %v", "96e6a25d35df5b1c477710ef4d0c7210", file4.FileChecksumMD5) + if file4.ChecksumMD5 != "96e6a25d35df5b1c477710ef4d0c7210" { + t.Errorf("expected %v, got %v", "96e6a25d35df5b1c477710ef4d0c7210", file4.ChecksumMD5) } if file4.LicenseConcluded != "NOASSERTION" { t.Errorf("expected %v, got %v", "NOASSERTION", file4.LicenseConcluded) @@ -587,8 +587,8 @@ func TestBuild2_2CreatesDocument(t *testing.T) { if len(file4.LicenseInfoInFile) != 0 { t.Errorf("expected %v, got %v", 0, len(file4.LicenseInfoInFile)) } - if file4.FileCopyrightText != "NOASSERTION" { - t.Errorf("expected %v, got %v", "NOASSERTION", file4.FileCopyrightText) + if file4.CopyrightText != "NOASSERTION" { + t.Errorf("expected %v, got %v", "NOASSERTION", file4.CopyrightText) } // check lastfile.testdata.txt @@ -596,20 +596,20 @@ func TestBuild2_2CreatesDocument(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.Name != "/lastfile.testdata.txt" { + t.Errorf("expected %v, got %v", "/lastfile.testdata.txt", lastfile.Name) } - if lastfile.FileSPDXIdentifier != spdx.ElementID("File4") { - t.Errorf("expected %v, got %v", "File4", lastfile.FileSPDXIdentifier) + if lastfile.SPDXIdentifier != spdx.ElementID("File4") { + t.Errorf("expected %v, got %v", "File4", lastfile.SPDXIdentifier) } - if lastfile.FileChecksumSHA1 != "26d6221d682d9ba59116f9753a701f34271c8ce1" { - t.Errorf("expected %v, got %v", "26d6221d682d9ba59116f9753a701f34271c8ce1", lastfile.FileChecksumSHA1) + if lastfile.ChecksumSHA1 != "26d6221d682d9ba59116f9753a701f34271c8ce1" { + t.Errorf("expected %v, got %v", "26d6221d682d9ba59116f9753a701f34271c8ce1", lastfile.ChecksumSHA1) } - if lastfile.FileChecksumSHA256 != "0a4bdaf990e9b330ff72022dd78110ae98b60e08337cf2105b89856373416805" { - t.Errorf("expected %v, got %v", "0a4bdaf990e9b330ff72022dd78110ae98b60e08337cf2105b89856373416805", lastfile.FileChecksumSHA256) + if lastfile.ChecksumSHA256 != "0a4bdaf990e9b330ff72022dd78110ae98b60e08337cf2105b89856373416805" { + t.Errorf("expected %v, got %v", "0a4bdaf990e9b330ff72022dd78110ae98b60e08337cf2105b89856373416805", lastfile.ChecksumSHA256) } - if lastfile.FileChecksumMD5 != "f60baa793870d9085461ad6bbab50b7f" { - t.Errorf("expected %v, got %v", "f60baa793870d9085461ad6bbab50b7f", lastfile.FileChecksumMD5) + if lastfile.ChecksumMD5 != "f60baa793870d9085461ad6bbab50b7f" { + t.Errorf("expected %v, got %v", "f60baa793870d9085461ad6bbab50b7f", lastfile.ChecksumMD5) } if lastfile.LicenseConcluded != "NOASSERTION" { t.Errorf("expected %v, got %v", "NOASSERTION", lastfile.LicenseConcluded) @@ -617,8 +617,8 @@ func TestBuild2_2CreatesDocument(t *testing.T) { if len(lastfile.LicenseInfoInFile) != 0 { t.Errorf("expected %v, got %v", 0, len(lastfile.LicenseInfoInFile)) } - if lastfile.FileCopyrightText != "NOASSERTION" { - t.Errorf("expected %v, got %v", "NOASSERTION", lastfile.FileCopyrightText) + if lastfile.CopyrightText != "NOASSERTION" { + t.Errorf("expected %v, got %v", "NOASSERTION", lastfile.CopyrightText) } // check Relationship section -- should be a relationship for doc DESCRIBES pkg @@ -685,31 +685,31 @@ func TestBuild2_2CanIgnoreFiles(t *testing.T) { } want := "/dontscan.txt" - got := pkg.Files[spdx.ElementID("File0")].FileName + got := pkg.Files[spdx.ElementID("File0")].Name if want != got { t.Errorf("expected %v, got %v", want, got) } want = "/keep/keep.txt" - got = pkg.Files[spdx.ElementID("File1")].FileName + got = pkg.Files[spdx.ElementID("File1")].Name if want != got { t.Errorf("expected %v, got %v", want, got) } want = "/keep.txt" - got = pkg.Files[spdx.ElementID("File2")].FileName + got = pkg.Files[spdx.ElementID("File2")].Name if want != got { t.Errorf("expected %v, got %v", want, got) } want = "/subdir/keep/dontscan.txt" - got = pkg.Files[spdx.ElementID("File3")].FileName + got = pkg.Files[spdx.ElementID("File3")].Name if want != got { t.Errorf("expected %v, got %v", want, got) } want = "/subdir/keep/keep.txt" - got = pkg.Files[spdx.ElementID("File4")].FileName + got = pkg.Files[spdx.ElementID("File4")].Name if want != got { t.Errorf("expected %v, got %v", want, got) } diff --git a/builder/builder2v1/build_file.go b/builder/builder2v1/build_file.go index 28bb5552..5469c942 100644 --- a/builder/builder2v1/build_file.go +++ b/builder/builder2v1/build_file.go @@ -30,14 +30,14 @@ func BuildFileSection2_1(filePath string, prefix string, fileNumber int) (*spdx. // now build the File section f := &spdx.File2_1{ - FileName: filePath, - FileSPDXIdentifier: spdx.ElementID(i), - FileChecksumSHA1: ssha1, - FileChecksumSHA256: ssha256, - FileChecksumMD5: smd5, - LicenseConcluded: "NOASSERTION", - LicenseInfoInFile: []string{}, - FileCopyrightText: "NOASSERTION", + Name: filePath, + SPDXIdentifier: spdx.ElementID(i), + ChecksumSHA1: ssha1, + ChecksumSHA256: ssha256, + ChecksumMD5: smd5, + LicenseConcluded: "NOASSERTION", + LicenseInfoInFile: []string{}, + CopyrightText: "NOASSERTION", } return f, nil diff --git a/builder/builder2v1/build_file_test.go b/builder/builder2v1/build_file_test.go index 1bdafd39..aa29f3b0 100644 --- a/builder/builder2v1/build_file_test.go +++ b/builder/builder2v1/build_file_test.go @@ -22,20 +22,20 @@ 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.Name != "/file1.testdata.txt" { + t.Errorf("expected %v, got %v", "/file1.testdata.txt", file1.Name) } - if file1.FileSPDXIdentifier != spdx.ElementID("File17") { - t.Errorf("expected %v, got %v", "File17", file1.FileSPDXIdentifier) + if file1.SPDXIdentifier != spdx.ElementID("File17") { + t.Errorf("expected %v, got %v", "File17", file1.SPDXIdentifier) } - if file1.FileChecksumSHA1 != "024f870eb6323f532515f7a09d5646a97083b819" { - t.Errorf("expected %v, got %v", "024f870eb6323f532515f7a09d5646a97083b819", file1.FileChecksumSHA1) + if file1.ChecksumSHA1 != "024f870eb6323f532515f7a09d5646a97083b819" { + t.Errorf("expected %v, got %v", "024f870eb6323f532515f7a09d5646a97083b819", file1.ChecksumSHA1) } - if file1.FileChecksumSHA256 != "b14e44284ca477b4c0db34b15ca4c454b2947cce7883e22321cf2984050e15bf" { - t.Errorf("expected %v, got %v", "b14e44284ca477b4c0db34b15ca4c454b2947cce7883e22321cf2984050e15bf", file1.FileChecksumSHA256) + if file1.ChecksumSHA256 != "b14e44284ca477b4c0db34b15ca4c454b2947cce7883e22321cf2984050e15bf" { + t.Errorf("expected %v, got %v", "b14e44284ca477b4c0db34b15ca4c454b2947cce7883e22321cf2984050e15bf", file1.ChecksumSHA256) } - if file1.FileChecksumMD5 != "37c8208479dfe42d2bb29debd6e32d4a" { - t.Errorf("expected %v, got %v", "37c8208479dfe42d2bb29debd6e32d4a", file1.FileChecksumMD5) + if file1.ChecksumMD5 != "37c8208479dfe42d2bb29debd6e32d4a" { + t.Errorf("expected %v, got %v", "37c8208479dfe42d2bb29debd6e32d4a", file1.ChecksumMD5) } if file1.LicenseConcluded != "NOASSERTION" { t.Errorf("expected %v, got %v", "NOASSERTION", file1.LicenseConcluded) @@ -43,8 +43,8 @@ func TestBuilder2_1CanBuildFileSection(t *testing.T) { if len(file1.LicenseInfoInFile) != 0 { t.Errorf("expected %v, got %v", 0, len(file1.LicenseInfoInFile)) } - if file1.FileCopyrightText != "NOASSERTION" { - t.Errorf("expected %v, got %v", "NOASSERTION", file1.FileCopyrightText) + if file1.CopyrightText != "NOASSERTION" { + t.Errorf("expected %v, got %v", "NOASSERTION", file1.CopyrightText) } } diff --git a/builder/builder2v1/build_package.go b/builder/builder2v1/build_package.go index 1dd66b67..ced381c4 100644 --- a/builder/builder2v1/build_package.go +++ b/builder/builder2v1/build_package.go @@ -29,7 +29,7 @@ func BuildPackageSection2_1(packageName string, dirRoot string, pathsIgnore []st if err != nil { return nil, err } - files[newFile.FileSPDXIdentifier] = newFile + files[newFile.SPDXIdentifier] = newFile fileNumber++ } @@ -41,17 +41,17 @@ func BuildPackageSection2_1(packageName string, dirRoot string, pathsIgnore []st // now build the package section pkg := &spdx.Package2_1{ - PackageName: packageName, - PackageSPDXIdentifier: spdx.ElementID(fmt.Sprintf("Package-%s", packageName)), - PackageDownloadLocation: "NOASSERTION", - FilesAnalyzed: true, - IsFilesAnalyzedTagPresent: true, - PackageVerificationCode: code, - PackageLicenseConcluded: "NOASSERTION", - PackageLicenseInfoFromFiles: []string{}, - PackageLicenseDeclared: "NOASSERTION", - PackageCopyrightText: "NOASSERTION", - Files: files, + Name: packageName, + SPDXIdentifier: spdx.ElementID(fmt.Sprintf("Package-%s", packageName)), + DownloadLocation: "NOASSERTION", + FilesAnalyzed: true, + IsFilesAnalyzedTagPresent: true, + VerificationCode: code, + LicenseConcluded: "NOASSERTION", + LicenseInfoFromFiles: []string{}, + LicenseDeclared: "NOASSERTION", + CopyrightText: "NOASSERTION", + Files: files, } return pkg, nil diff --git a/builder/builder2v1/build_package_test.go b/builder/builder2v1/build_package_test.go index 8902932a..7b6dfbe1 100644 --- a/builder/builder2v1/build_package_test.go +++ b/builder/builder2v1/build_package_test.go @@ -23,14 +23,14 @@ func TestBuilder2_1CanBuildPackageSection(t *testing.T) { if pkg == nil { t.Fatalf("expected non-nil Package, got nil") } - if pkg.PackageName != "project1" { - t.Errorf("expected %v, got %v", "project1", pkg.PackageName) + if pkg.Name != "project1" { + t.Errorf("expected %v, got %v", "project1", pkg.Name) } - if pkg.PackageSPDXIdentifier != spdx.ElementID("Package-project1") { - t.Errorf("expected %v, got %v", "Package-project1", pkg.PackageSPDXIdentifier) + if pkg.SPDXIdentifier != spdx.ElementID("Package-project1") { + t.Errorf("expected %v, got %v", "Package-project1", pkg.SPDXIdentifier) } - if pkg.PackageDownloadLocation != "NOASSERTION" { - t.Errorf("expected %v, got %v", "NOASSERTION", pkg.PackageDownloadLocation) + if pkg.DownloadLocation != "NOASSERTION" { + t.Errorf("expected %v, got %v", "NOASSERTION", pkg.DownloadLocation) } if pkg.FilesAnalyzed != true { t.Errorf("expected %v, got %v", true, pkg.FilesAnalyzed) @@ -38,20 +38,20 @@ func TestBuilder2_1CanBuildPackageSection(t *testing.T) { if pkg.IsFilesAnalyzedTagPresent != true { t.Errorf("expected %v, got %v", true, pkg.IsFilesAnalyzedTagPresent) } - if pkg.PackageVerificationCode != wantVerificationCode { - t.Errorf("expected %v, got %v", wantVerificationCode, pkg.PackageVerificationCode) + if pkg.VerificationCode != wantVerificationCode { + t.Errorf("expected %v, got %v", wantVerificationCode, pkg.VerificationCode) } - if pkg.PackageLicenseConcluded != "NOASSERTION" { - t.Errorf("expected %v, got %v", "NOASSERTION", pkg.PackageLicenseConcluded) + if pkg.LicenseConcluded != "NOASSERTION" { + t.Errorf("expected %v, got %v", "NOASSERTION", pkg.LicenseConcluded) } - if len(pkg.PackageLicenseInfoFromFiles) != 0 { - t.Errorf("expected %v, got %v", 0, len(pkg.PackageLicenseInfoFromFiles)) + if len(pkg.LicenseInfoFromFiles) != 0 { + t.Errorf("expected %v, got %v", 0, len(pkg.LicenseInfoFromFiles)) } - if pkg.PackageLicenseDeclared != "NOASSERTION" { - t.Errorf("expected %v, got %v", "NOASSERTION", pkg.PackageLicenseDeclared) + if pkg.LicenseDeclared != "NOASSERTION" { + t.Errorf("expected %v, got %v", "NOASSERTION", pkg.LicenseDeclared) } - if pkg.PackageCopyrightText != "NOASSERTION" { - t.Errorf("expected %v, got %v", "NOASSERTION", pkg.PackageCopyrightText) + if pkg.CopyrightText != "NOASSERTION" { + t.Errorf("expected %v, got %v", "NOASSERTION", pkg.CopyrightText) } // and make sure we got the right number of files, and check the first one @@ -65,20 +65,20 @@ 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.Name != "/emptyfile.testdata.txt" { + t.Errorf("expected %v, got %v", "/emptyfile.testdata.txt", fileEmpty.Name) } - if fileEmpty.FileSPDXIdentifier != spdx.ElementID("File0") { - t.Errorf("expected %v, got %v", "File0", fileEmpty.FileSPDXIdentifier) + if fileEmpty.SPDXIdentifier != spdx.ElementID("File0") { + t.Errorf("expected %v, got %v", "File0", fileEmpty.SPDXIdentifier) } - if fileEmpty.FileChecksumSHA1 != "da39a3ee5e6b4b0d3255bfef95601890afd80709" { - t.Errorf("expected %v, got %v", "da39a3ee5e6b4b0d3255bfef95601890afd80709", fileEmpty.FileChecksumSHA1) + if fileEmpty.ChecksumSHA1 != "da39a3ee5e6b4b0d3255bfef95601890afd80709" { + t.Errorf("expected %v, got %v", "da39a3ee5e6b4b0d3255bfef95601890afd80709", fileEmpty.ChecksumSHA1) } - if fileEmpty.FileChecksumSHA256 != "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" { - t.Errorf("expected %v, got %v", "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", fileEmpty.FileChecksumSHA256) + if fileEmpty.ChecksumSHA256 != "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" { + t.Errorf("expected %v, got %v", "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", fileEmpty.ChecksumSHA256) } - if fileEmpty.FileChecksumMD5 != "d41d8cd98f00b204e9800998ecf8427e" { - t.Errorf("expected %v, got %v", "d41d8cd98f00b204e9800998ecf8427e", fileEmpty.FileChecksumMD5) + if fileEmpty.ChecksumMD5 != "d41d8cd98f00b204e9800998ecf8427e" { + t.Errorf("expected %v, got %v", "d41d8cd98f00b204e9800998ecf8427e", fileEmpty.ChecksumMD5) } if fileEmpty.LicenseConcluded != "NOASSERTION" { t.Errorf("expected %v, got %v", "NOASSERTION", fileEmpty.LicenseConcluded) @@ -86,8 +86,8 @@ func TestBuilder2_1CanBuildPackageSection(t *testing.T) { if len(fileEmpty.LicenseInfoInFile) != 0 { t.Errorf("expected %v, got %v", 0, len(fileEmpty.LicenseInfoInFile)) } - if fileEmpty.FileCopyrightText != "NOASSERTION" { - t.Errorf("expected %v, got %v", "NOASSERTION", fileEmpty.FileCopyrightText) + if fileEmpty.CopyrightText != "NOASSERTION" { + t.Errorf("expected %v, got %v", "NOASSERTION", fileEmpty.CopyrightText) } } @@ -114,31 +114,31 @@ func TestBuilder2_1CanIgnoreFiles(t *testing.T) { } want := "/dontscan.txt" - got := pkg.Files[spdx.ElementID("File0")].FileName + got := pkg.Files[spdx.ElementID("File0")].Name if want != got { t.Errorf("expected %v, got %v", want, got) } want = "/keep/keep.txt" - got = pkg.Files[spdx.ElementID("File1")].FileName + got = pkg.Files[spdx.ElementID("File1")].Name if want != got { t.Errorf("expected %v, got %v", want, got) } want = "/keep.txt" - got = pkg.Files[spdx.ElementID("File2")].FileName + got = pkg.Files[spdx.ElementID("File2")].Name if want != got { t.Errorf("expected %v, got %v", want, got) } want = "/subdir/keep/dontscan.txt" - got = pkg.Files[spdx.ElementID("File3")].FileName + got = pkg.Files[spdx.ElementID("File3")].Name if want != got { t.Errorf("expected %v, got %v", want, got) } want = "/subdir/keep/keep.txt" - got = pkg.Files[spdx.ElementID("File4")].FileName + got = pkg.Files[spdx.ElementID("File4")].Name if want != got { t.Errorf("expected %v, got %v", want, got) } diff --git a/builder/builder2v2/build_file.go b/builder/builder2v2/build_file.go index 80429923..a2d14669 100644 --- a/builder/builder2v2/build_file.go +++ b/builder/builder2v2/build_file.go @@ -30,14 +30,14 @@ func BuildFileSection2_2(filePath string, prefix string, fileNumber int) (*spdx. // now build the File section f := &spdx.File2_2{ - FileName: filePath, - FileSPDXIdentifier: spdx.ElementID(i), - FileChecksumSHA1: ssha1, - FileChecksumSHA256: ssha256, - FileChecksumMD5: smd5, - LicenseConcluded: "NOASSERTION", - LicenseInfoInFile: []string{}, - FileCopyrightText: "NOASSERTION", + Name: filePath, + SPDXIdentifier: spdx.ElementID(i), + ChecksumSHA1: ssha1, + ChecksumSHA256: ssha256, + ChecksumMD5: smd5, + LicenseConcluded: "NOASSERTION", + LicenseInfoInFile: []string{}, + CopyrightText: "NOASSERTION", } return f, nil diff --git a/builder/builder2v2/build_file_test.go b/builder/builder2v2/build_file_test.go index bd74421b..8090f32b 100644 --- a/builder/builder2v2/build_file_test.go +++ b/builder/builder2v2/build_file_test.go @@ -22,20 +22,20 @@ func TestBuilder2_2CanBuildFileSection(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.Name != "/file1.testdata.txt" { + t.Errorf("expected %v, got %v", "/file1.testdata.txt", file1.Name) } - if file1.FileSPDXIdentifier != spdx.ElementID("File17") { - t.Errorf("expected %v, got %v", "File17", file1.FileSPDXIdentifier) + if file1.SPDXIdentifier != spdx.ElementID("File17") { + t.Errorf("expected %v, got %v", "File17", file1.SPDXIdentifier) } - if file1.FileChecksumSHA1 != "024f870eb6323f532515f7a09d5646a97083b819" { - t.Errorf("expected %v, got %v", "024f870eb6323f532515f7a09d5646a97083b819", file1.FileChecksumSHA1) + if file1.ChecksumSHA1 != "024f870eb6323f532515f7a09d5646a97083b819" { + t.Errorf("expected %v, got %v", "024f870eb6323f532515f7a09d5646a97083b819", file1.ChecksumSHA1) } - if file1.FileChecksumSHA256 != "b14e44284ca477b4c0db34b15ca4c454b2947cce7883e22321cf2984050e15bf" { - t.Errorf("expected %v, got %v", "b14e44284ca477b4c0db34b15ca4c454b2947cce7883e22321cf2984050e15bf", file1.FileChecksumSHA256) + if file1.ChecksumSHA256 != "b14e44284ca477b4c0db34b15ca4c454b2947cce7883e22321cf2984050e15bf" { + t.Errorf("expected %v, got %v", "b14e44284ca477b4c0db34b15ca4c454b2947cce7883e22321cf2984050e15bf", file1.ChecksumSHA256) } - if file1.FileChecksumMD5 != "37c8208479dfe42d2bb29debd6e32d4a" { - t.Errorf("expected %v, got %v", "37c8208479dfe42d2bb29debd6e32d4a", file1.FileChecksumMD5) + if file1.ChecksumMD5 != "37c8208479dfe42d2bb29debd6e32d4a" { + t.Errorf("expected %v, got %v", "37c8208479dfe42d2bb29debd6e32d4a", file1.ChecksumMD5) } if file1.LicenseConcluded != "NOASSERTION" { t.Errorf("expected %v, got %v", "NOASSERTION", file1.LicenseConcluded) @@ -43,8 +43,8 @@ func TestBuilder2_2CanBuildFileSection(t *testing.T) { if len(file1.LicenseInfoInFile) != 0 { t.Errorf("expected %v, got %v", 0, len(file1.LicenseInfoInFile)) } - if file1.FileCopyrightText != "NOASSERTION" { - t.Errorf("expected %v, got %v", "NOASSERTION", file1.FileCopyrightText) + if file1.CopyrightText != "NOASSERTION" { + t.Errorf("expected %v, got %v", "NOASSERTION", file1.CopyrightText) } } diff --git a/builder/builder2v2/build_package.go b/builder/builder2v2/build_package.go index 35c0a868..b458b2be 100644 --- a/builder/builder2v2/build_package.go +++ b/builder/builder2v2/build_package.go @@ -29,7 +29,7 @@ func BuildPackageSection2_2(packageName string, dirRoot string, pathsIgnore []st if err != nil { return nil, err } - files[newFile.FileSPDXIdentifier] = newFile + files[newFile.SPDXIdentifier] = newFile fileNumber++ } @@ -41,17 +41,17 @@ func BuildPackageSection2_2(packageName string, dirRoot string, pathsIgnore []st // now build the package section pkg := &spdx.Package2_2{ - PackageName: packageName, - PackageSPDXIdentifier: spdx.ElementID(fmt.Sprintf("Package-%s", packageName)), - PackageDownloadLocation: "NOASSERTION", - FilesAnalyzed: true, - IsFilesAnalyzedTagPresent: true, - PackageVerificationCode: code, - PackageLicenseConcluded: "NOASSERTION", - PackageLicenseInfoFromFiles: []string{}, - PackageLicenseDeclared: "NOASSERTION", - PackageCopyrightText: "NOASSERTION", - Files: files, + Name: packageName, + SPDXIdentifier: spdx.ElementID(fmt.Sprintf("Package-%s", packageName)), + DownloadLocation: "NOASSERTION", + FilesAnalyzed: true, + IsFilesAnalyzedTagPresent: true, + VerificationCode: code, + LicenseConcluded: "NOASSERTION", + LicenseInfoFromFiles: []string{}, + LicenseDeclared: "NOASSERTION", + CopyrightText: "NOASSERTION", + Files: files, } return pkg, nil diff --git a/builder/builder2v2/build_package_test.go b/builder/builder2v2/build_package_test.go index c7e4dc3a..46aa383e 100644 --- a/builder/builder2v2/build_package_test.go +++ b/builder/builder2v2/build_package_test.go @@ -23,14 +23,14 @@ func TestBuilder2_2CanBuildPackageSection(t *testing.T) { if pkg == nil { t.Fatalf("expected non-nil Package, got nil") } - if pkg.PackageName != "project1" { - t.Errorf("expected %v, got %v", "project1", pkg.PackageName) + if pkg.Name != "project1" { + t.Errorf("expected %v, got %v", "project1", pkg.Name) } - if pkg.PackageSPDXIdentifier != spdx.ElementID("Package-project1") { - t.Errorf("expected %v, got %v", "Package-project1", pkg.PackageSPDXIdentifier) + if pkg.SPDXIdentifier != spdx.ElementID("Package-project1") { + t.Errorf("expected %v, got %v", "Package-project1", pkg.SPDXIdentifier) } - if pkg.PackageDownloadLocation != "NOASSERTION" { - t.Errorf("expected %v, got %v", "NOASSERTION", pkg.PackageDownloadLocation) + if pkg.DownloadLocation != "NOASSERTION" { + t.Errorf("expected %v, got %v", "NOASSERTION", pkg.DownloadLocation) } if pkg.FilesAnalyzed != true { t.Errorf("expected %v, got %v", true, pkg.FilesAnalyzed) @@ -38,20 +38,20 @@ func TestBuilder2_2CanBuildPackageSection(t *testing.T) { if pkg.IsFilesAnalyzedTagPresent != true { t.Errorf("expected %v, got %v", true, pkg.IsFilesAnalyzedTagPresent) } - if pkg.PackageVerificationCode != wantVerificationCode { - t.Errorf("expected %v, got %v", wantVerificationCode, pkg.PackageVerificationCode) + if pkg.VerificationCode != wantVerificationCode { + t.Errorf("expected %v, got %v", wantVerificationCode, pkg.VerificationCode) } - if pkg.PackageLicenseConcluded != "NOASSERTION" { - t.Errorf("expected %v, got %v", "NOASSERTION", pkg.PackageLicenseConcluded) + if pkg.LicenseConcluded != "NOASSERTION" { + t.Errorf("expected %v, got %v", "NOASSERTION", pkg.LicenseConcluded) } - if len(pkg.PackageLicenseInfoFromFiles) != 0 { - t.Errorf("expected %v, got %v", 0, len(pkg.PackageLicenseInfoFromFiles)) + if len(pkg.LicenseInfoFromFiles) != 0 { + t.Errorf("expected %v, got %v", 0, len(pkg.LicenseInfoFromFiles)) } - if pkg.PackageLicenseDeclared != "NOASSERTION" { - t.Errorf("expected %v, got %v", "NOASSERTION", pkg.PackageLicenseDeclared) + if pkg.LicenseDeclared != "NOASSERTION" { + t.Errorf("expected %v, got %v", "NOASSERTION", pkg.LicenseDeclared) } - if pkg.PackageCopyrightText != "NOASSERTION" { - t.Errorf("expected %v, got %v", "NOASSERTION", pkg.PackageCopyrightText) + if pkg.CopyrightText != "NOASSERTION" { + t.Errorf("expected %v, got %v", "NOASSERTION", pkg.CopyrightText) } // and make sure we got the right number of files, and check the first one @@ -65,20 +65,20 @@ func TestBuilder2_2CanBuildPackageSection(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.Name != "/emptyfile.testdata.txt" { + t.Errorf("expected %v, got %v", "/emptyfile.testdata.txt", fileEmpty.Name) } - if fileEmpty.FileSPDXIdentifier != spdx.ElementID("File0") { - t.Errorf("expected %v, got %v", "File0", fileEmpty.FileSPDXIdentifier) + if fileEmpty.SPDXIdentifier != spdx.ElementID("File0") { + t.Errorf("expected %v, got %v", "File0", fileEmpty.SPDXIdentifier) } - if fileEmpty.FileChecksumSHA1 != "da39a3ee5e6b4b0d3255bfef95601890afd80709" { - t.Errorf("expected %v, got %v", "da39a3ee5e6b4b0d3255bfef95601890afd80709", fileEmpty.FileChecksumSHA1) + if fileEmpty.ChecksumSHA1 != "da39a3ee5e6b4b0d3255bfef95601890afd80709" { + t.Errorf("expected %v, got %v", "da39a3ee5e6b4b0d3255bfef95601890afd80709", fileEmpty.ChecksumSHA1) } - if fileEmpty.FileChecksumSHA256 != "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" { - t.Errorf("expected %v, got %v", "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", fileEmpty.FileChecksumSHA256) + if fileEmpty.ChecksumSHA256 != "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" { + t.Errorf("expected %v, got %v", "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", fileEmpty.ChecksumSHA256) } - if fileEmpty.FileChecksumMD5 != "d41d8cd98f00b204e9800998ecf8427e" { - t.Errorf("expected %v, got %v", "d41d8cd98f00b204e9800998ecf8427e", fileEmpty.FileChecksumMD5) + if fileEmpty.ChecksumMD5 != "d41d8cd98f00b204e9800998ecf8427e" { + t.Errorf("expected %v, got %v", "d41d8cd98f00b204e9800998ecf8427e", fileEmpty.ChecksumMD5) } if fileEmpty.LicenseConcluded != "NOASSERTION" { t.Errorf("expected %v, got %v", "NOASSERTION", fileEmpty.LicenseConcluded) @@ -86,8 +86,8 @@ func TestBuilder2_2CanBuildPackageSection(t *testing.T) { if len(fileEmpty.LicenseInfoInFile) != 0 { t.Errorf("expected %v, got %v", 0, len(fileEmpty.LicenseInfoInFile)) } - if fileEmpty.FileCopyrightText != "NOASSERTION" { - t.Errorf("expected %v, got %v", "NOASSERTION", fileEmpty.FileCopyrightText) + if fileEmpty.CopyrightText != "NOASSERTION" { + t.Errorf("expected %v, got %v", "NOASSERTION", fileEmpty.CopyrightText) } } @@ -114,31 +114,31 @@ func TestBuilder2_2CanIgnoreFiles(t *testing.T) { } want := "/dontscan.txt" - got := pkg.Files[spdx.ElementID("File0")].FileName + got := pkg.Files[spdx.ElementID("File0")].Name if want != got { t.Errorf("expected %v, got %v", want, got) } want = "/keep/keep.txt" - got = pkg.Files[spdx.ElementID("File1")].FileName + got = pkg.Files[spdx.ElementID("File1")].Name if want != got { t.Errorf("expected %v, got %v", want, got) } want = "/keep.txt" - got = pkg.Files[spdx.ElementID("File2")].FileName + got = pkg.Files[spdx.ElementID("File2")].Name if want != got { t.Errorf("expected %v, got %v", want, got) } want = "/subdir/keep/dontscan.txt" - got = pkg.Files[spdx.ElementID("File3")].FileName + got = pkg.Files[spdx.ElementID("File3")].Name if want != got { t.Errorf("expected %v, got %v", want, got) } want = "/subdir/keep/keep.txt" - got = pkg.Files[spdx.ElementID("File4")].FileName + got = pkg.Files[spdx.ElementID("File4")].Name if want != got { t.Errorf("expected %v, got %v", want, got) } diff --git a/examples/1-load/example_load.go b/examples/1-load/example_load.go index 2ad0a0b6..c3ea2b0a 100644 --- a/examples/1-load/example_load.go +++ b/examples/1-load/example_load.go @@ -71,27 +71,27 @@ func main() { // check whether the package had its files analyzed if !pkg.FilesAnalyzed { - fmt.Printf("Package %s (%s) had FilesAnalyzed: false\n", string(pkgID), pkg.PackageName) + fmt.Printf("Package %s (%s) had FilesAnalyzed: false\n", string(pkgID), pkg.Name) continue } // also check whether the package has any files present if pkg.Files == nil || len(pkg.Files) < 1 { - fmt.Printf("Package %s (%s) has no Files\n", string(pkgID), pkg.PackageName) + fmt.Printf("Package %s (%s) has no Files\n", string(pkgID), pkg.Name) continue } // if we got here, there's at least one file // print the filename and license info for the first 50 fmt.Printf("============================\n") - fmt.Printf("Package %s (%s)\n", string(pkgID), pkg.PackageName) + fmt.Printf("Package %s (%s)\n", string(pkgID), pkg.Name) fmt.Printf("File info (up to first 50):\n") i := 1 for _, f := range pkg.Files { // note that these will be in random order, since we're pulling // from a map. if we care about order, we should first pull the // IDs into a slice, sort it, and then print the ordered files. - fmt.Printf("- File %d: %s\n", i, f.FileName) + fmt.Printf("- File %d: %s\n", i, f.Name) fmt.Printf(" License from file: %v\n", f.LicenseInfoInFile) fmt.Printf(" License concluded: %v\n", f.LicenseConcluded) i++ diff --git a/examples/5-report/example_report.go b/examples/5-report/example_report.go index 4464f07c..cb3658c5 100644 --- a/examples/5-report/example_report.go +++ b/examples/5-report/example_report.go @@ -64,13 +64,13 @@ func main() { // check whether the package had its files analyzed if !pkg.FilesAnalyzed { - fmt.Printf("Package %s (%s) had FilesAnalyzed: false\n", string(pkgID), pkg.PackageName) + fmt.Printf("Package %s (%s) had FilesAnalyzed: false\n", string(pkgID), pkg.Name) return } // also check whether the package has any files present if pkg.Files == nil || len(pkg.Files) < 1 { - fmt.Printf("Package %s (%s) has no Files\n", string(pkgID), pkg.PackageName) + fmt.Printf("Package %s (%s) has no Files\n", string(pkgID), pkg.Name) return } @@ -78,7 +78,7 @@ func main() { // generate and print a report of the Package's Files' LicenseConcluded // values, sorted by # of occurrences fmt.Printf("============================\n") - fmt.Printf("Package %s (%s)\n", string(pkgID), pkg.PackageName) + fmt.Printf("Package %s (%s)\n", string(pkgID), pkg.Name) err = reporter.Generate2_2(pkg, os.Stdout) if err != nil { fmt.Printf("Error while generating report: %v\n", err) diff --git a/examples/6-licensediff/example_licensediff.go b/examples/6-licensediff/example_licensediff.go index 057e95e5..7f6501a8 100644 --- a/examples/6-licensediff/example_licensediff.go +++ b/examples/6-licensediff/example_licensediff.go @@ -90,7 +90,7 @@ func main() { fmt.Printf("Package %s has described relationship in first document but ID not found\n", string(pkgID)) continue } - fmt.Printf("Package %s (%s)\n", string(pkgID), p1.PackageName) + fmt.Printf("Package %s (%s)\n", string(pkgID), p1.Name) p2, okSecond := docSecond.Packages[pkgID] if !okSecond { fmt.Printf(" Found in first document, not found in second\n") @@ -130,7 +130,7 @@ func main() { _, okFirst := docFirst.Packages[pkgID] if !okFirst { fmt.Printf("================================\n") - fmt.Printf("Package %s (%s)\n", string(pkgID), p2.PackageName) + fmt.Printf("Package %s (%s)\n", string(pkgID), p2.Name) fmt.Printf(" Found in second document, not found in first\n") } } diff --git a/idsearcher/idsearcher.go b/idsearcher/idsearcher.go index 3982109c..623ad033 100644 --- a/idsearcher/idsearcher.go +++ b/idsearcher/idsearcher.go @@ -87,11 +87,11 @@ func BuildIDsDocument2_1(packageName string, dirRoot string, idconfig *Config2_1 f.LicenseConcluded = "NOASSERTION" // check whether the searcher should ignore this file - if utils.ShouldIgnore(f.FileName, idconfig.SearcherPathsIgnored) { + if utils.ShouldIgnore(f.Name, idconfig.SearcherPathsIgnored) { continue } - fPath := filepath.Join(dirRoot, f.FileName) + fPath := filepath.Join(dirRoot, f.Name) // FIXME this is not preferable -- ignoring error ids, _ := searchFileIDs(fPath) // FIXME for now, proceed onwards with whatever IDs we obtained. @@ -130,13 +130,13 @@ func BuildIDsDocument2_1(packageName string, dirRoot string, idconfig *Config2_1 // and finally, we can fill in the package's details if len(licsForPackage) == 0 { - pkg.PackageLicenseInfoFromFiles = []string{"NOASSERTION"} + pkg.LicenseInfoFromFiles = []string{"NOASSERTION"} } else { - pkg.PackageLicenseInfoFromFiles = []string{} + pkg.LicenseInfoFromFiles = []string{} for lic := range licsForPackage { - pkg.PackageLicenseInfoFromFiles = append(pkg.PackageLicenseInfoFromFiles, lic) + pkg.LicenseInfoFromFiles = append(pkg.LicenseInfoFromFiles, lic) } - sort.Strings(pkg.PackageLicenseInfoFromFiles) + sort.Strings(pkg.LicenseInfoFromFiles) } return doc, nil @@ -211,11 +211,11 @@ func BuildIDsDocument2_2(packageName string, dirRoot string, idconfig *Config2_2 f.LicenseConcluded = "NOASSERTION" // check whether the searcher should ignore this file - if utils.ShouldIgnore(f.FileName, idconfig.SearcherPathsIgnored) { + if utils.ShouldIgnore(f.Name, idconfig.SearcherPathsIgnored) { continue } - fPath := filepath.Join(dirRoot, f.FileName) + fPath := filepath.Join(dirRoot, f.Name) // FIXME this is not preferable -- ignoring error ids, _ := searchFileIDs(fPath) // FIXME for now, proceed onwards with whatever IDs we obtained. @@ -254,13 +254,13 @@ func BuildIDsDocument2_2(packageName string, dirRoot string, idconfig *Config2_2 // and finally, we can fill in the package's details if len(licsForPackage) == 0 { - pkg.PackageLicenseInfoFromFiles = []string{"NOASSERTION"} + pkg.LicenseInfoFromFiles = []string{"NOASSERTION"} } else { - pkg.PackageLicenseInfoFromFiles = []string{} + pkg.LicenseInfoFromFiles = []string{} for lic := range licsForPackage { - pkg.PackageLicenseInfoFromFiles = append(pkg.PackageLicenseInfoFromFiles, lic) + pkg.LicenseInfoFromFiles = append(pkg.LicenseInfoFromFiles, lic) } - sort.Strings(pkg.PackageLicenseInfoFromFiles) + sort.Strings(pkg.LicenseInfoFromFiles) } return doc, nil diff --git a/idsearcher/idsearcher_test.go b/idsearcher/idsearcher_test.go index f348dc73..099d4782 100644 --- a/idsearcher/idsearcher_test.go +++ b/idsearcher/idsearcher_test.go @@ -146,33 +146,33 @@ func Test2_1SearcherCanFillInIDs(t *testing.T) { } // and finally, the package should have all of these licenses - if pkg.PackageLicenseInfoFromFiles == nil { + if pkg.LicenseInfoFromFiles == nil { t.Fatalf("expected non-nil PackageLicenseInfoFromFiles, got nil") } - if len(pkg.PackageLicenseInfoFromFiles) != 7 { - t.Fatalf("expected PackageLicenseInfoFromFiles len to be 7, got %d", len(pkg.PackageLicenseInfoFromFiles)) + if len(pkg.LicenseInfoFromFiles) != 7 { + t.Fatalf("expected PackageLicenseInfoFromFiles len to be 7, got %d", len(pkg.LicenseInfoFromFiles)) } - if pkg.PackageLicenseInfoFromFiles[0] != "Apache-2.0" { - t.Errorf("expected %v, got %v", "Apache-2.0", pkg.PackageLicenseInfoFromFiles[0]) + if pkg.LicenseInfoFromFiles[0] != "Apache-2.0" { + t.Errorf("expected %v, got %v", "Apache-2.0", pkg.LicenseInfoFromFiles[0]) } - if pkg.PackageLicenseInfoFromFiles[1] != "BSD-2-Clause" { - t.Errorf("expected %v, got %v", "BSD-2-Clause", pkg.PackageLicenseInfoFromFiles[1]) + if pkg.LicenseInfoFromFiles[1] != "BSD-2-Clause" { + t.Errorf("expected %v, got %v", "BSD-2-Clause", pkg.LicenseInfoFromFiles[1]) } - if pkg.PackageLicenseInfoFromFiles[2] != "BSD-3-Clause" { - t.Errorf("expected %v, got %v", "BSD-3-Clause", pkg.PackageLicenseInfoFromFiles[2]) + if pkg.LicenseInfoFromFiles[2] != "BSD-3-Clause" { + t.Errorf("expected %v, got %v", "BSD-3-Clause", pkg.LicenseInfoFromFiles[2]) } // here, DO NOT keep the + - if pkg.PackageLicenseInfoFromFiles[3] != "EPL-1.0" { - t.Errorf("expected %v, got %v", "EPL-1.0", pkg.PackageLicenseInfoFromFiles[3]) + if pkg.LicenseInfoFromFiles[3] != "EPL-1.0" { + t.Errorf("expected %v, got %v", "EPL-1.0", pkg.LicenseInfoFromFiles[3]) } - if pkg.PackageLicenseInfoFromFiles[4] != "GPL-2.0-or-later" { - t.Errorf("expected %v, got %v", "GPL-2.0-or-later", pkg.PackageLicenseInfoFromFiles[4]) + if pkg.LicenseInfoFromFiles[4] != "GPL-2.0-or-later" { + t.Errorf("expected %v, got %v", "GPL-2.0-or-later", pkg.LicenseInfoFromFiles[4]) } - if pkg.PackageLicenseInfoFromFiles[5] != "ISC" { - t.Errorf("expected %v, got %v", "ISC", pkg.PackageLicenseInfoFromFiles[5]) + if pkg.LicenseInfoFromFiles[5] != "ISC" { + t.Errorf("expected %v, got %v", "ISC", pkg.LicenseInfoFromFiles[5]) } - if pkg.PackageLicenseInfoFromFiles[6] != "MIT" { - t.Errorf("expected %v, got %v", "MIT", pkg.PackageLicenseInfoFromFiles[6]) + if pkg.LicenseInfoFromFiles[6] != "MIT" { + t.Errorf("expected %v, got %v", "MIT", pkg.LicenseInfoFromFiles[6]) } } @@ -214,8 +214,8 @@ func Test2_1SearcherCanFillInIDsAndIgnorePaths(t *testing.T) { } f := pkg.Files[spdx.ElementID("File0")] - if f.FileName != "/dontscan.txt" { - t.Errorf("expected %v, got %v", "/dontscan.txt", f.FileName) + if f.Name != "/dontscan.txt" { + t.Errorf("expected %v, got %v", "/dontscan.txt", f.Name) } if len(f.LicenseInfoInFile) != 1 { t.Errorf("expected len to be %d, got %d", 1, len(f.LicenseInfoInFile)) @@ -228,8 +228,8 @@ func Test2_1SearcherCanFillInIDsAndIgnorePaths(t *testing.T) { } f = pkg.Files[spdx.ElementID("File1")] - if f.FileName != "/keep/keep.txt" { - t.Errorf("expected %v, got %v", "/keep/keep.txt", f.FileName) + if f.Name != "/keep/keep.txt" { + t.Errorf("expected %v, got %v", "/keep/keep.txt", f.Name) } if len(f.LicenseInfoInFile) != 1 { t.Errorf("expected len to be %d, got %d", 1, len(f.LicenseInfoInFile)) @@ -242,8 +242,8 @@ func Test2_1SearcherCanFillInIDsAndIgnorePaths(t *testing.T) { } f = pkg.Files[spdx.ElementID("File2")] - if f.FileName != "/keep.txt" { - t.Errorf("expected %v, got %v", "/keep.txt", f.FileName) + if f.Name != "/keep.txt" { + t.Errorf("expected %v, got %v", "/keep.txt", f.Name) } if len(f.LicenseInfoInFile) != 1 { t.Errorf("expected len to be %d, got %d", 1, len(f.LicenseInfoInFile)) @@ -256,8 +256,8 @@ func Test2_1SearcherCanFillInIDsAndIgnorePaths(t *testing.T) { } f = pkg.Files[spdx.ElementID("File3")] - if f.FileName != "/subdir/keep/dontscan.txt" { - t.Errorf("expected %v, got %v", "/subdir/keep/dontscan.txt", f.FileName) + if f.Name != "/subdir/keep/dontscan.txt" { + t.Errorf("expected %v, got %v", "/subdir/keep/dontscan.txt", f.Name) } if len(f.LicenseInfoInFile) != 1 { t.Errorf("expected len to be %d, got %d", 1, len(f.LicenseInfoInFile)) @@ -270,8 +270,8 @@ func Test2_1SearcherCanFillInIDsAndIgnorePaths(t *testing.T) { } f = pkg.Files[spdx.ElementID("File4")] - if f.FileName != "/subdir/keep/keep.txt" { - t.Errorf("expected %v, got %v", "/subdir/keep/keep.txt", f.FileName) + if f.Name != "/subdir/keep/keep.txt" { + t.Errorf("expected %v, got %v", "/subdir/keep/keep.txt", f.Name) } if len(f.LicenseInfoInFile) != 1 { t.Errorf("expected len to be %d, got %d", 1, len(f.LicenseInfoInFile)) @@ -435,33 +435,33 @@ func Test2_2SearcherCanFillInIDs(t *testing.T) { } // and finally, the package should have all of these licenses - if pkg.PackageLicenseInfoFromFiles == nil { + if pkg.LicenseInfoFromFiles == nil { t.Fatalf("expected non-nil PackageLicenseInfoFromFiles, got nil") } - if len(pkg.PackageLicenseInfoFromFiles) != 7 { - t.Fatalf("expected PackageLicenseInfoFromFiles len to be 7, got %d", len(pkg.PackageLicenseInfoFromFiles)) + if len(pkg.LicenseInfoFromFiles) != 7 { + t.Fatalf("expected PackageLicenseInfoFromFiles len to be 7, got %d", len(pkg.LicenseInfoFromFiles)) } - if pkg.PackageLicenseInfoFromFiles[0] != "Apache-2.0" { - t.Errorf("expected %v, got %v", "Apache-2.0", pkg.PackageLicenseInfoFromFiles[0]) + if pkg.LicenseInfoFromFiles[0] != "Apache-2.0" { + t.Errorf("expected %v, got %v", "Apache-2.0", pkg.LicenseInfoFromFiles[0]) } - if pkg.PackageLicenseInfoFromFiles[1] != "BSD-2-Clause" { - t.Errorf("expected %v, got %v", "BSD-2-Clause", pkg.PackageLicenseInfoFromFiles[1]) + if pkg.LicenseInfoFromFiles[1] != "BSD-2-Clause" { + t.Errorf("expected %v, got %v", "BSD-2-Clause", pkg.LicenseInfoFromFiles[1]) } - if pkg.PackageLicenseInfoFromFiles[2] != "BSD-3-Clause" { - t.Errorf("expected %v, got %v", "BSD-3-Clause", pkg.PackageLicenseInfoFromFiles[2]) + if pkg.LicenseInfoFromFiles[2] != "BSD-3-Clause" { + t.Errorf("expected %v, got %v", "BSD-3-Clause", pkg.LicenseInfoFromFiles[2]) } // here, DO NOT keep the + - if pkg.PackageLicenseInfoFromFiles[3] != "EPL-1.0" { - t.Errorf("expected %v, got %v", "EPL-1.0", pkg.PackageLicenseInfoFromFiles[3]) + if pkg.LicenseInfoFromFiles[3] != "EPL-1.0" { + t.Errorf("expected %v, got %v", "EPL-1.0", pkg.LicenseInfoFromFiles[3]) } - if pkg.PackageLicenseInfoFromFiles[4] != "GPL-2.0-or-later" { - t.Errorf("expected %v, got %v", "GPL-2.0-or-later", pkg.PackageLicenseInfoFromFiles[4]) + if pkg.LicenseInfoFromFiles[4] != "GPL-2.0-or-later" { + t.Errorf("expected %v, got %v", "GPL-2.0-or-later", pkg.LicenseInfoFromFiles[4]) } - if pkg.PackageLicenseInfoFromFiles[5] != "ISC" { - t.Errorf("expected %v, got %v", "ISC", pkg.PackageLicenseInfoFromFiles[5]) + if pkg.LicenseInfoFromFiles[5] != "ISC" { + t.Errorf("expected %v, got %v", "ISC", pkg.LicenseInfoFromFiles[5]) } - if pkg.PackageLicenseInfoFromFiles[6] != "MIT" { - t.Errorf("expected %v, got %v", "MIT", pkg.PackageLicenseInfoFromFiles[6]) + if pkg.LicenseInfoFromFiles[6] != "MIT" { + t.Errorf("expected %v, got %v", "MIT", pkg.LicenseInfoFromFiles[6]) } } @@ -503,8 +503,8 @@ func Test2_2SearcherCanFillInIDsAndIgnorePaths(t *testing.T) { } f := pkg.Files[spdx.ElementID("File0")] - if f.FileName != "/dontscan.txt" { - t.Errorf("expected %v, got %v", "/dontscan.txt", f.FileName) + if f.Name != "/dontscan.txt" { + t.Errorf("expected %v, got %v", "/dontscan.txt", f.Name) } if len(f.LicenseInfoInFile) != 1 { t.Errorf("expected len to be %d, got %d", 1, len(f.LicenseInfoInFile)) @@ -517,8 +517,8 @@ func Test2_2SearcherCanFillInIDsAndIgnorePaths(t *testing.T) { } f = pkg.Files[spdx.ElementID("File1")] - if f.FileName != "/keep/keep.txt" { - t.Errorf("expected %v, got %v", "/keep/keep.txt", f.FileName) + if f.Name != "/keep/keep.txt" { + t.Errorf("expected %v, got %v", "/keep/keep.txt", f.Name) } if len(f.LicenseInfoInFile) != 1 { t.Errorf("expected len to be %d, got %d", 1, len(f.LicenseInfoInFile)) @@ -531,8 +531,8 @@ func Test2_2SearcherCanFillInIDsAndIgnorePaths(t *testing.T) { } f = pkg.Files[spdx.ElementID("File2")] - if f.FileName != "/keep.txt" { - t.Errorf("expected %v, got %v", "/keep.txt", f.FileName) + if f.Name != "/keep.txt" { + t.Errorf("expected %v, got %v", "/keep.txt", f.Name) } if len(f.LicenseInfoInFile) != 1 { t.Errorf("expected len to be %d, got %d", 1, len(f.LicenseInfoInFile)) @@ -545,8 +545,8 @@ func Test2_2SearcherCanFillInIDsAndIgnorePaths(t *testing.T) { } f = pkg.Files[spdx.ElementID("File3")] - if f.FileName != "/subdir/keep/dontscan.txt" { - t.Errorf("expected %v, got %v", "/subdir/keep/dontscan.txt", f.FileName) + if f.Name != "/subdir/keep/dontscan.txt" { + t.Errorf("expected %v, got %v", "/subdir/keep/dontscan.txt", f.Name) } if len(f.LicenseInfoInFile) != 1 { t.Errorf("expected len to be %d, got %d", 1, len(f.LicenseInfoInFile)) @@ -559,8 +559,8 @@ func Test2_2SearcherCanFillInIDsAndIgnorePaths(t *testing.T) { } f = pkg.Files[spdx.ElementID("File4")] - if f.FileName != "/subdir/keep/keep.txt" { - t.Errorf("expected %v, got %v", "/subdir/keep/keep.txt", f.FileName) + if f.Name != "/subdir/keep/keep.txt" { + t.Errorf("expected %v, got %v", "/subdir/keep/keep.txt", f.Name) } if len(f.LicenseInfoInFile) != 1 { t.Errorf("expected len to be %d, got %d", 1, len(f.LicenseInfoInFile)) diff --git a/licensediff/licensediff.go b/licensediff/licensediff.go index 4b2f0acc..95d3ef96 100644 --- a/licensediff/licensediff.go +++ b/licensediff/licensediff.go @@ -22,21 +22,21 @@ func MakePairs2_1(p1 *spdx.Package2_1, p2 *spdx.Package2_1) (map[string]LicenseP // first, go through and add all files/licenses from p1 for _, f := range p1.Files { pair := LicensePair{First: f.LicenseConcluded, Second: ""} - pairs[f.FileName] = pair + pairs[f.Name] = pair } // now, go through all files/licenses from p2. If already // present, add as .second; if not, create new pair for _, f := range p2.Files { firstLic := "" - existingPair, ok := pairs[f.FileName] + existingPair, ok := pairs[f.Name] if ok { // already present; update it firstLic = existingPair.First } // now, update what's there, either way pair := LicensePair{First: firstLic, Second: f.LicenseConcluded} - pairs[f.FileName] = pair + pairs[f.Name] = pair } return pairs, nil @@ -50,21 +50,21 @@ func MakePairs2_2(p1 *spdx.Package2_2, p2 *spdx.Package2_2) (map[string]LicenseP // first, go through and add all files/licenses from p1 for _, f := range p1.Files { pair := LicensePair{First: f.LicenseConcluded, Second: ""} - pairs[f.FileName] = pair + pairs[f.Name] = pair } // now, go through all files/licenses from p2. If already // present, add as .second; if not, create new pair for _, f := range p2.Files { firstLic := "" - existingPair, ok := pairs[f.FileName] + existingPair, ok := pairs[f.Name] if ok { // already present; update it firstLic = existingPair.First } // now, update what's there, either way pair := LicensePair{First: firstLic, Second: f.LicenseConcluded} - pairs[f.FileName] = pair + pairs[f.Name] = pair } return pairs, nil diff --git a/licensediff/licensediff_test.go b/licensediff/licensediff_test.go index ccd92e17..9a7044b7 100644 --- a/licensediff/licensediff_test.go +++ b/licensediff/licensediff_test.go @@ -13,152 +13,152 @@ func Test2_1DifferCanCreateDiffPairs(t *testing.T) { // create files to be used in diff // f1 will be identical in both f1 := &spdx.File2_1{ - FileName: "/project/file1.txt", - FileSPDXIdentifier: spdx.ElementID("File561"), - FileChecksumSHA1: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3", - LicenseConcluded: "Apache-2.0", + Name: "/project/file1.txt", + SPDXIdentifier: spdx.ElementID("File561"), + ChecksumSHA1: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3", + LicenseConcluded: "Apache-2.0", LicenseInfoInFile: []string{ "LicenseRef-We-will-ignore-LicenseInfoInFile", }, - FileCopyrightText: "We'll ignore copyright values", + CopyrightText: "We'll ignore copyright values", } // f2 will only appear in the first Package f2 := &spdx.File2_1{ - FileName: "/project/file2.txt", - FileSPDXIdentifier: spdx.ElementID("File562"), - FileChecksumSHA1: "066c5139bd9a43d15812ec1a1755b08ccf199824", - LicenseConcluded: "GPL-2.0-or-later", + Name: "/project/file2.txt", + SPDXIdentifier: spdx.ElementID("File562"), + ChecksumSHA1: "066c5139bd9a43d15812ec1a1755b08ccf199824", + LicenseConcluded: "GPL-2.0-or-later", LicenseInfoInFile: []string{ "NOASSERTION", }, - FileCopyrightText: "NOASSERTION", + CopyrightText: "NOASSERTION", } // f3 will only appear in the second Package f3 := &spdx.File2_1{ - FileName: "/project/file3.txt", - FileSPDXIdentifier: spdx.ElementID("File563"), - FileChecksumSHA1: "bd0f4863b15fad2b79b35303af54fcb5baaf7c68", - LicenseConcluded: "MPL-2.0", + Name: "/project/file3.txt", + SPDXIdentifier: spdx.ElementID("File563"), + ChecksumSHA1: "bd0f4863b15fad2b79b35303af54fcb5baaf7c68", + LicenseConcluded: "MPL-2.0", LicenseInfoInFile: []string{ "NOASSERTION", }, - FileCopyrightText: "NOASSERTION", + CopyrightText: "NOASSERTION", } // f4_1 and f4_2 will appear in first and second, // with same name, same hash and different license f4_1 := &spdx.File2_1{ - FileName: "/project/file4.txt", - FileSPDXIdentifier: spdx.ElementID("File564"), - FileChecksumSHA1: "bc417a575ceae93435bcb7bfd382ac28cbdaa8b5", - LicenseConcluded: "MIT", + Name: "/project/file4.txt", + SPDXIdentifier: spdx.ElementID("File564"), + ChecksumSHA1: "bc417a575ceae93435bcb7bfd382ac28cbdaa8b5", + LicenseConcluded: "MIT", LicenseInfoInFile: []string{ "NOASSERTION", }, - FileCopyrightText: "NOASSERTION", + CopyrightText: "NOASSERTION", } f4_2 := &spdx.File2_1{ - FileName: "/project/file4.txt", - FileSPDXIdentifier: spdx.ElementID("File564"), - FileChecksumSHA1: "bc417a575ceae93435bcb7bfd382ac28cbdaa8b5", - LicenseConcluded: "Apache-2.0 AND MIT", + Name: "/project/file4.txt", + SPDXIdentifier: spdx.ElementID("File564"), + ChecksumSHA1: "bc417a575ceae93435bcb7bfd382ac28cbdaa8b5", + LicenseConcluded: "Apache-2.0 AND MIT", LicenseInfoInFile: []string{ "NOASSERTION", }, - FileCopyrightText: "NOASSERTION", + CopyrightText: "NOASSERTION", } // f5_1 and f5_2 will appear in first and second, // with same name, different hash and same license f5_1 := &spdx.File2_1{ - FileName: "/project/file5.txt", - FileSPDXIdentifier: spdx.ElementID("File565"), - FileChecksumSHA1: "ba226db943bbbf455da77afab6f16dbab156d000", - LicenseConcluded: "BSD-3-Clause", + Name: "/project/file5.txt", + SPDXIdentifier: spdx.ElementID("File565"), + ChecksumSHA1: "ba226db943bbbf455da77afab6f16dbab156d000", + LicenseConcluded: "BSD-3-Clause", LicenseInfoInFile: []string{ "NOASSERTION", }, - FileCopyrightText: "NOASSERTION", + CopyrightText: "NOASSERTION", } f5_2 := &spdx.File2_1{ - FileName: "/project/file5.txt", - FileSPDXIdentifier: spdx.ElementID("File565"), - FileChecksumSHA1: "b6e0ec7d085c5699b46f6f8d425413702652874d", - LicenseConcluded: "BSD-3-Clause", + Name: "/project/file5.txt", + SPDXIdentifier: spdx.ElementID("File565"), + ChecksumSHA1: "b6e0ec7d085c5699b46f6f8d425413702652874d", + LicenseConcluded: "BSD-3-Clause", LicenseInfoInFile: []string{ "NOASSERTION", }, - FileCopyrightText: "NOASSERTION", + CopyrightText: "NOASSERTION", } // f6_1 and f6_2 will appear in first and second, // with same name, different hash and different license f6_1 := &spdx.File2_1{ - FileName: "/project/file6.txt", - FileSPDXIdentifier: spdx.ElementID("File566"), - FileChecksumSHA1: "ba226db943bbbf455da77afab6f16dbab156d000", - LicenseConcluded: "CC0-1.0", + Name: "/project/file6.txt", + SPDXIdentifier: spdx.ElementID("File566"), + ChecksumSHA1: "ba226db943bbbf455da77afab6f16dbab156d000", + LicenseConcluded: "CC0-1.0", LicenseInfoInFile: []string{ "NOASSERTION", }, - FileCopyrightText: "NOASSERTION", + CopyrightText: "NOASSERTION", } f6_2 := &spdx.File2_1{ - FileName: "/project/file6.txt", - FileSPDXIdentifier: spdx.ElementID("File566"), - FileChecksumSHA1: "b6e0ec7d085c5699b46f6f8d425413702652874d", - LicenseConcluded: "Unlicense", + Name: "/project/file6.txt", + SPDXIdentifier: spdx.ElementID("File566"), + ChecksumSHA1: "b6e0ec7d085c5699b46f6f8d425413702652874d", + LicenseConcluded: "Unlicense", LicenseInfoInFile: []string{ "NOASSERTION", }, - FileCopyrightText: "NOASSERTION", + CopyrightText: "NOASSERTION", } // create Packages p1 := &spdx.Package2_1{ - PackageName: "p1", - PackageSPDXIdentifier: spdx.ElementID("p1"), - PackageDownloadLocation: "NOASSERTION", + Name: "p1", + SPDXIdentifier: spdx.ElementID("p1"), + DownloadLocation: "NOASSERTION", FilesAnalyzed: true, IsFilesAnalyzedTagPresent: true, // fake the verification code for present purposes - PackageVerificationCode: "abc123abc123", - PackageLicenseConcluded: "NOASSERTION", - PackageLicenseInfoFromFiles: []string{ + VerificationCode: "abc123abc123", + LicenseConcluded: "NOASSERTION", + LicenseInfoFromFiles: []string{ "NOASSERTION", }, - PackageLicenseDeclared: "NOASSERTION", - PackageCopyrightText: "NOASSERTION", + LicenseDeclared: "NOASSERTION", + CopyrightText: "NOASSERTION", Files: map[spdx.ElementID]*spdx.File2_1{ - spdx.ElementID(f1.FileSPDXIdentifier): f1, - spdx.ElementID(f2.FileSPDXIdentifier): f2, - spdx.ElementID(f4_1.FileSPDXIdentifier): f4_1, - spdx.ElementID(f5_1.FileSPDXIdentifier): f5_1, - spdx.ElementID(f6_1.FileSPDXIdentifier): f6_1, + spdx.ElementID(f1.SPDXIdentifier): f1, + spdx.ElementID(f2.SPDXIdentifier): f2, + spdx.ElementID(f4_1.SPDXIdentifier): f4_1, + spdx.ElementID(f5_1.SPDXIdentifier): f5_1, + spdx.ElementID(f6_1.SPDXIdentifier): f6_1, }, } p2 := &spdx.Package2_1{ - PackageName: "p2", - PackageSPDXIdentifier: spdx.ElementID("p2"), - PackageDownloadLocation: "NOASSERTION", + Name: "p2", + SPDXIdentifier: spdx.ElementID("p2"), + DownloadLocation: "NOASSERTION", FilesAnalyzed: true, IsFilesAnalyzedTagPresent: true, // fake the verification code for present purposes - PackageVerificationCode: "def456def456", - PackageLicenseConcluded: "NOASSERTION", - PackageLicenseInfoFromFiles: []string{ + VerificationCode: "def456def456", + LicenseConcluded: "NOASSERTION", + LicenseInfoFromFiles: []string{ "NOASSERTION", }, - PackageLicenseDeclared: "NOASSERTION", - PackageCopyrightText: "NOASSERTION", + LicenseDeclared: "NOASSERTION", + CopyrightText: "NOASSERTION", Files: map[spdx.ElementID]*spdx.File2_1{ - spdx.ElementID(f1.FileSPDXIdentifier): f1, - spdx.ElementID(f3.FileSPDXIdentifier): f3, - spdx.ElementID(f4_2.FileSPDXIdentifier): f4_2, - spdx.ElementID(f5_2.FileSPDXIdentifier): f5_2, - spdx.ElementID(f6_2.FileSPDXIdentifier): f6_2, + spdx.ElementID(f1.SPDXIdentifier): f1, + spdx.ElementID(f3.SPDXIdentifier): f3, + spdx.ElementID(f4_2.SPDXIdentifier): f4_2, + spdx.ElementID(f5_2.SPDXIdentifier): f5_2, + spdx.ElementID(f6_2.SPDXIdentifier): f6_2, }, } @@ -252,152 +252,152 @@ func Test2_1DifferCanCreateDiffStructuredResults(t *testing.T) { // create files to be used in diff // f1 will be identical in both f1 := &spdx.File2_1{ - FileName: "/project/file1.txt", - FileSPDXIdentifier: spdx.ElementID("File561"), - FileChecksumSHA1: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3", - LicenseConcluded: "Apache-2.0", + Name: "/project/file1.txt", + SPDXIdentifier: spdx.ElementID("File561"), + ChecksumSHA1: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3", + LicenseConcluded: "Apache-2.0", LicenseInfoInFile: []string{ "LicenseRef-We-will-ignore-LicenseInfoInFile", }, - FileCopyrightText: "We'll ignore copyright values", + CopyrightText: "We'll ignore copyright values", } // f2 will only appear in the first Package f2 := &spdx.File2_1{ - FileName: "/project/file2.txt", - FileSPDXIdentifier: spdx.ElementID("File562"), - FileChecksumSHA1: "066c5139bd9a43d15812ec1a1755b08ccf199824", - LicenseConcluded: "GPL-2.0-or-later", + Name: "/project/file2.txt", + SPDXIdentifier: spdx.ElementID("File562"), + ChecksumSHA1: "066c5139bd9a43d15812ec1a1755b08ccf199824", + LicenseConcluded: "GPL-2.0-or-later", LicenseInfoInFile: []string{ "NOASSERTION", }, - FileCopyrightText: "NOASSERTION", + CopyrightText: "NOASSERTION", } // f3 will only appear in the second Package f3 := &spdx.File2_1{ - FileName: "/project/file3.txt", - FileSPDXIdentifier: spdx.ElementID("File563"), - FileChecksumSHA1: "bd0f4863b15fad2b79b35303af54fcb5baaf7c68", - LicenseConcluded: "MPL-2.0", + Name: "/project/file3.txt", + SPDXIdentifier: spdx.ElementID("File563"), + ChecksumSHA1: "bd0f4863b15fad2b79b35303af54fcb5baaf7c68", + LicenseConcluded: "MPL-2.0", LicenseInfoInFile: []string{ "NOASSERTION", }, - FileCopyrightText: "NOASSERTION", + CopyrightText: "NOASSERTION", } // f4_1 and f4_2 will appear in first and second, // with same name, same hash and different license f4_1 := &spdx.File2_1{ - FileName: "/project/file4.txt", - FileSPDXIdentifier: spdx.ElementID("File564"), - FileChecksumSHA1: "bc417a575ceae93435bcb7bfd382ac28cbdaa8b5", - LicenseConcluded: "MIT", + Name: "/project/file4.txt", + SPDXIdentifier: spdx.ElementID("File564"), + ChecksumSHA1: "bc417a575ceae93435bcb7bfd382ac28cbdaa8b5", + LicenseConcluded: "MIT", LicenseInfoInFile: []string{ "NOASSERTION", }, - FileCopyrightText: "NOASSERTION", + CopyrightText: "NOASSERTION", } f4_2 := &spdx.File2_1{ - FileName: "/project/file4.txt", - FileSPDXIdentifier: spdx.ElementID("File564"), - FileChecksumSHA1: "bc417a575ceae93435bcb7bfd382ac28cbdaa8b5", - LicenseConcluded: "Apache-2.0 AND MIT", + Name: "/project/file4.txt", + SPDXIdentifier: spdx.ElementID("File564"), + ChecksumSHA1: "bc417a575ceae93435bcb7bfd382ac28cbdaa8b5", + LicenseConcluded: "Apache-2.0 AND MIT", LicenseInfoInFile: []string{ "NOASSERTION", }, - FileCopyrightText: "NOASSERTION", + CopyrightText: "NOASSERTION", } // f5_1 and f5_2 will appear in first and second, // with same name, different hash and same license f5_1 := &spdx.File2_1{ - FileName: "/project/file5.txt", - FileSPDXIdentifier: spdx.ElementID("File565"), - FileChecksumSHA1: "ba226db943bbbf455da77afab6f16dbab156d000", - LicenseConcluded: "BSD-3-Clause", + Name: "/project/file5.txt", + SPDXIdentifier: spdx.ElementID("File565"), + ChecksumSHA1: "ba226db943bbbf455da77afab6f16dbab156d000", + LicenseConcluded: "BSD-3-Clause", LicenseInfoInFile: []string{ "NOASSERTION", }, - FileCopyrightText: "NOASSERTION", + CopyrightText: "NOASSERTION", } f5_2 := &spdx.File2_1{ - FileName: "/project/file5.txt", - FileSPDXIdentifier: spdx.ElementID("File565"), - FileChecksumSHA1: "b6e0ec7d085c5699b46f6f8d425413702652874d", - LicenseConcluded: "BSD-3-Clause", + Name: "/project/file5.txt", + SPDXIdentifier: spdx.ElementID("File565"), + ChecksumSHA1: "b6e0ec7d085c5699b46f6f8d425413702652874d", + LicenseConcluded: "BSD-3-Clause", LicenseInfoInFile: []string{ "NOASSERTION", }, - FileCopyrightText: "NOASSERTION", + CopyrightText: "NOASSERTION", } // f6_1 and f6_2 will appear in first and second, // with same name, different hash and different license f6_1 := &spdx.File2_1{ - FileName: "/project/file6.txt", - FileSPDXIdentifier: spdx.ElementID("File566"), - FileChecksumSHA1: "ba226db943bbbf455da77afab6f16dbab156d000", - LicenseConcluded: "CC0-1.0", + Name: "/project/file6.txt", + SPDXIdentifier: spdx.ElementID("File566"), + ChecksumSHA1: "ba226db943bbbf455da77afab6f16dbab156d000", + LicenseConcluded: "CC0-1.0", LicenseInfoInFile: []string{ "NOASSERTION", }, - FileCopyrightText: "NOASSERTION", + CopyrightText: "NOASSERTION", } f6_2 := &spdx.File2_1{ - FileName: "/project/file6.txt", - FileSPDXIdentifier: spdx.ElementID("File566"), - FileChecksumSHA1: "b6e0ec7d085c5699b46f6f8d425413702652874d", - LicenseConcluded: "Unlicense", + Name: "/project/file6.txt", + SPDXIdentifier: spdx.ElementID("File566"), + ChecksumSHA1: "b6e0ec7d085c5699b46f6f8d425413702652874d", + LicenseConcluded: "Unlicense", LicenseInfoInFile: []string{ "NOASSERTION", }, - FileCopyrightText: "NOASSERTION", + CopyrightText: "NOASSERTION", } // create Packages p1 := &spdx.Package2_1{ - PackageName: "p1", - PackageSPDXIdentifier: spdx.ElementID("p1"), - PackageDownloadLocation: "NOASSERTION", + Name: "p1", + SPDXIdentifier: spdx.ElementID("p1"), + DownloadLocation: "NOASSERTION", FilesAnalyzed: true, IsFilesAnalyzedTagPresent: true, // fake the verification code for present purposes - PackageVerificationCode: "abc123abc123", - PackageLicenseConcluded: "NOASSERTION", - PackageLicenseInfoFromFiles: []string{ + VerificationCode: "abc123abc123", + LicenseConcluded: "NOASSERTION", + LicenseInfoFromFiles: []string{ "NOASSERTION", }, - PackageLicenseDeclared: "NOASSERTION", - PackageCopyrightText: "NOASSERTION", + LicenseDeclared: "NOASSERTION", + CopyrightText: "NOASSERTION", Files: map[spdx.ElementID]*spdx.File2_1{ - spdx.ElementID(f1.FileSPDXIdentifier): f1, - spdx.ElementID(f2.FileSPDXIdentifier): f2, - spdx.ElementID(f4_1.FileSPDXIdentifier): f4_1, - spdx.ElementID(f5_1.FileSPDXIdentifier): f5_1, - spdx.ElementID(f6_1.FileSPDXIdentifier): f6_1, + spdx.ElementID(f1.SPDXIdentifier): f1, + spdx.ElementID(f2.SPDXIdentifier): f2, + spdx.ElementID(f4_1.SPDXIdentifier): f4_1, + spdx.ElementID(f5_1.SPDXIdentifier): f5_1, + spdx.ElementID(f6_1.SPDXIdentifier): f6_1, }, } p2 := &spdx.Package2_1{ - PackageName: "p2", - PackageSPDXIdentifier: spdx.ElementID("p2"), - PackageDownloadLocation: "NOASSERTION", + Name: "p2", + SPDXIdentifier: spdx.ElementID("p2"), + DownloadLocation: "NOASSERTION", FilesAnalyzed: true, IsFilesAnalyzedTagPresent: true, // fake the verification code for present purposes - PackageVerificationCode: "def456def456", - PackageLicenseConcluded: "NOASSERTION", - PackageLicenseInfoFromFiles: []string{ + VerificationCode: "def456def456", + LicenseConcluded: "NOASSERTION", + LicenseInfoFromFiles: []string{ "NOASSERTION", }, - PackageLicenseDeclared: "NOASSERTION", - PackageCopyrightText: "NOASSERTION", + LicenseDeclared: "NOASSERTION", + CopyrightText: "NOASSERTION", Files: map[spdx.ElementID]*spdx.File2_1{ - spdx.ElementID(f1.FileSPDXIdentifier): f1, - spdx.ElementID(f3.FileSPDXIdentifier): f3, - spdx.ElementID(f4_2.FileSPDXIdentifier): f4_2, - spdx.ElementID(f5_2.FileSPDXIdentifier): f5_2, - spdx.ElementID(f6_2.FileSPDXIdentifier): f6_2, + spdx.ElementID(f1.SPDXIdentifier): f1, + spdx.ElementID(f3.SPDXIdentifier): f3, + spdx.ElementID(f4_2.SPDXIdentifier): f4_2, + spdx.ElementID(f5_2.SPDXIdentifier): f5_2, + spdx.ElementID(f6_2.SPDXIdentifier): f6_2, }, } @@ -499,152 +499,152 @@ func Test2_2DifferCanCreateDiffPairs(t *testing.T) { // create files to be used in diff // f1 will be identical in both f1 := &spdx.File2_2{ - FileName: "/project/file1.txt", - FileSPDXIdentifier: spdx.ElementID("File561"), - FileChecksumSHA1: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3", - LicenseConcluded: "Apache-2.0", + Name: "/project/file1.txt", + SPDXIdentifier: spdx.ElementID("File561"), + ChecksumSHA1: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3", + LicenseConcluded: "Apache-2.0", LicenseInfoInFile: []string{ "LicenseRef-We-will-ignore-LicenseInfoInFile", }, - FileCopyrightText: "We'll ignore copyright values", + CopyrightText: "We'll ignore copyright values", } // f2 will only appear in the first Package f2 := &spdx.File2_2{ - FileName: "/project/file2.txt", - FileSPDXIdentifier: spdx.ElementID("File562"), - FileChecksumSHA1: "066c5139bd9a43d15812ec1a1755b08ccf199824", - LicenseConcluded: "GPL-2.0-or-later", + Name: "/project/file2.txt", + SPDXIdentifier: spdx.ElementID("File562"), + ChecksumSHA1: "066c5139bd9a43d15812ec1a1755b08ccf199824", + LicenseConcluded: "GPL-2.0-or-later", LicenseInfoInFile: []string{ "NOASSERTION", }, - FileCopyrightText: "NOASSERTION", + CopyrightText: "NOASSERTION", } // f3 will only appear in the second Package f3 := &spdx.File2_2{ - FileName: "/project/file3.txt", - FileSPDXIdentifier: spdx.ElementID("File563"), - FileChecksumSHA1: "bd0f4863b15fad2b79b35303af54fcb5baaf7c68", - LicenseConcluded: "MPL-2.0", + Name: "/project/file3.txt", + SPDXIdentifier: spdx.ElementID("File563"), + ChecksumSHA1: "bd0f4863b15fad2b79b35303af54fcb5baaf7c68", + LicenseConcluded: "MPL-2.0", LicenseInfoInFile: []string{ "NOASSERTION", }, - FileCopyrightText: "NOASSERTION", + CopyrightText: "NOASSERTION", } // f4_1 and f4_2 will appear in first and second, // with same name, same hash and different license f4_1 := &spdx.File2_2{ - FileName: "/project/file4.txt", - FileSPDXIdentifier: spdx.ElementID("File564"), - FileChecksumSHA1: "bc417a575ceae93435bcb7bfd382ac28cbdaa8b5", - LicenseConcluded: "MIT", + Name: "/project/file4.txt", + SPDXIdentifier: spdx.ElementID("File564"), + ChecksumSHA1: "bc417a575ceae93435bcb7bfd382ac28cbdaa8b5", + LicenseConcluded: "MIT", LicenseInfoInFile: []string{ "NOASSERTION", }, - FileCopyrightText: "NOASSERTION", + CopyrightText: "NOASSERTION", } f4_2 := &spdx.File2_2{ - FileName: "/project/file4.txt", - FileSPDXIdentifier: spdx.ElementID("File564"), - FileChecksumSHA1: "bc417a575ceae93435bcb7bfd382ac28cbdaa8b5", - LicenseConcluded: "Apache-2.0 AND MIT", + Name: "/project/file4.txt", + SPDXIdentifier: spdx.ElementID("File564"), + ChecksumSHA1: "bc417a575ceae93435bcb7bfd382ac28cbdaa8b5", + LicenseConcluded: "Apache-2.0 AND MIT", LicenseInfoInFile: []string{ "NOASSERTION", }, - FileCopyrightText: "NOASSERTION", + CopyrightText: "NOASSERTION", } // f5_1 and f5_2 will appear in first and second, // with same name, different hash and same license f5_1 := &spdx.File2_2{ - FileName: "/project/file5.txt", - FileSPDXIdentifier: spdx.ElementID("File565"), - FileChecksumSHA1: "ba226db943bbbf455da77afab6f16dbab156d000", - LicenseConcluded: "BSD-3-Clause", + Name: "/project/file5.txt", + SPDXIdentifier: spdx.ElementID("File565"), + ChecksumSHA1: "ba226db943bbbf455da77afab6f16dbab156d000", + LicenseConcluded: "BSD-3-Clause", LicenseInfoInFile: []string{ "NOASSERTION", }, - FileCopyrightText: "NOASSERTION", + CopyrightText: "NOASSERTION", } f5_2 := &spdx.File2_2{ - FileName: "/project/file5.txt", - FileSPDXIdentifier: spdx.ElementID("File565"), - FileChecksumSHA1: "b6e0ec7d085c5699b46f6f8d425413702652874d", - LicenseConcluded: "BSD-3-Clause", + Name: "/project/file5.txt", + SPDXIdentifier: spdx.ElementID("File565"), + ChecksumSHA1: "b6e0ec7d085c5699b46f6f8d425413702652874d", + LicenseConcluded: "BSD-3-Clause", LicenseInfoInFile: []string{ "NOASSERTION", }, - FileCopyrightText: "NOASSERTION", + CopyrightText: "NOASSERTION", } // f6_1 and f6_2 will appear in first and second, // with same name, different hash and different license f6_1 := &spdx.File2_2{ - FileName: "/project/file6.txt", - FileSPDXIdentifier: spdx.ElementID("File566"), - FileChecksumSHA1: "ba226db943bbbf455da77afab6f16dbab156d000", - LicenseConcluded: "CC0-1.0", + Name: "/project/file6.txt", + SPDXIdentifier: spdx.ElementID("File566"), + ChecksumSHA1: "ba226db943bbbf455da77afab6f16dbab156d000", + LicenseConcluded: "CC0-1.0", LicenseInfoInFile: []string{ "NOASSERTION", }, - FileCopyrightText: "NOASSERTION", + CopyrightText: "NOASSERTION", } f6_2 := &spdx.File2_2{ - FileName: "/project/file6.txt", - FileSPDXIdentifier: spdx.ElementID("File566"), - FileChecksumSHA1: "b6e0ec7d085c5699b46f6f8d425413702652874d", - LicenseConcluded: "Unlicense", + Name: "/project/file6.txt", + SPDXIdentifier: spdx.ElementID("File566"), + ChecksumSHA1: "b6e0ec7d085c5699b46f6f8d425413702652874d", + LicenseConcluded: "Unlicense", LicenseInfoInFile: []string{ "NOASSERTION", }, - FileCopyrightText: "NOASSERTION", + CopyrightText: "NOASSERTION", } // create Packages p1 := &spdx.Package2_2{ - PackageName: "p1", - PackageSPDXIdentifier: spdx.ElementID("p1"), - PackageDownloadLocation: "NOASSERTION", + Name: "p1", + SPDXIdentifier: spdx.ElementID("p1"), + DownloadLocation: "NOASSERTION", FilesAnalyzed: true, IsFilesAnalyzedTagPresent: true, // fake the verification code for present purposes - PackageVerificationCode: "abc123abc123", - PackageLicenseConcluded: "NOASSERTION", - PackageLicenseInfoFromFiles: []string{ + VerificationCode: "abc123abc123", + LicenseConcluded: "NOASSERTION", + LicenseInfoFromFiles: []string{ "NOASSERTION", }, - PackageLicenseDeclared: "NOASSERTION", - PackageCopyrightText: "NOASSERTION", + LicenseDeclared: "NOASSERTION", + CopyrightText: "NOASSERTION", Files: map[spdx.ElementID]*spdx.File2_2{ - spdx.ElementID(f1.FileSPDXIdentifier): f1, - spdx.ElementID(f2.FileSPDXIdentifier): f2, - spdx.ElementID(f4_1.FileSPDXIdentifier): f4_1, - spdx.ElementID(f5_1.FileSPDXIdentifier): f5_1, - spdx.ElementID(f6_1.FileSPDXIdentifier): f6_1, + spdx.ElementID(f1.SPDXIdentifier): f1, + spdx.ElementID(f2.SPDXIdentifier): f2, + spdx.ElementID(f4_1.SPDXIdentifier): f4_1, + spdx.ElementID(f5_1.SPDXIdentifier): f5_1, + spdx.ElementID(f6_1.SPDXIdentifier): f6_1, }, } p2 := &spdx.Package2_2{ - PackageName: "p2", - PackageSPDXIdentifier: spdx.ElementID("p2"), - PackageDownloadLocation: "NOASSERTION", + Name: "p2", + SPDXIdentifier: spdx.ElementID("p2"), + DownloadLocation: "NOASSERTION", FilesAnalyzed: true, IsFilesAnalyzedTagPresent: true, // fake the verification code for present purposes - PackageVerificationCode: "def456def456", - PackageLicenseConcluded: "NOASSERTION", - PackageLicenseInfoFromFiles: []string{ + VerificationCode: "def456def456", + LicenseConcluded: "NOASSERTION", + LicenseInfoFromFiles: []string{ "NOASSERTION", }, - PackageLicenseDeclared: "NOASSERTION", - PackageCopyrightText: "NOASSERTION", + LicenseDeclared: "NOASSERTION", + CopyrightText: "NOASSERTION", Files: map[spdx.ElementID]*spdx.File2_2{ - spdx.ElementID(f1.FileSPDXIdentifier): f1, - spdx.ElementID(f3.FileSPDXIdentifier): f3, - spdx.ElementID(f4_2.FileSPDXIdentifier): f4_2, - spdx.ElementID(f5_2.FileSPDXIdentifier): f5_2, - spdx.ElementID(f6_2.FileSPDXIdentifier): f6_2, + spdx.ElementID(f1.SPDXIdentifier): f1, + spdx.ElementID(f3.SPDXIdentifier): f3, + spdx.ElementID(f4_2.SPDXIdentifier): f4_2, + spdx.ElementID(f5_2.SPDXIdentifier): f5_2, + spdx.ElementID(f6_2.SPDXIdentifier): f6_2, }, } @@ -738,152 +738,152 @@ func Test2_2DifferCanCreateDiffStructuredResults(t *testing.T) { // create files to be used in diff // f1 will be identical in both f1 := &spdx.File2_2{ - FileName: "/project/file1.txt", - FileSPDXIdentifier: spdx.ElementID("File561"), - FileChecksumSHA1: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3", - LicenseConcluded: "Apache-2.0", + Name: "/project/file1.txt", + SPDXIdentifier: spdx.ElementID("File561"), + ChecksumSHA1: "6c92dc8bc462b6889d9b1c0bc16c54d19a2cbdd3", + LicenseConcluded: "Apache-2.0", LicenseInfoInFile: []string{ "LicenseRef-We-will-ignore-LicenseInfoInFile", }, - FileCopyrightText: "We'll ignore copyright values", + CopyrightText: "We'll ignore copyright values", } // f2 will only appear in the first Package f2 := &spdx.File2_2{ - FileName: "/project/file2.txt", - FileSPDXIdentifier: spdx.ElementID("File562"), - FileChecksumSHA1: "066c5139bd9a43d15812ec1a1755b08ccf199824", - LicenseConcluded: "GPL-2.0-or-later", + Name: "/project/file2.txt", + SPDXIdentifier: spdx.ElementID("File562"), + ChecksumSHA1: "066c5139bd9a43d15812ec1a1755b08ccf199824", + LicenseConcluded: "GPL-2.0-or-later", LicenseInfoInFile: []string{ "NOASSERTION", }, - FileCopyrightText: "NOASSERTION", + CopyrightText: "NOASSERTION", } // f3 will only appear in the second Package f3 := &spdx.File2_2{ - FileName: "/project/file3.txt", - FileSPDXIdentifier: spdx.ElementID("File563"), - FileChecksumSHA1: "bd0f4863b15fad2b79b35303af54fcb5baaf7c68", - LicenseConcluded: "MPL-2.0", + Name: "/project/file3.txt", + SPDXIdentifier: spdx.ElementID("File563"), + ChecksumSHA1: "bd0f4863b15fad2b79b35303af54fcb5baaf7c68", + LicenseConcluded: "MPL-2.0", LicenseInfoInFile: []string{ "NOASSERTION", }, - FileCopyrightText: "NOASSERTION", + CopyrightText: "NOASSERTION", } // f4_1 and f4_2 will appear in first and second, // with same name, same hash and different license f4_1 := &spdx.File2_2{ - FileName: "/project/file4.txt", - FileSPDXIdentifier: spdx.ElementID("File564"), - FileChecksumSHA1: "bc417a575ceae93435bcb7bfd382ac28cbdaa8b5", - LicenseConcluded: "MIT", + Name: "/project/file4.txt", + SPDXIdentifier: spdx.ElementID("File564"), + ChecksumSHA1: "bc417a575ceae93435bcb7bfd382ac28cbdaa8b5", + LicenseConcluded: "MIT", LicenseInfoInFile: []string{ "NOASSERTION", }, - FileCopyrightText: "NOASSERTION", + CopyrightText: "NOASSERTION", } f4_2 := &spdx.File2_2{ - FileName: "/project/file4.txt", - FileSPDXIdentifier: spdx.ElementID("File564"), - FileChecksumSHA1: "bc417a575ceae93435bcb7bfd382ac28cbdaa8b5", - LicenseConcluded: "Apache-2.0 AND MIT", + Name: "/project/file4.txt", + SPDXIdentifier: spdx.ElementID("File564"), + ChecksumSHA1: "bc417a575ceae93435bcb7bfd382ac28cbdaa8b5", + LicenseConcluded: "Apache-2.0 AND MIT", LicenseInfoInFile: []string{ "NOASSERTION", }, - FileCopyrightText: "NOASSERTION", + CopyrightText: "NOASSERTION", } // f5_1 and f5_2 will appear in first and second, // with same name, different hash and same license f5_1 := &spdx.File2_2{ - FileName: "/project/file5.txt", - FileSPDXIdentifier: spdx.ElementID("File565"), - FileChecksumSHA1: "ba226db943bbbf455da77afab6f16dbab156d000", - LicenseConcluded: "BSD-3-Clause", + Name: "/project/file5.txt", + SPDXIdentifier: spdx.ElementID("File565"), + ChecksumSHA1: "ba226db943bbbf455da77afab6f16dbab156d000", + LicenseConcluded: "BSD-3-Clause", LicenseInfoInFile: []string{ "NOASSERTION", }, - FileCopyrightText: "NOASSERTION", + CopyrightText: "NOASSERTION", } f5_2 := &spdx.File2_2{ - FileName: "/project/file5.txt", - FileSPDXIdentifier: spdx.ElementID("File565"), - FileChecksumSHA1: "b6e0ec7d085c5699b46f6f8d425413702652874d", - LicenseConcluded: "BSD-3-Clause", + Name: "/project/file5.txt", + SPDXIdentifier: spdx.ElementID("File565"), + ChecksumSHA1: "b6e0ec7d085c5699b46f6f8d425413702652874d", + LicenseConcluded: "BSD-3-Clause", LicenseInfoInFile: []string{ "NOASSERTION", }, - FileCopyrightText: "NOASSERTION", + CopyrightText: "NOASSERTION", } // f6_1 and f6_2 will appear in first and second, // with same name, different hash and different license f6_1 := &spdx.File2_2{ - FileName: "/project/file6.txt", - FileSPDXIdentifier: spdx.ElementID("File566"), - FileChecksumSHA1: "ba226db943bbbf455da77afab6f16dbab156d000", - LicenseConcluded: "CC0-1.0", + Name: "/project/file6.txt", + SPDXIdentifier: spdx.ElementID("File566"), + ChecksumSHA1: "ba226db943bbbf455da77afab6f16dbab156d000", + LicenseConcluded: "CC0-1.0", LicenseInfoInFile: []string{ "NOASSERTION", }, - FileCopyrightText: "NOASSERTION", + CopyrightText: "NOASSERTION", } f6_2 := &spdx.File2_2{ - FileName: "/project/file6.txt", - FileSPDXIdentifier: spdx.ElementID("File566"), - FileChecksumSHA1: "b6e0ec7d085c5699b46f6f8d425413702652874d", - LicenseConcluded: "Unlicense", + Name: "/project/file6.txt", + SPDXIdentifier: spdx.ElementID("File566"), + ChecksumSHA1: "b6e0ec7d085c5699b46f6f8d425413702652874d", + LicenseConcluded: "Unlicense", LicenseInfoInFile: []string{ "NOASSERTION", }, - FileCopyrightText: "NOASSERTION", + CopyrightText: "NOASSERTION", } // create Packages p1 := &spdx.Package2_2{ - PackageName: "p1", - PackageSPDXIdentifier: spdx.ElementID("p1"), - PackageDownloadLocation: "NOASSERTION", + Name: "p1", + SPDXIdentifier: spdx.ElementID("p1"), + DownloadLocation: "NOASSERTION", FilesAnalyzed: true, IsFilesAnalyzedTagPresent: true, // fake the verification code for present purposes - PackageVerificationCode: "abc123abc123", - PackageLicenseConcluded: "NOASSERTION", - PackageLicenseInfoFromFiles: []string{ + VerificationCode: "abc123abc123", + LicenseConcluded: "NOASSERTION", + LicenseInfoFromFiles: []string{ "NOASSERTION", }, - PackageLicenseDeclared: "NOASSERTION", - PackageCopyrightText: "NOASSERTION", + LicenseDeclared: "NOASSERTION", + CopyrightText: "NOASSERTION", Files: map[spdx.ElementID]*spdx.File2_2{ - spdx.ElementID(f1.FileSPDXIdentifier): f1, - spdx.ElementID(f2.FileSPDXIdentifier): f2, - spdx.ElementID(f4_1.FileSPDXIdentifier): f4_1, - spdx.ElementID(f5_1.FileSPDXIdentifier): f5_1, - spdx.ElementID(f6_1.FileSPDXIdentifier): f6_1, + spdx.ElementID(f1.SPDXIdentifier): f1, + spdx.ElementID(f2.SPDXIdentifier): f2, + spdx.ElementID(f4_1.SPDXIdentifier): f4_1, + spdx.ElementID(f5_1.SPDXIdentifier): f5_1, + spdx.ElementID(f6_1.SPDXIdentifier): f6_1, }, } p2 := &spdx.Package2_2{ - PackageName: "p2", - PackageSPDXIdentifier: spdx.ElementID("p2"), - PackageDownloadLocation: "NOASSERTION", + Name: "p2", + SPDXIdentifier: spdx.ElementID("p2"), + DownloadLocation: "NOASSERTION", FilesAnalyzed: true, IsFilesAnalyzedTagPresent: true, // fake the verification code for present purposes - PackageVerificationCode: "def456def456", - PackageLicenseConcluded: "NOASSERTION", - PackageLicenseInfoFromFiles: []string{ + VerificationCode: "def456def456", + LicenseConcluded: "NOASSERTION", + LicenseInfoFromFiles: []string{ "NOASSERTION", }, - PackageLicenseDeclared: "NOASSERTION", - PackageCopyrightText: "NOASSERTION", + LicenseDeclared: "NOASSERTION", + CopyrightText: "NOASSERTION", Files: map[spdx.ElementID]*spdx.File2_2{ - spdx.ElementID(f1.FileSPDXIdentifier): f1, - spdx.ElementID(f3.FileSPDXIdentifier): f3, - spdx.ElementID(f4_2.FileSPDXIdentifier): f4_2, - spdx.ElementID(f5_2.FileSPDXIdentifier): f5_2, - spdx.ElementID(f6_2.FileSPDXIdentifier): f6_2, + spdx.ElementID(f1.SPDXIdentifier): f1, + spdx.ElementID(f3.SPDXIdentifier): f3, + spdx.ElementID(f4_2.SPDXIdentifier): f4_2, + spdx.ElementID(f5_2.SPDXIdentifier): f5_2, + spdx.ElementID(f6_2.SPDXIdentifier): f6_2, }, } diff --git a/rdfloader/parser2v2/parse_annotation.go b/rdfloader/parser2v2/parse_annotation.go index 92a56100..757e8a2a 100644 --- a/rdfloader/parser2v2/parse_annotation.go +++ b/rdfloader/parser2v2/parse_annotation.go @@ -21,10 +21,10 @@ func (parser *rdfParser2_2) parseAnnotationFromNode(node *gordfParser.Node) (err err = setAnnotatorFromString(subTriple.Object.ID, ann) case SPDX_ANNOTATION_DATE: // cardinality: exactly 1 - ann.AnnotationDate = subTriple.Object.ID + ann.Date = subTriple.Object.ID case RDFS_COMMENT: // cardinality: exactly 1 - ann.AnnotationComment = subTriple.Object.ID + ann.Comment = subTriple.Object.ID case SPDX_ANNOTATION_TYPE: // cardinality: exactly 1 err = setAnnotationType(subTriple.Object.ID, ann) @@ -70,9 +70,9 @@ func setAnnotatorFromString(annotatorString string, ann *spdx.Annotation2_2) err func setAnnotationType(annType string, ann *spdx.Annotation2_2) error { switch annType { case SPDX_ANNOTATION_TYPE_OTHER: - ann.AnnotationType = "OTHER" + ann.Type = "OTHER" case SPDX_ANNOTATION_TYPE_REVIEW: - ann.AnnotationType = "REVIEW" + ann.Type = "REVIEW" default: return fmt.Errorf("unknown annotation type %s", annType) } diff --git a/rdfloader/parser2v2/parse_annotation_test.go b/rdfloader/parser2v2/parse_annotation_test.go index 49a099d4..5c0c4414 100644 --- a/rdfloader/parser2v2/parse_annotation_test.go +++ b/rdfloader/parser2v2/parse_annotation_test.go @@ -58,8 +58,8 @@ func Test_setAnnotationType(t *testing.T) { if err != nil { t.Errorf("unexpected error: %v", err) } - if ann.AnnotationType != "OTHER" { - t.Errorf("expected: OTHER, found: %s", ann.AnnotationType) + if ann.Type != "OTHER" { + t.Errorf("expected: OTHER, found: %s", ann.Type) } // TestCase 4: valid input (annotationType_review) @@ -67,8 +67,8 @@ func Test_setAnnotationType(t *testing.T) { if err != nil { t.Errorf("unexpected error: %v", err) } - if ann.AnnotationType != "REVIEW" { - t.Errorf("expected: REVIEW, found: %s", ann.AnnotationType) + if ann.Type != "REVIEW" { + t.Errorf("expected: REVIEW, found: %s", ann.Type) } } @@ -161,12 +161,12 @@ func Test_rdfParser2_2_parseAnnotationFromNode(t *testing.T) { ann := parser.doc.Annotations[0] // validating all the attributes of the annotations expectedComment := "Document level annotation" - if ann.AnnotationComment != expectedComment { - t.Errorf(`expected: "%s", found "%s"`, expectedComment, ann.AnnotationComment) + if ann.Comment != expectedComment { + t.Errorf(`expected: "%s", found "%s"`, expectedComment, ann.Comment) } expectedDate := "2010-01-29T18:30:22Z" - if expectedDate != ann.AnnotationDate { - t.Errorf(`expected: "%s", found "%s"`, expectedDate, ann.AnnotationDate) + if expectedDate != ann.Date { + t.Errorf(`expected: "%s", found "%s"`, expectedDate, ann.Date) } expectedAnnotator := "Jane Doe" if expectedAnnotator != ann.Annotator { @@ -176,7 +176,7 @@ func Test_rdfParser2_2_parseAnnotationFromNode(t *testing.T) { t.Errorf(`expected: "%s", found "%s"`, "Person", ann.AnnotatorType) } expectedAnnotationType := "OTHER" - if expectedAnnotationType != ann.AnnotationType { - t.Errorf(`expected: "%s", found "%s"`, expectedAnnotationType, ann.AnnotationType) + if expectedAnnotationType != ann.Type { + t.Errorf(`expected: "%s", found "%s"`, expectedAnnotationType, ann.Type) } } diff --git a/rdfloader/parser2v2/parse_file.go b/rdfloader/parser2v2/parse_file.go index 647cef92..4def9fe5 100644 --- a/rdfloader/parser2v2/parse_file.go +++ b/rdfloader/parser2v2/parse_file.go @@ -26,7 +26,7 @@ func (parser *rdfParser2_2) getFileFromNode(fileNode *gordfParser.Node) (file *s } // setting color to grey to indicate that we've started parsing this node. - parser.cache[fileNode.ID].Color = GREY; + parser.cache[fileNode.ID].Color = GREY // setting color to black just before function returns to the caller to // indicate that parsing current node is complete. @@ -37,7 +37,7 @@ func (parser *rdfParser2_2) getFileFromNode(fileNode *gordfParser.Node) (file *s return nil, err } - if existingFile := parser.files[file.FileSPDXIdentifier]; existingFile != nil { + if existingFile := parser.files[file.SPDXIdentifier]; existingFile != nil { file = existingFile } @@ -45,7 +45,7 @@ func (parser *rdfParser2_2) getFileFromNode(fileNode *gordfParser.Node) (file *s switch subTriple.Predicate.ID { case SPDX_FILE_NAME: // 4.1 // cardinality: exactly 1 - file.FileName = subTriple.Object.ID + file.Name = subTriple.Object.ID case SPDX_NAME: // cardinality: exactly 1 // TODO: check where it will be set in the golang-tools spdx-data-model @@ -55,7 +55,7 @@ func (parser *rdfParser2_2) getFileFromNode(fileNode *gordfParser.Node) (file *s // cardinality: min 0 fileType := "" fileType, err = parser.getFileTypeFromUri(subTriple.Object.ID) - file.FileType = append(file.FileType, fileType) + file.Type = append(file.Type, fileType) case SPDX_CHECKSUM: // 4.4 // cardinality: min 1 err = parser.setFileChecksumFromNode(file, subTriple.Object) @@ -79,7 +79,7 @@ func (parser *rdfParser2_2) getFileFromNode(fileNode *gordfParser.Node) (file *s // TODO: allow copyright text to be of type NOASSERTION case SPDX_COPYRIGHT_TEXT: // 4.8 // cardinality: exactly 1 - file.FileCopyrightText = subTriple.Object.ID + file.CopyrightText = subTriple.Object.ID case SPDX_LICENSE_INFO_FROM_FILES: // TODO: implement it. It is not defined in the tools-golang model. // deprecated artifactOf (see sections 4.9, 4.10, 4.11) @@ -90,23 +90,23 @@ func (parser *rdfParser2_2) getFileFromNode(fileNode *gordfParser.Node) (file *s file.ArtifactOfProjects = append(file.ArtifactOfProjects, artifactOf) case RDFS_COMMENT: // 4.12 // cardinality: max 1 - file.FileComment = subTriple.Object.ID + file.Comment = subTriple.Object.ID case SPDX_NOTICE_TEXT: // 4.13 // cardinality: max 1 - file.FileNotice = getNoticeTextFromNode(subTriple.Object) + file.Notice = getNoticeTextFromNode(subTriple.Object) case SPDX_FILE_CONTRIBUTOR: // 4.14 // cardinality: min 0 - file.FileContributor = append(file.FileContributor, subTriple.Object.ID) + file.Contributor = append(file.Contributor, subTriple.Object.ID) case SPDX_FILE_DEPENDENCY: // cardinality: min 0 newFile, err := parser.getFileFromNode(subTriple.Object) if err != nil { return nil, fmt.Errorf("error setting a file dependency in a file: %v", err) } - file.FileDependencies = append(file.FileDependencies, string(newFile.FileSPDXIdentifier)) + file.Dependencies = append(file.Dependencies, string(newFile.SPDXIdentifier)) case SPDX_ATTRIBUTION_TEXT: // cardinality: min 0 - file.FileAttributionTexts = append(file.FileAttributionTexts, subTriple.Object.ID) + file.AttributionTexts = append(file.AttributionTexts, subTriple.Object.ID) case SPDX_ANNOTATION: // cardinality: min 0 err = parser.parseAnnotationFromNode(subTriple.Object) @@ -120,7 +120,7 @@ func (parser *rdfParser2_2) getFileFromNode(fileNode *gordfParser.Node) (file *s return nil, err } } - parser.files[file.FileSPDXIdentifier] = file + parser.files[file.SPDXIdentifier] = file return file, nil } @@ -131,11 +131,11 @@ func (parser *rdfParser2_2) setFileChecksumFromNode(file *spdx.File2_2, checksum } switch checksumAlgorithm { case "MD5": - file.FileChecksumMD5 = checksumValue + file.ChecksumMD5 = checksumValue case "SHA1": - file.FileChecksumSHA1 = checksumValue + file.ChecksumSHA1 = checksumValue case "SHA256": - file.FileChecksumSHA256 = checksumValue + file.ChecksumSHA256 = checksumValue case "": return fmt.Errorf("empty checksum algorithm and value") default: @@ -189,7 +189,7 @@ func (parser *rdfParser2_2) setUnpackagedFiles() { func setFileIdentifier(idURI string, file *spdx.File2_2) (err error) { idURI = strings.TrimSpace(idURI) uriFragment := getLastPartOfURI(idURI) - file.FileSPDXIdentifier, err = ExtractElementID(uriFragment) + file.SPDXIdentifier, err = ExtractElementID(uriFragment) if err != nil { return fmt.Errorf("error setting file identifier: %s", err) } diff --git a/rdfloader/parser2v2/parse_file_test.go b/rdfloader/parser2v2/parse_file_test.go index 4d7c8b33..0e2735b3 100644 --- a/rdfloader/parser2v2/parse_file_test.go +++ b/rdfloader/parser2v2/parse_file_test.go @@ -142,17 +142,17 @@ func Test_rdfParser2_2_setUnpackagedFiles(t *testing.T) { // unpackaged files are the files which are not associated with any package // file associated with a package sets parser.assocWithPackage[fileID] to true. rdfParser, _ := parserFromBodyContent(``) - file1 := &spdx.File2_2{FileSPDXIdentifier: spdx.ElementID("file1")} - file2 := &spdx.File2_2{FileSPDXIdentifier: spdx.ElementID("file2")} - file3 := &spdx.File2_2{FileSPDXIdentifier: spdx.ElementID("file3")} + file1 := &spdx.File2_2{SPDXIdentifier: spdx.ElementID("file1")} + file2 := &spdx.File2_2{SPDXIdentifier: spdx.ElementID("file2")} + file3 := &spdx.File2_2{SPDXIdentifier: spdx.ElementID("file3")} // setting files to the document as if it were to be set when it was parsed using triples. - rdfParser.files[file1.FileSPDXIdentifier] = file1 - rdfParser.files[file2.FileSPDXIdentifier] = file2 - rdfParser.files[file3.FileSPDXIdentifier] = file3 + rdfParser.files[file1.SPDXIdentifier] = file1 + rdfParser.files[file2.SPDXIdentifier] = file2 + rdfParser.files[file3.SPDXIdentifier] = file3 // assuming file1 is associated with a package - rdfParser.assocWithPackage[file1.FileSPDXIdentifier] = true + rdfParser.assocWithPackage[file1.SPDXIdentifier] = true rdfParser.setUnpackagedFiles() @@ -180,8 +180,8 @@ func Test_setFileIdentifier(t *testing.T) { if err != nil { t.Errorf("unexpected error: %v", err) } - if file.FileSPDXIdentifier != "129" { - t.Errorf("expected %s, found: %s", "129", file.FileSPDXIdentifier) + if file.SPDXIdentifier != "129" { + t.Errorf("expected %s, found: %s", "129", file.SPDXIdentifier) } // TestCase 2: invalid example @@ -206,13 +206,13 @@ func Test_rdfParser2_2_setFileChecksumFromNode(t *testing.T) { t.Errorf("error parsing a valid checksum node") } checksumValue := "d2356e0fe1c0b85285d83c6b2ad51b5f" - if file.FileChecksumMD5 != checksumValue { - t.Errorf("wrong checksum value for md5. Expected: %s, found: %s", checksumValue, file.FileChecksumMD5) + if file.ChecksumMD5 != checksumValue { + t.Errorf("wrong checksum value for md5. Expected: %s, found: %s", checksumValue, file.ChecksumMD5) } - if file.FileChecksumSHA1 != "" { + if file.ChecksumSHA1 != "" { t.Errorf("incorrectly set sha1, should've been empty") } - if file.FileChecksumSHA256 != "" { + if file.ChecksumSHA256 != "" { t.Errorf("incorrectly set sha256, should've been empty") } @@ -229,13 +229,13 @@ func Test_rdfParser2_2_setFileChecksumFromNode(t *testing.T) { if err != nil { t.Errorf("error parsing a valid checksum node") } - if file.FileChecksumSHA1 != checksumValue { - t.Errorf("wrong checksum value for sha1. Expected: %s, found: %s", checksumValue, file.FileChecksumSHA1) + if file.ChecksumSHA1 != checksumValue { + t.Errorf("wrong checksum value for sha1. Expected: %s, found: %s", checksumValue, file.ChecksumSHA1) } - if file.FileChecksumMD5 != "" { + if file.ChecksumMD5 != "" { t.Errorf("incorrectly set md5, should've been empty") } - if file.FileChecksumSHA256 != "" { + if file.ChecksumSHA256 != "" { t.Errorf("incorrectly set sha256, should've been empty") } @@ -252,13 +252,13 @@ func Test_rdfParser2_2_setFileChecksumFromNode(t *testing.T) { if err != nil { t.Errorf("error parsing a valid checksum node") } - if file.FileChecksumSHA256 != checksumValue { - t.Errorf("wrong checksum value for sha256. Expected: %s, found: %s", checksumValue, file.FileChecksumSHA256) + if file.ChecksumSHA256 != checksumValue { + t.Errorf("wrong checksum value for sha256. Expected: %s, found: %s", checksumValue, file.ChecksumSHA256) } - if file.FileChecksumMD5 != "" { + if file.ChecksumMD5 != "" { t.Errorf("incorrectly set md5, should've been empty") } - if file.FileChecksumSHA1 != "" { + if file.ChecksumSHA1 != "" { t.Errorf("incorrectly set sha1, should've been empty") } @@ -478,23 +478,22 @@ func Test_rdfParser2_2_getFileFromNode(t *testing.T) { // checking if all the attributes that spanned over a several tags are set in the same variable. expectedFileName := "time-1.9/ChangeLog" - if file.FileName != expectedFileName { - t.Errorf("expected %s, found %s", expectedFileName, file.FileName) + if file.Name != expectedFileName { + t.Errorf("expected %s, found %s", expectedFileName, file.Name) } expectedLicenseConcluded := "NOASSERTION" if file.LicenseConcluded != expectedLicenseConcluded { t.Errorf("expected %s, found %s", expectedLicenseConcluded, file.LicenseConcluded) } expectedFileType := "source" - if file.FileType[0] != expectedFileType { - t.Errorf("expected %s, found %s", expectedFileType, file.FileType) + if file.Type[0] != expectedFileType { + t.Errorf("expected %s, found %s", expectedFileType, file.Type) } expectedLicenseInfoInFile := "NOASSERTION" if file.LicenseInfoInFile[0] != expectedLicenseInfoInFile { t.Errorf("expected %s, found %s", expectedLicenseInfoInFile, file.LicenseInfoInFile[0]) } - // TestCase 12: checking if recursive dependencies are resolved. parser, _ = parserFromBodyContent(` @@ -565,21 +564,21 @@ func Test_rdfParser2_2_getFileFromNode(t *testing.T) { // checking each and every attribute of the obtained file. expectedFileName = "time-1.9/ChangeLog" - if file.FileName != expectedFileName { - t.Errorf("expected %s, found %s", expectedFileName, file.FileName) + if file.Name != expectedFileName { + t.Errorf("expected %s, found %s", expectedFileName, file.Name) } - if len(file.FileType) != 1 { - t.Errorf("given file should have 1 fileType attribute. found %d", len(file.FileType)) + if len(file.Type) != 1 { + t.Errorf("given file should have 1 fileType attribute. found %d", len(file.Type)) } expectedFileType = "source" - if file.FileType[0] != expectedFileType { - t.Errorf("expected %s, found %s", expectedFileType, file.FileType) + if file.Type[0] != expectedFileType { + t.Errorf("expected %s, found %s", expectedFileType, file.Type) } expectedChecksum := "0a3a0e1ab72b7c132f5021c538a7a3ea6d539bcd" - if file.FileChecksumSHA1 != expectedChecksum { - t.Errorf("expected %s, found %s", expectedChecksum, file.FileChecksumSHA1) + if file.ChecksumSHA1 != expectedChecksum { + t.Errorf("expected %s, found %s", expectedChecksum, file.ChecksumSHA1) } expectedLicenseConcluded = "NOASSERTION" @@ -601,8 +600,8 @@ func Test_rdfParser2_2_getFileFromNode(t *testing.T) { } expectedCopyrightText := "from spdx file" - if file.FileCopyrightText != expectedCopyrightText { - t.Errorf("expected %s, found %s", expectedCopyrightText, file.FileCopyrightText) + if file.CopyrightText != expectedCopyrightText { + t.Errorf("expected %s, found %s", expectedCopyrightText, file.CopyrightText) } if n := len(file.ArtifactOfProjects); n != 1 { @@ -621,37 +620,37 @@ func Test_rdfParser2_2_getFileFromNode(t *testing.T) { } expectedFileComment := "no comments" - if file.FileComment != expectedFileComment { - t.Errorf("expected %s, found %s", expectedFileName, file.FileComment) + if file.Comment != expectedFileComment { + t.Errorf("expected %s, found %s", expectedFileName, file.Comment) } expectedNoticeText := "NOASSERTION" - if file.FileNotice != expectedNoticeText { - t.Errorf("expected %s, found %s", expectedNoticeText, file.FileNotice) + if file.Notice != expectedNoticeText { + t.Errorf("expected %s, found %s", expectedNoticeText, file.Notice) } - if n := len(file.FileContributor); n != 1 { + if n := len(file.Contributor); n != 1 { t.Errorf("given file should have 1 fileContributor. found %d", n) } expectedFileContributor := "Some Organization" - if file.FileContributor[0] != expectedFileContributor { - t.Errorf("expected %s, found %s", expectedFileContributor, file.FileContributor) + if file.Contributor[0] != expectedFileContributor { + t.Errorf("expected %s, found %s", expectedFileContributor, file.Contributor) } - if n := len(file.FileDependencies); n != 1 { + if n := len(file.Dependencies); n != 1 { t.Errorf("given file should have 1 fileDependencies. found %d", n) } expectedFileDependency := "CommonsLangSrc" - if file.FileDependencies[0] != expectedFileDependency { - t.Errorf("expected %s, found %s", expectedFileDependency, file.FileDependencies[0]) + if file.Dependencies[0] != expectedFileDependency { + t.Errorf("expected %s, found %s", expectedFileDependency, file.Dependencies[0]) } - if n := len(file.FileAttributionTexts); n != 1 { + if n := len(file.AttributionTexts); n != 1 { t.Errorf("given file should have 1 attributionText. found %d", n) } expectedAttributionText := "attribution text" - if file.FileAttributionTexts[0] != expectedAttributionText { - t.Errorf("expected %s, found %s", expectedAttributionText, file.FileAttributionTexts[0]) + if file.AttributionTexts[0] != expectedAttributionText { + t.Errorf("expected %s, found %s", expectedAttributionText, file.AttributionTexts[0]) } if n := len(parser.doc.Annotations); n != 1 { @@ -659,23 +658,23 @@ func Test_rdfParser2_2_getFileFromNode(t *testing.T) { } ann := parser.doc.Annotations[0] expectedAnnDate := "2011-01-29T18:30:22Z" - if ann.AnnotationDate != expectedAnnDate { - t.Errorf("expected %s, found %s", expectedAnnDate, ann.AnnotationDate) + if ann.Date != expectedAnnDate { + t.Errorf("expected %s, found %s", expectedAnnDate, ann.Date) } expectedAnnComment := "File level annotation copied from a spdx document" - if ann.AnnotationComment != expectedAnnComment { - t.Errorf("expected %s, found %s", expectedAnnComment, ann.AnnotationComment) + if ann.Comment != expectedAnnComment { + t.Errorf("expected %s, found %s", expectedAnnComment, ann.Comment) } expectedAnnotationType := "OTHER" - if ann.AnnotationType != expectedAnnotationType { - t.Errorf("expected %s, found %s", expectedAnnotationType, ann.AnnotationType) + if ann.Type != expectedAnnotationType { + t.Errorf("expected %s, found %s", expectedAnnotationType, ann.Type) } expectedAnnotator := "File Commenter" if ann.Annotator != expectedAnnotator { t.Errorf("expected %s, found %s", expectedAnnotator, ann.Annotator) } expectedAnnotatorType := "Person" - if ann.AnnotationType != expectedAnnotationType { + if ann.Type != expectedAnnotationType { t.Errorf("expected %s, found %s", expectedAnnotatorType, ann.AnnotatorType) } @@ -701,8 +700,8 @@ func Test_rdfParser2_2_getFileFromNode(t *testing.T) { if reln.Relationship != expectedRelationType { t.Errorf("expected %s, found %s", expectedRefBEID, reln.RefB.ElementRefID) } - if reln.RelationshipComment != "" { - t.Errorf("expected relationship comment to be empty, found %s", reln.RelationshipComment) + if reln.Comment != "" { + t.Errorf("expected relationship comment to be empty, found %s", reln.Comment) } } diff --git a/rdfloader/parser2v2/parse_other_license_info.go b/rdfloader/parser2v2/parse_other_license_info.go index e7d1367a..1099235d 100644 --- a/rdfloader/parser2v2/parse_other_license_info.go +++ b/rdfloader/parser2v2/parse_other_license_info.go @@ -28,10 +28,10 @@ func (parser *rdfParser2_2) getExtractedLicensingInfoFromNode(node *gordfParser. } func (parser *rdfParser2_2) extractedLicenseToOtherLicense(extLicense ExtractedLicensingInfo) (othLic spdx.OtherLicense2_2) { - othLic.LicenseIdentifier = extLicense.licenseID + othLic.Identifier = extLicense.licenseID othLic.ExtractedText = extLicense.extractedText - othLic.LicenseComment = extLicense.comment - othLic.LicenseCrossReferences = extLicense.seeAlso - othLic.LicenseName = extLicense.name + othLic.Comment = extLicense.comment + othLic.CrossReferences = extLicense.seeAlso + othLic.Name = extLicense.name return othLic } diff --git a/rdfloader/parser2v2/parse_other_license_info_test.go b/rdfloader/parser2v2/parse_other_license_info_test.go index e606d504..1edd164f 100644 --- a/rdfloader/parser2v2/parse_other_license_info_test.go +++ b/rdfloader/parser2v2/parse_other_license_info_test.go @@ -55,19 +55,19 @@ func Test_rdfParser2_2_extractedLicenseToOtherLicense(t *testing.T) { extLicense, _ := parser.getExtractedLicensingInfoFromNode(node) othLic := parser.extractedLicenseToOtherLicense(extLicense) - if othLic.LicenseIdentifier != extLicense.licenseID { - t.Errorf("expected %v, got %v", othLic.LicenseIdentifier, extLicense.licenseID) + if othLic.Identifier != extLicense.licenseID { + t.Errorf("expected %v, got %v", othLic.Identifier, extLicense.licenseID) } if othLic.ExtractedText != extLicense.extractedText { t.Errorf("expected %v, got %v", othLic.ExtractedText, extLicense.extractedText) } - if othLic.LicenseComment != extLicense.comment { - t.Errorf("expected %v, got %v", othLic.LicenseComment, extLicense.comment) + if othLic.Comment != extLicense.comment { + t.Errorf("expected %v, got %v", othLic.Comment, extLicense.comment) } - if !reflect.DeepEqual(othLic.LicenseCrossReferences, extLicense.seeAlso) { - t.Errorf("expected %v, got %v", othLic.LicenseCrossReferences, extLicense.seeAlso) + if !reflect.DeepEqual(othLic.CrossReferences, extLicense.seeAlso) { + t.Errorf("expected %v, got %v", othLic.CrossReferences, extLicense.seeAlso) } - if othLic.LicenseName != extLicense.name { - t.Errorf("expected %v, got %v", othLic.LicenseName, extLicense.name) + if othLic.Name != extLicense.name { + t.Errorf("expected %v, got %v", othLic.Name, extLicense.name) } } diff --git a/rdfloader/parser2v2/parse_package.go b/rdfloader/parser2v2/parse_package.go index dde6e707..73655429 100644 --- a/rdfloader/parser2v2/parse_package.go +++ b/rdfloader/parser2v2/parse_package.go @@ -30,14 +30,14 @@ func (parser *rdfParser2_2) getPackageFromNode(packageNode *gordfParser.Node) (p parser.cache[packageNode.ID].Color = GREY // setting state color to black to indicate when we're done parsing this node. - defer func(){parser.cache[packageNode.ID].Color = BLACK}(); + defer func() { parser.cache[packageNode.ID].Color = BLACK }() // setting the SPDXIdentifier for the package. eId, err := ExtractElementID(getLastPartOfURI(packageNode.ID)) if err != nil { return nil, fmt.Errorf("error extracting elementID of a package identifier: %v", err) } - pkg.PackageSPDXIdentifier = eId // 3.2 + pkg.SPDXIdentifier = eId // 3.2 if existingPkg := parser.doc.Packages[eId]; existingPkg != nil { pkg = existingPkg @@ -51,13 +51,13 @@ func (parser *rdfParser2_2) getPackageFromNode(packageNode *gordfParser.Node) (p continue case SPDX_NAME: // 3.1 // cardinality: exactly 1 - pkg.PackageName = subTriple.Object.ID + pkg.Name = subTriple.Object.ID case SPDX_VERSION_INFO: // 3.3 // cardinality: max 1 - pkg.PackageVersion = subTriple.Object.ID + pkg.Version = subTriple.Object.ID case SPDX_PACKAGE_FILE_NAME: // 3.4 // cardinality: max 1 - pkg.PackageFileName = subTriple.Object.ID + pkg.FileName = subTriple.Object.ID case SPDX_SUPPLIER: // 3.5 // cardinality: max 1 err = setPackageSupplier(pkg, subTriple.Object.ID) @@ -82,49 +82,49 @@ func (parser *rdfParser2_2) getPackageFromNode(packageNode *gordfParser.Node) (p if !isUriValid(subTriple.Object.ID) { return nil, fmt.Errorf("invalid uri %s while parsing doap_homepage in a package", subTriple.Object.ID) } - pkg.PackageHomePage = subTriple.Object.ID + pkg.HomePage = subTriple.Object.ID case SPDX_SOURCE_INFO: // 3.12 // cardinality: max 1 - pkg.PackageSourceInfo = subTriple.Object.ID + pkg.SourceInfo = subTriple.Object.ID case SPDX_LICENSE_CONCLUDED: // 3.13 // cardinality: exactly 1 anyLicenseInfo, err := parser.getAnyLicenseFromNode(subTriple.Object) if err != nil { return nil, err } - pkg.PackageLicenseConcluded = anyLicenseInfo.ToLicenseString() + pkg.LicenseConcluded = anyLicenseInfo.ToLicenseString() case SPDX_LICENSE_INFO_FROM_FILES: // 3.14 // cardinality: min 0 - pkg.PackageLicenseInfoFromFiles = append(pkg.PackageLicenseInfoFromFiles, getLicenseStringFromURI(subTriple.Object.ID)) + pkg.LicenseInfoFromFiles = append(pkg.LicenseInfoFromFiles, getLicenseStringFromURI(subTriple.Object.ID)) case SPDX_LICENSE_DECLARED: // 3.15 // cardinality: exactly 1 anyLicenseInfo, err := parser.getAnyLicenseFromNode(subTriple.Object) if err != nil { return nil, err } - pkg.PackageLicenseDeclared = anyLicenseInfo.ToLicenseString() + pkg.LicenseDeclared = anyLicenseInfo.ToLicenseString() case SPDX_LICENSE_COMMENTS: // 3.16 // cardinality: max 1 - pkg.PackageLicenseComments = subTriple.Object.ID + pkg.LicenseComments = subTriple.Object.ID case SPDX_COPYRIGHT_TEXT: // 3.17 // cardinality: exactly 1 - pkg.PackageCopyrightText = subTriple.Object.ID + pkg.CopyrightText = subTriple.Object.ID case SPDX_SUMMARY: // 3.18 // cardinality: max 1 - pkg.PackageSummary = subTriple.Object.ID + pkg.Summary = subTriple.Object.ID case SPDX_DESCRIPTION: // 3.19 // cardinality: max 1 - pkg.PackageDescription = subTriple.Object.ID + pkg.Description = subTriple.Object.ID case RDFS_COMMENT: // 3.20 // cardinality: max 1 - pkg.PackageComment = subTriple.Object.ID + pkg.Comment = subTriple.Object.ID case SPDX_EXTERNAL_REF: // 3.21 // cardinality: min 0 externalDocRef, err := parser.getPackageExternalRef(subTriple.Object) if err != nil { return nil, fmt.Errorf("error parsing externalRef of a package: %v", err) } - pkg.PackageExternalReferences = append(pkg.PackageExternalReferences, externalDocRef) + pkg.ExternalReferences = append(pkg.ExternalReferences, externalDocRef) case SPDX_HAS_FILE: // 3.22 // cardinality: min 0 file, err := parser.getFileFromNode(subTriple.Object) @@ -137,7 +137,7 @@ func (parser *rdfParser2_2) getPackageFromNode(packageNode *gordfParser.Node) (p err = parser.parseRelationship(subTriple) case SPDX_ATTRIBUTION_TEXT: // cardinality: min 0 - pkg.PackageAttributionTexts = append(pkg.PackageAttributionTexts, subTriple.Object.ID) + pkg.AttributionTexts = append(pkg.AttributionTexts, subTriple.Object.ID) case SPDX_ANNOTATION: // cardinality: min 0 err = parser.parseAnnotationFromNode(subTriple.Object) @@ -149,7 +149,7 @@ func (parser *rdfParser2_2) getPackageFromNode(packageNode *gordfParser.Node) (p } } - parser.doc.Packages[pkg.PackageSPDXIdentifier] = pkg + parser.doc.Packages[pkg.SPDXIdentifier] = pkg return pkg, nil } @@ -198,10 +198,10 @@ func (parser *rdfParser2_2) setPackageVerificationCode(pkg *spdx.Package2_2, nod switch subTriple.Predicate.ID { case SPDX_PACKAGE_VERIFICATION_CODE_VALUE: // cardinality: exactly 1 - pkg.PackageVerificationCode = subTriple.Object.ID + pkg.VerificationCode = subTriple.Object.ID case SPDX_PACKAGE_VERIFICATION_CODE_EXCLUDED_FILE: // cardinality: min 0 - pkg.PackageVerificationCodeExcludedFile = subTriple.Object.ID + pkg.VerificationCodeExcludedFile = subTriple.Object.ID case RDF_TYPE: // cardinality: exactly 1 continue @@ -218,8 +218,8 @@ func (parser *rdfParser2_2) setFileToPackage(pkg *spdx.Package2_2, file *spdx.Fi if pkg.Files == nil { pkg.Files = map[spdx.ElementID]*spdx.File2_2{} } - pkg.Files[file.FileSPDXIdentifier] = file - parser.assocWithPackage[file.FileSPDXIdentifier] = true + pkg.Files[file.SPDXIdentifier] = file + parser.assocWithPackage[file.SPDXIdentifier] = true } // given a supplierObject, sets the PackageSupplier attribute of the pkg. @@ -228,7 +228,7 @@ func (parser *rdfParser2_2) setFileToPackage(pkg *spdx.Package2_2, file *spdx.Fi func setPackageSupplier(pkg *spdx.Package2_2, value string) error { value = strings.TrimSpace(value) if strings.ToUpper(value) == "NOASSERTION" { - pkg.PackageSupplierNOASSERTION = true + pkg.SupplierNOASSERTION = true return nil } subKey, subValue, err := ExtractSubs(value, ":") @@ -237,9 +237,9 @@ func setPackageSupplier(pkg *spdx.Package2_2, value string) error { } switch subKey { case "Person": - pkg.PackageSupplierPerson = subValue + pkg.SupplierPerson = subValue case "Organization": - pkg.PackageSupplierOrganization = subValue + pkg.SupplierOrganization = subValue default: return fmt.Errorf("unknown supplier %s", subKey) } @@ -252,7 +252,7 @@ func setPackageSupplier(pkg *spdx.Package2_2, value string) error { func setPackageOriginator(pkg *spdx.Package2_2, value string) error { value = strings.TrimSpace(value) if strings.ToUpper(value) == "NOASSERTION" { - pkg.PackageOriginatorNOASSERTION = true + pkg.OriginatorNOASSERTION = true return nil } subKey, subValue, err := ExtractSubs(value, ":") @@ -262,9 +262,9 @@ func setPackageOriginator(pkg *spdx.Package2_2, value string) error { switch subKey { case "Person": - pkg.PackageOriginatorPerson = subValue + pkg.OriginatorPerson = subValue case "Organization": - pkg.PackageOriginatorOrganization = subValue + pkg.OriginatorOrganization = subValue default: return fmt.Errorf("originator can be either a Person or Organization. found %s", subKey) } @@ -275,14 +275,14 @@ func setPackageOriginator(pkg *spdx.Package2_2, value string) error { func setDocumentLocationFromURI(pkg *spdx.Package2_2, locationURI string) error { switch locationURI { case SPDX_NOASSERTION_CAPS, SPDX_NOASSERTION_SMALL: - pkg.PackageDownloadLocation = "NOASSERTION" + pkg.DownloadLocation = "NOASSERTION" case SPDX_NONE_CAPS, SPDX_NONE_SMALL: - pkg.PackageDownloadLocation = "NONE" + pkg.DownloadLocation = "NONE" default: if !isUriValid(locationURI) { return fmt.Errorf("%s is not a valid uri", locationURI) } - pkg.PackageDownloadLocation = locationURI + pkg.DownloadLocation = locationURI } return nil } @@ -302,11 +302,11 @@ func (parser *rdfParser2_2) setPackageChecksum(pkg *spdx.Package2_2, node *gordf } switch checksumAlgorithm { case "MD5": - pkg.PackageChecksumMD5 = checksumValue + pkg.ChecksumMD5 = checksumValue case "SHA1": - pkg.PackageChecksumSHA1 = checksumValue + pkg.ChecksumSHA1 = checksumValue case "SHA256": - pkg.PackageChecksumSHA256 = checksumValue + pkg.ChecksumSHA256 = checksumValue default: return fmt.Errorf("unknown checksumAlgorithm %s while parsing a package", checksumAlgorithm) } diff --git a/rdfloader/parser2v2/parse_package_test.go b/rdfloader/parser2v2/parse_package_test.go index 22698269..8b3a1b73 100644 --- a/rdfloader/parser2v2/parse_package_test.go +++ b/rdfloader/parser2v2/parse_package_test.go @@ -18,7 +18,7 @@ func Test_setPackageSupplier(t *testing.T) { if err != nil { t.Fatalf("unexpected error: %v", err) } - if !pkg.PackageSupplierNOASSERTION { + if !pkg.SupplierNOASSERTION { t.Errorf("PackageSupplierNOASSERTION must've been set to true") } @@ -29,7 +29,7 @@ func Test_setPackageSupplier(t *testing.T) { if err != nil { t.Fatalf("unexpected error: %v", err) } - if !pkg.PackageSupplierNOASSERTION { + if !pkg.SupplierNOASSERTION { t.Errorf("PackageSupplierNOASSERTION must've been set to true") } @@ -49,8 +49,8 @@ func Test_setPackageSupplier(t *testing.T) { if err != nil { t.Errorf("unexpected error: %v", err) } - if pkg.PackageSupplierPerson != personName { - t.Errorf("PackageSupplierPerson should be %s. found %s", personName, pkg.PackageSupplierPerson) + if pkg.SupplierPerson != personName { + t.Errorf("PackageSupplierPerson should be %s. found %s", personName, pkg.SupplierPerson) } // TestCase 5: Valid Organization @@ -61,8 +61,8 @@ func Test_setPackageSupplier(t *testing.T) { if err != nil { t.Errorf("unexpected error: %v", err) } - if pkg.PackageSupplierOrganization != orgName { - t.Errorf("PackageSupplierPerson should be %s. found %s", orgName, pkg.PackageSupplierOrganization) + if pkg.SupplierOrganization != orgName { + t.Errorf("PackageSupplierPerson should be %s. found %s", orgName, pkg.SupplierOrganization) } // TestCase 6: Invalid EntityType @@ -83,7 +83,7 @@ func Test_setPackageOriginator(t *testing.T) { if err != nil { t.Fatalf("unexpected error: %v", err) } - if !pkg.PackageOriginatorNOASSERTION { + if !pkg.OriginatorNOASSERTION { t.Errorf("PackageOriginatorNOASSERTION must've been set to true") } @@ -94,7 +94,7 @@ func Test_setPackageOriginator(t *testing.T) { if err != nil { t.Fatalf("unexpected error: %v", err) } - if !pkg.PackageOriginatorNOASSERTION { + if !pkg.OriginatorNOASSERTION { t.Errorf("PackageOriginatorNOASSERTION must've been set to true") } @@ -114,8 +114,8 @@ func Test_setPackageOriginator(t *testing.T) { if err != nil { t.Errorf("unexpected error: %v", err) } - if pkg.PackageOriginatorPerson != personName { - t.Errorf("PackageOriginatorPerson should be %s. found %s", personName, pkg.PackageOriginatorPerson) + if pkg.OriginatorPerson != personName { + t.Errorf("PackageOriginatorPerson should be %s. found %s", personName, pkg.OriginatorPerson) } // TestCase 5: Valid Organization @@ -126,8 +126,8 @@ func Test_setPackageOriginator(t *testing.T) { if err != nil { t.Errorf("unexpected error: %v", err) } - if pkg.PackageOriginatorOrganization != orgName { - t.Errorf("PackageOriginatorOrganization should be %s. found %s", orgName, pkg.PackageOriginatorOrganization) + if pkg.OriginatorOrganization != orgName { + t.Errorf("PackageOriginatorOrganization should be %s. found %s", orgName, pkg.OriginatorOrganization) } // TestCase 6: Invalid EntityType @@ -174,12 +174,12 @@ func Test_rdfParser2_2_setPackageVerificationCode(t *testing.T) { t.Errorf("unexpected error: %v", err) } expectedValue := "cbceb8b5689b75a584efe35587b5d41bd48820ce" - if pkg.PackageVerificationCode != expectedValue { - t.Errorf("expected %v, got %v", expectedValue, pkg.PackageVerificationCode) + if pkg.VerificationCode != expectedValue { + t.Errorf("expected %v, got %v", expectedValue, pkg.VerificationCode) } expectedExcludedFile := "./package.spdx" - if pkg.PackageVerificationCodeExcludedFile != expectedExcludedFile { - t.Errorf("expected %v, got %v", expectedExcludedFile, pkg.PackageVerificationCodeExcludedFile) + if pkg.VerificationCodeExcludedFile != expectedExcludedFile { + t.Errorf("expected %v, got %v", expectedExcludedFile, pkg.VerificationCodeExcludedFile) } } @@ -447,16 +447,16 @@ func Test_rdfParser2_2_getPackageFromNode(t *testing.T) { } // validating if all the attributes that spanned over two tags are included in the parsed package. expectedID := "upload2" - if string(pkg.PackageSPDXIdentifier) != expectedID { - t.Errorf("expected package id: %s, got %s", expectedID, pkg.PackageSPDXIdentifier) + if string(pkg.SPDXIdentifier) != expectedID { + t.Errorf("expected package id: %s, got %s", expectedID, pkg.SPDXIdentifier) } expectedPkgFileName := "packageFileName" - if expectedPkgFileName != pkg.PackageFileName { - t.Errorf("expected package file name: %s, got %s", expectedPkgFileName, pkg.PackageFileName) + if expectedPkgFileName != pkg.FileName { + t.Errorf("expected package file name: %s, got %s", expectedPkgFileName, pkg.FileName) } expectedName := "Test Package" - if pkg.PackageName != expectedName { - t.Errorf("expected package name: %s, got %s", expectedPkgFileName, pkg.PackageName) + if pkg.Name != expectedName { + t.Errorf("expected package name: %s, got %s", expectedPkgFileName, pkg.Name) } // TestCase 8: Checking if packages can handle cyclic dependencies: @@ -484,11 +484,11 @@ func Test_rdfParser2_2_getPackageFromNode(t *testing.T) { // checking if both the attributes of the packages are set. expectedVersionInfo := "1.1.1" expectedPackageName := "Test Package" - if pkg.PackageVersion != expectedVersionInfo { - t.Errorf("Expected %s, found %s", expectedVersionInfo, pkg.PackageVersion) + if pkg.Version != expectedVersionInfo { + t.Errorf("Expected %s, found %s", expectedVersionInfo, pkg.Version) } - if pkg.PackageName != expectedPackageName { - t.Errorf("Expected %s, found %s", expectedPackageName, pkg.PackageName) + if pkg.Name != expectedPackageName { + t.Errorf("Expected %s, found %s", expectedPackageName, pkg.Name) } // TestCase 9: everything valid @@ -575,7 +575,7 @@ func Test_rdfParser2_2_setFileToPackage(t *testing.T) { if len(pkg.Files) != 1 { t.Errorf("expected given package to have one file after setting, got %d", len(pkg.Files)) } - if parser.assocWithPackage[file.FileSPDXIdentifier] != true { + if parser.assocWithPackage[file.SPDXIdentifier] != true { t.Errorf("given file should've been associated with a package, assocWithPackage is false") } } @@ -629,7 +629,7 @@ func Test_rdfParser2_2_setPackageChecksum(t *testing.T) { t.Errorf("unexpected error: %v", err) } expectedChecksumValue = "2fd4e1c67a2d28fced849ee1bb76e7391b93eb12" - gotChecksumValue = pkg.PackageChecksumSHA1 + gotChecksumValue = pkg.ChecksumSHA1 if gotChecksumValue != expectedChecksumValue { t.Errorf("expected: %v, got: %v", expectedChecksumValue, gotChecksumValue) } @@ -648,7 +648,7 @@ func Test_rdfParser2_2_setPackageChecksum(t *testing.T) { t.Errorf("unexpected error: %v", err) } expectedChecksumValue = "2fd4e1c67a2d28fced849ee1bb76e7391b93eb12" - gotChecksumValue = pkg.PackageChecksumSHA256 + gotChecksumValue = pkg.ChecksumSHA256 if gotChecksumValue != expectedChecksumValue { t.Errorf("expected: %v, got: %v", expectedChecksumValue, gotChecksumValue) } @@ -667,7 +667,7 @@ func Test_rdfParser2_2_setPackageChecksum(t *testing.T) { t.Errorf("unexpected error: %v", err) } expectedChecksumValue = "2fd4e1c67a2d28fced849ee1bb76e7391b93eb12" - gotChecksumValue = pkg.PackageChecksumMD5 + gotChecksumValue = pkg.ChecksumMD5 if gotChecksumValue != expectedChecksumValue { t.Errorf("expected: %v, got: %v", expectedChecksumValue, gotChecksumValue) } @@ -687,7 +687,7 @@ func Test_setDocumentLocationFromURI(t *testing.T) { t.Fatalf("unexpected error: %v", err) } expectedDocumentLocation = "NOASSERTION" - gotDocumentLocation = pkg.PackageDownloadLocation + gotDocumentLocation = pkg.DownloadLocation if expectedDocumentLocation != gotDocumentLocation { t.Errorf("expected: %v, got: %v", expectedDocumentLocation, gotDocumentLocation) } @@ -700,7 +700,7 @@ func Test_setDocumentLocationFromURI(t *testing.T) { t.Fatalf("unexpected error: %v", err) } expectedDocumentLocation = "NONE" - gotDocumentLocation = pkg.PackageDownloadLocation + gotDocumentLocation = pkg.DownloadLocation if expectedDocumentLocation != gotDocumentLocation { t.Errorf("expected: %v, got: %v", expectedDocumentLocation, gotDocumentLocation) } @@ -713,7 +713,7 @@ func Test_setDocumentLocationFromURI(t *testing.T) { t.Fatalf("unexpected error: %v", err) } expectedDocumentLocation = "https://www.gnu.org/software/texinfo/" - gotDocumentLocation = pkg.PackageDownloadLocation + gotDocumentLocation = pkg.DownloadLocation if expectedDocumentLocation != gotDocumentLocation { t.Errorf("expected: %v, got: %v", expectedDocumentLocation, gotDocumentLocation) } diff --git a/rdfloader/parser2v2/parse_relationship.go b/rdfloader/parser2v2/parse_relationship.go index c4e85403..4de715e1 100644 --- a/rdfloader/parser2v2/parse_relationship.go +++ b/rdfloader/parser2v2/parse_relationship.go @@ -40,7 +40,7 @@ func (parser *rdfParser2_2) parseRelationship(triple *gordfParser.Triple) (err e parser.cache[triple.Object.ID].Color = GREY // setting state color to black to indicate when we're done parsing this node. - defer func(){parser.cache[triple.Object.ID].Color = BLACK}(); + defer func() { parser.cache[triple.Object.ID].Color = BLACK }() for _, subTriple := range parser.nodeToTriples(triple.Object) { switch subTriple.Predicate.ID { @@ -73,7 +73,7 @@ func (parser *rdfParser2_2) parseRelationship(triple *gordfParser.Triple) (err e } case RDFS_COMMENT: // cardinality: max 1 - reln.RelationshipComment = subTriple.Object.ID + reln.Comment = subTriple.Object.ID default: return fmt.Errorf("unexpected predicate id: %s", subTriple.Predicate.ID) } @@ -96,7 +96,7 @@ func (parser *rdfParser2_2) parseRelatedElementFromTriple(reln *spdx.Relationshi } reln.RefB = spdx.DocElementID{ DocumentRefID: "", - ElementRefID: file.FileSPDXIdentifier, + ElementRefID: file.SPDXIdentifier, } case SPDX_PACKAGE: @@ -106,7 +106,7 @@ func (parser *rdfParser2_2) parseRelatedElementFromTriple(reln *spdx.Relationshi } reln.RefB = spdx.DocElementID{ DocumentRefID: "", - ElementRefID: pkg.PackageSPDXIdentifier, + ElementRefID: pkg.SPDXIdentifier, } case SPDX_SPDX_ELEMENT: diff --git a/rdfloader/parser2v2/parse_relationship_test.go b/rdfloader/parser2v2/parse_relationship_test.go index 14f4c129..c975e0f0 100644 --- a/rdfloader/parser2v2/parse_relationship_test.go +++ b/rdfloader/parser2v2/parse_relationship_test.go @@ -389,7 +389,7 @@ func Test_rdfParser2_2_parseRelationship(t *testing.T) { t.Errorf("expected %+v, found %+v", expectedRefB, reln.RefB) } expectedComment := "comment" - if reln.RelationshipComment != expectedComment { - t.Errorf("expected %v, found %v", expectedComment, reln.RelationshipComment) + if reln.Comment != expectedComment { + t.Errorf("expected %v, found %v", expectedComment, reln.Comment) } } diff --git a/rdfloader/parser2v2/parse_review.go b/rdfloader/parser2v2/parse_review.go index 437042d5..a7323177 100644 --- a/rdfloader/parser2v2/parse_review.go +++ b/rdfloader/parser2v2/parse_review.go @@ -17,10 +17,10 @@ func (parser *rdfParser2_2) setReviewFromNode(reviewedNode *gordfParser.Node) er continue case RDFS_COMMENT: // cardinality: max 1 - review.ReviewComment = triple.Object.ID + review.Comment = triple.Object.ID case SPDX_REVIEW_DATE: // cardinality: exactly 1 - review.ReviewDate = triple.Object.ID + review.Date = triple.Object.ID case SPDX_REVIEWER: // cardinality: max 1 var err error diff --git a/rdfloader/parser2v2/parse_review_test.go b/rdfloader/parser2v2/parse_review_test.go index d62b7b4e..8e3c3f84 100644 --- a/rdfloader/parser2v2/parse_review_test.go +++ b/rdfloader/parser2v2/parse_review_test.go @@ -55,12 +55,12 @@ func Test_rdfParser2_2_setReviewFromNode(t *testing.T) { } review := parser.doc.Reviews[0] expectedComment := "Another example reviewer." - if review.ReviewComment != expectedComment { - t.Errorf("expected: %v, found: %s", expectedComment, review.ReviewComment) + if review.Comment != expectedComment { + t.Errorf("expected: %v, found: %s", expectedComment, review.Comment) } expectedDate := "2011-03-13T00:00:00Z" - if review.ReviewDate != expectedDate { - t.Errorf("expected %s, found %s", expectedDate, review.ReviewDate) + if review.Date != expectedDate { + t.Errorf("expected %s, found %s", expectedDate, review.Date) } expectedReviewer := "Suzanne" if review.Reviewer != expectedReviewer { diff --git a/rdfloader/parser2v2/parse_snippet_info.go b/rdfloader/parser2v2/parse_snippet_info.go index d9c82794..9dd3cee2 100644 --- a/rdfloader/parser2v2/parse_snippet_info.go +++ b/rdfloader/parser2v2/parse_snippet_info.go @@ -49,20 +49,20 @@ func (parser *rdfParser2_2) getSnippetInformationFromNode2_2(node *gordfParser.N } si.LicenseInfoInSnippet = append(si.LicenseInfoInSnippet, anyLicense.ToLicenseString()) case SPDX_NAME: - si.SnippetName = siTriple.Object.ID + si.Name = siTriple.Object.ID case SPDX_COPYRIGHT_TEXT: - si.SnippetCopyrightText = siTriple.Object.ID + si.CopyrightText = siTriple.Object.ID case SPDX_LICENSE_COMMENTS: - si.SnippetLicenseComments = siTriple.Object.ID + si.LicenseComments = siTriple.Object.ID case RDFS_COMMENT: - si.SnippetComment = siTriple.Object.ID + si.Comment = siTriple.Object.ID case SPDX_LICENSE_CONCLUDED: var anyLicense AnyLicenseInfo anyLicense, err = parser.getAnyLicenseFromNode(siTriple.Object) if err != nil { return nil, fmt.Errorf("error parsing license info in snippet: %v", err) } - si.SnippetLicenseConcluded = anyLicense.ToLicenseString() + si.LicenseConcluded = anyLicense.ToLicenseString() default: return nil, fmt.Errorf("unknown predicate %v", siTriple.Predicate.ID) } @@ -82,7 +82,7 @@ func (parser *rdfParser2_2) setSnippetToFileWithID(snippet *spdx.Snippet2_2, fil } // setting the snippet to the file. - parser.files[fileID].Snippets[snippet.SnippetSPDXIdentifier] = snippet + parser.files[fileID].Snippets[snippet.SPDXIdentifier] = snippet return nil } @@ -132,11 +132,11 @@ func (parser *rdfParser2_2) setSnippetRangeFromNode(node *gordfParser.Node, si * } if startRangeType == LINE_RANGE { - si.SnippetLineRangeStart = start - si.SnippetLineRangeEnd = end + si.LineRangeStart = start + si.LineRangeEnd = end } else { - si.SnippetByteRangeStart = start - si.SnippetByteRangeEnd = end + si.ByteRangeStart = start + si.ByteRangeEnd = end } return nil } @@ -183,7 +183,7 @@ func (parser *rdfParser2_2) parseRangeReference(node *gordfParser.Node, snippet func setSnippetID(uri string, si *spdx.Snippet2_2) (err error) { fragment := getLastPartOfURI(uri) - si.SnippetSPDXIdentifier, err = ExtractElementID(fragment) + si.SPDXIdentifier, err = ExtractElementID(fragment) if err != nil { return fmt.Errorf("error setting snippet identifier: %v", uri) } diff --git a/rdfloader/parser2v2/parse_snippet_info_test.go b/rdfloader/parser2v2/parse_snippet_info_test.go index 47e999e0..0da442c7 100644 --- a/rdfloader/parser2v2/parse_snippet_info_test.go +++ b/rdfloader/parser2v2/parse_snippet_info_test.go @@ -140,8 +140,8 @@ func Test_setSnippetID(t *testing.T) { if err != nil { t.Errorf("unexpected error: %v", err) } - if si.SnippetSPDXIdentifier != "Snippet" { - t.Errorf("expected: %s, found: %s", "Snippet", si.SnippetSPDXIdentifier) + if si.SPDXIdentifier != "Snippet" { + t.Errorf("expected: %s, found: %s", "Snippet", si.SPDXIdentifier) } } @@ -520,7 +520,7 @@ func Test_rdfParser2_2_setSnippetToFileWithID(t *testing.T) { // TestCase 2: file exists, but snippet of the file doesn't ( it mustn't raise any error ) fileId = spdx.ElementID("File1") file = &spdx.File2_2{ - FileSPDXIdentifier: fileId, + SPDXIdentifier: fileId, } parser.files[fileId] = file file.Snippets = nil // nil snippets diff --git a/rdfloader/parser2v2/parse_spdx_document.go b/rdfloader/parser2v2/parse_spdx_document.go index e98fbf61..18707b16 100644 --- a/rdfloader/parser2v2/parse_spdx_document.go +++ b/rdfloader/parser2v2/parse_spdx_document.go @@ -64,7 +64,7 @@ func (parser *rdfParser2_2) parseSpdxDocumentNode(spdxDocNode *gordfParser.Node) if err != nil { return err } - parser.doc.Packages[pkg.PackageSPDXIdentifier] = pkg + parser.doc.Packages[pkg.SPDXIdentifier] = pkg case SPDX_HAS_EXTRACTED_LICENSING_INFO: // hasExtractedLicensingInfo // cardinality: min 0 extractedLicensingInfo, err := parser.getExtractedLicensingInfoFromNode(subTriple.Object) diff --git a/reporter/reporter_test.go b/reporter/reporter_test.go index 9de377e7..2c0c5801 100644 --- a/reporter/reporter_test.go +++ b/reporter/reporter_test.go @@ -14,18 +14,18 @@ func Test2_1ReporterCanMakeReportFromPackage(t *testing.T) { pkg := &spdx.Package2_1{ FilesAnalyzed: true, Files: map[spdx.ElementID]*spdx.File2_1{ - spdx.ElementID("File0"): &spdx.File2_1{FileSPDXIdentifier: "File0", LicenseConcluded: "MIT"}, - spdx.ElementID("File1"): &spdx.File2_1{FileSPDXIdentifier: "File1", LicenseConcluded: "NOASSERTION"}, - spdx.ElementID("File2"): &spdx.File2_1{FileSPDXIdentifier: "File2", LicenseConcluded: "MIT"}, - spdx.ElementID("File3"): &spdx.File2_1{FileSPDXIdentifier: "File3", LicenseConcluded: "MIT"}, - spdx.ElementID("File4"): &spdx.File2_1{FileSPDXIdentifier: "File4", LicenseConcluded: "GPL-2.0-only"}, - spdx.ElementID("File5"): &spdx.File2_1{FileSPDXIdentifier: "File5", LicenseConcluded: "NOASSERTION"}, - spdx.ElementID("File6"): &spdx.File2_1{FileSPDXIdentifier: "File6", LicenseConcluded: "GPL-2.0-only"}, - spdx.ElementID("File7"): &spdx.File2_1{FileSPDXIdentifier: "File7", LicenseConcluded: "GPL-2.0-only"}, - spdx.ElementID("File8"): &spdx.File2_1{FileSPDXIdentifier: "File8", LicenseConcluded: "MIT"}, - spdx.ElementID("File9"): &spdx.File2_1{FileSPDXIdentifier: "File9", LicenseConcluded: "GPL-2.0-only"}, - spdx.ElementID("File10"): &spdx.File2_1{FileSPDXIdentifier: "File10", LicenseConcluded: "GPL-2.0-only"}, - spdx.ElementID("File11"): &spdx.File2_1{FileSPDXIdentifier: "File11", LicenseConcluded: "NOASSERTION"}, + spdx.ElementID("File0"): &spdx.File2_1{SPDXIdentifier: "File0", LicenseConcluded: "MIT"}, + spdx.ElementID("File1"): &spdx.File2_1{SPDXIdentifier: "File1", LicenseConcluded: "NOASSERTION"}, + spdx.ElementID("File2"): &spdx.File2_1{SPDXIdentifier: "File2", LicenseConcluded: "MIT"}, + spdx.ElementID("File3"): &spdx.File2_1{SPDXIdentifier: "File3", LicenseConcluded: "MIT"}, + spdx.ElementID("File4"): &spdx.File2_1{SPDXIdentifier: "File4", LicenseConcluded: "GPL-2.0-only"}, + spdx.ElementID("File5"): &spdx.File2_1{SPDXIdentifier: "File5", LicenseConcluded: "NOASSERTION"}, + spdx.ElementID("File6"): &spdx.File2_1{SPDXIdentifier: "File6", LicenseConcluded: "GPL-2.0-only"}, + spdx.ElementID("File7"): &spdx.File2_1{SPDXIdentifier: "File7", LicenseConcluded: "GPL-2.0-only"}, + spdx.ElementID("File8"): &spdx.File2_1{SPDXIdentifier: "File8", LicenseConcluded: "MIT"}, + spdx.ElementID("File9"): &spdx.File2_1{SPDXIdentifier: "File9", LicenseConcluded: "GPL-2.0-only"}, + spdx.ElementID("File10"): &spdx.File2_1{SPDXIdentifier: "File10", LicenseConcluded: "GPL-2.0-only"}, + spdx.ElementID("File11"): &spdx.File2_1{SPDXIdentifier: "File11", LicenseConcluded: "NOASSERTION"}, }, } @@ -72,18 +72,18 @@ func Test2_1CanGetCountsOfLicenses(t *testing.T) { pkg := &spdx.Package2_1{ FilesAnalyzed: true, Files: map[spdx.ElementID]*spdx.File2_1{ - spdx.ElementID("File0"): &spdx.File2_1{FileSPDXIdentifier: "File0", LicenseConcluded: "MIT"}, - spdx.ElementID("File1"): &spdx.File2_1{FileSPDXIdentifier: "File1", LicenseConcluded: "NOASSERTION"}, - spdx.ElementID("File2"): &spdx.File2_1{FileSPDXIdentifier: "File2", LicenseConcluded: "MIT"}, - spdx.ElementID("File3"): &spdx.File2_1{FileSPDXIdentifier: "File3", LicenseConcluded: "MIT"}, - spdx.ElementID("File4"): &spdx.File2_1{FileSPDXIdentifier: "File4", LicenseConcluded: "GPL-2.0-only"}, - spdx.ElementID("File5"): &spdx.File2_1{FileSPDXIdentifier: "File5", LicenseConcluded: "NOASSERTION"}, - spdx.ElementID("File6"): &spdx.File2_1{FileSPDXIdentifier: "File6", LicenseConcluded: "GPL-2.0-only"}, - spdx.ElementID("File7"): &spdx.File2_1{FileSPDXIdentifier: "File7", LicenseConcluded: "GPL-2.0-only"}, - spdx.ElementID("File8"): &spdx.File2_1{FileSPDXIdentifier: "File8", LicenseConcluded: "MIT"}, - spdx.ElementID("File9"): &spdx.File2_1{FileSPDXIdentifier: "File9", LicenseConcluded: "GPL-2.0-only"}, - spdx.ElementID("File10"): &spdx.File2_1{FileSPDXIdentifier: "File10", LicenseConcluded: "GPL-2.0-only"}, - spdx.ElementID("File11"): &spdx.File2_1{FileSPDXIdentifier: "File11", LicenseConcluded: "NOASSERTION"}, + spdx.ElementID("File0"): &spdx.File2_1{SPDXIdentifier: "File0", LicenseConcluded: "MIT"}, + spdx.ElementID("File1"): &spdx.File2_1{SPDXIdentifier: "File1", LicenseConcluded: "NOASSERTION"}, + spdx.ElementID("File2"): &spdx.File2_1{SPDXIdentifier: "File2", LicenseConcluded: "MIT"}, + spdx.ElementID("File3"): &spdx.File2_1{SPDXIdentifier: "File3", LicenseConcluded: "MIT"}, + spdx.ElementID("File4"): &spdx.File2_1{SPDXIdentifier: "File4", LicenseConcluded: "GPL-2.0-only"}, + spdx.ElementID("File5"): &spdx.File2_1{SPDXIdentifier: "File5", LicenseConcluded: "NOASSERTION"}, + spdx.ElementID("File6"): &spdx.File2_1{SPDXIdentifier: "File6", LicenseConcluded: "GPL-2.0-only"}, + spdx.ElementID("File7"): &spdx.File2_1{SPDXIdentifier: "File7", LicenseConcluded: "GPL-2.0-only"}, + spdx.ElementID("File8"): &spdx.File2_1{SPDXIdentifier: "File8", LicenseConcluded: "MIT"}, + spdx.ElementID("File9"): &spdx.File2_1{SPDXIdentifier: "File9", LicenseConcluded: "GPL-2.0-only"}, + spdx.ElementID("File10"): &spdx.File2_1{SPDXIdentifier: "File10", LicenseConcluded: "GPL-2.0-only"}, + spdx.ElementID("File11"): &spdx.File2_1{SPDXIdentifier: "File11", LicenseConcluded: "NOASSERTION"}, }, } @@ -138,18 +138,18 @@ func Test2_2ReporterCanMakeReportFromPackage(t *testing.T) { pkg := &spdx.Package2_2{ FilesAnalyzed: true, Files: map[spdx.ElementID]*spdx.File2_2{ - spdx.ElementID("File0"): &spdx.File2_2{FileSPDXIdentifier: "File0", LicenseConcluded: "MIT"}, - spdx.ElementID("File1"): &spdx.File2_2{FileSPDXIdentifier: "File1", LicenseConcluded: "NOASSERTION"}, - spdx.ElementID("File2"): &spdx.File2_2{FileSPDXIdentifier: "File2", LicenseConcluded: "MIT"}, - spdx.ElementID("File3"): &spdx.File2_2{FileSPDXIdentifier: "File3", LicenseConcluded: "MIT"}, - spdx.ElementID("File4"): &spdx.File2_2{FileSPDXIdentifier: "File4", LicenseConcluded: "GPL-2.0-only"}, - spdx.ElementID("File5"): &spdx.File2_2{FileSPDXIdentifier: "File5", LicenseConcluded: "NOASSERTION"}, - spdx.ElementID("File6"): &spdx.File2_2{FileSPDXIdentifier: "File6", LicenseConcluded: "GPL-2.0-only"}, - spdx.ElementID("File7"): &spdx.File2_2{FileSPDXIdentifier: "File7", LicenseConcluded: "GPL-2.0-only"}, - spdx.ElementID("File8"): &spdx.File2_2{FileSPDXIdentifier: "File8", LicenseConcluded: "MIT"}, - spdx.ElementID("File9"): &spdx.File2_2{FileSPDXIdentifier: "File9", LicenseConcluded: "GPL-2.0-only"}, - spdx.ElementID("File10"): &spdx.File2_2{FileSPDXIdentifier: "File10", LicenseConcluded: "GPL-2.0-only"}, - spdx.ElementID("File11"): &spdx.File2_2{FileSPDXIdentifier: "File11", LicenseConcluded: "NOASSERTION"}, + spdx.ElementID("File0"): &spdx.File2_2{SPDXIdentifier: "File0", LicenseConcluded: "MIT"}, + spdx.ElementID("File1"): &spdx.File2_2{SPDXIdentifier: "File1", LicenseConcluded: "NOASSERTION"}, + spdx.ElementID("File2"): &spdx.File2_2{SPDXIdentifier: "File2", LicenseConcluded: "MIT"}, + spdx.ElementID("File3"): &spdx.File2_2{SPDXIdentifier: "File3", LicenseConcluded: "MIT"}, + spdx.ElementID("File4"): &spdx.File2_2{SPDXIdentifier: "File4", LicenseConcluded: "GPL-2.0-only"}, + spdx.ElementID("File5"): &spdx.File2_2{SPDXIdentifier: "File5", LicenseConcluded: "NOASSERTION"}, + spdx.ElementID("File6"): &spdx.File2_2{SPDXIdentifier: "File6", LicenseConcluded: "GPL-2.0-only"}, + spdx.ElementID("File7"): &spdx.File2_2{SPDXIdentifier: "File7", LicenseConcluded: "GPL-2.0-only"}, + spdx.ElementID("File8"): &spdx.File2_2{SPDXIdentifier: "File8", LicenseConcluded: "MIT"}, + spdx.ElementID("File9"): &spdx.File2_2{SPDXIdentifier: "File9", LicenseConcluded: "GPL-2.0-only"}, + spdx.ElementID("File10"): &spdx.File2_2{SPDXIdentifier: "File10", LicenseConcluded: "GPL-2.0-only"}, + spdx.ElementID("File11"): &spdx.File2_2{SPDXIdentifier: "File11", LicenseConcluded: "NOASSERTION"}, }, } @@ -196,18 +196,18 @@ func Test2_2CanGetCountsOfLicenses(t *testing.T) { pkg := &spdx.Package2_2{ FilesAnalyzed: true, Files: map[spdx.ElementID]*spdx.File2_2{ - spdx.ElementID("File0"): &spdx.File2_2{FileSPDXIdentifier: "File0", LicenseConcluded: "MIT"}, - spdx.ElementID("File1"): &spdx.File2_2{FileSPDXIdentifier: "File1", LicenseConcluded: "NOASSERTION"}, - spdx.ElementID("File2"): &spdx.File2_2{FileSPDXIdentifier: "File2", LicenseConcluded: "MIT"}, - spdx.ElementID("File3"): &spdx.File2_2{FileSPDXIdentifier: "File3", LicenseConcluded: "MIT"}, - spdx.ElementID("File4"): &spdx.File2_2{FileSPDXIdentifier: "File4", LicenseConcluded: "GPL-2.0-only"}, - spdx.ElementID("File5"): &spdx.File2_2{FileSPDXIdentifier: "File5", LicenseConcluded: "NOASSERTION"}, - spdx.ElementID("File6"): &spdx.File2_2{FileSPDXIdentifier: "File6", LicenseConcluded: "GPL-2.0-only"}, - spdx.ElementID("File7"): &spdx.File2_2{FileSPDXIdentifier: "File7", LicenseConcluded: "GPL-2.0-only"}, - spdx.ElementID("File8"): &spdx.File2_2{FileSPDXIdentifier: "File8", LicenseConcluded: "MIT"}, - spdx.ElementID("File9"): &spdx.File2_2{FileSPDXIdentifier: "File9", LicenseConcluded: "GPL-2.0-only"}, - spdx.ElementID("File10"): &spdx.File2_2{FileSPDXIdentifier: "File10", LicenseConcluded: "GPL-2.0-only"}, - spdx.ElementID("File11"): &spdx.File2_2{FileSPDXIdentifier: "File11", LicenseConcluded: "NOASSERTION"}, + spdx.ElementID("File0"): &spdx.File2_2{SPDXIdentifier: "File0", LicenseConcluded: "MIT"}, + spdx.ElementID("File1"): &spdx.File2_2{SPDXIdentifier: "File1", LicenseConcluded: "NOASSERTION"}, + spdx.ElementID("File2"): &spdx.File2_2{SPDXIdentifier: "File2", LicenseConcluded: "MIT"}, + spdx.ElementID("File3"): &spdx.File2_2{SPDXIdentifier: "File3", LicenseConcluded: "MIT"}, + spdx.ElementID("File4"): &spdx.File2_2{SPDXIdentifier: "File4", LicenseConcluded: "GPL-2.0-only"}, + spdx.ElementID("File5"): &spdx.File2_2{SPDXIdentifier: "File5", LicenseConcluded: "NOASSERTION"}, + spdx.ElementID("File6"): &spdx.File2_2{SPDXIdentifier: "File6", LicenseConcluded: "GPL-2.0-only"}, + spdx.ElementID("File7"): &spdx.File2_2{SPDXIdentifier: "File7", LicenseConcluded: "GPL-2.0-only"}, + spdx.ElementID("File8"): &spdx.File2_2{SPDXIdentifier: "File8", LicenseConcluded: "MIT"}, + spdx.ElementID("File9"): &spdx.File2_2{SPDXIdentifier: "File9", LicenseConcluded: "GPL-2.0-only"}, + spdx.ElementID("File10"): &spdx.File2_2{SPDXIdentifier: "File10", LicenseConcluded: "GPL-2.0-only"}, + spdx.ElementID("File11"): &spdx.File2_2{SPDXIdentifier: "File11", LicenseConcluded: "NOASSERTION"}, }, } diff --git a/spdx/annotation.go b/spdx/annotation.go index ede9c8ac..442d9ef0 100644 --- a/spdx/annotation.go +++ b/spdx/annotation.go @@ -13,19 +13,19 @@ type Annotation2_1 struct { // 8.2: Annotation Date: YYYY-MM-DDThh:mm:ssZ // Cardinality: conditional (mandatory, one) if there is an Annotation - AnnotationDate string + Date string // 8.3: Annotation Type: "REVIEW" or "OTHER" // Cardinality: conditional (mandatory, one) if there is an Annotation - AnnotationType string + Type string // 8.4: SPDX Identifier Reference // Cardinality: conditional (mandatory, one) if there is an Annotation - AnnotationSPDXIdentifier DocElementID + SPDXIdentifier DocElementID // 8.5: Annotation Comment // Cardinality: conditional (mandatory, one) if there is an Annotation - AnnotationComment string + Comment string } // Annotation2_2 is an Annotation section of an SPDX Document for version 2.2 of the spec. @@ -39,17 +39,17 @@ type Annotation2_2 struct { // 8.2: Annotation Date: YYYY-MM-DDThh:mm:ssZ // Cardinality: conditional (mandatory, one) if there is an Annotation - AnnotationDate string + Date string // 8.3: Annotation Type: "REVIEW" or "OTHER" // Cardinality: conditional (mandatory, one) if there is an Annotation - AnnotationType string + Type string // 8.4: SPDX Identifier Reference // Cardinality: conditional (mandatory, one) if there is an Annotation - AnnotationSPDXIdentifier DocElementID + SPDXIdentifier DocElementID // 8.5: Annotation Comment // Cardinality: conditional (mandatory, one) if there is an Annotation - AnnotationComment string + Comment string } diff --git a/spdx/file.go b/spdx/file.go index bfd47b74..63917261 100644 --- a/spdx/file.go +++ b/spdx/file.go @@ -7,21 +7,21 @@ type File2_1 struct { // 4.1: File Name // Cardinality: mandatory, one - FileName string + Name string // 4.2: File SPDX Identifier: "SPDXRef-[idstring]" // Cardinality: mandatory, one - FileSPDXIdentifier ElementID + SPDXIdentifier ElementID // 4.3: File Type // Cardinality: optional, multiple - FileType []string + Type []string // 4.4: File Checksum: may have keys for SHA1, SHA256 and/or MD5 // Cardinality: mandatory, one SHA1, others may be optionally provided - FileChecksumSHA1 string - FileChecksumSHA256 string - FileChecksumMD5 string + ChecksumSHA1 string + ChecksumSHA256 string + ChecksumMD5 string // 4.5: Concluded License: SPDX License Expression, "NONE" or "NOASSERTION" // Cardinality: mandatory, one @@ -37,7 +37,7 @@ type File2_1 struct { // 4.8: Copyright Text: copyright notice(s) text, "NONE" or "NOASSERTION" // Cardinality: mandatory, one - FileCopyrightText string + CopyrightText string // DEPRECATED in version 2.1 of spec // 4.9-4.11: Artifact of Project variables (defined below) @@ -46,20 +46,20 @@ type File2_1 struct { // 4.12: File Comment // Cardinality: optional, one - FileComment string + Comment string // 4.13: File Notice // Cardinality: optional, one - FileNotice string + Notice string // 4.14: File Contributor // Cardinality: optional, one or many - FileContributor []string + Contributor []string // DEPRECATED in version 2.0 of spec // 4.15: File Dependencies // Cardinality: optional, one or many - FileDependencies []string + Dependencies []string // Snippets contained in this File // Note that Snippets could be defined in a different Document! However, @@ -93,21 +93,21 @@ type File2_2 struct { // 4.1: File Name // Cardinality: mandatory, one - FileName string + Name string // 4.2: File SPDX Identifier: "SPDXRef-[idstring]" // Cardinality: mandatory, one - FileSPDXIdentifier ElementID + SPDXIdentifier ElementID // 4.3: File Type // Cardinality: optional, multiple - FileType []string + Type []string // 4.4: File Checksum: may have keys for SHA1, SHA256 and/or MD5 // Cardinality: mandatory, one SHA1, others may be optionally provided - FileChecksumSHA1 string - FileChecksumSHA256 string - FileChecksumMD5 string + ChecksumSHA1 string + ChecksumSHA256 string + ChecksumMD5 string // 4.5: Concluded License: SPDX License Expression, "NONE" or "NOASSERTION" // Cardinality: mandatory, one @@ -123,7 +123,7 @@ type File2_2 struct { // 4.8: Copyright Text: copyright notice(s) text, "NONE" or "NOASSERTION" // Cardinality: mandatory, one - FileCopyrightText string + CopyrightText string // DEPRECATED in version 2.1 of spec // 4.9-4.11: Artifact of Project variables (defined below) @@ -132,24 +132,24 @@ type File2_2 struct { // 4.12: File Comment // Cardinality: optional, one - FileComment string + Comment string // 4.13: File Notice // Cardinality: optional, one - FileNotice string + Notice string // 4.14: File Contributor // Cardinality: optional, one or many - FileContributor []string + Contributor []string // 4.15: File Attribution Text // Cardinality: optional, one or many - FileAttributionTexts []string + AttributionTexts []string // DEPRECATED in version 2.0 of spec // 4.16: File Dependencies // Cardinality: optional, one or many - FileDependencies []string + Dependencies []string // Snippets contained in this File // Note that Snippets could be defined in a different Document! However, diff --git a/spdx/other_license.go b/spdx/other_license.go index a509c472..f2a6c1d9 100644 --- a/spdx/other_license.go +++ b/spdx/other_license.go @@ -9,7 +9,7 @@ type OtherLicense2_1 struct { // 6.1: License Identifier: "LicenseRef-[idstring]" // Cardinality: conditional (mandatory, one) if license is not // on SPDX License List - LicenseIdentifier string + Identifier string // 6.2: Extracted Text // Cardinality: conditional (mandatory, one) if there is a @@ -19,16 +19,16 @@ type OtherLicense2_1 struct { // 6.3: License Name: single line of text or "NOASSERTION" // Cardinality: conditional (mandatory, one) if license is not // on SPDX License List - LicenseName string + Name string // 6.4: License Cross Reference // Cardinality: conditional (optional, one or many) if license // is not on SPDX License List - LicenseCrossReferences []string + CrossReferences []string // 6.5: License Comment // Cardinality: optional, one - LicenseComment string + Comment string } // OtherLicense2_2 is an Other License Information section of an @@ -38,7 +38,7 @@ type OtherLicense2_2 struct { // 6.1: License Identifier: "LicenseRef-[idstring]" // Cardinality: conditional (mandatory, one) if license is not // on SPDX License List - LicenseIdentifier string + Identifier string // 6.2: Extracted Text // Cardinality: conditional (mandatory, one) if there is a @@ -48,14 +48,14 @@ type OtherLicense2_2 struct { // 6.3: License Name: single line of text or "NOASSERTION" // Cardinality: conditional (mandatory, one) if license is not // on SPDX License List - LicenseName string + Name string // 6.4: License Cross Reference // Cardinality: conditional (optional, one or many) if license // is not on SPDX License List - LicenseCrossReferences []string + CrossReferences []string // 6.5: License Comment // Cardinality: optional, one - LicenseComment string + Comment string } diff --git a/spdx/package.go b/spdx/package.go index 4af39035..7913a7bd 100644 --- a/spdx/package.go +++ b/spdx/package.go @@ -7,37 +7,37 @@ type Package2_1 struct { // 3.1: Package Name // Cardinality: mandatory, one - PackageName string + Name string // 3.2: Package SPDX Identifier: "SPDXRef-[idstring]" // Cardinality: mandatory, one - PackageSPDXIdentifier ElementID + SPDXIdentifier ElementID // 3.3: Package Version // Cardinality: optional, one - PackageVersion string + Version string // 3.4: Package File Name // Cardinality: optional, one - PackageFileName string + FileName string // 3.5: Package Supplier: may have single result for either Person or Organization, // or NOASSERTION // Cardinality: optional, one - PackageSupplierPerson string - PackageSupplierOrganization string - PackageSupplierNOASSERTION bool + SupplierPerson string + SupplierOrganization string + SupplierNOASSERTION bool // 3.6: Package Originator: may have single result for either Person or Organization, // or NOASSERTION // Cardinality: optional, one - PackageOriginatorPerson string - PackageOriginatorOrganization string - PackageOriginatorNOASSERTION bool + OriginatorPerson string + OriginatorOrganization string + OriginatorNOASSERTION bool // 3.7: Package Download Location // Cardinality: mandatory, one - PackageDownloadLocation string + DownloadLocation string // 3.8: FilesAnalyzed // Cardinality: optional, one; default value is "true" if omitted @@ -48,62 +48,62 @@ type Package2_1 struct { // 3.9: Package Verification Code // Cardinality: mandatory, one if filesAnalyzed is true / omitted; // zero (must be omitted) if filesAnalyzed is false - PackageVerificationCode string + VerificationCode string // Spec also allows specifying a single file to exclude from the // verification code algorithm; intended to enable exclusion of // the SPDX document file itself. - PackageVerificationCodeExcludedFile string + VerificationCodeExcludedFile string // 3.10: Package Checksum: may have keys for SHA1, SHA256 and/or MD5 // Cardinality: optional, one or many - PackageChecksumSHA1 string - PackageChecksumSHA256 string - PackageChecksumMD5 string + ChecksumSHA1 string + ChecksumSHA256 string + ChecksumMD5 string // 3.11: Package Home Page // Cardinality: optional, one - PackageHomePage string + HomePage string // 3.12: Source Information // Cardinality: optional, one - PackageSourceInfo string + SourceInfo string // 3.13: Concluded License: SPDX License Expression, "NONE" or "NOASSERTION" // Cardinality: mandatory, one - PackageLicenseConcluded string + LicenseConcluded string // 3.14: All Licenses Info from Files: SPDX License Expression, "NONE" or "NOASSERTION" // Cardinality: mandatory, one or many if filesAnalyzed is true / omitted; // zero (must be omitted) if filesAnalyzed is false - PackageLicenseInfoFromFiles []string + LicenseInfoFromFiles []string // 3.15: Declared License: SPDX License Expression, "NONE" or "NOASSERTION" // Cardinality: mandatory, one - PackageLicenseDeclared string + LicenseDeclared string // 3.16: Comments on License // Cardinality: optional, one - PackageLicenseComments string + LicenseComments string // 3.17: Copyright Text: copyright notice(s) text, "NONE" or "NOASSERTION" // Cardinality: mandatory, one - PackageCopyrightText string + CopyrightText string // 3.18: Package Summary Description // Cardinality: optional, one - PackageSummary string + Summary string // 3.19: Package Detailed Description // Cardinality: optional, one - PackageDescription string + Description string // 3.20: Package Comment // Cardinality: optional, one - PackageComment string + Comment string // 3.21: Package External Reference // Cardinality: optional, one or many - PackageExternalReferences []*PackageExternalReference2_1 + ExternalReferences []*PackageExternalReference2_1 // 3.22: Package External Reference Comment // Cardinality: conditional (optional, one) for each External Reference @@ -143,37 +143,37 @@ type Package2_2 struct { // 3.1: Package Name // Cardinality: mandatory, one - PackageName string + Name string // 3.2: Package SPDX Identifier: "SPDXRef-[idstring]" // Cardinality: mandatory, one - PackageSPDXIdentifier ElementID + SPDXIdentifier ElementID // 3.3: Package Version // Cardinality: optional, one - PackageVersion string + Version string // 3.4: Package File Name // Cardinality: optional, one - PackageFileName string + FileName string // 3.5: Package Supplier: may have single result for either Person or Organization, // or NOASSERTION // Cardinality: optional, one - PackageSupplierPerson string - PackageSupplierOrganization string - PackageSupplierNOASSERTION bool + SupplierPerson string + SupplierOrganization string + SupplierNOASSERTION bool // 3.6: Package Originator: may have single result for either Person or Organization, // or NOASSERTION // Cardinality: optional, one - PackageOriginatorPerson string - PackageOriginatorOrganization string - PackageOriginatorNOASSERTION bool + OriginatorPerson string + OriginatorOrganization string + OriginatorNOASSERTION bool // 3.7: Package Download Location // Cardinality: mandatory, one - PackageDownloadLocation string + DownloadLocation string // 3.8: FilesAnalyzed // Cardinality: optional, one; default value is "true" if omitted @@ -184,62 +184,62 @@ type Package2_2 struct { // 3.9: Package Verification Code // Cardinality: mandatory, one if filesAnalyzed is true / omitted; // zero (must be omitted) if filesAnalyzed is false - PackageVerificationCode string + VerificationCode string // Spec also allows specifying a single file to exclude from the // verification code algorithm; intended to enable exclusion of // the SPDX document file itself. - PackageVerificationCodeExcludedFile string + VerificationCodeExcludedFile string // 3.10: Package Checksum: may have keys for SHA1, SHA256 and/or MD5 // Cardinality: optional, one or many - PackageChecksumSHA1 string - PackageChecksumSHA256 string - PackageChecksumMD5 string + ChecksumSHA1 string + ChecksumSHA256 string + ChecksumMD5 string // 3.11: Package Home Page // Cardinality: optional, one - PackageHomePage string + HomePage string // 3.12: Source Information // Cardinality: optional, one - PackageSourceInfo string + SourceInfo string // 3.13: Concluded License: SPDX License Expression, "NONE" or "NOASSERTION" // Cardinality: mandatory, one - PackageLicenseConcluded string + LicenseConcluded string // 3.14: All Licenses Info from Files: SPDX License Expression, "NONE" or "NOASSERTION" // Cardinality: mandatory, one or many if filesAnalyzed is true / omitted; // zero (must be omitted) if filesAnalyzed is false - PackageLicenseInfoFromFiles []string + LicenseInfoFromFiles []string // 3.15: Declared License: SPDX License Expression, "NONE" or "NOASSERTION" // Cardinality: mandatory, one - PackageLicenseDeclared string + LicenseDeclared string // 3.16: Comments on License // Cardinality: optional, one - PackageLicenseComments string + LicenseComments string // 3.17: Copyright Text: copyright notice(s) text, "NONE" or "NOASSERTION" // Cardinality: mandatory, one - PackageCopyrightText string + CopyrightText string // 3.18: Package Summary Description // Cardinality: optional, one - PackageSummary string + Summary string // 3.19: Package Detailed Description // Cardinality: optional, one - PackageDescription string + Description string // 3.20: Package Comment // Cardinality: optional, one - PackageComment string + Comment string // 3.21: Package External Reference // Cardinality: optional, one or many - PackageExternalReferences []*PackageExternalReference2_2 + ExternalReferences []*PackageExternalReference2_2 // 3.22: Package External Reference Comment // Cardinality: conditional (optional, one) for each External Reference @@ -247,7 +247,7 @@ type Package2_2 struct { // 3.23: Package Attribution Text // Cardinality: optional, one or many - PackageAttributionTexts []string + AttributionTexts []string // Files contained in this Package Files map[ElementID]*File2_2 diff --git a/spdx/relationship.go b/spdx/relationship.go index 9e06838c..d117b542 100644 --- a/spdx/relationship.go +++ b/spdx/relationship.go @@ -17,7 +17,7 @@ type Relationship2_1 struct { // 7.2: Relationship Comment // Cardinality: optional, one - RelationshipComment string + Comment string } // Relationship2_2 is a Relationship section of an SPDX Document for @@ -35,5 +35,5 @@ type Relationship2_2 struct { // 7.2: Relationship Comment // Cardinality: optional, one - RelationshipComment string + Comment string } diff --git a/spdx/review.go b/spdx/review.go index 8ca6a77c..dbc87e6d 100644 --- a/spdx/review.go +++ b/spdx/review.go @@ -16,12 +16,12 @@ type Review2_1 struct { // DEPRECATED in version 2.0 of spec // 9.2: Review Date: YYYY-MM-DDThh:mm:ssZ // Cardinality: conditional (mandatory, one) if there is a Reviewer - ReviewDate string + Date string // DEPRECATED in version 2.0 of spec // 9.3: Review Comment // Cardinality: optional, one - ReviewComment string + Comment string } // Review2_2 is a Review section of an SPDX Document for version 2.2 of the spec. @@ -38,10 +38,10 @@ type Review2_2 struct { // DEPRECATED in version 2.0 of spec // 9.2: Review Date: YYYY-MM-DDThh:mm:ssZ // Cardinality: conditional (mandatory, one) if there is a Reviewer - ReviewDate string + Date string // DEPRECATED in version 2.0 of spec // 9.3: Review Comment // Cardinality: optional, one - ReviewComment string + Comment string } diff --git a/spdx/snippet.go b/spdx/snippet.go index 5fe37ca3..5142d1ee 100644 --- a/spdx/snippet.go +++ b/spdx/snippet.go @@ -7,7 +7,7 @@ type Snippet2_1 struct { // 5.1: Snippet SPDX Identifier: "SPDXRef-[idstring]" // Cardinality: mandatory, one - SnippetSPDXIdentifier ElementID + SPDXIdentifier ElementID // 5.2: Snippet from File SPDX Identifier // Cardinality: mandatory, one @@ -15,17 +15,17 @@ type Snippet2_1 struct { // 5.3: Snippet Byte Range: [start byte]:[end byte] // Cardinality: mandatory, one - SnippetByteRangeStart int - SnippetByteRangeEnd int + ByteRangeStart int + ByteRangeEnd int // 5.4: Snippet Line Range: [start line]:[end line] // Cardinality: optional, one - SnippetLineRangeStart int - SnippetLineRangeEnd int + LineRangeStart int + LineRangeEnd int // 5.5: Snippet Concluded License: SPDX License Expression, "NONE" or "NOASSERTION" // Cardinality: mandatory, one - SnippetLicenseConcluded string + LicenseConcluded string // 5.6: License Information in Snippet: SPDX License Expression, "NONE" or "NOASSERTION" // Cardinality: optional, one or many @@ -33,19 +33,19 @@ type Snippet2_1 struct { // 5.7: Snippet Comments on License // Cardinality: optional, one - SnippetLicenseComments string + LicenseComments string // 5.8: Snippet Copyright Text: copyright notice(s) text, "NONE" or "NOASSERTION" // Cardinality: mandatory, one - SnippetCopyrightText string + CopyrightText string // 5.9: Snippet Comment // Cardinality: optional, one - SnippetComment string + Comment string // 5.10: Snippet Name // Cardinality: optional, one - SnippetName string + Name string } // Snippet2_2 is a Snippet section of an SPDX Document for version 2.2 of the spec. @@ -53,7 +53,7 @@ type Snippet2_2 struct { // 5.1: Snippet SPDX Identifier: "SPDXRef-[idstring]" // Cardinality: mandatory, one - SnippetSPDXIdentifier ElementID + SPDXIdentifier ElementID // 5.2: Snippet from File SPDX Identifier // Cardinality: mandatory, one @@ -61,17 +61,17 @@ type Snippet2_2 struct { // 5.3: Snippet Byte Range: [start byte]:[end byte] // Cardinality: mandatory, one - SnippetByteRangeStart int - SnippetByteRangeEnd int + ByteRangeStart int + ByteRangeEnd int // 5.4: Snippet Line Range: [start line]:[end line] // Cardinality: optional, one - SnippetLineRangeStart int - SnippetLineRangeEnd int + LineRangeStart int + LineRangeEnd int // 5.5: Snippet Concluded License: SPDX License Expression, "NONE" or "NOASSERTION" // Cardinality: mandatory, one - SnippetLicenseConcluded string + LicenseConcluded string // 5.6: License Information in Snippet: SPDX License Expression, "NONE" or "NOASSERTION" // Cardinality: optional, one or many @@ -79,21 +79,21 @@ type Snippet2_2 struct { // 5.7: Snippet Comments on License // Cardinality: optional, one - SnippetLicenseComments string + LicenseComments string // 5.8: Snippet Copyright Text: copyright notice(s) text, "NONE" or "NOASSERTION" // Cardinality: mandatory, one - SnippetCopyrightText string + CopyrightText string // 5.9: Snippet Comment // Cardinality: optional, one - SnippetComment string + Comment string // 5.10: Snippet Name // Cardinality: optional, one - SnippetName string + Name string // 5.11: Snippet Attribution Text // Cardinality: optional, one or many - SnippetAttributionTexts []string + AttributionTexts []string } diff --git a/spdxlib/described_elements_test.go b/spdxlib/described_elements_test.go index 4ba99da8..9ad28ba5 100644 --- a/spdxlib/described_elements_test.go +++ b/spdxlib/described_elements_test.go @@ -19,11 +19,11 @@ func Test2_1CanGetIDsOfDescribedPackages(t *testing.T) { SPDXIdentifier: spdx.ElementID("DOCUMENT"), }, Packages: map[spdx.ElementID]*spdx.Package2_1{ - spdx.ElementID("p1"): &spdx.Package2_1{PackageName: "pkg1", PackageSPDXIdentifier: "p1"}, - spdx.ElementID("p2"): &spdx.Package2_1{PackageName: "pkg2", PackageSPDXIdentifier: "p2"}, - spdx.ElementID("p3"): &spdx.Package2_1{PackageName: "pkg3", PackageSPDXIdentifier: "p3"}, - spdx.ElementID("p4"): &spdx.Package2_1{PackageName: "pkg4", PackageSPDXIdentifier: "p4"}, - spdx.ElementID("p5"): &spdx.Package2_1{PackageName: "pkg5", PackageSPDXIdentifier: "p5"}, + spdx.ElementID("p1"): &spdx.Package2_1{Name: "pkg1", SPDXIdentifier: "p1"}, + spdx.ElementID("p2"): &spdx.Package2_1{Name: "pkg2", SPDXIdentifier: "p2"}, + spdx.ElementID("p3"): &spdx.Package2_1{Name: "pkg3", SPDXIdentifier: "p3"}, + spdx.ElementID("p4"): &spdx.Package2_1{Name: "pkg4", SPDXIdentifier: "p4"}, + spdx.ElementID("p5"): &spdx.Package2_1{Name: "pkg5", SPDXIdentifier: "p5"}, }, Relationships: []*spdx.Relationship2_1{ &spdx.Relationship2_1{ @@ -81,7 +81,7 @@ func Test2_1GetDescribedPackagesReturnsSinglePackageIfOnlyOne(t *testing.T) { SPDXIdentifier: spdx.ElementID("DOCUMENT"), }, Packages: map[spdx.ElementID]*spdx.Package2_1{ - spdx.ElementID("p1"): &spdx.Package2_1{PackageName: "pkg1", PackageSPDXIdentifier: "p1"}, + spdx.ElementID("p1"): &spdx.Package2_1{Name: "pkg1", SPDXIdentifier: "p1"}, }, } @@ -108,11 +108,11 @@ func Test2_1FailsToGetDescribedPackagesIfMoreThanOneWithoutDescribesRelationship SPDXIdentifier: spdx.ElementID("DOCUMENT"), }, Packages: map[spdx.ElementID]*spdx.Package2_1{ - spdx.ElementID("p1"): &spdx.Package2_1{PackageName: "pkg1", PackageSPDXIdentifier: "p1"}, - spdx.ElementID("p2"): &spdx.Package2_1{PackageName: "pkg2", PackageSPDXIdentifier: "p2"}, - spdx.ElementID("p3"): &spdx.Package2_1{PackageName: "pkg3", PackageSPDXIdentifier: "p3"}, - spdx.ElementID("p4"): &spdx.Package2_1{PackageName: "pkg4", PackageSPDXIdentifier: "p4"}, - spdx.ElementID("p5"): &spdx.Package2_1{PackageName: "pkg5", PackageSPDXIdentifier: "p5"}, + spdx.ElementID("p1"): &spdx.Package2_1{Name: "pkg1", SPDXIdentifier: "p1"}, + spdx.ElementID("p2"): &spdx.Package2_1{Name: "pkg2", SPDXIdentifier: "p2"}, + spdx.ElementID("p3"): &spdx.Package2_1{Name: "pkg3", SPDXIdentifier: "p3"}, + spdx.ElementID("p4"): &spdx.Package2_1{Name: "pkg4", SPDXIdentifier: "p4"}, + spdx.ElementID("p5"): &spdx.Package2_1{Name: "pkg5", SPDXIdentifier: "p5"}, }, Relationships: []*spdx.Relationship2_1{ // different relationship @@ -139,8 +139,8 @@ func Test2_1FailsToGetDescribedPackagesIfMoreThanOneWithNilRelationships(t *test SPDXIdentifier: spdx.ElementID("DOCUMENT"), }, Packages: map[spdx.ElementID]*spdx.Package2_1{ - spdx.ElementID("p1"): &spdx.Package2_1{PackageName: "pkg1", PackageSPDXIdentifier: "p1"}, - spdx.ElementID("p2"): &spdx.Package2_1{PackageName: "pkg2", PackageSPDXIdentifier: "p2"}, + spdx.ElementID("p1"): &spdx.Package2_1{Name: "pkg1", SPDXIdentifier: "p1"}, + spdx.ElementID("p2"): &spdx.Package2_1{Name: "pkg2", SPDXIdentifier: "p2"}, }, } @@ -192,8 +192,8 @@ func Test2_1FailsToGetDescribedPackagesIfRelationshipForNonexistantPackageID(t * SPDXIdentifier: spdx.ElementID("DOCUMENT"), }, Packages: map[spdx.ElementID]*spdx.Package2_1{ - spdx.ElementID("p1"): &spdx.Package2_1{PackageName: "pkg1", PackageSPDXIdentifier: "p1"}, - spdx.ElementID("p2"): &spdx.Package2_1{PackageName: "pkg2", PackageSPDXIdentifier: "p2"}, + spdx.ElementID("p1"): &spdx.Package2_1{Name: "pkg1", SPDXIdentifier: "p1"}, + spdx.ElementID("p2"): &spdx.Package2_1{Name: "pkg2", SPDXIdentifier: "p2"}, }, Relationships: []*spdx.Relationship2_1{ // different relationship @@ -222,11 +222,11 @@ func Test2_2CanGetIDsOfDescribedPackages(t *testing.T) { SPDXIdentifier: spdx.ElementID("DOCUMENT"), }, Packages: map[spdx.ElementID]*spdx.Package2_2{ - spdx.ElementID("p1"): &spdx.Package2_2{PackageName: "pkg1", PackageSPDXIdentifier: "p1"}, - spdx.ElementID("p2"): &spdx.Package2_2{PackageName: "pkg2", PackageSPDXIdentifier: "p2"}, - spdx.ElementID("p3"): &spdx.Package2_2{PackageName: "pkg3", PackageSPDXIdentifier: "p3"}, - spdx.ElementID("p4"): &spdx.Package2_2{PackageName: "pkg4", PackageSPDXIdentifier: "p4"}, - spdx.ElementID("p5"): &spdx.Package2_2{PackageName: "pkg5", PackageSPDXIdentifier: "p5"}, + spdx.ElementID("p1"): &spdx.Package2_2{Name: "pkg1", SPDXIdentifier: "p1"}, + spdx.ElementID("p2"): &spdx.Package2_2{Name: "pkg2", SPDXIdentifier: "p2"}, + spdx.ElementID("p3"): &spdx.Package2_2{Name: "pkg3", SPDXIdentifier: "p3"}, + spdx.ElementID("p4"): &spdx.Package2_2{Name: "pkg4", SPDXIdentifier: "p4"}, + spdx.ElementID("p5"): &spdx.Package2_2{Name: "pkg5", SPDXIdentifier: "p5"}, }, Relationships: []*spdx.Relationship2_2{ &spdx.Relationship2_2{ @@ -284,7 +284,7 @@ func Test2_2GetDescribedPackagesReturnsSinglePackageIfOnlyOne(t *testing.T) { SPDXIdentifier: spdx.ElementID("DOCUMENT"), }, Packages: map[spdx.ElementID]*spdx.Package2_2{ - spdx.ElementID("p1"): &spdx.Package2_2{PackageName: "pkg1", PackageSPDXIdentifier: "p1"}, + spdx.ElementID("p1"): &spdx.Package2_2{Name: "pkg1", SPDXIdentifier: "p1"}, }, } @@ -311,11 +311,11 @@ func Test2_2FailsToGetDescribedPackagesIfMoreThanOneWithoutDescribesRelationship SPDXIdentifier: spdx.ElementID("DOCUMENT"), }, Packages: map[spdx.ElementID]*spdx.Package2_2{ - spdx.ElementID("p1"): &spdx.Package2_2{PackageName: "pkg1", PackageSPDXIdentifier: "p1"}, - spdx.ElementID("p2"): &spdx.Package2_2{PackageName: "pkg2", PackageSPDXIdentifier: "p2"}, - spdx.ElementID("p3"): &spdx.Package2_2{PackageName: "pkg3", PackageSPDXIdentifier: "p3"}, - spdx.ElementID("p4"): &spdx.Package2_2{PackageName: "pkg4", PackageSPDXIdentifier: "p4"}, - spdx.ElementID("p5"): &spdx.Package2_2{PackageName: "pkg5", PackageSPDXIdentifier: "p5"}, + spdx.ElementID("p1"): &spdx.Package2_2{Name: "pkg1", SPDXIdentifier: "p1"}, + spdx.ElementID("p2"): &spdx.Package2_2{Name: "pkg2", SPDXIdentifier: "p2"}, + spdx.ElementID("p3"): &spdx.Package2_2{Name: "pkg3", SPDXIdentifier: "p3"}, + spdx.ElementID("p4"): &spdx.Package2_2{Name: "pkg4", SPDXIdentifier: "p4"}, + spdx.ElementID("p5"): &spdx.Package2_2{Name: "pkg5", SPDXIdentifier: "p5"}, }, Relationships: []*spdx.Relationship2_2{ // different relationship @@ -342,8 +342,8 @@ func Test2_2FailsToGetDescribedPackagesIfMoreThanOneWithNilRelationships(t *test SPDXIdentifier: spdx.ElementID("DOCUMENT"), }, Packages: map[spdx.ElementID]*spdx.Package2_2{ - spdx.ElementID("p1"): &spdx.Package2_2{PackageName: "pkg1", PackageSPDXIdentifier: "p1"}, - spdx.ElementID("p2"): &spdx.Package2_2{PackageName: "pkg2", PackageSPDXIdentifier: "p2"}, + spdx.ElementID("p1"): &spdx.Package2_2{Name: "pkg1", SPDXIdentifier: "p1"}, + spdx.ElementID("p2"): &spdx.Package2_2{Name: "pkg2", SPDXIdentifier: "p2"}, }, } @@ -395,8 +395,8 @@ func Test2_2FailsToGetDescribedPackagesIfRelationshipForNonexistantPackageID(t * SPDXIdentifier: spdx.ElementID("DOCUMENT"), }, Packages: map[spdx.ElementID]*spdx.Package2_2{ - spdx.ElementID("p1"): &spdx.Package2_2{PackageName: "pkg1", PackageSPDXIdentifier: "p1"}, - spdx.ElementID("p2"): &spdx.Package2_2{PackageName: "pkg2", PackageSPDXIdentifier: "p2"}, + spdx.ElementID("p1"): &spdx.Package2_2{Name: "pkg1", SPDXIdentifier: "p1"}, + spdx.ElementID("p2"): &spdx.Package2_2{Name: "pkg2", SPDXIdentifier: "p2"}, }, Relationships: []*spdx.Relationship2_2{ // different relationship diff --git a/tvloader/parser2v1/parse_annotation.go b/tvloader/parser2v1/parse_annotation.go index 65680d9a..9316521e 100644 --- a/tvloader/parser2v1/parse_annotation.go +++ b/tvloader/parser2v1/parse_annotation.go @@ -24,17 +24,17 @@ func (parser *tvParser2_1) parsePairForAnnotation2_1(tag string, value string) e } return fmt.Errorf("unrecognized Annotator type %v", subkey) case "AnnotationDate": - parser.ann.AnnotationDate = value + parser.ann.Date = value case "AnnotationType": - parser.ann.AnnotationType = value + parser.ann.Type = value case "SPDXREF": deID, err := extractDocElementID(value) if err != nil { return err } - parser.ann.AnnotationSPDXIdentifier = deID + parser.ann.SPDXIdentifier = deID case "AnnotationComment": - parser.ann.AnnotationComment = value + parser.ann.Comment = value default: return fmt.Errorf("received unknown tag %v in Annotation section", tag) } diff --git a/tvloader/parser2v1/parse_annotation_test.go b/tvloader/parser2v1/parse_annotation_test.go index 3fdce9f6..37ecabb7 100644 --- a/tvloader/parser2v1/parse_annotation_test.go +++ b/tvloader/parser2v1/parse_annotation_test.go @@ -83,8 +83,8 @@ func TestParser2_1CanParseAnnotationTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.ann.AnnotationDate != dt { - t.Errorf("got %v for AnnotationDate, expected %v", parser.ann.AnnotationDate, dt) + if parser.ann.Date != dt { + t.Errorf("got %v for AnnotationDate, expected %v", parser.ann.Date, dt) } // Annotation type @@ -93,8 +93,8 @@ func TestParser2_1CanParseAnnotationTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.ann.AnnotationType != aType { - t.Errorf("got %v for AnnotationType, expected %v", parser.ann.AnnotationType, aType) + if parser.ann.Type != aType { + t.Errorf("got %v for AnnotationType, expected %v", parser.ann.Type, aType) } // SPDX Identifier Reference @@ -103,9 +103,9 @@ func TestParser2_1CanParseAnnotationTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - deID := parser.ann.AnnotationSPDXIdentifier + deID := parser.ann.SPDXIdentifier if deID.DocumentRefID != "" || deID.ElementRefID != "30" { - t.Errorf("got %v for SPDXREF, expected %v", parser.ann.AnnotationSPDXIdentifier, "30") + t.Errorf("got %v for SPDXREF, expected %v", parser.ann.SPDXIdentifier, "30") } // Annotation Comment @@ -114,8 +114,8 @@ func TestParser2_1CanParseAnnotationTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.ann.AnnotationComment != cmt { - t.Errorf("got %v for AnnotationComment, expected %v", parser.ann.AnnotationComment, cmt) + if parser.ann.Comment != cmt { + t.Errorf("got %v for AnnotationComment, expected %v", parser.ann.Comment, cmt) } } @@ -156,4 +156,3 @@ func TestParser2_1FailsIfAnnotationRefInvalid(t *testing.T) { t.Errorf("expected non-nil error, got nil") } } - diff --git a/tvloader/parser2v1/parse_creation_info_test.go b/tvloader/parser2v1/parse_creation_info_test.go index 2a8c094d..bd82ff50 100644 --- a/tvloader/parser2v1/parse_creation_info_test.go +++ b/tvloader/parser2v1/parse_creation_info_test.go @@ -27,8 +27,8 @@ func TestParser2_1CIMovesToPackageAfterParsingPackageNameTag(t *testing.T) { t.Fatalf("parser didn't create new package") } // and the package name should be as expected - if parser.pkg.PackageName != pkgName { - t.Errorf("expected package name %s, got %s", pkgName, parser.pkg.PackageName) + if parser.pkg.Name != pkgName { + t.Errorf("expected package name %s, got %s", pkgName, parser.pkg.Name) } // and the package should default to true for FilesAnalyzed if parser.pkg.FilesAnalyzed != true { diff --git a/tvloader/parser2v1/parse_file.go b/tvloader/parser2v1/parse_file.go index efe31d93..6e1ad3c4 100644 --- a/tvloader/parser2v1/parse_file.go +++ b/tvloader/parser2v1/parse_file.go @@ -19,7 +19,7 @@ func (parser *tvParser2_1) parsePairFromFile2_1(tag string, value string) error // tag for creating new file section case "FileName": parser.file = &spdx.File2_1{} - parser.file.FileName = value + parser.file.Name = value // tag for creating new package section and going back to parsing Package case "PackageName": parser.st = psPackage2_1 @@ -39,7 +39,7 @@ func (parser *tvParser2_1) parsePairFromFile2_1(tag string, value string) error if err != nil { return err } - parser.file.FileSPDXIdentifier = eID + parser.file.SPDXIdentifier = eID if parser.pkg == nil { if parser.doc.UnpackagedFiles == nil { parser.doc.UnpackagedFiles = map[spdx.ElementID]*spdx.File2_1{} @@ -52,7 +52,7 @@ func (parser *tvParser2_1) parsePairFromFile2_1(tag string, value string) error parser.pkg.Files[eID] = parser.file } case "FileType": - parser.file.FileType = append(parser.file.FileType, value) + parser.file.Type = append(parser.file.Type, value) case "FileChecksum": subkey, subvalue, err := extractSubs(value) if err != nil { @@ -60,11 +60,11 @@ func (parser *tvParser2_1) parsePairFromFile2_1(tag string, value string) error } switch subkey { case "SHA1": - parser.file.FileChecksumSHA1 = subvalue + parser.file.ChecksumSHA1 = subvalue case "SHA256": - parser.file.FileChecksumSHA256 = subvalue + parser.file.ChecksumSHA256 = subvalue case "MD5": - parser.file.FileChecksumMD5 = subvalue + parser.file.ChecksumMD5 = subvalue default: return fmt.Errorf("got unknown checksum type %s", subkey) } @@ -75,7 +75,7 @@ func (parser *tvParser2_1) parsePairFromFile2_1(tag string, value string) error case "LicenseComments": parser.file.LicenseComments = value case "FileCopyrightText": - parser.file.FileCopyrightText = value + parser.file.CopyrightText = value case "ArtifactOfProjectName": parser.fileAOP = &spdx.ArtifactOfProject2_1{} parser.file.ArtifactOfProjects = append(parser.file.ArtifactOfProjects, parser.fileAOP) @@ -91,13 +91,13 @@ func (parser *tvParser2_1) parsePairFromFile2_1(tag string, value string) error } parser.fileAOP.URI = value case "FileComment": - parser.file.FileComment = value + parser.file.Comment = value case "FileNotice": - parser.file.FileNotice = value + parser.file.Notice = value case "FileContributor": - parser.file.FileContributor = append(parser.file.FileContributor, value) + parser.file.Contributor = append(parser.file.Contributor, value) case "FileDependency": - parser.file.FileDependencies = append(parser.file.FileDependencies, value) + parser.file.Dependencies = append(parser.file.Dependencies, value) // for relationship tags, pass along but don't change state case "Relationship": parser.rln = &spdx.Relationship2_1{} diff --git a/tvloader/parser2v1/parse_file_test.go b/tvloader/parser2v1/parse_file_test.go index 68efe2b4..293f4200 100644 --- a/tvloader/parser2v1/parse_file_test.go +++ b/tvloader/parser2v1/parse_file_test.go @@ -15,8 +15,8 @@ func TestParser2_1FileStartsNewFileAfterParsingFileNameTag(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psFile2_1, - pkg: &spdx.Package2_1{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, - file: &spdx.File2_1{FileName: fileOldName, FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_1{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, + file: &spdx.File2_1{Name: fileOldName, SPDXIdentifier: "f1"}, } fileOld := parser.file parser.doc.Packages["test"] = parser.pkg @@ -28,8 +28,8 @@ func TestParser2_1FileStartsNewFileAfterParsingFileNameTag(t *testing.T) { if parser.pkg.Files["f1"] != fileOld { t.Errorf("expected file %v in Files[f1], got %v", fileOld, parser.pkg.Files["f1"]) } - if parser.pkg.Files["f1"].FileName != fileOldName { - t.Errorf("expected file name %s in Files[f1], got %s", fileOldName, parser.pkg.Files["f1"].FileName) + if parser.pkg.Files["f1"].Name != fileOldName { + t.Errorf("expected file name %s in Files[f1], got %s", fileOldName, parser.pkg.Files["f1"].Name) } // now add a new file @@ -47,8 +47,8 @@ func TestParser2_1FileStartsNewFileAfterParsingFileNameTag(t *testing.T) { t.Fatalf("parser didn't create new file") } // and the file name should be as expected - if parser.file.FileName != fileName { - t.Errorf("expected file name %s, got %s", fileName, parser.file.FileName) + if parser.file.Name != fileName { + t.Errorf("expected file name %s, got %s", fileName, parser.file.Name) } // and the Package's Files should still be of size 1 and not have this new // one yet, since it hasn't seen an SPDX identifier @@ -58,8 +58,8 @@ func TestParser2_1FileStartsNewFileAfterParsingFileNameTag(t *testing.T) { if parser.pkg.Files["f1"] != fileOld { t.Errorf("expected file %v in Files[f1], got %v", fileOld, parser.pkg.Files["f1"]) } - if parser.pkg.Files["f1"].FileName != fileOldName { - t.Errorf("expected file name %s in Files[f1], got %s", fileOldName, parser.pkg.Files["f1"].FileName) + if parser.pkg.Files["f1"].Name != fileOldName { + t.Errorf("expected file name %s in Files[f1], got %s", fileOldName, parser.pkg.Files["f1"].Name) } // now parse an SPDX identifier tag @@ -74,14 +74,14 @@ func TestParser2_1FileStartsNewFileAfterParsingFileNameTag(t *testing.T) { if parser.pkg.Files["f1"] != fileOld { t.Errorf("expected file %v in Files[f1], got %v", fileOld, parser.pkg.Files["f1"]) } - if parser.pkg.Files["f1"].FileName != fileOldName { - t.Errorf("expected file name %s in Files[f1], got %s", fileOldName, parser.pkg.Files["f1"].FileName) + if parser.pkg.Files["f1"].Name != fileOldName { + t.Errorf("expected file name %s in Files[f1], got %s", fileOldName, parser.pkg.Files["f1"].Name) } if parser.pkg.Files["f2ID"] != parser.file { t.Errorf("expected file %v in Files[f2ID], got %v", parser.file, parser.pkg.Files["f2ID"]) } - if parser.pkg.Files["f2ID"].FileName != fileName { - t.Errorf("expected file name %s in Files[f2ID], got %s", fileName, parser.pkg.Files["f2ID"].FileName) + if parser.pkg.Files["f2ID"].Name != fileName { + t.Errorf("expected file name %s in Files[f2ID], got %s", fileName, parser.pkg.Files["f2ID"].Name) } } @@ -151,8 +151,8 @@ func TestParser2_1FileStartsNewPackageAfterParsingPackageNameTag(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psFile2_1, - pkg: &spdx.Package2_1{PackageName: p1Name, PackageSPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_1{}}, - file: &spdx.File2_1{FileName: f1Name, FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_1{Name: p1Name, SPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_1{}}, + file: &spdx.File2_1{Name: f1Name, SPDXIdentifier: "f1"}, } p1 := parser.pkg f1 := parser.file @@ -174,8 +174,8 @@ func TestParser2_1FileStartsNewPackageAfterParsingPackageNameTag(t *testing.T) { t.Fatalf("parser didn't create new pkg") } // and the package name should be as expected - if parser.pkg.PackageName != p2Name { - t.Errorf("expected package name %s, got %s", p2Name, parser.pkg.PackageName) + if parser.pkg.Name != p2Name { + t.Errorf("expected package name %s, got %s", p2Name, parser.pkg.Name) } // and the package should default to true for FilesAnalyzed if parser.pkg.FilesAnalyzed != true { @@ -196,8 +196,8 @@ func TestParser2_1FileStartsNewPackageAfterParsingPackageNameTag(t *testing.T) { if parser.doc.Packages["package1"] != p1 { t.Errorf("Expected package %v in Packages[package1], got %v", p1, parser.doc.Packages["package1"]) } - if parser.doc.Packages["package1"].PackageName != p1Name { - t.Errorf("expected package name %s in Packages[package1], got %s", p1Name, parser.doc.Packages["package1"].PackageName) + if parser.doc.Packages["package1"].Name != p1Name { + t.Errorf("expected package name %s in Packages[package1], got %s", p1Name, parser.doc.Packages["package1"].Name) } // and the first Package's Files should be of size 1 and have f1 only if len(parser.doc.Packages["package1"].Files) != 1 { @@ -206,8 +206,8 @@ func TestParser2_1FileStartsNewPackageAfterParsingPackageNameTag(t *testing.T) { if parser.doc.Packages["package1"].Files["f1"] != f1 { t.Errorf("Expected file %v in Files[f1], got %v", f1, parser.doc.Packages["package1"].Files["f1"]) } - if parser.doc.Packages["package1"].Files["f1"].FileName != f1Name { - t.Errorf("expected file name %s in Files[f1], got %s", f1Name, parser.doc.Packages["package1"].Files["f1"].FileName) + if parser.doc.Packages["package1"].Files["f1"].Name != f1Name { + t.Errorf("expected file name %s in Files[f1], got %s", f1Name, parser.doc.Packages["package1"].Files["f1"].Name) } // and the current file should be nil if parser.file != nil { @@ -219,8 +219,8 @@ func TestParser2_1FileMovesToSnippetAfterParsingSnippetSPDXIDTag(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psFile2_1, - pkg: &spdx.Package2_1{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, - file: &spdx.File2_1{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_1{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, + file: &spdx.File2_1{Name: "f1.txt", SPDXIdentifier: "f1"}, } parser.doc.Packages["test"] = parser.pkg parser.pkg.Files["f1"] = parser.file @@ -244,8 +244,8 @@ func TestParser2_1FileMovesToOtherLicenseAfterParsingLicenseIDTag(t *testing.T) parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psFile2_1, - pkg: &spdx.Package2_1{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, - file: &spdx.File2_1{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_1{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, + file: &spdx.File2_1{Name: "f1.txt", SPDXIdentifier: "f1"}, } parser.doc.Packages["test"] = parser.pkg parser.pkg.Files["f1"] = parser.file @@ -263,8 +263,8 @@ func TestParser2_1FileMovesToReviewAfterParsingReviewerTag(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psFile2_1, - pkg: &spdx.Package2_1{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, - file: &spdx.File2_1{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_1{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, + file: &spdx.File2_1{Name: "f1.txt", SPDXIdentifier: "f1"}, } parser.doc.Packages["test"] = parser.pkg parser.pkg.Files["f1"] = parser.file @@ -282,8 +282,8 @@ func TestParser2_1FileStaysAfterParsingRelationshipTags(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psFile2_1, - pkg: &spdx.Package2_1{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, - file: &spdx.File2_1{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_1{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, + file: &spdx.File2_1{Name: "f1.txt", SPDXIdentifier: "f1"}, } parser.doc.Packages["test"] = parser.pkg parser.pkg.Files["f1"] = parser.file @@ -311,8 +311,8 @@ func TestParser2_1FileStaysAfterParsingAnnotationTags(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psFile2_1, - pkg: &spdx.Package2_1{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, - file: &spdx.File2_1{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_1{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, + file: &spdx.File2_1{Name: "f1.txt", SPDXIdentifier: "f1"}, } parser.doc.Packages["test"] = parser.pkg parser.pkg.Files["f1"] = parser.file @@ -363,7 +363,7 @@ func TestParser2_1CanParseFileTags(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psFile2_1, - pkg: &spdx.Package2_1{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, + pkg: &spdx.Package2_1{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, } parser.doc.Packages["test"] = parser.pkg @@ -372,8 +372,8 @@ func TestParser2_1CanParseFileTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.file.FileName != "f1.txt" { - t.Errorf("got %v for FileName", parser.file.FileName) + if parser.file.Name != "f1.txt" { + t.Errorf("got %v for FileName", parser.file.Name) } // should not yet be added to the Packages file list, because we haven't // seen an SPDX identifier yet @@ -386,8 +386,8 @@ func TestParser2_1CanParseFileTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.file.FileSPDXIdentifier != "f1" { - t.Errorf("got %v for FileSPDXIdentifier", parser.file.FileSPDXIdentifier) + if parser.file.SPDXIdentifier != "f1" { + t.Errorf("got %v for FileSPDXIdentifier", parser.file.SPDXIdentifier) } // should now be added to the Packages file list if len(parser.pkg.Files) != 1 { @@ -410,7 +410,7 @@ func TestParser2_1CanParseFileTags(t *testing.T) { } for _, typeWant := range fileTypes { flagFound := false - for _, typeCheck := range parser.file.FileType { + for _, typeCheck := range parser.file.Type { if typeWant == typeCheck { flagFound = true } @@ -419,9 +419,9 @@ func TestParser2_1CanParseFileTags(t *testing.T) { t.Errorf("didn't find %s in FileType", typeWant) } } - if len(fileTypes) != len(parser.file.FileType) { + if len(fileTypes) != len(parser.file.Type) { t.Errorf("expected %d types in FileType, got %d", len(fileTypes), - len(parser.file.FileType)) + len(parser.file.Type)) } // File Checksums @@ -443,14 +443,14 @@ func TestParser2_1CanParseFileTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.file.FileChecksumSHA1 != codeSha1 { - t.Errorf("expected %s for FileChecksumSHA1, got %s", codeSha1, parser.file.FileChecksumSHA1) + if parser.file.ChecksumSHA1 != codeSha1 { + t.Errorf("expected %s for FileChecksumSHA1, got %s", codeSha1, parser.file.ChecksumSHA1) } - if parser.file.FileChecksumSHA256 != codeSha256 { - t.Errorf("expected %s for FileChecksumSHA256, got %s", codeSha256, parser.file.FileChecksumSHA256) + if parser.file.ChecksumSHA256 != codeSha256 { + t.Errorf("expected %s for FileChecksumSHA256, got %s", codeSha256, parser.file.ChecksumSHA256) } - if parser.file.FileChecksumMD5 != codeMd5 { - t.Errorf("expected %s for FileChecksumMD5, got %s", codeMd5, parser.file.FileChecksumMD5) + if parser.file.ChecksumMD5 != codeMd5 { + t.Errorf("expected %s for FileChecksumMD5, got %s", codeMd5, parser.file.ChecksumMD5) } // Concluded License @@ -504,8 +504,8 @@ func TestParser2_1CanParseFileTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.file.FileCopyrightText != "copyright (c) me" { - t.Errorf("got %v for FileCopyrightText", parser.file.FileCopyrightText) + if parser.file.CopyrightText != "copyright (c) me" { + t.Errorf("got %v for FileCopyrightText", parser.file.CopyrightText) } // Artifact of Projects: Name, HomePage and URI @@ -599,8 +599,8 @@ func TestParser2_1CanParseFileTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.file.FileComment != "this is a comment" { - t.Errorf("got %v for FileComment", parser.file.FileComment) + if parser.file.Comment != "this is a comment" { + t.Errorf("got %v for FileComment", parser.file.Comment) } // File Notice @@ -608,8 +608,8 @@ func TestParser2_1CanParseFileTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.file.FileNotice != "this is a Notice" { - t.Errorf("got %v for FileNotice", parser.file.FileNotice) + if parser.file.Notice != "this is a Notice" { + t.Errorf("got %v for FileNotice", parser.file.Notice) } // File Contributor @@ -625,7 +625,7 @@ func TestParser2_1CanParseFileTags(t *testing.T) { } for _, contribWant := range contribs { flagFound := false - for _, contribCheck := range parser.file.FileContributor { + for _, contribCheck := range parser.file.Contributor { if contribWant == contribCheck { flagFound = true } @@ -634,9 +634,9 @@ func TestParser2_1CanParseFileTags(t *testing.T) { t.Errorf("didn't find %s in FileContributor", contribWant) } } - if len(contribs) != len(parser.file.FileContributor) { + if len(contribs) != len(parser.file.Contributor) { t.Errorf("expected %d contribenses in FileContributor, got %d", len(contribs), - len(parser.file.FileContributor)) + len(parser.file.Contributor)) } // File Dependencies @@ -652,7 +652,7 @@ func TestParser2_1CanParseFileTags(t *testing.T) { } for _, depWant := range deps { flagFound := false - for _, depCheck := range parser.file.FileDependencies { + for _, depCheck := range parser.file.Dependencies { if depWant == depCheck { flagFound = true } @@ -661,9 +661,9 @@ func TestParser2_1CanParseFileTags(t *testing.T) { t.Errorf("didn't find %s in FileDependency", depWant) } } - if len(deps) != len(parser.file.FileDependencies) { + if len(deps) != len(parser.file.Dependencies) { t.Errorf("expected %d depenses in FileDependency, got %d", len(deps), - len(parser.file.FileDependencies)) + len(parser.file.Dependencies)) } } @@ -672,8 +672,8 @@ func TestParser2_1FileCreatesRelationshipInDocument(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psFile2_1, - pkg: &spdx.Package2_1{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, - file: &spdx.File2_1{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_1{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, + file: &spdx.File2_1{Name: "f1.txt", SPDXIdentifier: "f1"}, } parser.doc.Packages["test"] = parser.pkg parser.pkg.Files["f1"] = parser.file @@ -694,8 +694,8 @@ func TestParser2_1FileCreatesAnnotationInDocument(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psFile2_1, - pkg: &spdx.Package2_1{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, - file: &spdx.File2_1{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_1{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, + file: &spdx.File2_1{Name: "f1.txt", SPDXIdentifier: "f1"}, } parser.doc.Packages["test"] = parser.pkg parser.pkg.Files["f1"] = parser.file @@ -716,8 +716,8 @@ func TestParser2_1FileUnknownTagFails(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psFile2_1, - pkg: &spdx.Package2_1{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, - file: &spdx.File2_1{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_1{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, + file: &spdx.File2_1{Name: "f1.txt", SPDXIdentifier: "f1"}, } parser.doc.Packages["test"] = parser.pkg parser.pkg.Files["f1"] = parser.file @@ -732,8 +732,8 @@ func TestFileAOPPointerChangesAfterTags(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psFile2_1, - pkg: &spdx.Package2_1{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, - file: &spdx.File2_1{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_1{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, + file: &spdx.File2_1{Name: "f1.txt", SPDXIdentifier: "f1"}, } parser.doc.Packages["test"] = parser.pkg parser.pkg.Files["f1"] = parser.file @@ -789,7 +789,7 @@ func TestParser2_1FailsIfInvalidSPDXIDInFileSection(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psFile2_1, - pkg: &spdx.Package2_1{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, + pkg: &spdx.Package2_1{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, } parser.doc.Packages["test"] = parser.pkg @@ -809,7 +809,7 @@ func TestParser2_1FailsIfInvalidChecksumFormatInFileSection(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psFile2_1, - pkg: &spdx.Package2_1{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, + pkg: &spdx.Package2_1{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, } parser.doc.Packages["test"] = parser.pkg @@ -829,7 +829,7 @@ func TestParser2_1FailsIfUnknownChecksumTypeInFileSection(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psFile2_1, - pkg: &spdx.Package2_1{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, + pkg: &spdx.Package2_1{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, } parser.doc.Packages["test"] = parser.pkg @@ -849,7 +849,7 @@ func TestParser2_1FailsIfArtifactHomePageBeforeArtifactName(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psFile2_1, - pkg: &spdx.Package2_1{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, + pkg: &spdx.Package2_1{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, } parser.doc.Packages["test"] = parser.pkg @@ -869,7 +869,7 @@ func TestParser2_1FailsIfArtifactURIBeforeArtifactName(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psFile2_1, - pkg: &spdx.Package2_1{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, + pkg: &spdx.Package2_1{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, } parser.doc.Packages["test"] = parser.pkg @@ -884,5 +884,3 @@ func TestParser2_1FailsIfArtifactURIBeforeArtifactName(t *testing.T) { t.Errorf("expected non-nil error, got nil") } } - - diff --git a/tvloader/parser2v1/parse_other_license.go b/tvloader/parser2v1/parse_other_license.go index 3090a890..13b635e9 100644 --- a/tvloader/parser2v1/parse_other_license.go +++ b/tvloader/parser2v1/parse_other_license.go @@ -14,15 +14,15 @@ func (parser *tvParser2_1) parsePairFromOtherLicense2_1(tag string, value string case "LicenseID": parser.otherLic = &spdx.OtherLicense2_1{} parser.doc.OtherLicenses = append(parser.doc.OtherLicenses, parser.otherLic) - parser.otherLic.LicenseIdentifier = value + parser.otherLic.Identifier = value case "ExtractedText": parser.otherLic.ExtractedText = value case "LicenseName": - parser.otherLic.LicenseName = value + parser.otherLic.Name = value case "LicenseCrossReference": - parser.otherLic.LicenseCrossReferences = append(parser.otherLic.LicenseCrossReferences, value) + parser.otherLic.CrossReferences = append(parser.otherLic.CrossReferences, value) case "LicenseComment": - parser.otherLic.LicenseComment = value + parser.otherLic.Comment = value // for relationship tags, pass along but don't change state case "Relationship": parser.rln = &spdx.Relationship2_1{} diff --git a/tvloader/parser2v1/parse_other_license_test.go b/tvloader/parser2v1/parse_other_license_test.go index d97eb1c8..156303c8 100644 --- a/tvloader/parser2v1/parse_other_license_test.go +++ b/tvloader/parser2v1/parse_other_license_test.go @@ -16,11 +16,11 @@ func TestParser2_1OLStartsNewOtherLicenseAfterParsingLicenseIDTag(t *testing.T) parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psOtherLicense2_1, - pkg: &spdx.Package2_1{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, - file: &spdx.File2_1{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_1{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, + file: &spdx.File2_1{Name: "f1.txt", SPDXIdentifier: "f1"}, otherLic: &spdx.OtherLicense2_1{ - LicenseIdentifier: olid1, - LicenseName: olname1, + Identifier: olid1, + Name: olname1, }, } olic1 := parser.otherLic @@ -32,8 +32,8 @@ func TestParser2_1OLStartsNewOtherLicenseAfterParsingLicenseIDTag(t *testing.T) if parser.doc.OtherLicenses[0] != olic1 { t.Errorf("Expected other license %v in OtherLicenses[0], got %v", olic1, parser.doc.OtherLicenses[0]) } - if parser.doc.OtherLicenses[0].LicenseName != olname1 { - t.Errorf("expected other license name %s in OtherLicenses[0], got %s", olname1, parser.doc.OtherLicenses[0].LicenseName) + if parser.doc.OtherLicenses[0].Name != olname1 { + t.Errorf("expected other license name %s in OtherLicenses[0], got %s", olname1, parser.doc.OtherLicenses[0].Name) } // now add a new other license @@ -61,8 +61,8 @@ func TestParser2_1OLStartsNewOtherLicenseAfterParsingLicenseIDTag(t *testing.T) t.Errorf("expected state to be %v, got %v", psOtherLicense2_1, parser.st) } // and the other license name should be as expected - if parser.otherLic.LicenseName != olname2 { - t.Errorf("expected other license name %s, got %s", olname2, parser.otherLic.LicenseName) + if parser.otherLic.Name != olname2 { + t.Errorf("expected other license name %s, got %s", olname2, parser.otherLic.Name) } // and the Document's Other Licenses should be of size 2 and have these two if len(parser.doc.OtherLicenses) != 2 { @@ -71,20 +71,20 @@ func TestParser2_1OLStartsNewOtherLicenseAfterParsingLicenseIDTag(t *testing.T) if parser.doc.OtherLicenses[0] != olic1 { t.Errorf("Expected other license %v in OtherLicenses[0], got %v", olic1, parser.doc.OtherLicenses[0]) } - if parser.doc.OtherLicenses[0].LicenseIdentifier != olid1 { - t.Errorf("expected other license ID %s in OtherLicenses[0], got %s", olid1, parser.doc.OtherLicenses[0].LicenseIdentifier) + if parser.doc.OtherLicenses[0].Identifier != olid1 { + t.Errorf("expected other license ID %s in OtherLicenses[0], got %s", olid1, parser.doc.OtherLicenses[0].Identifier) } - if parser.doc.OtherLicenses[0].LicenseName != olname1 { - t.Errorf("expected other license name %s in OtherLicenses[0], got %s", olname1, parser.doc.OtherLicenses[0].LicenseName) + if parser.doc.OtherLicenses[0].Name != olname1 { + t.Errorf("expected other license name %s in OtherLicenses[0], got %s", olname1, parser.doc.OtherLicenses[0].Name) } if parser.doc.OtherLicenses[1] != parser.otherLic { t.Errorf("Expected other license %v in OtherLicenses[1], got %v", parser.otherLic, parser.doc.OtherLicenses[1]) } - if parser.doc.OtherLicenses[1].LicenseIdentifier != olid2 { - t.Errorf("expected other license ID %s in OtherLicenses[1], got %s", olid2, parser.doc.OtherLicenses[1].LicenseIdentifier) + if parser.doc.OtherLicenses[1].Identifier != olid2 { + t.Errorf("expected other license ID %s in OtherLicenses[1], got %s", olid2, parser.doc.OtherLicenses[1].Identifier) } - if parser.doc.OtherLicenses[1].LicenseName != olname2 { - t.Errorf("expected other license name %s in OtherLicenses[1], got %s", olname2, parser.doc.OtherLicenses[1].LicenseName) + if parser.doc.OtherLicenses[1].Name != olname2 { + t.Errorf("expected other license name %s in OtherLicenses[1], got %s", olname2, parser.doc.OtherLicenses[1].Name) } } @@ -92,8 +92,8 @@ func TestParser2_1OLMovesToReviewAfterParsingReviewerTag(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psOtherLicense2_1, - pkg: &spdx.Package2_1{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, - file: &spdx.File2_1{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_1{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, + file: &spdx.File2_1{Name: "f1.txt", SPDXIdentifier: "f1"}, } parser.doc.Packages["test"] = parser.pkg parser.pkg.Files["f1"] = parser.file @@ -112,11 +112,11 @@ func TestParser2_1OtherLicenseStaysAfterParsingRelationshipTags(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psOtherLicense2_1, - pkg: &spdx.Package2_1{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, - file: &spdx.File2_1{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_1{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, + file: &spdx.File2_1{Name: "f1.txt", SPDXIdentifier: "f1"}, otherLic: &spdx.OtherLicense2_1{ - LicenseIdentifier: "LicenseRef-whatever", - LicenseName: "the whatever license", + Identifier: "LicenseRef-whatever", + Name: "the whatever license", }, } parser.doc.Packages["test"] = parser.pkg @@ -154,11 +154,11 @@ func TestParser2_1OtherLicenseStaysAfterParsingAnnotationTags(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psOtherLicense2_1, - pkg: &spdx.Package2_1{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, - file: &spdx.File2_1{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_1{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, + file: &spdx.File2_1{Name: "f1.txt", SPDXIdentifier: "f1"}, otherLic: &spdx.OtherLicense2_1{ - LicenseIdentifier: "LicenseRef-whatever", - LicenseName: "the whatever license", + Identifier: "LicenseRef-whatever", + Name: "the whatever license", }, } parser.doc.Packages["test"] = parser.pkg @@ -218,11 +218,11 @@ func TestParser2_1OLFailsAfterParsingOtherSectionTags(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psOtherLicense2_1, - pkg: &spdx.Package2_1{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, - file: &spdx.File2_1{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_1{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, + file: &spdx.File2_1{Name: "f1.txt", SPDXIdentifier: "f1"}, otherLic: &spdx.OtherLicense2_1{ - LicenseIdentifier: "LicenseRef-Lic11", - LicenseName: "License 11", + Identifier: "LicenseRef-Lic11", + Name: "License 11", }, } parser.doc.Packages["test"] = parser.pkg @@ -249,8 +249,8 @@ func TestParser2_1CanParseOtherLicenseTags(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psOtherLicense2_1, - pkg: &spdx.Package2_1{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, - file: &spdx.File2_1{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_1{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, + file: &spdx.File2_1{Name: "f1.txt", SPDXIdentifier: "f1"}, } parser.doc.Packages["test"] = parser.pkg parser.pkg.Files["f1"] = parser.file @@ -261,8 +261,8 @@ func TestParser2_1CanParseOtherLicenseTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.otherLic.LicenseIdentifier != "LicenseRef-Lic11" { - t.Errorf("got %v for LicenseID", parser.otherLic.LicenseIdentifier) + if parser.otherLic.Identifier != "LicenseRef-Lic11" { + t.Errorf("got %v for LicenseID", parser.otherLic.Identifier) } // Extracted Text @@ -279,8 +279,8 @@ func TestParser2_1CanParseOtherLicenseTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.otherLic.LicenseName != "License 11" { - t.Errorf("got %v for LicenseName", parser.otherLic.LicenseName) + if parser.otherLic.Name != "License 11" { + t.Errorf("got %v for LicenseName", parser.otherLic.Name) } // License Cross Reference @@ -297,7 +297,7 @@ func TestParser2_1CanParseOtherLicenseTags(t *testing.T) { } for _, refWant := range crossRefs { flagFound := false - for _, refCheck := range parser.otherLic.LicenseCrossReferences { + for _, refCheck := range parser.otherLic.CrossReferences { if refWant == refCheck { flagFound = true } @@ -306,9 +306,9 @@ func TestParser2_1CanParseOtherLicenseTags(t *testing.T) { t.Errorf("didn't find %s in LicenseCrossReferences", refWant) } } - if len(crossRefs) != len(parser.otherLic.LicenseCrossReferences) { + if len(crossRefs) != len(parser.otherLic.CrossReferences) { t.Errorf("expected %d types in LicenseCrossReferences, got %d", len(crossRefs), - len(parser.otherLic.LicenseCrossReferences)) + len(parser.otherLic.CrossReferences)) } // License Comment @@ -316,8 +316,8 @@ func TestParser2_1CanParseOtherLicenseTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.otherLic.LicenseComment != "this is a comment" { - t.Errorf("got %v for LicenseComment", parser.otherLic.LicenseComment) + if parser.otherLic.Comment != "this is a comment" { + t.Errorf("got %v for LicenseComment", parser.otherLic.Comment) } } @@ -325,8 +325,8 @@ func TestParser2_1OLUnknownTagFails(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psOtherLicense2_1, - pkg: &spdx.Package2_1{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, - file: &spdx.File2_1{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_1{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, + file: &spdx.File2_1{Name: "f1.txt", SPDXIdentifier: "f1"}, } parser.doc.Packages["test"] = parser.pkg parser.pkg.Files["f1"] = parser.file diff --git a/tvloader/parser2v1/parse_package.go b/tvloader/parser2v1/parse_package.go index b653d9eb..0e10a3e3 100644 --- a/tvloader/parser2v1/parse_package.go +++ b/tvloader/parser2v1/parse_package.go @@ -19,13 +19,13 @@ func (parser *tvParser2_1) parsePairFromPackage2_1(tag string, value string) err switch tag { case "PackageName": // if package already has a name, create and go on to a new package - if parser.pkg == nil || parser.pkg.PackageName != "" { + if parser.pkg == nil || parser.pkg.Name != "" { parser.pkg = &spdx.Package2_1{ FilesAnalyzed: true, IsFilesAnalyzedTagPresent: false, } } - parser.pkg.PackageName = value + parser.pkg.Name = value // tag for going on to file section case "FileName": parser.st = psFile2_1 @@ -39,18 +39,18 @@ func (parser *tvParser2_1) parsePairFromPackage2_1(tag string, value string) err if err != nil { return err } - parser.pkg.PackageSPDXIdentifier = eID + parser.pkg.SPDXIdentifier = eID if parser.doc.Packages == nil { parser.doc.Packages = map[spdx.ElementID]*spdx.Package2_1{} } parser.doc.Packages[eID] = parser.pkg case "PackageVersion": - parser.pkg.PackageVersion = value + parser.pkg.Version = value case "PackageFileName": - parser.pkg.PackageFileName = value + parser.pkg.FileName = value case "PackageSupplier": if value == "NOASSERTION" { - parser.pkg.PackageSupplierNOASSERTION = true + parser.pkg.SupplierNOASSERTION = true break } subkey, subvalue, err := extractSubs(value) @@ -59,15 +59,15 @@ func (parser *tvParser2_1) parsePairFromPackage2_1(tag string, value string) err } switch subkey { case "Person": - parser.pkg.PackageSupplierPerson = subvalue + parser.pkg.SupplierPerson = subvalue case "Organization": - parser.pkg.PackageSupplierOrganization = subvalue + parser.pkg.SupplierOrganization = subvalue default: return fmt.Errorf("unrecognized PackageSupplier type %v", subkey) } case "PackageOriginator": if value == "NOASSERTION" { - parser.pkg.PackageOriginatorNOASSERTION = true + parser.pkg.OriginatorNOASSERTION = true break } subkey, subvalue, err := extractSubs(value) @@ -76,14 +76,14 @@ func (parser *tvParser2_1) parsePairFromPackage2_1(tag string, value string) err } switch subkey { case "Person": - parser.pkg.PackageOriginatorPerson = subvalue + parser.pkg.OriginatorPerson = subvalue case "Organization": - parser.pkg.PackageOriginatorOrganization = subvalue + parser.pkg.OriginatorOrganization = subvalue default: return fmt.Errorf("unrecognized PackageOriginator type %v", subkey) } case "PackageDownloadLocation": - parser.pkg.PackageDownloadLocation = value + parser.pkg.DownloadLocation = value case "FilesAnalyzed": parser.pkg.IsFilesAnalyzedTagPresent = true if value == "false" { @@ -93,8 +93,8 @@ func (parser *tvParser2_1) parsePairFromPackage2_1(tag string, value string) err } case "PackageVerificationCode": code, excludesFileName := extractCodeAndExcludes(value) - parser.pkg.PackageVerificationCode = code - parser.pkg.PackageVerificationCodeExcludedFile = excludesFileName + parser.pkg.VerificationCode = code + parser.pkg.VerificationCodeExcludedFile = excludesFileName case "PackageChecksum": subkey, subvalue, err := extractSubs(value) if err != nil { @@ -102,37 +102,37 @@ func (parser *tvParser2_1) parsePairFromPackage2_1(tag string, value string) err } switch subkey { case "SHA1": - parser.pkg.PackageChecksumSHA1 = subvalue + parser.pkg.ChecksumSHA1 = subvalue case "SHA256": - parser.pkg.PackageChecksumSHA256 = subvalue + parser.pkg.ChecksumSHA256 = subvalue case "MD5": - parser.pkg.PackageChecksumMD5 = subvalue + parser.pkg.ChecksumMD5 = subvalue default: return fmt.Errorf("got unknown checksum type %s", subkey) } case "PackageHomePage": - parser.pkg.PackageHomePage = value + parser.pkg.HomePage = value case "PackageSourceInfo": - parser.pkg.PackageSourceInfo = value + parser.pkg.SourceInfo = value case "PackageLicenseConcluded": - parser.pkg.PackageLicenseConcluded = value + parser.pkg.LicenseConcluded = value case "PackageLicenseInfoFromFiles": - parser.pkg.PackageLicenseInfoFromFiles = append(parser.pkg.PackageLicenseInfoFromFiles, value) + parser.pkg.LicenseInfoFromFiles = append(parser.pkg.LicenseInfoFromFiles, value) case "PackageLicenseDeclared": - parser.pkg.PackageLicenseDeclared = value + parser.pkg.LicenseDeclared = value case "PackageLicenseComments": - parser.pkg.PackageLicenseComments = value + parser.pkg.LicenseComments = value case "PackageCopyrightText": - parser.pkg.PackageCopyrightText = value + parser.pkg.CopyrightText = value case "PackageSummary": - parser.pkg.PackageSummary = value + parser.pkg.Summary = value case "PackageDescription": - parser.pkg.PackageDescription = value + parser.pkg.Description = value case "PackageComment": - parser.pkg.PackageComment = value + parser.pkg.Comment = value case "ExternalRef": parser.pkgExtRef = &spdx.PackageExternalReference2_1{} - parser.pkg.PackageExternalReferences = append(parser.pkg.PackageExternalReferences, parser.pkgExtRef) + parser.pkg.ExternalReferences = append(parser.pkg.ExternalReferences, parser.pkgExtRef) category, refType, locator, err := extractPackageExternalReference(value) if err != nil { return err diff --git a/tvloader/parser2v1/parse_package_test.go b/tvloader/parser2v1/parse_package_test.go index e6dc5e4a..1401153c 100644 --- a/tvloader/parser2v1/parse_package_test.go +++ b/tvloader/parser2v1/parse_package_test.go @@ -15,7 +15,7 @@ func TestParser2_1PackageStartsNewPackageAfterParsingPackageNameTag(t *testing.T parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psPackage2_1, - pkg: &spdx.Package2_1{PackageName: pkgOldName, PackageSPDXIdentifier: "p1"}, + pkg: &spdx.Package2_1{Name: pkgOldName, SPDXIdentifier: "p1"}, } pkgOld := parser.pkg parser.doc.Packages["p1"] = pkgOld @@ -46,8 +46,8 @@ func TestParser2_1PackageStartsNewPackageAfterParsingPackageNameTag(t *testing.T t.Errorf("expected new package, got pkgOld") } // and the package name should be as expected - if parser.pkg.PackageName != pkgName { - t.Errorf("expected package name %s, got %s", pkgName, parser.pkg.PackageName) + if parser.pkg.Name != pkgName { + t.Errorf("expected package name %s, got %s", pkgName, parser.pkg.Name) } // and the package should default to true for FilesAnalyzed if parser.pkg.FilesAnalyzed != true { @@ -93,8 +93,8 @@ func TestParser2_1PackageStartsNewPackageAfterParsingPackageNameTagWhileInUnpack t.Fatalf("parser didn't create new package") } // and the package name should be as expected - if parser.pkg.PackageName != pkgName { - t.Errorf("expected package name %s, got %s", pkgName, parser.pkg.PackageName) + if parser.pkg.Name != pkgName { + t.Errorf("expected package name %s, got %s", pkgName, parser.pkg.Name) } // and the package should default to true for FilesAnalyzed if parser.pkg.FilesAnalyzed != true { @@ -114,7 +114,7 @@ func TestParser2_1PackageMovesToFileAfterParsingFileNameTag(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psPackage2_1, - pkg: &spdx.Package2_1{PackageName: "p1", PackageSPDXIdentifier: "p1"}, + pkg: &spdx.Package2_1{Name: "p1", SPDXIdentifier: "p1"}, } parser.doc.Packages["p1"] = parser.pkg pkgCurrent := parser.pkg @@ -137,7 +137,7 @@ func TestParser2_1PackageMovesToOtherLicenseAfterParsingLicenseIDTag(t *testing. parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psPackage2_1, - pkg: &spdx.Package2_1{PackageName: "p1", PackageSPDXIdentifier: "p1"}, + pkg: &spdx.Package2_1{Name: "p1", SPDXIdentifier: "p1"}, } parser.doc.Packages["p1"] = parser.pkg @@ -154,7 +154,7 @@ func TestParser2_1PackageMovesToReviewAfterParsingReviewerTag(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psPackage2_1, - pkg: &spdx.Package2_1{PackageName: "p1", PackageSPDXIdentifier: "p1"}, + pkg: &spdx.Package2_1{Name: "p1", SPDXIdentifier: "p1"}, } parser.doc.Packages["p1"] = parser.pkg @@ -171,7 +171,7 @@ func TestParser2_1PackageStaysAfterParsingRelationshipTags(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psPackage2_1, - pkg: &spdx.Package2_1{PackageName: "p1", PackageSPDXIdentifier: "p1"}, + pkg: &spdx.Package2_1{Name: "p1", SPDXIdentifier: "p1"}, } parser.doc.Packages["p1"] = parser.pkg @@ -198,7 +198,7 @@ func TestParser2_1PackageStaysAfterParsingAnnotationTags(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psPackage2_1, - pkg: &spdx.Package2_1{PackageName: "p1", PackageSPDXIdentifier: "p1"}, + pkg: &spdx.Package2_1{Name: "p1", SPDXIdentifier: "p1"}, } parser.doc.Packages["p1"] = parser.pkg @@ -261,8 +261,8 @@ func TestParser2_1CanParsePackageTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.pkg.PackageName != "p1" { - t.Errorf("got %v for PackageName", parser.pkg.PackageName) + if parser.pkg.Name != "p1" { + t.Errorf("got %v for PackageName", parser.pkg.Name) } // still should not yet be in Packages map, b/c no SPDX identifier if len(parser.doc.Packages) != 0 { @@ -275,8 +275,8 @@ func TestParser2_1CanParsePackageTags(t *testing.T) { t.Errorf("expected nil error, got %v", err) } // "SPDXRef-" prefix should be removed from the item - if parser.pkg.PackageSPDXIdentifier != "p1" { - t.Errorf("got %v for PackageSPDXIdentifier", parser.pkg.PackageSPDXIdentifier) + if parser.pkg.SPDXIdentifier != "p1" { + t.Errorf("got %v for PackageSPDXIdentifier", parser.pkg.SPDXIdentifier) } // and it should now be added to the Packages map if len(parser.doc.Packages) != 1 { @@ -291,8 +291,8 @@ func TestParser2_1CanParsePackageTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.pkg.PackageVersion != "2.1.1" { - t.Errorf("got %v for PackageVersion", parser.pkg.PackageVersion) + if parser.pkg.Version != "2.1.1" { + t.Errorf("got %v for PackageVersion", parser.pkg.Version) } // Package File Name @@ -300,8 +300,8 @@ func TestParser2_1CanParsePackageTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.pkg.PackageFileName != "p1-2.1.1.tar.gz" { - t.Errorf("got %v for PackageFileName", parser.pkg.PackageFileName) + if parser.pkg.FileName != "p1-2.1.1.tar.gz" { + t.Errorf("got %v for PackageFileName", parser.pkg.FileName) } // Package Supplier @@ -315,8 +315,8 @@ func TestParser2_1CanParsePackageTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.pkg.PackageDownloadLocation != "https://example.com/whatever" { - t.Errorf("got %v for PackageDownloadLocation", parser.pkg.PackageDownloadLocation) + if parser.pkg.DownloadLocation != "https://example.com/whatever" { + t.Errorf("got %v for PackageDownloadLocation", parser.pkg.DownloadLocation) } // Files Analyzed @@ -353,14 +353,14 @@ func TestParser2_1CanParsePackageTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.pkg.PackageChecksumSHA1 != codeSha1 { - t.Errorf("expected %s for PackageChecksumSHA1, got %s", codeSha1, parser.pkg.PackageChecksumSHA1) + if parser.pkg.ChecksumSHA1 != codeSha1 { + t.Errorf("expected %s for PackageChecksumSHA1, got %s", codeSha1, parser.pkg.ChecksumSHA1) } - if parser.pkg.PackageChecksumSHA256 != codeSha256 { - t.Errorf("expected %s for PackageChecksumSHA256, got %s", codeSha256, parser.pkg.PackageChecksumSHA256) + if parser.pkg.ChecksumSHA256 != codeSha256 { + t.Errorf("expected %s for PackageChecksumSHA256, got %s", codeSha256, parser.pkg.ChecksumSHA256) } - if parser.pkg.PackageChecksumMD5 != codeMd5 { - t.Errorf("expected %s for PackageChecksumMD5, got %s", codeMd5, parser.pkg.PackageChecksumMD5) + if parser.pkg.ChecksumMD5 != codeMd5 { + t.Errorf("expected %s for PackageChecksumMD5, got %s", codeMd5, parser.pkg.ChecksumMD5) } // Package Home Page @@ -368,8 +368,8 @@ func TestParser2_1CanParsePackageTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.pkg.PackageHomePage != "https://example.com/whatever2" { - t.Errorf("got %v for PackageHomePage", parser.pkg.PackageHomePage) + if parser.pkg.HomePage != "https://example.com/whatever2" { + t.Errorf("got %v for PackageHomePage", parser.pkg.HomePage) } // Package Source Info @@ -377,8 +377,8 @@ func TestParser2_1CanParsePackageTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.pkg.PackageSourceInfo != "random comment" { - t.Errorf("got %v for PackageSourceInfo", parser.pkg.PackageSourceInfo) + if parser.pkg.SourceInfo != "random comment" { + t.Errorf("got %v for PackageSourceInfo", parser.pkg.SourceInfo) } // Package License Concluded @@ -386,8 +386,8 @@ func TestParser2_1CanParsePackageTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.pkg.PackageLicenseConcluded != "Apache-2.0 OR GPL-2.0-or-later" { - t.Errorf("got %v for PackageLicenseConcluded", parser.pkg.PackageLicenseConcluded) + if parser.pkg.LicenseConcluded != "Apache-2.0 OR GPL-2.0-or-later" { + t.Errorf("got %v for PackageLicenseConcluded", parser.pkg.LicenseConcluded) } // All Licenses Info From Files @@ -404,7 +404,7 @@ func TestParser2_1CanParsePackageTags(t *testing.T) { } for _, licWant := range lics { flagFound := false - for _, licCheck := range parser.pkg.PackageLicenseInfoFromFiles { + for _, licCheck := range parser.pkg.LicenseInfoFromFiles { if licWant == licCheck { flagFound = true } @@ -413,9 +413,9 @@ func TestParser2_1CanParsePackageTags(t *testing.T) { t.Errorf("didn't find %s in PackageLicenseInfoFromFiles", licWant) } } - if len(lics) != len(parser.pkg.PackageLicenseInfoFromFiles) { + if len(lics) != len(parser.pkg.LicenseInfoFromFiles) { t.Errorf("expected %d licenses in PackageLicenseInfoFromFiles, got %d", len(lics), - len(parser.pkg.PackageLicenseInfoFromFiles)) + len(parser.pkg.LicenseInfoFromFiles)) } // Package License Declared @@ -423,8 +423,8 @@ func TestParser2_1CanParsePackageTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.pkg.PackageLicenseDeclared != "Apache-2.0 OR GPL-2.0-or-later" { - t.Errorf("got %v for PackageLicenseDeclared", parser.pkg.PackageLicenseDeclared) + if parser.pkg.LicenseDeclared != "Apache-2.0 OR GPL-2.0-or-later" { + t.Errorf("got %v for PackageLicenseDeclared", parser.pkg.LicenseDeclared) } // Package License Comments @@ -432,8 +432,8 @@ func TestParser2_1CanParsePackageTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.pkg.PackageLicenseComments != "this is a license comment" { - t.Errorf("got %v for PackageLicenseComments", parser.pkg.PackageLicenseComments) + if parser.pkg.LicenseComments != "this is a license comment" { + t.Errorf("got %v for PackageLicenseComments", parser.pkg.LicenseComments) } // Package Copyright Text @@ -441,8 +441,8 @@ func TestParser2_1CanParsePackageTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.pkg.PackageCopyrightText != "Copyright (c) me myself and i" { - t.Errorf("got %v for PackageCopyrightText", parser.pkg.PackageCopyrightText) + if parser.pkg.CopyrightText != "Copyright (c) me myself and i" { + t.Errorf("got %v for PackageCopyrightText", parser.pkg.CopyrightText) } // Package Summary @@ -450,8 +450,8 @@ func TestParser2_1CanParsePackageTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.pkg.PackageSummary != "i wrote this package" { - t.Errorf("got %v for PackageSummary", parser.pkg.PackageSummary) + if parser.pkg.Summary != "i wrote this package" { + t.Errorf("got %v for PackageSummary", parser.pkg.Summary) } // Package Description @@ -459,8 +459,8 @@ func TestParser2_1CanParsePackageTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.pkg.PackageDescription != "i wrote this package a lot" { - t.Errorf("got %v for PackageDescription", parser.pkg.PackageDescription) + if parser.pkg.Description != "i wrote this package a lot" { + t.Errorf("got %v for PackageDescription", parser.pkg.Description) } // Package Comment @@ -468,8 +468,8 @@ func TestParser2_1CanParsePackageTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.pkg.PackageComment != "i scanned this package" { - t.Errorf("got %v for PackageComment", parser.pkg.PackageComment) + if parser.pkg.Comment != "i scanned this package" { + t.Errorf("got %v for PackageComment", parser.pkg.Comment) } // Package External References and Comments @@ -487,16 +487,16 @@ func TestParser2_1CanParsePackageTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if len(parser.pkg.PackageExternalReferences) != 1 { - t.Errorf("expected 1 external reference, got %d", len(parser.pkg.PackageExternalReferences)) + if len(parser.pkg.ExternalReferences) != 1 { + t.Errorf("expected 1 external reference, got %d", len(parser.pkg.ExternalReferences)) } if parser.pkgExtRef == nil { t.Errorf("expected non-nil pkgExtRef, got nil") } - if parser.pkg.PackageExternalReferences[0] == nil { + if parser.pkg.ExternalReferences[0] == nil { t.Errorf("expected non-nil PackageExternalReferences[0], got nil") } - if parser.pkgExtRef != parser.pkg.PackageExternalReferences[0] { + if parser.pkgExtRef != parser.pkg.ExternalReferences[0] { t.Errorf("expected pkgExtRef to match PackageExternalReferences[0], got no match") } err = parser.parsePairFromPackage2_1("ExternalRefComment", ref1Comment) @@ -507,16 +507,16 @@ func TestParser2_1CanParsePackageTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if len(parser.pkg.PackageExternalReferences) != 2 { - t.Errorf("expected 2 external references, got %d", len(parser.pkg.PackageExternalReferences)) + if len(parser.pkg.ExternalReferences) != 2 { + t.Errorf("expected 2 external references, got %d", len(parser.pkg.ExternalReferences)) } if parser.pkgExtRef == nil { t.Errorf("expected non-nil pkgExtRef, got nil") } - if parser.pkg.PackageExternalReferences[1] == nil { + if parser.pkg.ExternalReferences[1] == nil { t.Errorf("expected non-nil PackageExternalReferences[1], got nil") } - if parser.pkgExtRef != parser.pkg.PackageExternalReferences[1] { + if parser.pkgExtRef != parser.pkg.ExternalReferences[1] { t.Errorf("expected pkgExtRef to match PackageExternalReferences[1], got no match") } err = parser.parsePairFromPackage2_1("ExternalRefComment", ref2Comment) @@ -524,7 +524,7 @@ func TestParser2_1CanParsePackageTags(t *testing.T) { t.Errorf("expected nil error, got %v", err) } // finally, check these values - gotRef1 := parser.pkg.PackageExternalReferences[0] + gotRef1 := parser.pkg.ExternalReferences[0] if gotRef1.Category != ref1Category { t.Errorf("expected ref1 category to be %s, got %s", gotRef1.Category, ref1Category) } @@ -537,7 +537,7 @@ func TestParser2_1CanParsePackageTags(t *testing.T) { if gotRef1.ExternalRefComment != ref1Comment { t.Errorf("expected ref1 comment to be %s, got %s", gotRef1.ExternalRefComment, ref1Comment) } - gotRef2 := parser.pkg.PackageExternalReferences[1] + gotRef2 := parser.pkg.ExternalReferences[1] if gotRef2.Category != ref2Category { t.Errorf("expected ref2 category to be %s, got %s", gotRef2.Category, ref2Category) } @@ -557,7 +557,7 @@ func TestParser2_1CanParsePackageSupplierPersonTag(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psPackage2_1, - pkg: &spdx.Package2_1{PackageName: "p1", PackageSPDXIdentifier: "p1"}, + pkg: &spdx.Package2_1{Name: "p1", SPDXIdentifier: "p1"}, } parser.doc.Packages["p1"] = parser.pkg @@ -566,8 +566,8 @@ func TestParser2_1CanParsePackageSupplierPersonTag(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.pkg.PackageSupplierPerson != "John Doe" { - t.Errorf("got %v for PackageSupplierPerson", parser.pkg.PackageSupplierPerson) + if parser.pkg.SupplierPerson != "John Doe" { + t.Errorf("got %v for PackageSupplierPerson", parser.pkg.SupplierPerson) } } @@ -575,7 +575,7 @@ func TestParser2_1CanParsePackageSupplierOrganizationTag(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psPackage2_1, - pkg: &spdx.Package2_1{PackageName: "p1", PackageSPDXIdentifier: "p1"}, + pkg: &spdx.Package2_1{Name: "p1", SPDXIdentifier: "p1"}, } parser.doc.Packages["p1"] = parser.pkg @@ -584,8 +584,8 @@ func TestParser2_1CanParsePackageSupplierOrganizationTag(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.pkg.PackageSupplierOrganization != "John Doe, Inc." { - t.Errorf("got %v for PackageSupplierOrganization", parser.pkg.PackageSupplierOrganization) + if parser.pkg.SupplierOrganization != "John Doe, Inc." { + t.Errorf("got %v for PackageSupplierOrganization", parser.pkg.SupplierOrganization) } } @@ -593,7 +593,7 @@ func TestParser2_1CanParsePackageSupplierNOASSERTIONTag(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psPackage2_1, - pkg: &spdx.Package2_1{PackageName: "p1", PackageSPDXIdentifier: "p1"}, + pkg: &spdx.Package2_1{Name: "p1", SPDXIdentifier: "p1"}, } parser.doc.Packages["p1"] = parser.pkg @@ -602,7 +602,7 @@ func TestParser2_1CanParsePackageSupplierNOASSERTIONTag(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.pkg.PackageSupplierNOASSERTION != true { + if parser.pkg.SupplierNOASSERTION != true { t.Errorf("got false for PackageSupplierNOASSERTION") } } @@ -611,7 +611,7 @@ func TestParser2_1CanParsePackageOriginatorPersonTag(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psPackage2_1, - pkg: &spdx.Package2_1{PackageName: "p1", PackageSPDXIdentifier: "p1"}, + pkg: &spdx.Package2_1{Name: "p1", SPDXIdentifier: "p1"}, } parser.doc.Packages["p1"] = parser.pkg @@ -620,8 +620,8 @@ func TestParser2_1CanParsePackageOriginatorPersonTag(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.pkg.PackageOriginatorPerson != "John Doe" { - t.Errorf("got %v for PackageOriginatorPerson", parser.pkg.PackageOriginatorPerson) + if parser.pkg.OriginatorPerson != "John Doe" { + t.Errorf("got %v for PackageOriginatorPerson", parser.pkg.OriginatorPerson) } } @@ -629,7 +629,7 @@ func TestParser2_1CanParsePackageOriginatorOrganizationTag(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psPackage2_1, - pkg: &spdx.Package2_1{PackageName: "p1", PackageSPDXIdentifier: "p1"}, + pkg: &spdx.Package2_1{Name: "p1", SPDXIdentifier: "p1"}, } parser.doc.Packages["p1"] = parser.pkg @@ -638,8 +638,8 @@ func TestParser2_1CanParsePackageOriginatorOrganizationTag(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.pkg.PackageOriginatorOrganization != "John Doe, Inc." { - t.Errorf("got %v for PackageOriginatorOrganization", parser.pkg.PackageOriginatorOrganization) + if parser.pkg.OriginatorOrganization != "John Doe, Inc." { + t.Errorf("got %v for PackageOriginatorOrganization", parser.pkg.OriginatorOrganization) } } @@ -647,7 +647,7 @@ func TestParser2_1CanParsePackageOriginatorNOASSERTIONTag(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psPackage2_1, - pkg: &spdx.Package2_1{PackageName: "p1", PackageSPDXIdentifier: "p1"}, + pkg: &spdx.Package2_1{Name: "p1", SPDXIdentifier: "p1"}, } parser.doc.Packages["p1"] = parser.pkg @@ -656,7 +656,7 @@ func TestParser2_1CanParsePackageOriginatorNOASSERTIONTag(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.pkg.PackageOriginatorNOASSERTION != true { + if parser.pkg.OriginatorNOASSERTION != true { t.Errorf("got false for PackageOriginatorNOASSERTION") } } @@ -665,7 +665,7 @@ func TestParser2_1CanParsePackageVerificationCodeTagWithExcludes(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psPackage2_1, - pkg: &spdx.Package2_1{PackageName: "p1", PackageSPDXIdentifier: "p1"}, + pkg: &spdx.Package2_1{Name: "p1", SPDXIdentifier: "p1"}, } parser.doc.Packages["p1"] = parser.pkg @@ -677,11 +677,11 @@ func TestParser2_1CanParsePackageVerificationCodeTagWithExcludes(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.pkg.PackageVerificationCode != code { - t.Errorf("got %v for PackageVerificationCode", parser.pkg.PackageVerificationCode) + if parser.pkg.VerificationCode != code { + t.Errorf("got %v for PackageVerificationCode", parser.pkg.VerificationCode) } - if parser.pkg.PackageVerificationCodeExcludedFile != fileName { - t.Errorf("got %v for PackageVerificationCodeExcludedFile", parser.pkg.PackageVerificationCodeExcludedFile) + if parser.pkg.VerificationCodeExcludedFile != fileName { + t.Errorf("got %v for PackageVerificationCodeExcludedFile", parser.pkg.VerificationCodeExcludedFile) } } @@ -690,7 +690,7 @@ func TestParser2_1CanParsePackageVerificationCodeTagWithoutExcludes(t *testing.T parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psPackage2_1, - pkg: &spdx.Package2_1{PackageName: "p1", PackageSPDXIdentifier: "p1"}, + pkg: &spdx.Package2_1{Name: "p1", SPDXIdentifier: "p1"}, } parser.doc.Packages["p1"] = parser.pkg @@ -700,11 +700,11 @@ func TestParser2_1CanParsePackageVerificationCodeTagWithoutExcludes(t *testing.T if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.pkg.PackageVerificationCode != code { - t.Errorf("got %v for PackageVerificationCode", parser.pkg.PackageVerificationCode) + if parser.pkg.VerificationCode != code { + t.Errorf("got %v for PackageVerificationCode", parser.pkg.VerificationCode) } - if parser.pkg.PackageVerificationCodeExcludedFile != "" { - t.Errorf("got %v for PackageVerificationCodeExcludedFile", parser.pkg.PackageVerificationCodeExcludedFile) + if parser.pkg.VerificationCodeExcludedFile != "" { + t.Errorf("got %v for PackageVerificationCodeExcludedFile", parser.pkg.VerificationCodeExcludedFile) } } @@ -713,7 +713,7 @@ func TestPackageExternalRefPointerChangesAfterTags(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psPackage2_1, - pkg: &spdx.Package2_1{PackageName: "p1", PackageSPDXIdentifier: "p1"}, + pkg: &spdx.Package2_1{Name: "p1", SPDXIdentifier: "p1"}, } parser.doc.Packages["p1"] = parser.pkg @@ -758,7 +758,7 @@ func TestParser2_1PackageCreatesRelationshipInDocument(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psPackage2_1, - pkg: &spdx.Package2_1{PackageName: "p1", PackageSPDXIdentifier: "p1"}, + pkg: &spdx.Package2_1{Name: "p1", SPDXIdentifier: "p1"}, } parser.doc.Packages["p1"] = parser.pkg @@ -778,7 +778,7 @@ func TestParser2_1PackageCreatesAnnotationInDocument(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psPackage2_1, - pkg: &spdx.Package2_1{PackageName: "p1", PackageSPDXIdentifier: "p1"}, + pkg: &spdx.Package2_1{Name: "p1", SPDXIdentifier: "p1"}, } parser.doc.Packages["p1"] = parser.pkg @@ -798,7 +798,7 @@ func TestParser2_1PackageUnknownTagFails(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psPackage2_1, - pkg: &spdx.Package2_1{PackageName: "p1", PackageSPDXIdentifier: "p1"}, + pkg: &spdx.Package2_1{Name: "p1", SPDXIdentifier: "p1"}, } parser.doc.Packages["p1"] = parser.pkg @@ -1068,4 +1068,3 @@ func TestFailsPackageExternalRefWithInvalidFormat(t *testing.T) { t.Errorf("expected non-nil error, got nil") } } - diff --git a/tvloader/parser2v1/parse_relationship.go b/tvloader/parser2v1/parse_relationship.go index 2b9b8ccb..884819d7 100644 --- a/tvloader/parser2v1/parse_relationship.go +++ b/tvloader/parser2v1/parse_relationship.go @@ -44,7 +44,7 @@ func (parser *tvParser2_1) parsePairForRelationship2_1(tag string, value string) } if tag == "RelationshipComment" { - parser.rln.RelationshipComment = value + parser.rln.Comment = value return nil } diff --git a/tvloader/parser2v1/parse_relationship_test.go b/tvloader/parser2v1/parse_relationship_test.go index 3e5610f4..8e449261 100644 --- a/tvloader/parser2v1/parse_relationship_test.go +++ b/tvloader/parser2v1/parse_relationship_test.go @@ -57,8 +57,8 @@ func TestParser2_1CanParseRelationshipTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.rln.RelationshipComment != cmt { - t.Errorf("got %v for RelationshipComment, expected %v", parser.rln.RelationshipComment, cmt) + if parser.rln.Comment != cmt { + t.Errorf("got %v for RelationshipComment, expected %v", parser.rln.Comment, cmt) } } diff --git a/tvloader/parser2v1/parse_review.go b/tvloader/parser2v1/parse_review.go index 0d102d3b..7cdfcc52 100644 --- a/tvloader/parser2v1/parse_review.go +++ b/tvloader/parser2v1/parse_review.go @@ -32,9 +32,9 @@ func (parser *tvParser2_1) parsePairFromReview2_1(tag string, value string) erro return fmt.Errorf("unrecognized Reviewer type %v", subkey) } case "ReviewDate": - parser.rev.ReviewDate = value + parser.rev.Date = value case "ReviewComment": - parser.rev.ReviewComment = value + parser.rev.Comment = value // for relationship tags, pass along but don't change state case "Relationship": parser.rln = &spdx.Relationship2_1{} diff --git a/tvloader/parser2v1/parse_review_test.go b/tvloader/parser2v1/parse_review_test.go index efcde5c4..348d1dac 100644 --- a/tvloader/parser2v1/parse_review_test.go +++ b/tvloader/parser2v1/parse_review_test.go @@ -14,11 +14,11 @@ func TestParser2_1ReviewStartsNewReviewAfterParsingReviewerTag(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psReview2_1, - pkg: &spdx.Package2_1{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, - file: &spdx.File2_1{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_1{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, + file: &spdx.File2_1{Name: "f1.txt", SPDXIdentifier: "f1"}, otherLic: &spdx.OtherLicense2_1{ - LicenseIdentifier: "LicenseRef-Lic11", - LicenseName: "License 11", + Identifier: "LicenseRef-Lic11", + Name: "License 11", }, rev: &spdx.Review2_1{ Reviewer: rev1, @@ -84,11 +84,11 @@ func TestParser2_1ReviewStaysAfterParsingRelationshipTags(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psReview2_1, - pkg: &spdx.Package2_1{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, - file: &spdx.File2_1{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_1{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, + file: &spdx.File2_1{Name: "f1.txt", SPDXIdentifier: "f1"}, otherLic: &spdx.OtherLicense2_1{ - LicenseIdentifier: "LicenseRef-Lic11", - LicenseName: "License 11", + Identifier: "LicenseRef-Lic11", + Name: "License 11", }, rev: &spdx.Review2_1{ Reviewer: "Jane Doe", @@ -131,11 +131,11 @@ func TestParser2_1ReviewStaysAfterParsingAnnotationTags(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psReview2_1, - pkg: &spdx.Package2_1{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, - file: &spdx.File2_1{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_1{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, + file: &spdx.File2_1{Name: "f1.txt", SPDXIdentifier: "f1"}, otherLic: &spdx.OtherLicense2_1{ - LicenseIdentifier: "LicenseRef-Lic11", - LicenseName: "License 11", + Identifier: "LicenseRef-Lic11", + Name: "License 11", }, rev: &spdx.Review2_1{ Reviewer: "Jane Doe", @@ -200,11 +200,11 @@ func TestParser2_1ReviewFailsAfterParsingOtherSectionTags(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psReview2_1, - pkg: &spdx.Package2_1{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, - file: &spdx.File2_1{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_1{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, + file: &spdx.File2_1{Name: "f1.txt", SPDXIdentifier: "f1"}, otherLic: &spdx.OtherLicense2_1{ - LicenseIdentifier: "LicenseRef-Lic11", - LicenseName: "License 11", + Identifier: "LicenseRef-Lic11", + Name: "License 11", }, rev: &spdx.Review2_1{}, } @@ -237,11 +237,11 @@ func TestParser2_1CanParseReviewTags(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psReview2_1, - pkg: &spdx.Package2_1{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, - file: &spdx.File2_1{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_1{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, + file: &spdx.File2_1{Name: "f1.txt", SPDXIdentifier: "f1"}, otherLic: &spdx.OtherLicense2_1{ - LicenseIdentifier: "LicenseRef-Lic11", - LicenseName: "License 11", + Identifier: "LicenseRef-Lic11", + Name: "License 11", }, rev: &spdx.Review2_1{}, } @@ -258,8 +258,8 @@ func TestParser2_1CanParseReviewTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.rev.ReviewDate != "2018-09-23T08:30:00Z" { - t.Errorf("got %v for ReviewDate", parser.rev.ReviewDate) + if parser.rev.Date != "2018-09-23T08:30:00Z" { + t.Errorf("got %v for ReviewDate", parser.rev.Date) } // Review Comment (DEPRECATED) @@ -267,8 +267,8 @@ func TestParser2_1CanParseReviewTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.rev.ReviewComment != "this is a comment" { - t.Errorf("got %v for ReviewComment", parser.rev.ReviewComment) + if parser.rev.Comment != "this is a comment" { + t.Errorf("got %v for ReviewComment", parser.rev.Comment) } } @@ -276,11 +276,11 @@ func TestParser2_1CanParseReviewerPersonTag(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psReview2_1, - pkg: &spdx.Package2_1{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, - file: &spdx.File2_1{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_1{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, + file: &spdx.File2_1{Name: "f1.txt", SPDXIdentifier: "f1"}, otherLic: &spdx.OtherLicense2_1{ - LicenseIdentifier: "LicenseRef-Lic11", - LicenseName: "License 11", + Identifier: "LicenseRef-Lic11", + Name: "License 11", }, rev: &spdx.Review2_1{}, } @@ -306,11 +306,11 @@ func TestParser2_1CanParseReviewerOrganizationTag(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psReview2_1, - pkg: &spdx.Package2_1{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, - file: &spdx.File2_1{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_1{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, + file: &spdx.File2_1{Name: "f1.txt", SPDXIdentifier: "f1"}, otherLic: &spdx.OtherLicense2_1{ - LicenseIdentifier: "LicenseRef-Lic11", - LicenseName: "License 11", + Identifier: "LicenseRef-Lic11", + Name: "License 11", }, rev: &spdx.Review2_1{}, } @@ -336,11 +336,11 @@ func TestParser2_1CanParseReviewerToolTag(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psReview2_1, - pkg: &spdx.Package2_1{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, - file: &spdx.File2_1{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_1{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, + file: &spdx.File2_1{Name: "f1.txt", SPDXIdentifier: "f1"}, otherLic: &spdx.OtherLicense2_1{ - LicenseIdentifier: "LicenseRef-Lic11", - LicenseName: "License 11", + Identifier: "LicenseRef-Lic11", + Name: "License 11", }, rev: &spdx.Review2_1{}, } @@ -364,8 +364,8 @@ func TestParser2_1CanParseReviewerToolTag(t *testing.T) { func TestParser2_1FailsIfReviewerInvalidFormat(t *testing.T) { parser := tvParser2_1{ - doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, - st: psReview2_1, + doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, + st: psReview2_1, rev: &spdx.Review2_1{}, } parser.doc.Reviews = append(parser.doc.Reviews, parser.rev) @@ -378,8 +378,8 @@ func TestParser2_1FailsIfReviewerInvalidFormat(t *testing.T) { func TestParser2_1FailsIfReviewerUnknownType(t *testing.T) { parser := tvParser2_1{ - doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, - st: psReview2_1, + doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, + st: psReview2_1, rev: &spdx.Review2_1{}, } parser.doc.Reviews = append(parser.doc.Reviews, parser.rev) @@ -394,11 +394,11 @@ func TestParser2_1ReviewUnknownTagFails(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psReview2_1, - pkg: &spdx.Package2_1{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, - file: &spdx.File2_1{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_1{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, + file: &spdx.File2_1{Name: "f1.txt", SPDXIdentifier: "f1"}, otherLic: &spdx.OtherLicense2_1{ - LicenseIdentifier: "LicenseRef-Lic11", - LicenseName: "License 11", + Identifier: "LicenseRef-Lic11", + Name: "License 11", }, rev: &spdx.Review2_1{}, } @@ -412,5 +412,3 @@ func TestParser2_1ReviewUnknownTagFails(t *testing.T) { t.Errorf("expected error from parsing unknown tag") } } - - diff --git a/tvloader/parser2v1/parse_snippet.go b/tvloader/parser2v1/parse_snippet.go index f7085a70..2532c7c6 100644 --- a/tvloader/parser2v1/parse_snippet.go +++ b/tvloader/parser2v1/parse_snippet.go @@ -25,7 +25,7 @@ func (parser *tvParser2_1) parsePairFromSnippet2_1(tag string, value string) err } parser.file.Snippets[eID] = parser.snippet } - parser.snippet.SnippetSPDXIdentifier = eID + parser.snippet.SPDXIdentifier = eID // tag for creating new file section and going back to parsing File case "FileName": parser.st = psFile2_1 @@ -61,8 +61,8 @@ func (parser *tvParser2_1) parsePairFromSnippet2_1(tag string, value string) err if err != nil { return err } - parser.snippet.SnippetByteRangeStart = bIntStart - parser.snippet.SnippetByteRangeEnd = bIntEnd + parser.snippet.ByteRangeStart = bIntStart + parser.snippet.ByteRangeEnd = bIntEnd case "SnippetLineRange": lineStart, lineEnd, err := extractSubs(value) if err != nil { @@ -76,20 +76,20 @@ func (parser *tvParser2_1) parsePairFromSnippet2_1(tag string, value string) err if err != nil { return err } - parser.snippet.SnippetLineRangeStart = lInttStart - parser.snippet.SnippetLineRangeEnd = lInttEnd + parser.snippet.LineRangeStart = lInttStart + parser.snippet.LineRangeEnd = lInttEnd case "SnippetLicenseConcluded": - parser.snippet.SnippetLicenseConcluded = value + parser.snippet.LicenseConcluded = value case "LicenseInfoInSnippet": parser.snippet.LicenseInfoInSnippet = append(parser.snippet.LicenseInfoInSnippet, value) case "SnippetLicenseComments": - parser.snippet.SnippetLicenseComments = value + parser.snippet.LicenseComments = value case "SnippetCopyrightText": - parser.snippet.SnippetCopyrightText = value + parser.snippet.CopyrightText = value case "SnippetComment": - parser.snippet.SnippetComment = value + parser.snippet.Comment = value case "SnippetName": - parser.snippet.SnippetName = value + parser.snippet.Name = value // for relationship tags, pass along but don't change state case "Relationship": parser.rln = &spdx.Relationship2_1{} diff --git a/tvloader/parser2v1/parse_snippet_test.go b/tvloader/parser2v1/parse_snippet_test.go index a4412df3..4d43ea1b 100644 --- a/tvloader/parser2v1/parse_snippet_test.go +++ b/tvloader/parser2v1/parse_snippet_test.go @@ -14,9 +14,9 @@ func TestParser2_1SnippetStartsNewSnippetAfterParsingSnippetSPDXIDTag(t *testing parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psSnippet2_1, - pkg: &spdx.Package2_1{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, - file: &spdx.File2_1{FileName: "f1.txt", FileSPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_1{}}, - snippet: &spdx.Snippet2_1{SnippetSPDXIdentifier: sid1}, + pkg: &spdx.Package2_1{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_1{}}, + file: &spdx.File2_1{Name: "f1.txt", SPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_1{}}, + snippet: &spdx.Snippet2_1{SPDXIdentifier: sid1}, } s1 := parser.snippet parser.doc.Packages["test"] = parser.pkg @@ -30,8 +30,8 @@ func TestParser2_1SnippetStartsNewSnippetAfterParsingSnippetSPDXIDTag(t *testing if parser.file.Snippets["s1"] != s1 { t.Errorf("Expected snippet %v in Snippets[s1], got %v", s1, parser.file.Snippets["s1"]) } - if parser.file.Snippets["s1"].SnippetSPDXIdentifier != sid1 { - t.Errorf("expected snippet ID %s in Snippets[s1], got %s", sid1, parser.file.Snippets["s1"].SnippetSPDXIdentifier) + if parser.file.Snippets["s1"].SPDXIdentifier != sid1 { + t.Errorf("expected snippet ID %s in Snippets[s1], got %s", sid1, parser.file.Snippets["s1"].SPDXIdentifier) } // now add a new snippet @@ -48,8 +48,8 @@ func TestParser2_1SnippetStartsNewSnippetAfterParsingSnippetSPDXIDTag(t *testing t.Fatalf("parser didn't create new snippet") } // and the snippet ID should be as expected - if parser.snippet.SnippetSPDXIdentifier != "s2" { - t.Errorf("expected snippet ID %s, got %s", "s2", parser.snippet.SnippetSPDXIdentifier) + if parser.snippet.SPDXIdentifier != "s2" { + t.Errorf("expected snippet ID %s, got %s", "s2", parser.snippet.SPDXIdentifier) } // and the File's Snippets should be of size 2 and have these two if len(parser.file.Snippets) != 2 { @@ -58,14 +58,14 @@ func TestParser2_1SnippetStartsNewSnippetAfterParsingSnippetSPDXIDTag(t *testing if parser.file.Snippets["s1"] != s1 { t.Errorf("Expected snippet %v in Snippets[s1], got %v", s1, parser.file.Snippets["s1"]) } - if parser.file.Snippets["s1"].SnippetSPDXIdentifier != sid1 { - t.Errorf("expected snippet ID %s in Snippets[s1], got %s", sid1, parser.file.Snippets["s1"].SnippetSPDXIdentifier) + if parser.file.Snippets["s1"].SPDXIdentifier != sid1 { + t.Errorf("expected snippet ID %s in Snippets[s1], got %s", sid1, parser.file.Snippets["s1"].SPDXIdentifier) } if parser.file.Snippets["s2"] != parser.snippet { t.Errorf("Expected snippet %v in Snippets[s2], got %v", parser.snippet, parser.file.Snippets["s2"]) } - if parser.file.Snippets["s2"].SnippetSPDXIdentifier != "s2" { - t.Errorf("expected snippet ID %s in Snippets[s2], got %s", "s2", parser.file.Snippets["s2"].SnippetSPDXIdentifier) + if parser.file.Snippets["s2"].SPDXIdentifier != "s2" { + t.Errorf("expected snippet ID %s in Snippets[s2], got %s", "s2", parser.file.Snippets["s2"].SPDXIdentifier) } } @@ -73,9 +73,9 @@ func TestParser2_1SnippetStartsNewPackageAfterParsingPackageNameTag(t *testing.T parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psSnippet2_1, - pkg: &spdx.Package2_1{PackageName: "package1", PackageSPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_1{}}, - file: &spdx.File2_1{FileName: "f1.txt", FileSPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_1{}}, - snippet: &spdx.Snippet2_1{SnippetSPDXIdentifier: "s1"}, + pkg: &spdx.Package2_1{Name: "package1", SPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_1{}}, + file: &spdx.File2_1{Name: "f1.txt", SPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_1{}}, + snippet: &spdx.Snippet2_1{SPDXIdentifier: "s1"}, } p1 := parser.pkg f1 := parser.file @@ -98,8 +98,8 @@ func TestParser2_1SnippetStartsNewPackageAfterParsingPackageNameTag(t *testing.T t.Fatalf("parser didn't create new pkg") } // and the package name should be as expected - if parser.pkg.PackageName != p2Name { - t.Errorf("expected package name %s, got %s", p2Name, parser.pkg.PackageName) + if parser.pkg.Name != p2Name { + t.Errorf("expected package name %s, got %s", p2Name, parser.pkg.Name) } // and the package should default to true for FilesAnalyzed if parser.pkg.FilesAnalyzed != true { @@ -116,8 +116,8 @@ func TestParser2_1SnippetStartsNewPackageAfterParsingPackageNameTag(t *testing.T if parser.doc.Packages["package1"] != p1 { t.Errorf("Expected package %v in Packages[package1], got %v", p1, parser.doc.Packages["package1"]) } - if parser.doc.Packages["package1"].PackageName != "package1" { - t.Errorf("expected package name %s in Packages[package1], got %s", "package1", parser.doc.Packages["package1"].PackageName) + if parser.doc.Packages["package1"].Name != "package1" { + t.Errorf("expected package name %s in Packages[package1], got %s", "package1", parser.doc.Packages["package1"].Name) } // and the first Package's Files should be of size 1 and have f1 only if len(parser.doc.Packages["package1"].Files) != 1 { @@ -126,8 +126,8 @@ func TestParser2_1SnippetStartsNewPackageAfterParsingPackageNameTag(t *testing.T if parser.doc.Packages["package1"].Files["f1"] != f1 { t.Errorf("Expected file %v in Files[f1], got %v", f1, parser.doc.Packages["package1"].Files["f1"]) } - if parser.doc.Packages["package1"].Files["f1"].FileName != "f1.txt" { - t.Errorf("expected file name %s in Files[f1], got %s", "f1.txt", parser.doc.Packages["package1"].Files["f1"].FileName) + if parser.doc.Packages["package1"].Files["f1"].Name != "f1.txt" { + t.Errorf("expected file name %s in Files[f1], got %s", "f1.txt", parser.doc.Packages["package1"].Files["f1"].Name) } // and the new Package should have no files if len(parser.pkg.Files) != 0 { @@ -148,9 +148,9 @@ func TestParser2_1SnippetMovesToFileAfterParsingFileNameTag(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psSnippet2_1, - pkg: &spdx.Package2_1{PackageName: "package1", PackageSPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_1{}}, - file: &spdx.File2_1{FileName: "f1.txt", FileSPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_1{}}, - snippet: &spdx.Snippet2_1{SnippetSPDXIdentifier: "s1"}, + pkg: &spdx.Package2_1{Name: "package1", SPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_1{}}, + file: &spdx.File2_1{Name: "f1.txt", SPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_1{}}, + snippet: &spdx.Snippet2_1{SPDXIdentifier: "s1"}, } p1 := parser.pkg f1 := parser.file @@ -176,8 +176,8 @@ func TestParser2_1SnippetMovesToFileAfterParsingFileNameTag(t *testing.T) { t.Fatalf("parser didn't create new file") } // and the file name should be as expected - if parser.file.FileName != f2Name { - t.Errorf("expected file name %s, got %s", f2Name, parser.file.FileName) + if parser.file.Name != f2Name { + t.Errorf("expected file name %s, got %s", f2Name, parser.file.Name) } // and the Package's Files should still be of size 1 since we haven't seen // an SPDX identifier yet for this new file @@ -187,8 +187,8 @@ func TestParser2_1SnippetMovesToFileAfterParsingFileNameTag(t *testing.T) { if parser.pkg.Files["f1"] != f1 { t.Errorf("Expected file %v in Files[f1], got %v", f1, parser.pkg.Files["f1"]) } - if parser.pkg.Files["f1"].FileName != f1Name { - t.Errorf("expected file name %s in Files[f1], got %s", f1Name, parser.pkg.Files["f1"].FileName) + if parser.pkg.Files["f1"].Name != f1Name { + t.Errorf("expected file name %s in Files[f1], got %s", f1Name, parser.pkg.Files["f1"].Name) } // and the current snippet should be nil if parser.snippet != nil { @@ -200,9 +200,9 @@ func TestParser2_1SnippetMovesToOtherLicenseAfterParsingLicenseIDTag(t *testing. parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psSnippet2_1, - pkg: &spdx.Package2_1{PackageName: "package1", PackageSPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_1{}}, - file: &spdx.File2_1{FileName: "f1.txt", FileSPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_1{}}, - snippet: &spdx.Snippet2_1{SnippetSPDXIdentifier: "s1"}, + pkg: &spdx.Package2_1{Name: "package1", SPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_1{}}, + file: &spdx.File2_1{Name: "f1.txt", SPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_1{}}, + snippet: &spdx.Snippet2_1{SPDXIdentifier: "s1"}, } parser.doc.Packages["package1"] = parser.pkg parser.pkg.Files["f1"] = parser.file @@ -221,9 +221,9 @@ func TestParser2_1SnippetMovesToReviewAfterParsingReviewerTag(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psSnippet2_1, - pkg: &spdx.Package2_1{PackageName: "package1", PackageSPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_1{}}, - file: &spdx.File2_1{FileName: "f1.txt", FileSPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_1{}}, - snippet: &spdx.Snippet2_1{SnippetSPDXIdentifier: "s1"}, + pkg: &spdx.Package2_1{Name: "package1", SPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_1{}}, + file: &spdx.File2_1{Name: "f1.txt", SPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_1{}}, + snippet: &spdx.Snippet2_1{SPDXIdentifier: "s1"}, } parser.doc.Packages["package1"] = parser.pkg parser.pkg.Files["f1"] = parser.file @@ -242,9 +242,9 @@ func TestParser2_1SnippetStaysAfterParsingRelationshipTags(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psSnippet2_1, - pkg: &spdx.Package2_1{PackageName: "package1", PackageSPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_1{}}, - file: &spdx.File2_1{FileName: "f1.txt", FileSPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_1{}}, - snippet: &spdx.Snippet2_1{SnippetSPDXIdentifier: "s1"}, + pkg: &spdx.Package2_1{Name: "package1", SPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_1{}}, + file: &spdx.File2_1{Name: "f1.txt", SPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_1{}}, + snippet: &spdx.Snippet2_1{SPDXIdentifier: "s1"}, } parser.doc.Packages["package1"] = parser.pkg parser.pkg.Files["f1"] = parser.file @@ -281,9 +281,9 @@ func TestParser2_1SnippetStaysAfterParsingAnnotationTags(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psSnippet2_1, - pkg: &spdx.Package2_1{PackageName: "package1", PackageSPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_1{}}, - file: &spdx.File2_1{FileName: "f1.txt", FileSPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_1{}}, - snippet: &spdx.Snippet2_1{SnippetSPDXIdentifier: "s1"}, + pkg: &spdx.Package2_1{Name: "package1", SPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_1{}}, + file: &spdx.File2_1{Name: "f1.txt", SPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_1{}}, + snippet: &spdx.Snippet2_1{SPDXIdentifier: "s1"}, } parser.doc.Packages["package1"] = parser.pkg parser.pkg.Files["f1"] = parser.file @@ -343,8 +343,8 @@ func TestParser2_1CanParseSnippetTags(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psSnippet2_1, - pkg: &spdx.Package2_1{PackageName: "package1", PackageSPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_1{}}, - file: &spdx.File2_1{FileName: "f1.txt", FileSPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_1{}}, + pkg: &spdx.Package2_1{Name: "package1", SPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_1{}}, + file: &spdx.File2_1{Name: "f1.txt", SPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_1{}}, snippet: &spdx.Snippet2_1{}, } parser.doc.Packages["package1"] = parser.pkg @@ -355,8 +355,8 @@ func TestParser2_1CanParseSnippetTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.snippet.SnippetSPDXIdentifier != "s1" { - t.Errorf("got %v for SnippetSPDXIdentifier", parser.snippet.SnippetSPDXIdentifier) + if parser.snippet.SPDXIdentifier != "s1" { + t.Errorf("got %v for SnippetSPDXIdentifier", parser.snippet.SPDXIdentifier) } // Snippet from File SPDX Identifier @@ -374,11 +374,11 @@ func TestParser2_1CanParseSnippetTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.snippet.SnippetByteRangeStart != 20 { - t.Errorf("got %v for SnippetByteRangeStart", parser.snippet.SnippetByteRangeStart) + if parser.snippet.ByteRangeStart != 20 { + t.Errorf("got %v for SnippetByteRangeStart", parser.snippet.ByteRangeStart) } - if parser.snippet.SnippetByteRangeEnd != 320 { - t.Errorf("got %v for SnippetByteRangeEnd", parser.snippet.SnippetByteRangeEnd) + if parser.snippet.ByteRangeEnd != 320 { + t.Errorf("got %v for SnippetByteRangeEnd", parser.snippet.ByteRangeEnd) } // Snippet Line Range @@ -386,11 +386,11 @@ func TestParser2_1CanParseSnippetTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.snippet.SnippetLineRangeStart != 5 { - t.Errorf("got %v for SnippetLineRangeStart", parser.snippet.SnippetLineRangeStart) + if parser.snippet.LineRangeStart != 5 { + t.Errorf("got %v for SnippetLineRangeStart", parser.snippet.LineRangeStart) } - if parser.snippet.SnippetLineRangeEnd != 12 { - t.Errorf("got %v for SnippetLineRangeEnd", parser.snippet.SnippetLineRangeEnd) + if parser.snippet.LineRangeEnd != 12 { + t.Errorf("got %v for SnippetLineRangeEnd", parser.snippet.LineRangeEnd) } // Snippet Concluded License @@ -398,8 +398,8 @@ func TestParser2_1CanParseSnippetTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.snippet.SnippetLicenseConcluded != "BSD-3-Clause" { - t.Errorf("got %v for SnippetLicenseConcluded", parser.snippet.SnippetLicenseConcluded) + if parser.snippet.LicenseConcluded != "BSD-3-Clause" { + t.Errorf("got %v for SnippetLicenseConcluded", parser.snippet.LicenseConcluded) } // License Information in Snippet @@ -435,8 +435,8 @@ func TestParser2_1CanParseSnippetTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.snippet.SnippetLicenseComments != "this is a comment about the licenses" { - t.Errorf("got %v for SnippetLicenseComments", parser.snippet.SnippetLicenseComments) + if parser.snippet.LicenseComments != "this is a comment about the licenses" { + t.Errorf("got %v for SnippetLicenseComments", parser.snippet.LicenseComments) } // Snippet Copyright Text @@ -444,8 +444,8 @@ func TestParser2_1CanParseSnippetTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.snippet.SnippetCopyrightText != "copyright (c) John Doe and friends" { - t.Errorf("got %v for SnippetCopyrightText", parser.snippet.SnippetCopyrightText) + if parser.snippet.CopyrightText != "copyright (c) John Doe and friends" { + t.Errorf("got %v for SnippetCopyrightText", parser.snippet.CopyrightText) } // Snippet Comment @@ -453,8 +453,8 @@ func TestParser2_1CanParseSnippetTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.snippet.SnippetComment != "this is a comment about the snippet" { - t.Errorf("got %v for SnippetComment", parser.snippet.SnippetComment) + if parser.snippet.Comment != "this is a comment about the snippet" { + t.Errorf("got %v for SnippetComment", parser.snippet.Comment) } // Snippet Name @@ -462,8 +462,8 @@ func TestParser2_1CanParseSnippetTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.snippet.SnippetName != "from some other package called abc" { - t.Errorf("got %v for SnippetName", parser.snippet.SnippetName) + if parser.snippet.Name != "from some other package called abc" { + t.Errorf("got %v for SnippetName", parser.snippet.Name) } } @@ -471,9 +471,9 @@ func TestParser2_1SnippetUnknownTagFails(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psSnippet2_1, - pkg: &spdx.Package2_1{PackageName: "package1", PackageSPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_1{}}, - file: &spdx.File2_1{FileName: "f1.txt", FileSPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_1{}}, - snippet: &spdx.Snippet2_1{SnippetSPDXIdentifier: "s1"}, + pkg: &spdx.Package2_1{Name: "package1", SPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_1{}}, + file: &spdx.File2_1{Name: "f1.txt", SPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_1{}}, + snippet: &spdx.Snippet2_1{SPDXIdentifier: "s1"}, } parser.doc.Packages["package1"] = parser.pkg parser.pkg.Files["f1"] = parser.file @@ -488,8 +488,8 @@ func TestParser2_1FailsForInvalidSnippetSPDXID(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psSnippet2_1, - pkg: &spdx.Package2_1{PackageName: "package1", PackageSPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_1{}}, - file: &spdx.File2_1{FileName: "f1.txt", FileSPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_1{}}, + pkg: &spdx.Package2_1{Name: "package1", SPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_1{}}, + file: &spdx.File2_1{Name: "f1.txt", SPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_1{}}, snippet: &spdx.Snippet2_1{}, } parser.doc.Packages["package1"] = parser.pkg @@ -506,8 +506,8 @@ func TestParser2_1FailsForInvalidSnippetFromFileSPDXID(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psSnippet2_1, - pkg: &spdx.Package2_1{PackageName: "package1", PackageSPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_1{}}, - file: &spdx.File2_1{FileName: "f1.txt", FileSPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_1{}}, + pkg: &spdx.Package2_1{Name: "package1", SPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_1{}}, + file: &spdx.File2_1{Name: "f1.txt", SPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_1{}}, snippet: &spdx.Snippet2_1{}, } parser.doc.Packages["package1"] = parser.pkg @@ -529,8 +529,8 @@ func TestParser2_1FailsForInvalidSnippetByteValues(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psSnippet2_1, - pkg: &spdx.Package2_1{PackageName: "package1", PackageSPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_1{}}, - file: &spdx.File2_1{FileName: "f1.txt", FileSPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_1{}}, + pkg: &spdx.Package2_1{Name: "package1", SPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_1{}}, + file: &spdx.File2_1{Name: "f1.txt", SPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_1{}}, snippet: &spdx.Snippet2_1{}, } parser.doc.Packages["package1"] = parser.pkg @@ -560,8 +560,8 @@ func TestParser2_1FailsForInvalidSnippetLineValues(t *testing.T) { parser := tvParser2_1{ doc: &spdx.Document2_1{Packages: map[spdx.ElementID]*spdx.Package2_1{}}, st: psSnippet2_1, - pkg: &spdx.Package2_1{PackageName: "package1", PackageSPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_1{}}, - file: &spdx.File2_1{FileName: "f1.txt", FileSPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_1{}}, + pkg: &spdx.Package2_1{Name: "package1", SPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_1{}}, + file: &spdx.File2_1{Name: "f1.txt", SPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_1{}}, snippet: &spdx.Snippet2_1{}, } parser.doc.Packages["package1"] = parser.pkg @@ -586,4 +586,3 @@ func TestParser2_1FailsForInvalidSnippetLineValues(t *testing.T) { t.Errorf("expected non-nil error, got nil") } } - diff --git a/tvloader/parser2v2/parse_annotation.go b/tvloader/parser2v2/parse_annotation.go index 8cd5b76e..1685e1a3 100644 --- a/tvloader/parser2v2/parse_annotation.go +++ b/tvloader/parser2v2/parse_annotation.go @@ -24,17 +24,17 @@ func (parser *tvParser2_2) parsePairForAnnotation2_2(tag string, value string) e } return fmt.Errorf("unrecognized Annotator type %v", subkey) case "AnnotationDate": - parser.ann.AnnotationDate = value + parser.ann.Date = value case "AnnotationType": - parser.ann.AnnotationType = value + parser.ann.Type = value case "SPDXREF": deID, err := extractDocElementID(value) if err != nil { return err } - parser.ann.AnnotationSPDXIdentifier = deID + parser.ann.SPDXIdentifier = deID case "AnnotationComment": - parser.ann.AnnotationComment = value + parser.ann.Comment = value default: return fmt.Errorf("received unknown tag %v in Annotation section", tag) } diff --git a/tvloader/parser2v2/parse_annotation_test.go b/tvloader/parser2v2/parse_annotation_test.go index 7a12adfb..ea4fdb98 100644 --- a/tvloader/parser2v2/parse_annotation_test.go +++ b/tvloader/parser2v2/parse_annotation_test.go @@ -83,8 +83,8 @@ func TestParser2_2CanParseAnnotationTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.ann.AnnotationDate != dt { - t.Errorf("got %v for AnnotationDate, expected %v", parser.ann.AnnotationDate, dt) + if parser.ann.Date != dt { + t.Errorf("got %v for AnnotationDate, expected %v", parser.ann.Date, dt) } // Annotation type @@ -93,8 +93,8 @@ func TestParser2_2CanParseAnnotationTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.ann.AnnotationType != aType { - t.Errorf("got %v for AnnotationType, expected %v", parser.ann.AnnotationType, aType) + if parser.ann.Type != aType { + t.Errorf("got %v for AnnotationType, expected %v", parser.ann.Type, aType) } // SPDX Identifier Reference @@ -103,9 +103,9 @@ func TestParser2_2CanParseAnnotationTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - deID := parser.ann.AnnotationSPDXIdentifier + deID := parser.ann.SPDXIdentifier if deID.DocumentRefID != "" || deID.ElementRefID != "30" { - t.Errorf("got %v for SPDXREF, expected %v", parser.ann.AnnotationSPDXIdentifier, "30") + t.Errorf("got %v for SPDXREF, expected %v", parser.ann.SPDXIdentifier, "30") } // Annotation Comment @@ -114,8 +114,8 @@ func TestParser2_2CanParseAnnotationTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.ann.AnnotationComment != cmt { - t.Errorf("got %v for AnnotationComment, expected %v", parser.ann.AnnotationComment, cmt) + if parser.ann.Comment != cmt { + t.Errorf("got %v for AnnotationComment, expected %v", parser.ann.Comment, cmt) } } diff --git a/tvloader/parser2v2/parse_creation_info_test.go b/tvloader/parser2v2/parse_creation_info_test.go index e12fc010..742f26a4 100644 --- a/tvloader/parser2v2/parse_creation_info_test.go +++ b/tvloader/parser2v2/parse_creation_info_test.go @@ -27,8 +27,8 @@ func TestParser2_2CIMovesToPackageAfterParsingPackageNameTag(t *testing.T) { t.Fatalf("parser didn't create new package") } // and the package name should be as expected - if parser.pkg.PackageName != pkgName { - t.Errorf("expected package name %s, got %s", pkgName, parser.pkg.PackageName) + if parser.pkg.Name != pkgName { + t.Errorf("expected package name %s, got %s", pkgName, parser.pkg.Name) } // and the package should default to true for FilesAnalyzed if parser.pkg.FilesAnalyzed != true { diff --git a/tvloader/parser2v2/parse_file.go b/tvloader/parser2v2/parse_file.go index c0e3c927..7738fc2a 100644 --- a/tvloader/parser2v2/parse_file.go +++ b/tvloader/parser2v2/parse_file.go @@ -19,7 +19,7 @@ func (parser *tvParser2_2) parsePairFromFile2_2(tag string, value string) error // tag for creating new file section case "FileName": parser.file = &spdx.File2_2{} - parser.file.FileName = value + parser.file.Name = value // tag for creating new package section and going back to parsing Package case "PackageName": parser.st = psPackage2_2 @@ -39,7 +39,7 @@ func (parser *tvParser2_2) parsePairFromFile2_2(tag string, value string) error if err != nil { return err } - parser.file.FileSPDXIdentifier = eID + parser.file.SPDXIdentifier = eID if parser.pkg == nil { if parser.doc.UnpackagedFiles == nil { parser.doc.UnpackagedFiles = map[spdx.ElementID]*spdx.File2_2{} @@ -52,7 +52,7 @@ func (parser *tvParser2_2) parsePairFromFile2_2(tag string, value string) error parser.pkg.Files[eID] = parser.file } case "FileType": - parser.file.FileType = append(parser.file.FileType, value) + parser.file.Type = append(parser.file.Type, value) case "FileChecksum": subkey, subvalue, err := extractSubs(value) if err != nil { @@ -60,11 +60,11 @@ func (parser *tvParser2_2) parsePairFromFile2_2(tag string, value string) error } switch subkey { case "SHA1": - parser.file.FileChecksumSHA1 = subvalue + parser.file.ChecksumSHA1 = subvalue case "SHA256": - parser.file.FileChecksumSHA256 = subvalue + parser.file.ChecksumSHA256 = subvalue case "MD5": - parser.file.FileChecksumMD5 = subvalue + parser.file.ChecksumMD5 = subvalue default: return fmt.Errorf("got unknown checksum type %s", subkey) } @@ -75,7 +75,7 @@ func (parser *tvParser2_2) parsePairFromFile2_2(tag string, value string) error case "LicenseComments": parser.file.LicenseComments = value case "FileCopyrightText": - parser.file.FileCopyrightText = value + parser.file.CopyrightText = value case "ArtifactOfProjectName": parser.fileAOP = &spdx.ArtifactOfProject2_2{} parser.file.ArtifactOfProjects = append(parser.file.ArtifactOfProjects, parser.fileAOP) @@ -91,15 +91,15 @@ func (parser *tvParser2_2) parsePairFromFile2_2(tag string, value string) error } parser.fileAOP.URI = value case "FileComment": - parser.file.FileComment = value + parser.file.Comment = value case "FileNotice": - parser.file.FileNotice = value + parser.file.Notice = value case "FileContributor": - parser.file.FileContributor = append(parser.file.FileContributor, value) + parser.file.Contributor = append(parser.file.Contributor, value) case "FileDependency": - parser.file.FileDependencies = append(parser.file.FileDependencies, value) + parser.file.Dependencies = append(parser.file.Dependencies, value) case "FileAttributionText": - parser.file.FileAttributionTexts = append(parser.file.FileAttributionTexts, value) + parser.file.AttributionTexts = append(parser.file.AttributionTexts, value) // for relationship tags, pass along but don't change state case "Relationship": parser.rln = &spdx.Relationship2_2{} diff --git a/tvloader/parser2v2/parse_file_test.go b/tvloader/parser2v2/parse_file_test.go index ffa76621..ce661f6f 100644 --- a/tvloader/parser2v2/parse_file_test.go +++ b/tvloader/parser2v2/parse_file_test.go @@ -15,8 +15,8 @@ func TestParser2_2FileStartsNewFileAfterParsingFileNameTag(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psFile2_2, - pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, - file: &spdx.File2_2{FileName: fileOldName, FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_2{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, + file: &spdx.File2_2{Name: fileOldName, SPDXIdentifier: "f1"}, } fileOld := parser.file parser.doc.Packages["test"] = parser.pkg @@ -28,8 +28,8 @@ func TestParser2_2FileStartsNewFileAfterParsingFileNameTag(t *testing.T) { if parser.pkg.Files["f1"] != fileOld { t.Errorf("expected file %v in Files[f1], got %v", fileOld, parser.pkg.Files["f1"]) } - if parser.pkg.Files["f1"].FileName != fileOldName { - t.Errorf("expected file name %s in Files[f1], got %s", fileOldName, parser.pkg.Files["f1"].FileName) + if parser.pkg.Files["f1"].Name != fileOldName { + t.Errorf("expected file name %s in Files[f1], got %s", fileOldName, parser.pkg.Files["f1"].Name) } // now add a new file @@ -47,8 +47,8 @@ func TestParser2_2FileStartsNewFileAfterParsingFileNameTag(t *testing.T) { t.Fatalf("parser didn't create new file") } // and the file name should be as expected - if parser.file.FileName != fileName { - t.Errorf("expected file name %s, got %s", fileName, parser.file.FileName) + if parser.file.Name != fileName { + t.Errorf("expected file name %s, got %s", fileName, parser.file.Name) } // and the Package's Files should still be of size 1 and not have this new // one yet, since it hasn't seen an SPDX identifier @@ -58,8 +58,8 @@ func TestParser2_2FileStartsNewFileAfterParsingFileNameTag(t *testing.T) { if parser.pkg.Files["f1"] != fileOld { t.Errorf("expected file %v in Files[f1], got %v", fileOld, parser.pkg.Files["f1"]) } - if parser.pkg.Files["f1"].FileName != fileOldName { - t.Errorf("expected file name %s in Files[f1], got %s", fileOldName, parser.pkg.Files["f1"].FileName) + if parser.pkg.Files["f1"].Name != fileOldName { + t.Errorf("expected file name %s in Files[f1], got %s", fileOldName, parser.pkg.Files["f1"].Name) } // now parse an SPDX identifier tag @@ -74,14 +74,14 @@ func TestParser2_2FileStartsNewFileAfterParsingFileNameTag(t *testing.T) { if parser.pkg.Files["f1"] != fileOld { t.Errorf("expected file %v in Files[f1], got %v", fileOld, parser.pkg.Files["f1"]) } - if parser.pkg.Files["f1"].FileName != fileOldName { - t.Errorf("expected file name %s in Files[f1], got %s", fileOldName, parser.pkg.Files["f1"].FileName) + if parser.pkg.Files["f1"].Name != fileOldName { + t.Errorf("expected file name %s in Files[f1], got %s", fileOldName, parser.pkg.Files["f1"].Name) } if parser.pkg.Files["f2ID"] != parser.file { t.Errorf("expected file %v in Files[f2ID], got %v", parser.file, parser.pkg.Files["f2ID"]) } - if parser.pkg.Files["f2ID"].FileName != fileName { - t.Errorf("expected file name %s in Files[f2ID], got %s", fileName, parser.pkg.Files["f2ID"].FileName) + if parser.pkg.Files["f2ID"].Name != fileName { + t.Errorf("expected file name %s in Files[f2ID], got %s", fileName, parser.pkg.Files["f2ID"].Name) } } @@ -151,8 +151,8 @@ func TestParser2_2FileStartsNewPackageAfterParsingPackageNameTag(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psFile2_2, - pkg: &spdx.Package2_2{PackageName: p1Name, PackageSPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_2{}}, - file: &spdx.File2_2{FileName: f1Name, FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_2{Name: p1Name, SPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_2{}}, + file: &spdx.File2_2{Name: f1Name, SPDXIdentifier: "f1"}, } p1 := parser.pkg f1 := parser.file @@ -174,8 +174,8 @@ func TestParser2_2FileStartsNewPackageAfterParsingPackageNameTag(t *testing.T) { t.Fatalf("parser didn't create new pkg") } // and the package name should be as expected - if parser.pkg.PackageName != p2Name { - t.Errorf("expected package name %s, got %s", p2Name, parser.pkg.PackageName) + if parser.pkg.Name != p2Name { + t.Errorf("expected package name %s, got %s", p2Name, parser.pkg.Name) } // and the package should default to true for FilesAnalyzed if parser.pkg.FilesAnalyzed != true { @@ -196,8 +196,8 @@ func TestParser2_2FileStartsNewPackageAfterParsingPackageNameTag(t *testing.T) { if parser.doc.Packages["package1"] != p1 { t.Errorf("Expected package %v in Packages[package1], got %v", p1, parser.doc.Packages["package1"]) } - if parser.doc.Packages["package1"].PackageName != p1Name { - t.Errorf("expected package name %s in Packages[package1], got %s", p1Name, parser.doc.Packages["package1"].PackageName) + if parser.doc.Packages["package1"].Name != p1Name { + t.Errorf("expected package name %s in Packages[package1], got %s", p1Name, parser.doc.Packages["package1"].Name) } // and the first Package's Files should be of size 1 and have f1 only if len(parser.doc.Packages["package1"].Files) != 1 { @@ -206,8 +206,8 @@ func TestParser2_2FileStartsNewPackageAfterParsingPackageNameTag(t *testing.T) { if parser.doc.Packages["package1"].Files["f1"] != f1 { t.Errorf("Expected file %v in Files[f1], got %v", f1, parser.doc.Packages["package1"].Files["f1"]) } - if parser.doc.Packages["package1"].Files["f1"].FileName != f1Name { - t.Errorf("expected file name %s in Files[f1], got %s", f1Name, parser.doc.Packages["package1"].Files["f1"].FileName) + if parser.doc.Packages["package1"].Files["f1"].Name != f1Name { + t.Errorf("expected file name %s in Files[f1], got %s", f1Name, parser.doc.Packages["package1"].Files["f1"].Name) } // and the current file should be nil if parser.file != nil { @@ -219,8 +219,8 @@ func TestParser2_2FileMovesToSnippetAfterParsingSnippetSPDXIDTag(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psFile2_2, - pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, - file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_2{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, + file: &spdx.File2_2{Name: "f1.txt", SPDXIdentifier: "f1"}, } parser.doc.Packages["test"] = parser.pkg parser.pkg.Files["f1"] = parser.file @@ -244,8 +244,8 @@ func TestParser2_2FileMovesToOtherLicenseAfterParsingLicenseIDTag(t *testing.T) parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psFile2_2, - pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, - file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_2{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, + file: &spdx.File2_2{Name: "f1.txt", SPDXIdentifier: "f1"}, } parser.doc.Packages["test"] = parser.pkg parser.pkg.Files["f2"] = parser.file @@ -263,8 +263,8 @@ func TestParser2_2FileMovesToReviewAfterParsingReviewerTag(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psFile2_2, - pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, - file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_2{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, + file: &spdx.File2_2{Name: "f1.txt", SPDXIdentifier: "f1"}, } parser.doc.Packages["test"] = parser.pkg parser.pkg.Files["f1"] = parser.file @@ -282,8 +282,8 @@ func TestParser2_2FileStaysAfterParsingRelationshipTags(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psFile2_2, - pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, - file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_2{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, + file: &spdx.File2_2{Name: "f1.txt", SPDXIdentifier: "f1"}, } parser.doc.Packages["test"] = parser.pkg parser.pkg.Files["f1"] = parser.file @@ -311,8 +311,8 @@ func TestParser2_2FileStaysAfterParsingAnnotationTags(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psFile2_2, - pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, - file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_2{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, + file: &spdx.File2_2{Name: "f1.txt", SPDXIdentifier: "f1"}, } parser.doc.Packages["test"] = parser.pkg parser.pkg.Files["f1"] = parser.file @@ -363,7 +363,7 @@ func TestParser2_2CanParseFileTags(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psFile2_2, - pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, + pkg: &spdx.Package2_2{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, } parser.doc.Packages["test"] = parser.pkg @@ -372,8 +372,8 @@ func TestParser2_2CanParseFileTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.file.FileName != "f1.txt" { - t.Errorf("got %v for FileName", parser.file.FileName) + if parser.file.Name != "f1.txt" { + t.Errorf("got %v for FileName", parser.file.Name) } // should not yet be added to the Packages file list, because we haven't // seen an SPDX identifier yet @@ -386,8 +386,8 @@ func TestParser2_2CanParseFileTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.file.FileSPDXIdentifier != "f1" { - t.Errorf("got %v for FileSPDXIdentifier", parser.file.FileSPDXIdentifier) + if parser.file.SPDXIdentifier != "f1" { + t.Errorf("got %v for FileSPDXIdentifier", parser.file.SPDXIdentifier) } // should now be added to the Packages file list if len(parser.pkg.Files) != 1 { @@ -410,7 +410,7 @@ func TestParser2_2CanParseFileTags(t *testing.T) { } for _, typeWant := range fileTypes { flagFound := false - for _, typeCheck := range parser.file.FileType { + for _, typeCheck := range parser.file.Type { if typeWant == typeCheck { flagFound = true } @@ -419,9 +419,9 @@ func TestParser2_2CanParseFileTags(t *testing.T) { t.Errorf("didn't find %s in FileType", typeWant) } } - if len(fileTypes) != len(parser.file.FileType) { + if len(fileTypes) != len(parser.file.Type) { t.Errorf("expected %d types in FileType, got %d", len(fileTypes), - len(parser.file.FileType)) + len(parser.file.Type)) } // File Checksums @@ -443,14 +443,14 @@ func TestParser2_2CanParseFileTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.file.FileChecksumSHA1 != codeSha1 { - t.Errorf("expected %s for FileChecksumSHA1, got %s", codeSha1, parser.file.FileChecksumSHA1) + if parser.file.ChecksumSHA1 != codeSha1 { + t.Errorf("expected %s for FileChecksumSHA1, got %s", codeSha1, parser.file.ChecksumSHA1) } - if parser.file.FileChecksumSHA256 != codeSha256 { - t.Errorf("expected %s for FileChecksumSHA256, got %s", codeSha256, parser.file.FileChecksumSHA256) + if parser.file.ChecksumSHA256 != codeSha256 { + t.Errorf("expected %s for FileChecksumSHA256, got %s", codeSha256, parser.file.ChecksumSHA256) } - if parser.file.FileChecksumMD5 != codeMd5 { - t.Errorf("expected %s for FileChecksumMD5, got %s", codeMd5, parser.file.FileChecksumMD5) + if parser.file.ChecksumMD5 != codeMd5 { + t.Errorf("expected %s for FileChecksumMD5, got %s", codeMd5, parser.file.ChecksumMD5) } // Concluded License @@ -504,8 +504,8 @@ func TestParser2_2CanParseFileTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.file.FileCopyrightText != "copyright (c) me" { - t.Errorf("got %v for FileCopyrightText", parser.file.FileCopyrightText) + if parser.file.CopyrightText != "copyright (c) me" { + t.Errorf("got %v for FileCopyrightText", parser.file.CopyrightText) } // Artifact of Projects: Name, HomePage and URI @@ -599,8 +599,8 @@ func TestParser2_2CanParseFileTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.file.FileComment != "this is a comment" { - t.Errorf("got %v for FileComment", parser.file.FileComment) + if parser.file.Comment != "this is a comment" { + t.Errorf("got %v for FileComment", parser.file.Comment) } // File Notice @@ -608,8 +608,8 @@ func TestParser2_2CanParseFileTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.file.FileNotice != "this is a Notice" { - t.Errorf("got %v for FileNotice", parser.file.FileNotice) + if parser.file.Notice != "this is a Notice" { + t.Errorf("got %v for FileNotice", parser.file.Notice) } // File Contributor @@ -625,7 +625,7 @@ func TestParser2_2CanParseFileTags(t *testing.T) { } for _, contribWant := range contribs { flagFound := false - for _, contribCheck := range parser.file.FileContributor { + for _, contribCheck := range parser.file.Contributor { if contribWant == contribCheck { flagFound = true } @@ -634,9 +634,9 @@ func TestParser2_2CanParseFileTags(t *testing.T) { t.Errorf("didn't find %s in FileContributor", contribWant) } } - if len(contribs) != len(parser.file.FileContributor) { + if len(contribs) != len(parser.file.Contributor) { t.Errorf("expected %d contribenses in FileContributor, got %d", len(contribs), - len(parser.file.FileContributor)) + len(parser.file.Contributor)) } // File Dependencies @@ -652,7 +652,7 @@ func TestParser2_2CanParseFileTags(t *testing.T) { } for _, depWant := range deps { flagFound := false - for _, depCheck := range parser.file.FileDependencies { + for _, depCheck := range parser.file.Dependencies { if depWant == depCheck { flagFound = true } @@ -661,9 +661,9 @@ func TestParser2_2CanParseFileTags(t *testing.T) { t.Errorf("didn't find %s in FileDependency", depWant) } } - if len(deps) != len(parser.file.FileDependencies) { + if len(deps) != len(parser.file.Dependencies) { t.Errorf("expected %d depenses in FileDependency, got %d", len(deps), - len(parser.file.FileDependencies)) + len(parser.file.Dependencies)) } // File Attribution Texts @@ -679,7 +679,7 @@ func TestParser2_2CanParseFileTags(t *testing.T) { } for _, attrWant := range attrs { flagFound := false - for _, attrCheck := range parser.file.FileAttributionTexts { + for _, attrCheck := range parser.file.AttributionTexts { if attrWant == attrCheck { flagFound = true } @@ -688,9 +688,9 @@ func TestParser2_2CanParseFileTags(t *testing.T) { t.Errorf("didn't find %s in FileAttributionText", attrWant) } } - if len(attrs) != len(parser.file.FileAttributionTexts) { + if len(attrs) != len(parser.file.AttributionTexts) { t.Errorf("expected %d attribution texts in FileAttributionTexts, got %d", len(attrs), - len(parser.file.FileAttributionTexts)) + len(parser.file.AttributionTexts)) } } @@ -699,8 +699,8 @@ func TestParser2_2FileCreatesRelationshipInDocument(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psFile2_2, - pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, - file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_2{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, + file: &spdx.File2_2{Name: "f1.txt", SPDXIdentifier: "f1"}, } parser.doc.Packages["test"] = parser.pkg parser.pkg.Files["f1"] = parser.file @@ -721,8 +721,8 @@ func TestParser2_2FileCreatesAnnotationInDocument(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psFile2_2, - pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, - file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_2{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, + file: &spdx.File2_2{Name: "f1.txt", SPDXIdentifier: "f1"}, } parser.doc.Packages["test"] = parser.pkg parser.pkg.Files["f1"] = parser.file @@ -743,8 +743,8 @@ func TestParser2_2FileUnknownTagFails(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psFile2_2, - pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, - file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_2{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, + file: &spdx.File2_2{Name: "f1.txt", SPDXIdentifier: "f1"}, } parser.doc.Packages["test"] = parser.pkg parser.pkg.Files["f1"] = parser.file @@ -759,8 +759,8 @@ func TestFileAOPPointerChangesAfterTags(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psFile2_2, - pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, - file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_2{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, + file: &spdx.File2_2{Name: "f1.txt", SPDXIdentifier: "f1"}, } parser.doc.Packages["test"] = parser.pkg parser.pkg.Files["f1"] = parser.file @@ -816,7 +816,7 @@ func TestParser2_2FailsIfInvalidSPDXIDInFileSection(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psFile2_2, - pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, + pkg: &spdx.Package2_2{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, } parser.doc.Packages["test"] = parser.pkg @@ -836,7 +836,7 @@ func TestParser2_2FailsIfInvalidChecksumFormatInFileSection(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psFile2_2, - pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, + pkg: &spdx.Package2_2{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, } parser.doc.Packages["test"] = parser.pkg @@ -856,7 +856,7 @@ func TestParser2_1FailsIfUnknownChecksumTypeInFileSection(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psFile2_2, - pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, + pkg: &spdx.Package2_2{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, } parser.doc.Packages["test"] = parser.pkg @@ -876,7 +876,7 @@ func TestParser2_2FailsIfArtifactHomePageBeforeArtifactName(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psFile2_2, - pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, + pkg: &spdx.Package2_2{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, } parser.doc.Packages["test"] = parser.pkg @@ -896,7 +896,7 @@ func TestParser2_2FailsIfArtifactURIBeforeArtifactName(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psFile2_2, - pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, + pkg: &spdx.Package2_2{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, } parser.doc.Packages["test"] = parser.pkg diff --git a/tvloader/parser2v2/parse_other_license.go b/tvloader/parser2v2/parse_other_license.go index 371f8348..a2798302 100644 --- a/tvloader/parser2v2/parse_other_license.go +++ b/tvloader/parser2v2/parse_other_license.go @@ -14,15 +14,15 @@ func (parser *tvParser2_2) parsePairFromOtherLicense2_2(tag string, value string case "LicenseID": parser.otherLic = &spdx.OtherLicense2_2{} parser.doc.OtherLicenses = append(parser.doc.OtherLicenses, parser.otherLic) - parser.otherLic.LicenseIdentifier = value + parser.otherLic.Identifier = value case "ExtractedText": parser.otherLic.ExtractedText = value case "LicenseName": - parser.otherLic.LicenseName = value + parser.otherLic.Name = value case "LicenseCrossReference": - parser.otherLic.LicenseCrossReferences = append(parser.otherLic.LicenseCrossReferences, value) + parser.otherLic.CrossReferences = append(parser.otherLic.CrossReferences, value) case "LicenseComment": - parser.otherLic.LicenseComment = value + parser.otherLic.Comment = value // for relationship tags, pass along but don't change state case "Relationship": parser.rln = &spdx.Relationship2_2{} diff --git a/tvloader/parser2v2/parse_other_license_test.go b/tvloader/parser2v2/parse_other_license_test.go index ebf4170c..9cb6a5fd 100644 --- a/tvloader/parser2v2/parse_other_license_test.go +++ b/tvloader/parser2v2/parse_other_license_test.go @@ -16,11 +16,11 @@ func TestParser2_2OLStartsNewOtherLicenseAfterParsingLicenseIDTag(t *testing.T) parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psOtherLicense2_2, - pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, - file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_2{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, + file: &spdx.File2_2{Name: "f1.txt", SPDXIdentifier: "f1"}, otherLic: &spdx.OtherLicense2_2{ - LicenseIdentifier: olid1, - LicenseName: olname1, + Identifier: olid1, + Name: olname1, }, } olic1 := parser.otherLic @@ -32,8 +32,8 @@ func TestParser2_2OLStartsNewOtherLicenseAfterParsingLicenseIDTag(t *testing.T) if parser.doc.OtherLicenses[0] != olic1 { t.Errorf("Expected other license %v in OtherLicenses[0], got %v", olic1, parser.doc.OtherLicenses[0]) } - if parser.doc.OtherLicenses[0].LicenseName != olname1 { - t.Errorf("expected other license name %s in OtherLicenses[0], got %s", olname1, parser.doc.OtherLicenses[0].LicenseName) + if parser.doc.OtherLicenses[0].Name != olname1 { + t.Errorf("expected other license name %s in OtherLicenses[0], got %s", olname1, parser.doc.OtherLicenses[0].Name) } // now add a new other license @@ -61,8 +61,8 @@ func TestParser2_2OLStartsNewOtherLicenseAfterParsingLicenseIDTag(t *testing.T) t.Errorf("expected state to be %v, got %v", psOtherLicense2_2, parser.st) } // and the other license name should be as expected - if parser.otherLic.LicenseName != olname2 { - t.Errorf("expected other license name %s, got %s", olname2, parser.otherLic.LicenseName) + if parser.otherLic.Name != olname2 { + t.Errorf("expected other license name %s, got %s", olname2, parser.otherLic.Name) } // and the Document's Other Licenses should be of size 2 and have these two if len(parser.doc.OtherLicenses) != 2 { @@ -71,20 +71,20 @@ func TestParser2_2OLStartsNewOtherLicenseAfterParsingLicenseIDTag(t *testing.T) if parser.doc.OtherLicenses[0] != olic1 { t.Errorf("Expected other license %v in OtherLicenses[0], got %v", olic1, parser.doc.OtherLicenses[0]) } - if parser.doc.OtherLicenses[0].LicenseIdentifier != olid1 { - t.Errorf("expected other license ID %s in OtherLicenses[0], got %s", olid1, parser.doc.OtherLicenses[0].LicenseIdentifier) + if parser.doc.OtherLicenses[0].Identifier != olid1 { + t.Errorf("expected other license ID %s in OtherLicenses[0], got %s", olid1, parser.doc.OtherLicenses[0].Identifier) } - if parser.doc.OtherLicenses[0].LicenseName != olname1 { - t.Errorf("expected other license name %s in OtherLicenses[0], got %s", olname1, parser.doc.OtherLicenses[0].LicenseName) + if parser.doc.OtherLicenses[0].Name != olname1 { + t.Errorf("expected other license name %s in OtherLicenses[0], got %s", olname1, parser.doc.OtherLicenses[0].Name) } if parser.doc.OtherLicenses[1] != parser.otherLic { t.Errorf("Expected other license %v in OtherLicenses[1], got %v", parser.otherLic, parser.doc.OtherLicenses[1]) } - if parser.doc.OtherLicenses[1].LicenseIdentifier != olid2 { - t.Errorf("expected other license ID %s in OtherLicenses[1], got %s", olid2, parser.doc.OtherLicenses[1].LicenseIdentifier) + if parser.doc.OtherLicenses[1].Identifier != olid2 { + t.Errorf("expected other license ID %s in OtherLicenses[1], got %s", olid2, parser.doc.OtherLicenses[1].Identifier) } - if parser.doc.OtherLicenses[1].LicenseName != olname2 { - t.Errorf("expected other license name %s in OtherLicenses[1], got %s", olname2, parser.doc.OtherLicenses[1].LicenseName) + if parser.doc.OtherLicenses[1].Name != olname2 { + t.Errorf("expected other license name %s in OtherLicenses[1], got %s", olname2, parser.doc.OtherLicenses[1].Name) } } @@ -92,8 +92,8 @@ func TestParser2_2OLMovesToReviewAfterParsingReviewerTag(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psOtherLicense2_2, - pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, - file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_2{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, + file: &spdx.File2_2{Name: "f1.txt", SPDXIdentifier: "f1"}, } parser.doc.Packages["test"] = parser.pkg parser.pkg.Files["f1"] = parser.file @@ -112,11 +112,11 @@ func TestParser2_2OtherLicenseStaysAfterParsingRelationshipTags(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psOtherLicense2_2, - pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, - file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_2{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, + file: &spdx.File2_2{Name: "f1.txt", SPDXIdentifier: "f1"}, otherLic: &spdx.OtherLicense2_2{ - LicenseIdentifier: "LicenseRef-whatever", - LicenseName: "the whatever license", + Identifier: "LicenseRef-whatever", + Name: "the whatever license", }, } parser.doc.Packages["test"] = parser.pkg @@ -154,11 +154,11 @@ func TestParser2_2OtherLicenseStaysAfterParsingAnnotationTags(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psOtherLicense2_2, - pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, - file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_2{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, + file: &spdx.File2_2{Name: "f1.txt", SPDXIdentifier: "f1"}, otherLic: &spdx.OtherLicense2_2{ - LicenseIdentifier: "LicenseRef-whatever", - LicenseName: "the whatever license", + Identifier: "LicenseRef-whatever", + Name: "the whatever license", }, } parser.doc.Packages["test"] = parser.pkg @@ -218,11 +218,11 @@ func TestParser2_2OLFailsAfterParsingOtherSectionTags(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psOtherLicense2_2, - pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, - file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_2{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, + file: &spdx.File2_2{Name: "f1.txt", SPDXIdentifier: "f1"}, otherLic: &spdx.OtherLicense2_2{ - LicenseIdentifier: "LicenseRef-Lic11", - LicenseName: "License 11", + Identifier: "LicenseRef-Lic11", + Name: "License 11", }, } parser.doc.Packages["test"] = parser.pkg @@ -249,8 +249,8 @@ func TestParser2_2CanParseOtherLicenseTags(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psOtherLicense2_2, - pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, - file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_2{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, + file: &spdx.File2_2{Name: "f1.txt", SPDXIdentifier: "f1"}, } parser.doc.Packages["test"] = parser.pkg parser.pkg.Files["f1"] = parser.file @@ -261,8 +261,8 @@ func TestParser2_2CanParseOtherLicenseTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.otherLic.LicenseIdentifier != "LicenseRef-Lic11" { - t.Errorf("got %v for LicenseID", parser.otherLic.LicenseIdentifier) + if parser.otherLic.Identifier != "LicenseRef-Lic11" { + t.Errorf("got %v for LicenseID", parser.otherLic.Identifier) } // Extracted Text @@ -279,8 +279,8 @@ func TestParser2_2CanParseOtherLicenseTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.otherLic.LicenseName != "License 11" { - t.Errorf("got %v for LicenseName", parser.otherLic.LicenseName) + if parser.otherLic.Name != "License 11" { + t.Errorf("got %v for LicenseName", parser.otherLic.Name) } // License Cross Reference @@ -297,7 +297,7 @@ func TestParser2_2CanParseOtherLicenseTags(t *testing.T) { } for _, refWant := range crossRefs { flagFound := false - for _, refCheck := range parser.otherLic.LicenseCrossReferences { + for _, refCheck := range parser.otherLic.CrossReferences { if refWant == refCheck { flagFound = true } @@ -306,9 +306,9 @@ func TestParser2_2CanParseOtherLicenseTags(t *testing.T) { t.Errorf("didn't find %s in LicenseCrossReferences", refWant) } } - if len(crossRefs) != len(parser.otherLic.LicenseCrossReferences) { + if len(crossRefs) != len(parser.otherLic.CrossReferences) { t.Errorf("expected %d types in LicenseCrossReferences, got %d", len(crossRefs), - len(parser.otherLic.LicenseCrossReferences)) + len(parser.otherLic.CrossReferences)) } // License Comment @@ -316,8 +316,8 @@ func TestParser2_2CanParseOtherLicenseTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.otherLic.LicenseComment != "this is a comment" { - t.Errorf("got %v for LicenseComment", parser.otherLic.LicenseComment) + if parser.otherLic.Comment != "this is a comment" { + t.Errorf("got %v for LicenseComment", parser.otherLic.Comment) } } @@ -325,8 +325,8 @@ func TestParser2_2OLUnknownTagFails(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psOtherLicense2_2, - pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, - file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_2{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, + file: &spdx.File2_2{Name: "f1.txt", SPDXIdentifier: "f1"}, } parser.doc.Packages["test"] = parser.pkg parser.pkg.Files["f1"] = parser.file diff --git a/tvloader/parser2v2/parse_package.go b/tvloader/parser2v2/parse_package.go index ddc9cb06..3ef97720 100644 --- a/tvloader/parser2v2/parse_package.go +++ b/tvloader/parser2v2/parse_package.go @@ -19,13 +19,13 @@ func (parser *tvParser2_2) parsePairFromPackage2_2(tag string, value string) err switch tag { case "PackageName": // if package already has a name, create and go on to a new package - if parser.pkg == nil || parser.pkg.PackageName != "" { + if parser.pkg == nil || parser.pkg.Name != "" { parser.pkg = &spdx.Package2_2{ FilesAnalyzed: true, IsFilesAnalyzedTagPresent: false, } } - parser.pkg.PackageName = value + parser.pkg.Name = value // tag for going on to file section case "FileName": parser.st = psFile2_2 @@ -39,18 +39,18 @@ func (parser *tvParser2_2) parsePairFromPackage2_2(tag string, value string) err if err != nil { return err } - parser.pkg.PackageSPDXIdentifier = eID + parser.pkg.SPDXIdentifier = eID if parser.doc.Packages == nil { parser.doc.Packages = map[spdx.ElementID]*spdx.Package2_2{} } parser.doc.Packages[eID] = parser.pkg case "PackageVersion": - parser.pkg.PackageVersion = value + parser.pkg.Version = value case "PackageFileName": - parser.pkg.PackageFileName = value + parser.pkg.FileName = value case "PackageSupplier": if value == "NOASSERTION" { - parser.pkg.PackageSupplierNOASSERTION = true + parser.pkg.SupplierNOASSERTION = true break } subkey, subvalue, err := extractSubs(value) @@ -59,15 +59,15 @@ func (parser *tvParser2_2) parsePairFromPackage2_2(tag string, value string) err } switch subkey { case "Person": - parser.pkg.PackageSupplierPerson = subvalue + parser.pkg.SupplierPerson = subvalue case "Organization": - parser.pkg.PackageSupplierOrganization = subvalue + parser.pkg.SupplierOrganization = subvalue default: return fmt.Errorf("unrecognized PackageSupplier type %v", subkey) } case "PackageOriginator": if value == "NOASSERTION" { - parser.pkg.PackageOriginatorNOASSERTION = true + parser.pkg.OriginatorNOASSERTION = true break } subkey, subvalue, err := extractSubs(value) @@ -76,14 +76,14 @@ func (parser *tvParser2_2) parsePairFromPackage2_2(tag string, value string) err } switch subkey { case "Person": - parser.pkg.PackageOriginatorPerson = subvalue + parser.pkg.OriginatorPerson = subvalue case "Organization": - parser.pkg.PackageOriginatorOrganization = subvalue + parser.pkg.OriginatorOrganization = subvalue default: return fmt.Errorf("unrecognized PackageOriginator type %v", subkey) } case "PackageDownloadLocation": - parser.pkg.PackageDownloadLocation = value + parser.pkg.DownloadLocation = value case "FilesAnalyzed": parser.pkg.IsFilesAnalyzedTagPresent = true if value == "false" { @@ -93,8 +93,8 @@ func (parser *tvParser2_2) parsePairFromPackage2_2(tag string, value string) err } case "PackageVerificationCode": code, excludesFileName := extractCodeAndExcludes(value) - parser.pkg.PackageVerificationCode = code - parser.pkg.PackageVerificationCodeExcludedFile = excludesFileName + parser.pkg.VerificationCode = code + parser.pkg.VerificationCodeExcludedFile = excludesFileName case "PackageChecksum": subkey, subvalue, err := extractSubs(value) if err != nil { @@ -102,39 +102,39 @@ func (parser *tvParser2_2) parsePairFromPackage2_2(tag string, value string) err } switch subkey { case "SHA1": - parser.pkg.PackageChecksumSHA1 = subvalue + parser.pkg.ChecksumSHA1 = subvalue case "SHA256": - parser.pkg.PackageChecksumSHA256 = subvalue + parser.pkg.ChecksumSHA256 = subvalue case "MD5": - parser.pkg.PackageChecksumMD5 = subvalue + parser.pkg.ChecksumMD5 = subvalue default: return fmt.Errorf("got unknown checksum type %s", subkey) } case "PackageHomePage": - parser.pkg.PackageHomePage = value + parser.pkg.HomePage = value case "PackageSourceInfo": - parser.pkg.PackageSourceInfo = value + parser.pkg.SourceInfo = value case "PackageLicenseConcluded": - parser.pkg.PackageLicenseConcluded = value + parser.pkg.LicenseConcluded = value case "PackageLicenseInfoFromFiles": - parser.pkg.PackageLicenseInfoFromFiles = append(parser.pkg.PackageLicenseInfoFromFiles, value) + parser.pkg.LicenseInfoFromFiles = append(parser.pkg.LicenseInfoFromFiles, value) case "PackageLicenseDeclared": - parser.pkg.PackageLicenseDeclared = value + parser.pkg.LicenseDeclared = value case "PackageLicenseComments": - parser.pkg.PackageLicenseComments = value + parser.pkg.LicenseComments = value case "PackageCopyrightText": - parser.pkg.PackageCopyrightText = value + parser.pkg.CopyrightText = value case "PackageSummary": - parser.pkg.PackageSummary = value + parser.pkg.Summary = value case "PackageDescription": - parser.pkg.PackageDescription = value + parser.pkg.Description = value case "PackageComment": - parser.pkg.PackageComment = value + parser.pkg.Comment = value case "PackageAttributionText": - parser.pkg.PackageAttributionTexts = append(parser.pkg.PackageAttributionTexts, value) + parser.pkg.AttributionTexts = append(parser.pkg.AttributionTexts, value) case "ExternalRef": parser.pkgExtRef = &spdx.PackageExternalReference2_2{} - parser.pkg.PackageExternalReferences = append(parser.pkg.PackageExternalReferences, parser.pkgExtRef) + parser.pkg.ExternalReferences = append(parser.pkg.ExternalReferences, parser.pkgExtRef) category, refType, locator, err := extractPackageExternalReference(value) if err != nil { return err diff --git a/tvloader/parser2v2/parse_package_test.go b/tvloader/parser2v2/parse_package_test.go index 6f40170f..b1a95602 100644 --- a/tvloader/parser2v2/parse_package_test.go +++ b/tvloader/parser2v2/parse_package_test.go @@ -15,7 +15,7 @@ func TestParser2_2PackageStartsNewPackageAfterParsingPackageNameTag(t *testing.T parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psPackage2_2, - pkg: &spdx.Package2_2{PackageName: pkgOldName, PackageSPDXIdentifier: "p1"}, + pkg: &spdx.Package2_2{Name: pkgOldName, SPDXIdentifier: "p1"}, } pkgOld := parser.pkg parser.doc.Packages["p1"] = pkgOld @@ -46,8 +46,8 @@ func TestParser2_2PackageStartsNewPackageAfterParsingPackageNameTag(t *testing.T t.Errorf("expected new package, got pkgOld") } // and the package name should be as expected - if parser.pkg.PackageName != pkgName { - t.Errorf("expected package name %s, got %s", pkgName, parser.pkg.PackageName) + if parser.pkg.Name != pkgName { + t.Errorf("expected package name %s, got %s", pkgName, parser.pkg.Name) } // and the package should default to true for FilesAnalyzed if parser.pkg.FilesAnalyzed != true { @@ -93,8 +93,8 @@ func TestParser2_2PackageStartsNewPackageAfterParsingPackageNameTagWhileInUnpack t.Fatalf("parser didn't create new package") } // and the package name should be as expected - if parser.pkg.PackageName != pkgName { - t.Errorf("expected package name %s, got %s", pkgName, parser.pkg.PackageName) + if parser.pkg.Name != pkgName { + t.Errorf("expected package name %s, got %s", pkgName, parser.pkg.Name) } // and the package should default to true for FilesAnalyzed if parser.pkg.FilesAnalyzed != true { @@ -114,7 +114,7 @@ func TestParser2_2PackageMovesToFileAfterParsingFileNameTag(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psPackage2_2, - pkg: &spdx.Package2_2{PackageName: "p1", PackageSPDXIdentifier: "p1"}, + pkg: &spdx.Package2_2{Name: "p1", SPDXIdentifier: "p1"}, } parser.doc.Packages["p1"] = parser.pkg pkgCurrent := parser.pkg @@ -137,7 +137,7 @@ func TestParser2_2PackageMovesToOtherLicenseAfterParsingLicenseIDTag(t *testing. parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psPackage2_2, - pkg: &spdx.Package2_2{PackageName: "p1", PackageSPDXIdentifier: "p1"}, + pkg: &spdx.Package2_2{Name: "p1", SPDXIdentifier: "p1"}, } parser.doc.Packages["p1"] = parser.pkg @@ -154,7 +154,7 @@ func TestParser2_2PackageMovesToReviewAfterParsingReviewerTag(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psPackage2_2, - pkg: &spdx.Package2_2{PackageName: "p1", PackageSPDXIdentifier: "p1"}, + pkg: &spdx.Package2_2{Name: "p1", SPDXIdentifier: "p1"}, } parser.doc.Packages["p1"] = parser.pkg @@ -171,7 +171,7 @@ func TestParser2_2PackageStaysAfterParsingRelationshipTags(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psPackage2_2, - pkg: &spdx.Package2_2{PackageName: "p1", PackageSPDXIdentifier: "p1"}, + pkg: &spdx.Package2_2{Name: "p1", SPDXIdentifier: "p1"}, } parser.doc.Packages["p1"] = parser.pkg @@ -198,7 +198,7 @@ func TestParser2_2PackageStaysAfterParsingAnnotationTags(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psPackage2_2, - pkg: &spdx.Package2_2{PackageName: "p1", PackageSPDXIdentifier: "p1"}, + pkg: &spdx.Package2_2{Name: "p1", SPDXIdentifier: "p1"}, } parser.doc.Packages["p1"] = parser.pkg @@ -261,8 +261,8 @@ func TestParser2_2CanParsePackageTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.pkg.PackageName != "p1" { - t.Errorf("got %v for PackageName", parser.pkg.PackageName) + if parser.pkg.Name != "p1" { + t.Errorf("got %v for PackageName", parser.pkg.Name) } // still should not yet be in Packages map, b/c no SPDX identifier if len(parser.doc.Packages) != 0 { @@ -275,8 +275,8 @@ func TestParser2_2CanParsePackageTags(t *testing.T) { t.Errorf("expected nil error, got %v", err) } // "SPDXRef-" prefix should be removed from the item - if parser.pkg.PackageSPDXIdentifier != "p1" { - t.Errorf("got %v for PackageSPDXIdentifier", parser.pkg.PackageSPDXIdentifier) + if parser.pkg.SPDXIdentifier != "p1" { + t.Errorf("got %v for PackageSPDXIdentifier", parser.pkg.SPDXIdentifier) } // and it should now be added to the Packages map if len(parser.doc.Packages) != 1 { @@ -291,8 +291,8 @@ func TestParser2_2CanParsePackageTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.pkg.PackageVersion != "2.1.1" { - t.Errorf("got %v for PackageVersion", parser.pkg.PackageVersion) + if parser.pkg.Version != "2.1.1" { + t.Errorf("got %v for PackageVersion", parser.pkg.Version) } // Package File Name @@ -300,8 +300,8 @@ func TestParser2_2CanParsePackageTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.pkg.PackageFileName != "p1-2.1.1.tar.gz" { - t.Errorf("got %v for PackageFileName", parser.pkg.PackageFileName) + if parser.pkg.FileName != "p1-2.1.1.tar.gz" { + t.Errorf("got %v for PackageFileName", parser.pkg.FileName) } // Package Supplier @@ -315,8 +315,8 @@ func TestParser2_2CanParsePackageTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.pkg.PackageDownloadLocation != "https://example.com/whatever" { - t.Errorf("got %v for PackageDownloadLocation", parser.pkg.PackageDownloadLocation) + if parser.pkg.DownloadLocation != "https://example.com/whatever" { + t.Errorf("got %v for PackageDownloadLocation", parser.pkg.DownloadLocation) } // Files Analyzed @@ -353,14 +353,14 @@ func TestParser2_2CanParsePackageTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.pkg.PackageChecksumSHA1 != codeSha1 { - t.Errorf("expected %s for PackageChecksumSHA1, got %s", codeSha1, parser.pkg.PackageChecksumSHA1) + if parser.pkg.ChecksumSHA1 != codeSha1 { + t.Errorf("expected %s for PackageChecksumSHA1, got %s", codeSha1, parser.pkg.ChecksumSHA1) } - if parser.pkg.PackageChecksumSHA256 != codeSha256 { - t.Errorf("expected %s for PackageChecksumSHA256, got %s", codeSha256, parser.pkg.PackageChecksumSHA256) + if parser.pkg.ChecksumSHA256 != codeSha256 { + t.Errorf("expected %s for PackageChecksumSHA256, got %s", codeSha256, parser.pkg.ChecksumSHA256) } - if parser.pkg.PackageChecksumMD5 != codeMd5 { - t.Errorf("expected %s for PackageChecksumMD5, got %s", codeMd5, parser.pkg.PackageChecksumMD5) + if parser.pkg.ChecksumMD5 != codeMd5 { + t.Errorf("expected %s for PackageChecksumMD5, got %s", codeMd5, parser.pkg.ChecksumMD5) } // Package Home Page @@ -368,8 +368,8 @@ func TestParser2_2CanParsePackageTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.pkg.PackageHomePage != "https://example.com/whatever2" { - t.Errorf("got %v for PackageHomePage", parser.pkg.PackageHomePage) + if parser.pkg.HomePage != "https://example.com/whatever2" { + t.Errorf("got %v for PackageHomePage", parser.pkg.HomePage) } // Package Source Info @@ -377,8 +377,8 @@ func TestParser2_2CanParsePackageTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.pkg.PackageSourceInfo != "random comment" { - t.Errorf("got %v for PackageSourceInfo", parser.pkg.PackageSourceInfo) + if parser.pkg.SourceInfo != "random comment" { + t.Errorf("got %v for PackageSourceInfo", parser.pkg.SourceInfo) } // Package License Concluded @@ -386,8 +386,8 @@ func TestParser2_2CanParsePackageTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.pkg.PackageLicenseConcluded != "Apache-2.0 OR GPL-2.0-or-later" { - t.Errorf("got %v for PackageLicenseConcluded", parser.pkg.PackageLicenseConcluded) + if parser.pkg.LicenseConcluded != "Apache-2.0 OR GPL-2.0-or-later" { + t.Errorf("got %v for PackageLicenseConcluded", parser.pkg.LicenseConcluded) } // All Licenses Info From Files @@ -404,7 +404,7 @@ func TestParser2_2CanParsePackageTags(t *testing.T) { } for _, licWant := range lics { flagFound := false - for _, licCheck := range parser.pkg.PackageLicenseInfoFromFiles { + for _, licCheck := range parser.pkg.LicenseInfoFromFiles { if licWant == licCheck { flagFound = true } @@ -413,9 +413,9 @@ func TestParser2_2CanParsePackageTags(t *testing.T) { t.Errorf("didn't find %s in PackageLicenseInfoFromFiles", licWant) } } - if len(lics) != len(parser.pkg.PackageLicenseInfoFromFiles) { + if len(lics) != len(parser.pkg.LicenseInfoFromFiles) { t.Errorf("expected %d licenses in PackageLicenseInfoFromFiles, got %d", len(lics), - len(parser.pkg.PackageLicenseInfoFromFiles)) + len(parser.pkg.LicenseInfoFromFiles)) } // Package License Declared @@ -423,8 +423,8 @@ func TestParser2_2CanParsePackageTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.pkg.PackageLicenseDeclared != "Apache-2.0 OR GPL-2.0-or-later" { - t.Errorf("got %v for PackageLicenseDeclared", parser.pkg.PackageLicenseDeclared) + if parser.pkg.LicenseDeclared != "Apache-2.0 OR GPL-2.0-or-later" { + t.Errorf("got %v for PackageLicenseDeclared", parser.pkg.LicenseDeclared) } // Package License Comments @@ -432,8 +432,8 @@ func TestParser2_2CanParsePackageTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.pkg.PackageLicenseComments != "this is a license comment" { - t.Errorf("got %v for PackageLicenseComments", parser.pkg.PackageLicenseComments) + if parser.pkg.LicenseComments != "this is a license comment" { + t.Errorf("got %v for PackageLicenseComments", parser.pkg.LicenseComments) } // Package Copyright Text @@ -441,8 +441,8 @@ func TestParser2_2CanParsePackageTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.pkg.PackageCopyrightText != "Copyright (c) me myself and i" { - t.Errorf("got %v for PackageCopyrightText", parser.pkg.PackageCopyrightText) + if parser.pkg.CopyrightText != "Copyright (c) me myself and i" { + t.Errorf("got %v for PackageCopyrightText", parser.pkg.CopyrightText) } // Package Summary @@ -450,8 +450,8 @@ func TestParser2_2CanParsePackageTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.pkg.PackageSummary != "i wrote this package" { - t.Errorf("got %v for PackageSummary", parser.pkg.PackageSummary) + if parser.pkg.Summary != "i wrote this package" { + t.Errorf("got %v for PackageSummary", parser.pkg.Summary) } // Package Description @@ -459,8 +459,8 @@ func TestParser2_2CanParsePackageTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.pkg.PackageDescription != "i wrote this package a lot" { - t.Errorf("got %v for PackageDescription", parser.pkg.PackageDescription) + if parser.pkg.Description != "i wrote this package a lot" { + t.Errorf("got %v for PackageDescription", parser.pkg.Description) } // Package Comment @@ -468,8 +468,8 @@ func TestParser2_2CanParsePackageTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.pkg.PackageComment != "i scanned this package" { - t.Errorf("got %v for PackageComment", parser.pkg.PackageComment) + if parser.pkg.Comment != "i scanned this package" { + t.Errorf("got %v for PackageComment", parser.pkg.Comment) } // Package Attribution Text @@ -485,7 +485,7 @@ func TestParser2_2CanParsePackageTags(t *testing.T) { } for _, attrWant := range attrs { flagFound := false - for _, attrCheck := range parser.pkg.PackageAttributionTexts { + for _, attrCheck := range parser.pkg.AttributionTexts { if attrWant == attrCheck { flagFound = true } @@ -494,9 +494,9 @@ func TestParser2_2CanParsePackageTags(t *testing.T) { t.Errorf("didn't find %s in PackageAttributionText", attrWant) } } - if len(attrs) != len(parser.pkg.PackageAttributionTexts) { + if len(attrs) != len(parser.pkg.AttributionTexts) { t.Errorf("expected %d attribution texts in PackageAttributionTexts, got %d", len(attrs), - len(parser.pkg.PackageAttributionTexts)) + len(parser.pkg.AttributionTexts)) } // Package External References and Comments @@ -514,16 +514,16 @@ func TestParser2_2CanParsePackageTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if len(parser.pkg.PackageExternalReferences) != 1 { - t.Errorf("expected 1 external reference, got %d", len(parser.pkg.PackageExternalReferences)) + if len(parser.pkg.ExternalReferences) != 1 { + t.Errorf("expected 1 external reference, got %d", len(parser.pkg.ExternalReferences)) } if parser.pkgExtRef == nil { t.Errorf("expected non-nil pkgExtRef, got nil") } - if parser.pkg.PackageExternalReferences[0] == nil { + if parser.pkg.ExternalReferences[0] == nil { t.Errorf("expected non-nil PackageExternalReferences[0], got nil") } - if parser.pkgExtRef != parser.pkg.PackageExternalReferences[0] { + if parser.pkgExtRef != parser.pkg.ExternalReferences[0] { t.Errorf("expected pkgExtRef to match PackageExternalReferences[0], got no match") } err = parser.parsePairFromPackage2_2("ExternalRefComment", ref1Comment) @@ -534,16 +534,16 @@ func TestParser2_2CanParsePackageTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if len(parser.pkg.PackageExternalReferences) != 2 { - t.Errorf("expected 2 external references, got %d", len(parser.pkg.PackageExternalReferences)) + if len(parser.pkg.ExternalReferences) != 2 { + t.Errorf("expected 2 external references, got %d", len(parser.pkg.ExternalReferences)) } if parser.pkgExtRef == nil { t.Errorf("expected non-nil pkgExtRef, got nil") } - if parser.pkg.PackageExternalReferences[1] == nil { + if parser.pkg.ExternalReferences[1] == nil { t.Errorf("expected non-nil PackageExternalReferences[1], got nil") } - if parser.pkgExtRef != parser.pkg.PackageExternalReferences[1] { + if parser.pkgExtRef != parser.pkg.ExternalReferences[1] { t.Errorf("expected pkgExtRef to match PackageExternalReferences[1], got no match") } err = parser.parsePairFromPackage2_2("ExternalRefComment", ref2Comment) @@ -551,7 +551,7 @@ func TestParser2_2CanParsePackageTags(t *testing.T) { t.Errorf("expected nil error, got %v", err) } // finally, check these values - gotRef1 := parser.pkg.PackageExternalReferences[0] + gotRef1 := parser.pkg.ExternalReferences[0] if gotRef1.Category != ref1Category { t.Errorf("expected ref1 category to be %s, got %s", gotRef1.Category, ref1Category) } @@ -564,7 +564,7 @@ func TestParser2_2CanParsePackageTags(t *testing.T) { if gotRef1.ExternalRefComment != ref1Comment { t.Errorf("expected ref1 comment to be %s, got %s", gotRef1.ExternalRefComment, ref1Comment) } - gotRef2 := parser.pkg.PackageExternalReferences[1] + gotRef2 := parser.pkg.ExternalReferences[1] if gotRef2.Category != ref2Category { t.Errorf("expected ref2 category to be %s, got %s", gotRef2.Category, ref2Category) } @@ -584,7 +584,7 @@ func TestParser2_2CanParsePackageSupplierPersonTag(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psPackage2_2, - pkg: &spdx.Package2_2{PackageName: "p1", PackageSPDXIdentifier: "p1"}, + pkg: &spdx.Package2_2{Name: "p1", SPDXIdentifier: "p1"}, } parser.doc.Packages["p1"] = parser.pkg @@ -593,8 +593,8 @@ func TestParser2_2CanParsePackageSupplierPersonTag(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.pkg.PackageSupplierPerson != "John Doe" { - t.Errorf("got %v for PackageSupplierPerson", parser.pkg.PackageSupplierPerson) + if parser.pkg.SupplierPerson != "John Doe" { + t.Errorf("got %v for PackageSupplierPerson", parser.pkg.SupplierPerson) } } @@ -602,7 +602,7 @@ func TestParser2_2CanParsePackageSupplierOrganizationTag(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psPackage2_2, - pkg: &spdx.Package2_2{PackageName: "p1", PackageSPDXIdentifier: "p1"}, + pkg: &spdx.Package2_2{Name: "p1", SPDXIdentifier: "p1"}, } parser.doc.Packages["p1"] = parser.pkg @@ -611,8 +611,8 @@ func TestParser2_2CanParsePackageSupplierOrganizationTag(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.pkg.PackageSupplierOrganization != "John Doe, Inc." { - t.Errorf("got %v for PackageSupplierOrganization", parser.pkg.PackageSupplierOrganization) + if parser.pkg.SupplierOrganization != "John Doe, Inc." { + t.Errorf("got %v for PackageSupplierOrganization", parser.pkg.SupplierOrganization) } } @@ -620,7 +620,7 @@ func TestParser2_2CanParsePackageSupplierNOASSERTIONTag(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psPackage2_2, - pkg: &spdx.Package2_2{PackageName: "p1", PackageSPDXIdentifier: "p1"}, + pkg: &spdx.Package2_2{Name: "p1", SPDXIdentifier: "p1"}, } parser.doc.Packages["p1"] = parser.pkg @@ -629,7 +629,7 @@ func TestParser2_2CanParsePackageSupplierNOASSERTIONTag(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.pkg.PackageSupplierNOASSERTION != true { + if parser.pkg.SupplierNOASSERTION != true { t.Errorf("got false for PackageSupplierNOASSERTION") } } @@ -638,7 +638,7 @@ func TestParser2_2CanParsePackageOriginatorPersonTag(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psPackage2_2, - pkg: &spdx.Package2_2{PackageName: "p1", PackageSPDXIdentifier: "p1"}, + pkg: &spdx.Package2_2{Name: "p1", SPDXIdentifier: "p1"}, } parser.doc.Packages["p1"] = parser.pkg @@ -647,8 +647,8 @@ func TestParser2_2CanParsePackageOriginatorPersonTag(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.pkg.PackageOriginatorPerson != "John Doe" { - t.Errorf("got %v for PackageOriginatorPerson", parser.pkg.PackageOriginatorPerson) + if parser.pkg.OriginatorPerson != "John Doe" { + t.Errorf("got %v for PackageOriginatorPerson", parser.pkg.OriginatorPerson) } } @@ -656,7 +656,7 @@ func TestParser2_2CanParsePackageOriginatorOrganizationTag(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psPackage2_2, - pkg: &spdx.Package2_2{PackageName: "p1", PackageSPDXIdentifier: "p1"}, + pkg: &spdx.Package2_2{Name: "p1", SPDXIdentifier: "p1"}, } parser.doc.Packages["p1"] = parser.pkg @@ -665,8 +665,8 @@ func TestParser2_2CanParsePackageOriginatorOrganizationTag(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.pkg.PackageOriginatorOrganization != "John Doe, Inc." { - t.Errorf("got %v for PackageOriginatorOrganization", parser.pkg.PackageOriginatorOrganization) + if parser.pkg.OriginatorOrganization != "John Doe, Inc." { + t.Errorf("got %v for PackageOriginatorOrganization", parser.pkg.OriginatorOrganization) } } @@ -674,7 +674,7 @@ func TestParser2_2CanParsePackageOriginatorNOASSERTIONTag(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psPackage2_2, - pkg: &spdx.Package2_2{PackageName: "p1", PackageSPDXIdentifier: "p1"}, + pkg: &spdx.Package2_2{Name: "p1", SPDXIdentifier: "p1"}, } parser.doc.Packages["p1"] = parser.pkg @@ -683,7 +683,7 @@ func TestParser2_2CanParsePackageOriginatorNOASSERTIONTag(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.pkg.PackageOriginatorNOASSERTION != true { + if parser.pkg.OriginatorNOASSERTION != true { t.Errorf("got false for PackageOriginatorNOASSERTION") } } @@ -692,7 +692,7 @@ func TestParser2_2CanParsePackageVerificationCodeTagWithExcludes(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psPackage2_2, - pkg: &spdx.Package2_2{PackageName: "p1", PackageSPDXIdentifier: "p1"}, + pkg: &spdx.Package2_2{Name: "p1", SPDXIdentifier: "p1"}, } parser.doc.Packages["p1"] = parser.pkg @@ -704,11 +704,11 @@ func TestParser2_2CanParsePackageVerificationCodeTagWithExcludes(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.pkg.PackageVerificationCode != code { - t.Errorf("got %v for PackageVerificationCode", parser.pkg.PackageVerificationCode) + if parser.pkg.VerificationCode != code { + t.Errorf("got %v for PackageVerificationCode", parser.pkg.VerificationCode) } - if parser.pkg.PackageVerificationCodeExcludedFile != fileName { - t.Errorf("got %v for PackageVerificationCodeExcludedFile", parser.pkg.PackageVerificationCodeExcludedFile) + if parser.pkg.VerificationCodeExcludedFile != fileName { + t.Errorf("got %v for PackageVerificationCodeExcludedFile", parser.pkg.VerificationCodeExcludedFile) } } @@ -717,7 +717,7 @@ func TestParser2_2CanParsePackageVerificationCodeTagWithoutExcludes(t *testing.T parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psPackage2_2, - pkg: &spdx.Package2_2{PackageName: "p1", PackageSPDXIdentifier: "p1"}, + pkg: &spdx.Package2_2{Name: "p1", SPDXIdentifier: "p1"}, } parser.doc.Packages["p1"] = parser.pkg @@ -727,11 +727,11 @@ func TestParser2_2CanParsePackageVerificationCodeTagWithoutExcludes(t *testing.T if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.pkg.PackageVerificationCode != code { - t.Errorf("got %v for PackageVerificationCode", parser.pkg.PackageVerificationCode) + if parser.pkg.VerificationCode != code { + t.Errorf("got %v for PackageVerificationCode", parser.pkg.VerificationCode) } - if parser.pkg.PackageVerificationCodeExcludedFile != "" { - t.Errorf("got %v for PackageVerificationCodeExcludedFile", parser.pkg.PackageVerificationCodeExcludedFile) + if parser.pkg.VerificationCodeExcludedFile != "" { + t.Errorf("got %v for PackageVerificationCodeExcludedFile", parser.pkg.VerificationCodeExcludedFile) } } @@ -740,7 +740,7 @@ func TestParser2_2PackageExternalRefPointerChangesAfterTags(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psPackage2_2, - pkg: &spdx.Package2_2{PackageName: "p1", PackageSPDXIdentifier: "p1"}, + pkg: &spdx.Package2_2{Name: "p1", SPDXIdentifier: "p1"}, } parser.doc.Packages["p1"] = parser.pkg @@ -785,7 +785,7 @@ func TestParser2_2PackageCreatesRelationshipInDocument(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psPackage2_2, - pkg: &spdx.Package2_2{PackageName: "p1", PackageSPDXIdentifier: "p1"}, + pkg: &spdx.Package2_2{Name: "p1", SPDXIdentifier: "p1"}, } parser.doc.Packages["p1"] = parser.pkg @@ -805,7 +805,7 @@ func TestParser2_2PackageCreatesAnnotationInDocument(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psPackage2_2, - pkg: &spdx.Package2_2{PackageName: "p1", PackageSPDXIdentifier: "p1"}, + pkg: &spdx.Package2_2{Name: "p1", SPDXIdentifier: "p1"}, } parser.doc.Packages["p1"] = parser.pkg @@ -825,7 +825,7 @@ func TestParser2_2PackageUnknownTagFails(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psPackage2_2, - pkg: &spdx.Package2_2{PackageName: "p1", PackageSPDXIdentifier: "p1"}, + pkg: &spdx.Package2_2{Name: "p1", SPDXIdentifier: "p1"}, } parser.doc.Packages["p1"] = parser.pkg diff --git a/tvloader/parser2v2/parse_relationship.go b/tvloader/parser2v2/parse_relationship.go index 28e5b728..bffdbcea 100644 --- a/tvloader/parser2v2/parse_relationship.go +++ b/tvloader/parser2v2/parse_relationship.go @@ -44,7 +44,7 @@ func (parser *tvParser2_2) parsePairForRelationship2_2(tag string, value string) } if tag == "RelationshipComment" { - parser.rln.RelationshipComment = value + parser.rln.Comment = value return nil } diff --git a/tvloader/parser2v2/parse_relationship_test.go b/tvloader/parser2v2/parse_relationship_test.go index 1312cc55..bd5871b7 100644 --- a/tvloader/parser2v2/parse_relationship_test.go +++ b/tvloader/parser2v2/parse_relationship_test.go @@ -57,8 +57,8 @@ func TestParser2_2CanParseRelationshipTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.rln.RelationshipComment != cmt { - t.Errorf("got %v for RelationshipComment, expected %v", parser.rln.RelationshipComment, cmt) + if parser.rln.Comment != cmt { + t.Errorf("got %v for RelationshipComment, expected %v", parser.rln.Comment, cmt) } } diff --git a/tvloader/parser2v2/parse_review.go b/tvloader/parser2v2/parse_review.go index 065d889d..61d602aa 100644 --- a/tvloader/parser2v2/parse_review.go +++ b/tvloader/parser2v2/parse_review.go @@ -32,9 +32,9 @@ func (parser *tvParser2_2) parsePairFromReview2_2(tag string, value string) erro return fmt.Errorf("unrecognized Reviewer type %v", subkey) } case "ReviewDate": - parser.rev.ReviewDate = value + parser.rev.Date = value case "ReviewComment": - parser.rev.ReviewComment = value + parser.rev.Comment = value // for relationship tags, pass along but don't change state case "Relationship": parser.rln = &spdx.Relationship2_2{} diff --git a/tvloader/parser2v2/parse_review_test.go b/tvloader/parser2v2/parse_review_test.go index f482184c..c5a7d946 100644 --- a/tvloader/parser2v2/parse_review_test.go +++ b/tvloader/parser2v2/parse_review_test.go @@ -14,11 +14,11 @@ func TestParser2_2ReviewStartsNewReviewAfterParsingReviewerTag(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psReview2_2, - pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, - file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_2{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, + file: &spdx.File2_2{Name: "f1.txt", SPDXIdentifier: "f1"}, otherLic: &spdx.OtherLicense2_2{ - LicenseIdentifier: "LicenseRef-Lic11", - LicenseName: "License 11", + Identifier: "LicenseRef-Lic11", + Name: "License 11", }, rev: &spdx.Review2_2{ Reviewer: rev1, @@ -84,11 +84,11 @@ func TestParser2_2ReviewStaysAfterParsingRelationshipTags(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psReview2_2, - pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, - file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_2{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, + file: &spdx.File2_2{Name: "f1.txt", SPDXIdentifier: "f1"}, otherLic: &spdx.OtherLicense2_2{ - LicenseIdentifier: "LicenseRef-Lic11", - LicenseName: "License 11", + Identifier: "LicenseRef-Lic11", + Name: "License 11", }, rev: &spdx.Review2_2{ Reviewer: "Jane Doe", @@ -131,11 +131,11 @@ func TestParser2_2ReviewStaysAfterParsingAnnotationTags(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psReview2_2, - pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, - file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_2{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, + file: &spdx.File2_2{Name: "f1.txt", SPDXIdentifier: "f1"}, otherLic: &spdx.OtherLicense2_2{ - LicenseIdentifier: "LicenseRef-Lic11", - LicenseName: "License 11", + Identifier: "LicenseRef-Lic11", + Name: "License 11", }, rev: &spdx.Review2_2{ Reviewer: "Jane Doe", @@ -200,11 +200,11 @@ func TestParser2_2ReviewFailsAfterParsingOtherSectionTags(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psReview2_2, - pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, - file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_2{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, + file: &spdx.File2_2{Name: "f1.txt", SPDXIdentifier: "f1"}, otherLic: &spdx.OtherLicense2_2{ - LicenseIdentifier: "LicenseRef-Lic11", - LicenseName: "License 11", + Identifier: "LicenseRef-Lic11", + Name: "License 11", }, rev: &spdx.Review2_2{}, } @@ -237,11 +237,11 @@ func TestParser2_2CanParseReviewTags(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psReview2_2, - pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, - file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_2{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, + file: &spdx.File2_2{Name: "f1.txt", SPDXIdentifier: "f1"}, otherLic: &spdx.OtherLicense2_2{ - LicenseIdentifier: "LicenseRef-Lic11", - LicenseName: "License 11", + Identifier: "LicenseRef-Lic11", + Name: "License 11", }, rev: &spdx.Review2_2{}, } @@ -258,8 +258,8 @@ func TestParser2_2CanParseReviewTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.rev.ReviewDate != "2018-09-23T08:30:00Z" { - t.Errorf("got %v for ReviewDate", parser.rev.ReviewDate) + if parser.rev.Date != "2018-09-23T08:30:00Z" { + t.Errorf("got %v for ReviewDate", parser.rev.Date) } // Review Comment (DEPRECATED) @@ -267,8 +267,8 @@ func TestParser2_2CanParseReviewTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.rev.ReviewComment != "this is a comment" { - t.Errorf("got %v for ReviewComment", parser.rev.ReviewComment) + if parser.rev.Comment != "this is a comment" { + t.Errorf("got %v for ReviewComment", parser.rev.Comment) } } @@ -276,11 +276,11 @@ func TestParser2_2CanParseReviewerPersonTag(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psReview2_2, - pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, - file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_2{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, + file: &spdx.File2_2{Name: "f1.txt", SPDXIdentifier: "f1"}, otherLic: &spdx.OtherLicense2_2{ - LicenseIdentifier: "LicenseRef-Lic11", - LicenseName: "License 11", + Identifier: "LicenseRef-Lic11", + Name: "License 11", }, rev: &spdx.Review2_2{}, } @@ -306,11 +306,11 @@ func TestParser2_2CanParseReviewerOrganizationTag(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psReview2_2, - pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, - file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_2{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, + file: &spdx.File2_2{Name: "f1.txt", SPDXIdentifier: "f1"}, otherLic: &spdx.OtherLicense2_2{ - LicenseIdentifier: "LicenseRef-Lic11", - LicenseName: "License 11", + Identifier: "LicenseRef-Lic11", + Name: "License 11", }, rev: &spdx.Review2_2{}, } @@ -336,11 +336,11 @@ func TestParser2_2CanParseReviewerToolTag(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psReview2_2, - pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, - file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_2{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, + file: &spdx.File2_2{Name: "f1.txt", SPDXIdentifier: "f1"}, otherLic: &spdx.OtherLicense2_2{ - LicenseIdentifier: "LicenseRef-Lic11", - LicenseName: "License 11", + Identifier: "LicenseRef-Lic11", + Name: "License 11", }, rev: &spdx.Review2_2{}, } @@ -394,11 +394,11 @@ func TestParser2_2ReviewUnknownTagFails(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psReview2_2, - pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, - file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1"}, + pkg: &spdx.Package2_2{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, + file: &spdx.File2_2{Name: "f1.txt", SPDXIdentifier: "f1"}, otherLic: &spdx.OtherLicense2_2{ - LicenseIdentifier: "LicenseRef-Lic11", - LicenseName: "License 11", + Identifier: "LicenseRef-Lic11", + Name: "License 11", }, rev: &spdx.Review2_2{}, } diff --git a/tvloader/parser2v2/parse_snippet.go b/tvloader/parser2v2/parse_snippet.go index 0d9dc3f8..809f984c 100644 --- a/tvloader/parser2v2/parse_snippet.go +++ b/tvloader/parser2v2/parse_snippet.go @@ -25,7 +25,7 @@ func (parser *tvParser2_2) parsePairFromSnippet2_2(tag string, value string) err } parser.file.Snippets[eID] = parser.snippet } - parser.snippet.SnippetSPDXIdentifier = eID + parser.snippet.SPDXIdentifier = eID // tag for creating new file section and going back to parsing File case "FileName": parser.st = psFile2_2 @@ -61,8 +61,8 @@ func (parser *tvParser2_2) parsePairFromSnippet2_2(tag string, value string) err if err != nil { return err } - parser.snippet.SnippetByteRangeStart = bIntStart - parser.snippet.SnippetByteRangeEnd = bIntEnd + parser.snippet.ByteRangeStart = bIntStart + parser.snippet.ByteRangeEnd = bIntEnd case "SnippetLineRange": lineStart, lineEnd, err := extractSubs(value) if err != nil { @@ -76,22 +76,22 @@ func (parser *tvParser2_2) parsePairFromSnippet2_2(tag string, value string) err if err != nil { return err } - parser.snippet.SnippetLineRangeStart = lInttStart - parser.snippet.SnippetLineRangeEnd = lInttEnd + parser.snippet.LineRangeStart = lInttStart + parser.snippet.LineRangeEnd = lInttEnd case "SnippetLicenseConcluded": - parser.snippet.SnippetLicenseConcluded = value + parser.snippet.LicenseConcluded = value case "LicenseInfoInSnippet": parser.snippet.LicenseInfoInSnippet = append(parser.snippet.LicenseInfoInSnippet, value) case "SnippetLicenseComments": - parser.snippet.SnippetLicenseComments = value + parser.snippet.LicenseComments = value case "SnippetCopyrightText": - parser.snippet.SnippetCopyrightText = value + parser.snippet.CopyrightText = value case "SnippetComment": - parser.snippet.SnippetComment = value + parser.snippet.Comment = value case "SnippetName": - parser.snippet.SnippetName = value + parser.snippet.Name = value case "SnippetAttributionText": - parser.snippet.SnippetAttributionTexts = append(parser.snippet.SnippetAttributionTexts, value) + parser.snippet.AttributionTexts = append(parser.snippet.AttributionTexts, value) // for relationship tags, pass along but don't change state case "Relationship": parser.rln = &spdx.Relationship2_2{} diff --git a/tvloader/parser2v2/parse_snippet_test.go b/tvloader/parser2v2/parse_snippet_test.go index 987fe2a5..c7c10acb 100644 --- a/tvloader/parser2v2/parse_snippet_test.go +++ b/tvloader/parser2v2/parse_snippet_test.go @@ -14,9 +14,9 @@ func TestParser2_2SnippetStartsNewSnippetAfterParsingSnippetSPDXIDTag(t *testing parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psSnippet2_2, - pkg: &spdx.Package2_2{PackageName: "test", PackageSPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, - file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_2{}}, - snippet: &spdx.Snippet2_2{SnippetSPDXIdentifier: sid1}, + pkg: &spdx.Package2_2{Name: "test", SPDXIdentifier: "test", Files: map[spdx.ElementID]*spdx.File2_2{}}, + file: &spdx.File2_2{Name: "f1.txt", SPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_2{}}, + snippet: &spdx.Snippet2_2{SPDXIdentifier: sid1}, } s1 := parser.snippet parser.doc.Packages["test"] = parser.pkg @@ -30,8 +30,8 @@ func TestParser2_2SnippetStartsNewSnippetAfterParsingSnippetSPDXIDTag(t *testing if parser.file.Snippets["s1"] != s1 { t.Errorf("Expected snippet %v in Snippets[s1], got %v", s1, parser.file.Snippets["s1"]) } - if parser.file.Snippets["s1"].SnippetSPDXIdentifier != sid1 { - t.Errorf("expected snippet ID %s in Snippets[s1], got %s", sid1, parser.file.Snippets["s1"].SnippetSPDXIdentifier) + if parser.file.Snippets["s1"].SPDXIdentifier != sid1 { + t.Errorf("expected snippet ID %s in Snippets[s1], got %s", sid1, parser.file.Snippets["s1"].SPDXIdentifier) } // now add a new snippet @@ -48,8 +48,8 @@ func TestParser2_2SnippetStartsNewSnippetAfterParsingSnippetSPDXIDTag(t *testing t.Fatalf("parser didn't create new snippet") } // and the snippet ID should be as expected - if parser.snippet.SnippetSPDXIdentifier != "s2" { - t.Errorf("expected snippet ID %s, got %s", "s2", parser.snippet.SnippetSPDXIdentifier) + if parser.snippet.SPDXIdentifier != "s2" { + t.Errorf("expected snippet ID %s, got %s", "s2", parser.snippet.SPDXIdentifier) } // and the File's Snippets should be of size 2 and have these two if len(parser.file.Snippets) != 2 { @@ -58,14 +58,14 @@ func TestParser2_2SnippetStartsNewSnippetAfterParsingSnippetSPDXIDTag(t *testing if parser.file.Snippets["s1"] != s1 { t.Errorf("Expected snippet %v in Snippets[s1], got %v", s1, parser.file.Snippets["s1"]) } - if parser.file.Snippets["s1"].SnippetSPDXIdentifier != sid1 { - t.Errorf("expected snippet ID %s in Snippets[s1], got %s", sid1, parser.file.Snippets["s1"].SnippetSPDXIdentifier) + if parser.file.Snippets["s1"].SPDXIdentifier != sid1 { + t.Errorf("expected snippet ID %s in Snippets[s1], got %s", sid1, parser.file.Snippets["s1"].SPDXIdentifier) } if parser.file.Snippets["s2"] != parser.snippet { t.Errorf("Expected snippet %v in Snippets[s2], got %v", parser.snippet, parser.file.Snippets["s2"]) } - if parser.file.Snippets["s2"].SnippetSPDXIdentifier != "s2" { - t.Errorf("expected snippet ID %s in Snippets[s2], got %s", "s2", parser.file.Snippets["s2"].SnippetSPDXIdentifier) + if parser.file.Snippets["s2"].SPDXIdentifier != "s2" { + t.Errorf("expected snippet ID %s in Snippets[s2], got %s", "s2", parser.file.Snippets["s2"].SPDXIdentifier) } } @@ -73,9 +73,9 @@ func TestParser2_2SnippetStartsNewPackageAfterParsingPackageNameTag(t *testing.T parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psSnippet2_2, - pkg: &spdx.Package2_2{PackageName: "package1", PackageSPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_2{}}, - file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_2{}}, - snippet: &spdx.Snippet2_2{SnippetSPDXIdentifier: "s1"}, + pkg: &spdx.Package2_2{Name: "package1", SPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_2{}}, + file: &spdx.File2_2{Name: "f1.txt", SPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_2{}}, + snippet: &spdx.Snippet2_2{SPDXIdentifier: "s1"}, } p1 := parser.pkg f1 := parser.file @@ -98,8 +98,8 @@ func TestParser2_2SnippetStartsNewPackageAfterParsingPackageNameTag(t *testing.T t.Fatalf("parser didn't create new pkg") } // and the package name should be as expected - if parser.pkg.PackageName != p2Name { - t.Errorf("expected package name %s, got %s", p2Name, parser.pkg.PackageName) + if parser.pkg.Name != p2Name { + t.Errorf("expected package name %s, got %s", p2Name, parser.pkg.Name) } // and the package should default to true for FilesAnalyzed if parser.pkg.FilesAnalyzed != true { @@ -116,8 +116,8 @@ func TestParser2_2SnippetStartsNewPackageAfterParsingPackageNameTag(t *testing.T if parser.doc.Packages["package1"] != p1 { t.Errorf("Expected package %v in Packages[package1], got %v", p1, parser.doc.Packages["package1"]) } - if parser.doc.Packages["package1"].PackageName != "package1" { - t.Errorf("expected package name %s in Packages[package1], got %s", "package1", parser.doc.Packages["package1"].PackageName) + if parser.doc.Packages["package1"].Name != "package1" { + t.Errorf("expected package name %s in Packages[package1], got %s", "package1", parser.doc.Packages["package1"].Name) } // and the first Package's Files should be of size 1 and have f1 only if len(parser.doc.Packages["package1"].Files) != 1 { @@ -126,8 +126,8 @@ func TestParser2_2SnippetStartsNewPackageAfterParsingPackageNameTag(t *testing.T if parser.doc.Packages["package1"].Files["f1"] != f1 { t.Errorf("Expected file %v in Files[f1], got %v", f1, parser.doc.Packages["package1"].Files["f1"]) } - if parser.doc.Packages["package1"].Files["f1"].FileName != "f1.txt" { - t.Errorf("expected file name %s in Files[f1], got %s", "f1.txt", parser.doc.Packages["package1"].Files["f1"].FileName) + if parser.doc.Packages["package1"].Files["f1"].Name != "f1.txt" { + t.Errorf("expected file name %s in Files[f1], got %s", "f1.txt", parser.doc.Packages["package1"].Files["f1"].Name) } // and the new Package should have no files if len(parser.pkg.Files) != 0 { @@ -148,9 +148,9 @@ func TestParser2_2SnippetMovesToFileAfterParsingFileNameTag(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psSnippet2_2, - pkg: &spdx.Package2_2{PackageName: "package1", PackageSPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_2{}}, - file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_2{}}, - snippet: &spdx.Snippet2_2{SnippetSPDXIdentifier: "s1"}, + pkg: &spdx.Package2_2{Name: "package1", SPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_2{}}, + file: &spdx.File2_2{Name: "f1.txt", SPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_2{}}, + snippet: &spdx.Snippet2_2{SPDXIdentifier: "s1"}, } p1 := parser.pkg f1 := parser.file @@ -176,8 +176,8 @@ func TestParser2_2SnippetMovesToFileAfterParsingFileNameTag(t *testing.T) { t.Fatalf("parser didn't create new file") } // and the file name should be as expected - if parser.file.FileName != f2Name { - t.Errorf("expected file name %s, got %s", f2Name, parser.file.FileName) + if parser.file.Name != f2Name { + t.Errorf("expected file name %s, got %s", f2Name, parser.file.Name) } // and the Package's Files should still be of size 1 since we haven't seen // an SPDX identifier yet for this new file @@ -187,8 +187,8 @@ func TestParser2_2SnippetMovesToFileAfterParsingFileNameTag(t *testing.T) { if parser.pkg.Files["f1"] != f1 { t.Errorf("Expected file %v in Files[f1], got %v", f1, parser.pkg.Files["f1"]) } - if parser.pkg.Files["f1"].FileName != f1Name { - t.Errorf("expected file name %s in Files[f1], got %s", f1Name, parser.pkg.Files["f1"].FileName) + if parser.pkg.Files["f1"].Name != f1Name { + t.Errorf("expected file name %s in Files[f1], got %s", f1Name, parser.pkg.Files["f1"].Name) } // and the current snippet should be nil if parser.snippet != nil { @@ -200,9 +200,9 @@ func TestParser2_2SnippetMovesToOtherLicenseAfterParsingLicenseIDTag(t *testing. parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psSnippet2_2, - pkg: &spdx.Package2_2{PackageName: "package1", PackageSPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_2{}}, - file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_2{}}, - snippet: &spdx.Snippet2_2{SnippetSPDXIdentifier: "s1"}, + pkg: &spdx.Package2_2{Name: "package1", SPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_2{}}, + file: &spdx.File2_2{Name: "f1.txt", SPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_2{}}, + snippet: &spdx.Snippet2_2{SPDXIdentifier: "s1"}, } parser.doc.Packages["package1"] = parser.pkg parser.pkg.Files["f1"] = parser.file @@ -221,9 +221,9 @@ func TestParser2_2SnippetMovesToReviewAfterParsingReviewerTag(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psSnippet2_2, - pkg: &spdx.Package2_2{PackageName: "package1", PackageSPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_2{}}, - file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_2{}}, - snippet: &spdx.Snippet2_2{SnippetSPDXIdentifier: "s1"}, + pkg: &spdx.Package2_2{Name: "package1", SPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_2{}}, + file: &spdx.File2_2{Name: "f1.txt", SPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_2{}}, + snippet: &spdx.Snippet2_2{SPDXIdentifier: "s1"}, } parser.doc.Packages["package1"] = parser.pkg parser.pkg.Files["f1"] = parser.file @@ -242,9 +242,9 @@ func TestParser2_2SnippetStaysAfterParsingRelationshipTags(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psSnippet2_2, - pkg: &spdx.Package2_2{PackageName: "package1", PackageSPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_2{}}, - file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_2{}}, - snippet: &spdx.Snippet2_2{SnippetSPDXIdentifier: "s1"}, + pkg: &spdx.Package2_2{Name: "package1", SPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_2{}}, + file: &spdx.File2_2{Name: "f1.txt", SPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_2{}}, + snippet: &spdx.Snippet2_2{SPDXIdentifier: "s1"}, } parser.doc.Packages["package1"] = parser.pkg parser.pkg.Files["f1"] = parser.file @@ -281,9 +281,9 @@ func TestParser2_2SnippetStaysAfterParsingAnnotationTags(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psSnippet2_2, - pkg: &spdx.Package2_2{PackageName: "package1", PackageSPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_2{}}, - file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_2{}}, - snippet: &spdx.Snippet2_2{SnippetSPDXIdentifier: "s1"}, + pkg: &spdx.Package2_2{Name: "package1", SPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_2{}}, + file: &spdx.File2_2{Name: "f1.txt", SPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_2{}}, + snippet: &spdx.Snippet2_2{SPDXIdentifier: "s1"}, } parser.doc.Packages["package1"] = parser.pkg parser.pkg.Files["f1"] = parser.file @@ -343,8 +343,8 @@ func TestParser2_2CanParseSnippetTags(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psSnippet2_2, - pkg: &spdx.Package2_2{PackageName: "package1", PackageSPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_2{}}, - file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_2{}}, + pkg: &spdx.Package2_2{Name: "package1", SPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_2{}}, + file: &spdx.File2_2{Name: "f1.txt", SPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_2{}}, snippet: &spdx.Snippet2_2{}, } parser.doc.Packages["package1"] = parser.pkg @@ -355,8 +355,8 @@ func TestParser2_2CanParseSnippetTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.snippet.SnippetSPDXIdentifier != "s1" { - t.Errorf("got %v for SnippetSPDXIdentifier", parser.snippet.SnippetSPDXIdentifier) + if parser.snippet.SPDXIdentifier != "s1" { + t.Errorf("got %v for SnippetSPDXIdentifier", parser.snippet.SPDXIdentifier) } // Snippet from File SPDX Identifier @@ -374,11 +374,11 @@ func TestParser2_2CanParseSnippetTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.snippet.SnippetByteRangeStart != 20 { - t.Errorf("got %v for SnippetByteRangeStart", parser.snippet.SnippetByteRangeStart) + if parser.snippet.ByteRangeStart != 20 { + t.Errorf("got %v for SnippetByteRangeStart", parser.snippet.ByteRangeStart) } - if parser.snippet.SnippetByteRangeEnd != 320 { - t.Errorf("got %v for SnippetByteRangeEnd", parser.snippet.SnippetByteRangeEnd) + if parser.snippet.ByteRangeEnd != 320 { + t.Errorf("got %v for SnippetByteRangeEnd", parser.snippet.ByteRangeEnd) } // Snippet Line Range @@ -386,11 +386,11 @@ func TestParser2_2CanParseSnippetTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.snippet.SnippetLineRangeStart != 5 { - t.Errorf("got %v for SnippetLineRangeStart", parser.snippet.SnippetLineRangeStart) + if parser.snippet.LineRangeStart != 5 { + t.Errorf("got %v for SnippetLineRangeStart", parser.snippet.LineRangeStart) } - if parser.snippet.SnippetLineRangeEnd != 12 { - t.Errorf("got %v for SnippetLineRangeEnd", parser.snippet.SnippetLineRangeEnd) + if parser.snippet.LineRangeEnd != 12 { + t.Errorf("got %v for SnippetLineRangeEnd", parser.snippet.LineRangeEnd) } // Snippet Concluded License @@ -398,8 +398,8 @@ func TestParser2_2CanParseSnippetTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.snippet.SnippetLicenseConcluded != "BSD-3-Clause" { - t.Errorf("got %v for SnippetLicenseConcluded", parser.snippet.SnippetLicenseConcluded) + if parser.snippet.LicenseConcluded != "BSD-3-Clause" { + t.Errorf("got %v for SnippetLicenseConcluded", parser.snippet.LicenseConcluded) } // License Information in Snippet @@ -435,8 +435,8 @@ func TestParser2_2CanParseSnippetTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.snippet.SnippetLicenseComments != "this is a comment about the licenses" { - t.Errorf("got %v for SnippetLicenseComments", parser.snippet.SnippetLicenseComments) + if parser.snippet.LicenseComments != "this is a comment about the licenses" { + t.Errorf("got %v for SnippetLicenseComments", parser.snippet.LicenseComments) } // Snippet Copyright Text @@ -444,8 +444,8 @@ func TestParser2_2CanParseSnippetTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.snippet.SnippetCopyrightText != "copyright (c) John Doe and friends" { - t.Errorf("got %v for SnippetCopyrightText", parser.snippet.SnippetCopyrightText) + if parser.snippet.CopyrightText != "copyright (c) John Doe and friends" { + t.Errorf("got %v for SnippetCopyrightText", parser.snippet.CopyrightText) } // Snippet Comment @@ -453,8 +453,8 @@ func TestParser2_2CanParseSnippetTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.snippet.SnippetComment != "this is a comment about the snippet" { - t.Errorf("got %v for SnippetComment", parser.snippet.SnippetComment) + if parser.snippet.Comment != "this is a comment about the snippet" { + t.Errorf("got %v for SnippetComment", parser.snippet.Comment) } // Snippet Name @@ -462,8 +462,8 @@ func TestParser2_2CanParseSnippetTags(t *testing.T) { if err != nil { t.Errorf("expected nil error, got %v", err) } - if parser.snippet.SnippetName != "from some other package called abc" { - t.Errorf("got %v for SnippetName", parser.snippet.SnippetName) + if parser.snippet.Name != "from some other package called abc" { + t.Errorf("got %v for SnippetName", parser.snippet.Name) } // Snippet Attribution Texts @@ -479,7 +479,7 @@ func TestParser2_2CanParseSnippetTags(t *testing.T) { } for _, attrWant := range attrs { flagFound := false - for _, attrCheck := range parser.snippet.SnippetAttributionTexts { + for _, attrCheck := range parser.snippet.AttributionTexts { if attrWant == attrCheck { flagFound = true } @@ -488,9 +488,9 @@ func TestParser2_2CanParseSnippetTags(t *testing.T) { t.Errorf("didn't find %s in SnippetAttributionText", attrWant) } } - if len(attrs) != len(parser.snippet.SnippetAttributionTexts) { + if len(attrs) != len(parser.snippet.AttributionTexts) { t.Errorf("expected %d attribution texts in SnippetAttributionTexts, got %d", len(attrs), - len(parser.snippet.SnippetAttributionTexts)) + len(parser.snippet.AttributionTexts)) } } @@ -499,9 +499,9 @@ func TestParser2_2SnippetUnknownTagFails(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psSnippet2_2, - pkg: &spdx.Package2_2{PackageName: "package1", PackageSPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_2{}}, - file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_2{}}, - snippet: &spdx.Snippet2_2{SnippetSPDXIdentifier: "s1"}, + pkg: &spdx.Package2_2{Name: "package1", SPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_2{}}, + file: &spdx.File2_2{Name: "f1.txt", SPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_2{}}, + snippet: &spdx.Snippet2_2{SPDXIdentifier: "s1"}, } parser.doc.Packages["package1"] = parser.pkg parser.pkg.Files["f1"] = parser.file @@ -516,8 +516,8 @@ func TestParser2_2FailsForInvalidSnippetSPDXID(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psSnippet2_2, - pkg: &spdx.Package2_2{PackageName: "package1", PackageSPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_2{}}, - file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_2{}}, + pkg: &spdx.Package2_2{Name: "package1", SPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_2{}}, + file: &spdx.File2_2{Name: "f1.txt", SPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_2{}}, snippet: &spdx.Snippet2_2{}, } parser.doc.Packages["package1"] = parser.pkg @@ -534,8 +534,8 @@ func TestParser2_2FailsForInvalidSnippetFromFileSPDXID(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psSnippet2_2, - pkg: &spdx.Package2_2{PackageName: "package1", PackageSPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_2{}}, - file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_2{}}, + pkg: &spdx.Package2_2{Name: "package1", SPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_2{}}, + file: &spdx.File2_2{Name: "f1.txt", SPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_2{}}, snippet: &spdx.Snippet2_2{}, } parser.doc.Packages["package1"] = parser.pkg @@ -557,8 +557,8 @@ func TestParser2_2FailsForInvalidSnippetByteValues(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psSnippet2_2, - pkg: &spdx.Package2_2{PackageName: "package1", PackageSPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_2{}}, - file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_2{}}, + pkg: &spdx.Package2_2{Name: "package1", SPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_2{}}, + file: &spdx.File2_2{Name: "f1.txt", SPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_2{}}, snippet: &spdx.Snippet2_2{}, } parser.doc.Packages["package1"] = parser.pkg @@ -588,8 +588,8 @@ func TestParser2_2FailsForInvalidSnippetLineValues(t *testing.T) { parser := tvParser2_2{ doc: &spdx.Document2_2{Packages: map[spdx.ElementID]*spdx.Package2_2{}}, st: psSnippet2_2, - pkg: &spdx.Package2_2{PackageName: "package1", PackageSPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_2{}}, - file: &spdx.File2_2{FileName: "f1.txt", FileSPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_2{}}, + pkg: &spdx.Package2_2{Name: "package1", SPDXIdentifier: "package1", Files: map[spdx.ElementID]*spdx.File2_2{}}, + file: &spdx.File2_2{Name: "f1.txt", SPDXIdentifier: "f1", Snippets: map[spdx.ElementID]*spdx.Snippet2_2{}}, snippet: &spdx.Snippet2_2{}, } parser.doc.Packages["package1"] = parser.pkg diff --git a/tvsaver/saver2v1/save_annotation.go b/tvsaver/saver2v1/save_annotation.go index 8c0ae89b..08305f30 100644 --- a/tvsaver/saver2v1/save_annotation.go +++ b/tvsaver/saver2v1/save_annotation.go @@ -13,18 +13,18 @@ func renderAnnotation2_1(ann *spdx.Annotation2_1, w io.Writer) error { if ann.Annotator != "" && ann.AnnotatorType != "" { fmt.Fprintf(w, "Annotator: %s: %s\n", ann.AnnotatorType, ann.Annotator) } - if ann.AnnotationDate != "" { - fmt.Fprintf(w, "AnnotationDate: %s\n", ann.AnnotationDate) + if ann.Date != "" { + fmt.Fprintf(w, "AnnotationDate: %s\n", ann.Date) } - if ann.AnnotationType != "" { - fmt.Fprintf(w, "AnnotationType: %s\n", ann.AnnotationType) + if ann.Type != "" { + fmt.Fprintf(w, "AnnotationType: %s\n", ann.Type) } - annIDStr := spdx.RenderDocElementID(ann.AnnotationSPDXIdentifier) + annIDStr := spdx.RenderDocElementID(ann.SPDXIdentifier) if annIDStr != "SPDXRef-" { fmt.Fprintf(w, "SPDXREF: %s\n", annIDStr) } - if ann.AnnotationComment != "" { - fmt.Fprintf(w, "AnnotationComment: %s\n", textify(ann.AnnotationComment)) + if ann.Comment != "" { + fmt.Fprintf(w, "AnnotationComment: %s\n", textify(ann.Comment)) } return nil diff --git a/tvsaver/saver2v1/save_annotation_test.go b/tvsaver/saver2v1/save_annotation_test.go index 9cb0277d..86a126c5 100644 --- a/tvsaver/saver2v1/save_annotation_test.go +++ b/tvsaver/saver2v1/save_annotation_test.go @@ -12,12 +12,12 @@ import ( // ===== Annotation section Saver tests ===== func TestSaver2_1AnnotationSavesTextForPerson(t *testing.T) { ann := &spdx.Annotation2_1{ - Annotator: "John Doe", - AnnotatorType: "Person", - AnnotationDate: "2018-10-10T17:52:00Z", - AnnotationType: "REVIEW", - AnnotationSPDXIdentifier: spdx.MakeDocElementID("", "DOCUMENT"), - AnnotationComment: "This is an annotation about the SPDX document", + Annotator: "John Doe", + AnnotatorType: "Person", + Date: "2018-10-10T17:52:00Z", + Type: "REVIEW", + SPDXIdentifier: spdx.MakeDocElementID("", "DOCUMENT"), + Comment: "This is an annotation about the SPDX document", } // what we want to get, as a buffer of bytes @@ -45,12 +45,12 @@ AnnotationComment: This is an annotation about the SPDX document func TestSaver2_1AnnotationSavesTextForOrganization(t *testing.T) { ann := &spdx.Annotation2_1{ - Annotator: "John Doe, Inc.", - AnnotatorType: "Organization", - AnnotationDate: "2018-10-10T17:52:00Z", - AnnotationType: "REVIEW", - AnnotationSPDXIdentifier: spdx.MakeDocElementID("", "DOCUMENT"), - AnnotationComment: "This is an annotation about the SPDX document", + Annotator: "John Doe, Inc.", + AnnotatorType: "Organization", + Date: "2018-10-10T17:52:00Z", + Type: "REVIEW", + SPDXIdentifier: spdx.MakeDocElementID("", "DOCUMENT"), + Comment: "This is an annotation about the SPDX document", } // what we want to get, as a buffer of bytes @@ -78,12 +78,12 @@ AnnotationComment: This is an annotation about the SPDX document func TestSaver2_1AnnotationSavesTextForTool(t *testing.T) { ann := &spdx.Annotation2_1{ - Annotator: "magictool-1.1", - AnnotatorType: "Tool", - AnnotationDate: "2018-10-10T17:52:00Z", - AnnotationType: "REVIEW", - AnnotationSPDXIdentifier: spdx.MakeDocElementID("", "DOCUMENT"), - AnnotationComment: "This is an annotation about the SPDX document", + Annotator: "magictool-1.1", + AnnotatorType: "Tool", + Date: "2018-10-10T17:52:00Z", + Type: "REVIEW", + SPDXIdentifier: spdx.MakeDocElementID("", "DOCUMENT"), + Comment: "This is an annotation about the SPDX document", } // what we want to get, as a buffer of bytes diff --git a/tvsaver/saver2v1/save_document.go b/tvsaver/saver2v1/save_document.go index 67dfddc9..7587e357 100644 --- a/tvsaver/saver2v1/save_document.go +++ b/tvsaver/saver2v1/save_document.go @@ -45,7 +45,7 @@ func RenderDocument2_1(doc *spdx.Document2_1, w io.Writer) error { sort.Strings(packageKeys) for _, pkgID := range packageKeys { pkg := doc.Packages[spdx.ElementID(pkgID)] - fmt.Fprintf(w, "##### Package: %s\n\n", pkg.PackageName) + fmt.Fprintf(w, "##### Package: %s\n\n", pkg.Name) renderPackage2_1(pkg, w) } diff --git a/tvsaver/saver2v1/save_document_test.go b/tvsaver/saver2v1/save_document_test.go index 980c6dfb..4a7dcb58 100644 --- a/tvsaver/saver2v1/save_document_test.go +++ b/tvsaver/saver2v1/save_document_test.go @@ -27,21 +27,21 @@ func TestSaver2_1DocumentSavesText(t *testing.T) { // unpackaged files f1 := &spdx.File2_1{ - FileName: "/tmp/whatever1.txt", - FileSPDXIdentifier: spdx.ElementID("File1231"), - FileChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983c", - LicenseConcluded: "Apache-2.0", - LicenseInfoInFile: []string{"Apache-2.0"}, - FileCopyrightText: "Copyright (c) Jane Doe", + Name: "/tmp/whatever1.txt", + SPDXIdentifier: spdx.ElementID("File1231"), + ChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983c", + LicenseConcluded: "Apache-2.0", + LicenseInfoInFile: []string{"Apache-2.0"}, + CopyrightText: "Copyright (c) Jane Doe", } f2 := &spdx.File2_1{ - FileName: "/tmp/whatever2.txt", - FileSPDXIdentifier: spdx.ElementID("File1232"), - FileChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983d", - LicenseConcluded: "MIT", - LicenseInfoInFile: []string{"MIT"}, - FileCopyrightText: "Copyright (c) John Doe", + Name: "/tmp/whatever2.txt", + SPDXIdentifier: spdx.ElementID("File1232"), + ChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983d", + LicenseConcluded: "MIT", + LicenseInfoInFile: []string{"MIT"}, + CopyrightText: "Copyright (c) John Doe", } unFiles := map[spdx.ElementID]*spdx.File2_1{ @@ -51,34 +51,34 @@ func TestSaver2_1DocumentSavesText(t *testing.T) { // Package 1: packaged files with snippets sn1 := &spdx.Snippet2_1{ - SnippetSPDXIdentifier: "Snippet19", + SPDXIdentifier: "Snippet19", SnippetFromFileSPDXIdentifier: spdx.MakeDocElementID("", "FileHasSnippets"), - SnippetByteRangeStart: 17, - SnippetByteRangeEnd: 209, - SnippetLicenseConcluded: "GPL-2.0-or-later", - SnippetCopyrightText: "Copyright (c) John Doe 20x6", + ByteRangeStart: 17, + ByteRangeEnd: 209, + LicenseConcluded: "GPL-2.0-or-later", + CopyrightText: "Copyright (c) John Doe 20x6", } sn2 := &spdx.Snippet2_1{ - SnippetSPDXIdentifier: "Snippet20", + SPDXIdentifier: "Snippet20", SnippetFromFileSPDXIdentifier: spdx.MakeDocElementID("", "FileHasSnippets"), - SnippetByteRangeStart: 268, - SnippetByteRangeEnd: 309, - SnippetLicenseConcluded: "WTFPL", - SnippetCopyrightText: "NOASSERTION", + ByteRangeStart: 268, + ByteRangeEnd: 309, + LicenseConcluded: "WTFPL", + CopyrightText: "NOASSERTION", } f3 := &spdx.File2_1{ - FileName: "/tmp/file-with-snippets.txt", - FileSPDXIdentifier: spdx.ElementID("FileHasSnippets"), - FileChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983e", - LicenseConcluded: "GPL-2.0-or-later AND WTFPL", + Name: "/tmp/file-with-snippets.txt", + SPDXIdentifier: spdx.ElementID("FileHasSnippets"), + ChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983e", + LicenseConcluded: "GPL-2.0-or-later AND WTFPL", LicenseInfoInFile: []string{ "Apache-2.0", "GPL-2.0-or-later", "WTFPL", }, - FileCopyrightText: "Copyright (c) Jane Doe", + CopyrightText: "Copyright (c) Jane Doe", Snippets: map[spdx.ElementID]*spdx.Snippet2_1{ spdx.ElementID("Snippet19"): sn1, spdx.ElementID("Snippet20"): sn2, @@ -86,30 +86,30 @@ func TestSaver2_1DocumentSavesText(t *testing.T) { } f4 := &spdx.File2_1{ - FileName: "/tmp/another-file.txt", - FileSPDXIdentifier: spdx.ElementID("FileAnother"), - FileChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983f", - LicenseConcluded: "BSD-3-Clause", - LicenseInfoInFile: []string{"BSD-3-Clause"}, - FileCopyrightText: "Copyright (c) Jane Doe LLC", + Name: "/tmp/another-file.txt", + SPDXIdentifier: spdx.ElementID("FileAnother"), + ChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983f", + LicenseConcluded: "BSD-3-Clause", + LicenseInfoInFile: []string{"BSD-3-Clause"}, + CopyrightText: "Copyright (c) Jane Doe LLC", } pkgWith := &spdx.Package2_1{ - PackageName: "p1", - PackageSPDXIdentifier: spdx.ElementID("p1"), - PackageDownloadLocation: "http://example.com/p1/p1-0.1.0-master.tar.gz", + Name: "p1", + SPDXIdentifier: spdx.ElementID("p1"), + DownloadLocation: "http://example.com/p1/p1-0.1.0-master.tar.gz", FilesAnalyzed: true, IsFilesAnalyzedTagPresent: true, - PackageVerificationCode: "0123456789abcdef0123456789abcdef01234567", - PackageLicenseConcluded: "GPL-2.0-or-later AND BSD-3-Clause AND WTFPL", - PackageLicenseInfoFromFiles: []string{ + VerificationCode: "0123456789abcdef0123456789abcdef01234567", + LicenseConcluded: "GPL-2.0-or-later AND BSD-3-Clause AND WTFPL", + LicenseInfoFromFiles: []string{ "Apache-2.0", "GPL-2.0-or-later", "WTFPL", "BSD-3-Clause", }, - PackageLicenseDeclared: "Apache-2.0 OR GPL-2.0-or-later", - PackageCopyrightText: "Copyright (c) John Doe, Inc.", + LicenseDeclared: "Apache-2.0 OR GPL-2.0-or-later", + CopyrightText: "Copyright (c) John Doe, Inc.", Files: map[spdx.ElementID]*spdx.File2_1{ spdx.ElementID("FileHasSnippets"): f3, spdx.ElementID("FileAnother"): f4, @@ -118,17 +118,17 @@ func TestSaver2_1DocumentSavesText(t *testing.T) { // Other Licenses 1 and 2 ol1 := &spdx.OtherLicense2_1{ - LicenseIdentifier: "LicenseRef-1", + Identifier: "LicenseRef-1", ExtractedText: `License 1 text blah blah blah blah blah blah blah`, - LicenseName: "License 1", + Name: "License 1", } ol2 := &spdx.OtherLicense2_1{ - LicenseIdentifier: "LicenseRef-2", - ExtractedText: `License 2 text - this is a license that does some stuff`, - LicenseName: "License 2", + Identifier: "LicenseRef-2", + ExtractedText: `License 2 text - this is a license that does some stuff`, + Name: "License 2", } // Relationships @@ -152,34 +152,34 @@ blah blah blah blah`, // Annotations ann1 := &spdx.Annotation2_1{ - Annotator: "John Doe", - AnnotatorType: "Person", - AnnotationDate: "2018-10-10T17:52:00Z", - AnnotationType: "REVIEW", - AnnotationSPDXIdentifier: spdx.MakeDocElementID("", "DOCUMENT"), - AnnotationComment: "This is an annotation about the SPDX document", + Annotator: "John Doe", + AnnotatorType: "Person", + Date: "2018-10-10T17:52:00Z", + Type: "REVIEW", + SPDXIdentifier: spdx.MakeDocElementID("", "DOCUMENT"), + Comment: "This is an annotation about the SPDX document", } ann2 := &spdx.Annotation2_1{ - Annotator: "John Doe, Inc.", - AnnotatorType: "Organization", - AnnotationDate: "2018-10-10T17:52:00Z", - AnnotationType: "REVIEW", - AnnotationSPDXIdentifier: spdx.MakeDocElementID("", "p1"), - AnnotationComment: "This is an annotation about Package p1", + Annotator: "John Doe, Inc.", + AnnotatorType: "Organization", + Date: "2018-10-10T17:52:00Z", + Type: "REVIEW", + SPDXIdentifier: spdx.MakeDocElementID("", "p1"), + Comment: "This is an annotation about Package p1", } // Reviews rev1 := &spdx.Review2_1{ Reviewer: "John Doe", ReviewerType: "Person", - ReviewDate: "2018-10-14T10:28:00Z", + Date: "2018-10-14T10:28:00Z", } rev2 := &spdx.Review2_1{ - Reviewer: "Jane Doe LLC", - ReviewerType: "Organization", - ReviewDate: "2018-10-14T10:28:00Z", - ReviewComment: "I have reviewed this SPDX document and it is awesome", + Reviewer: "Jane Doe LLC", + ReviewerType: "Organization", + Date: "2018-10-14T10:28:00Z", + Comment: "I have reviewed this SPDX document and it is awesome", } // now, build the document diff --git a/tvsaver/saver2v1/save_file.go b/tvsaver/saver2v1/save_file.go index a9df3ede..7b3fe7f5 100644 --- a/tvsaver/saver2v1/save_file.go +++ b/tvsaver/saver2v1/save_file.go @@ -11,23 +11,23 @@ import ( ) func renderFile2_1(f *spdx.File2_1, w io.Writer) error { - if f.FileName != "" { - fmt.Fprintf(w, "FileName: %s\n", f.FileName) + if f.Name != "" { + fmt.Fprintf(w, "FileName: %s\n", f.Name) } - if f.FileSPDXIdentifier != "" { - fmt.Fprintf(w, "SPDXID: %s\n", spdx.RenderElementID(f.FileSPDXIdentifier)) + if f.SPDXIdentifier != "" { + fmt.Fprintf(w, "SPDXID: %s\n", spdx.RenderElementID(f.SPDXIdentifier)) } - for _, s := range f.FileType { + for _, s := range f.Type { fmt.Fprintf(w, "FileType: %s\n", s) } - if f.FileChecksumSHA1 != "" { - fmt.Fprintf(w, "FileChecksum: SHA1: %s\n", f.FileChecksumSHA1) + if f.ChecksumSHA1 != "" { + fmt.Fprintf(w, "FileChecksum: SHA1: %s\n", f.ChecksumSHA1) } - if f.FileChecksumSHA256 != "" { - fmt.Fprintf(w, "FileChecksum: SHA256: %s\n", f.FileChecksumSHA256) + if f.ChecksumSHA256 != "" { + fmt.Fprintf(w, "FileChecksum: SHA256: %s\n", f.ChecksumSHA256) } - if f.FileChecksumMD5 != "" { - fmt.Fprintf(w, "FileChecksum: MD5: %s\n", f.FileChecksumMD5) + if f.ChecksumMD5 != "" { + fmt.Fprintf(w, "FileChecksum: MD5: %s\n", f.ChecksumMD5) } if f.LicenseConcluded != "" { fmt.Fprintf(w, "LicenseConcluded: %s\n", f.LicenseConcluded) @@ -38,8 +38,8 @@ func renderFile2_1(f *spdx.File2_1, w io.Writer) error { if f.LicenseComments != "" { fmt.Fprintf(w, "LicenseComments: %s\n", f.LicenseComments) } - if f.FileCopyrightText != "" { - fmt.Fprintf(w, "FileCopyrightText: %s\n", textify(f.FileCopyrightText)) + if f.CopyrightText != "" { + fmt.Fprintf(w, "FileCopyrightText: %s\n", textify(f.CopyrightText)) } for _, aop := range f.ArtifactOfProjects { fmt.Fprintf(w, "ArtifactOfProjectName: %s\n", aop.Name) @@ -50,16 +50,16 @@ func renderFile2_1(f *spdx.File2_1, w io.Writer) error { fmt.Fprintf(w, "ArtifactOfProjectURI: %s\n", aop.URI) } } - if f.FileComment != "" { - fmt.Fprintf(w, "FileComment: %s\n", f.FileComment) + if f.Comment != "" { + fmt.Fprintf(w, "FileComment: %s\n", f.Comment) } - if f.FileNotice != "" { - fmt.Fprintf(w, "FileNotice: %s\n", f.FileNotice) + if f.Notice != "" { + fmt.Fprintf(w, "FileNotice: %s\n", f.Notice) } - for _, s := range f.FileContributor { + for _, s := range f.Contributor { fmt.Fprintf(w, "FileContributor: %s\n", s) } - for _, s := range f.FileDependencies { + for _, s := range f.Dependencies { fmt.Fprintf(w, "FileDependency: %s\n", s) } diff --git a/tvsaver/saver2v1/save_file_test.go b/tvsaver/saver2v1/save_file_test.go index 9e652b6f..686ff8ce 100644 --- a/tvsaver/saver2v1/save_file_test.go +++ b/tvsaver/saver2v1/save_file_test.go @@ -12,22 +12,22 @@ import ( // ===== File section Saver tests ===== func TestSaver2_1FileSavesText(t *testing.T) { f := &spdx.File2_1{ - FileName: "/tmp/whatever.txt", - FileSPDXIdentifier: spdx.ElementID("File123"), - FileType: []string{ + Name: "/tmp/whatever.txt", + SPDXIdentifier: spdx.ElementID("File123"), + Type: []string{ "TEXT", "DOCUMENTATION", }, - FileChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983c", - FileChecksumSHA256: "11b6d3ee554eedf79299905a98f9b9a04e498210b59f15094c916c91d150efcd", - FileChecksumMD5: "624c1abb3664f4b35547e7c73864ad24", - LicenseConcluded: "Apache-2.0", + ChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983c", + ChecksumSHA256: "11b6d3ee554eedf79299905a98f9b9a04e498210b59f15094c916c91d150efcd", + ChecksumMD5: "624c1abb3664f4b35547e7c73864ad24", + LicenseConcluded: "Apache-2.0", LicenseInfoInFile: []string{ "Apache-2.0", "Apache-1.1", }, - LicenseComments: "this is a license comment(s)", - FileCopyrightText: "Copyright (c) Jane Doe", + LicenseComments: "this is a license comment(s)", + CopyrightText: "Copyright (c) Jane Doe", ArtifactOfProjects: []*spdx.ArtifactOfProject2_1{ &spdx.ArtifactOfProject2_1{ Name: "project1", @@ -46,13 +46,13 @@ func TestSaver2_1FileSavesText(t *testing.T) { URI: "http://example.com/4/uri.whatever", }, }, - FileComment: "this is a file comment", - FileNotice: "This file may be used under either Apache-2.0 or Apache-1.1.", - FileContributor: []string{ + Comment: "this is a file comment", + Notice: "This file may be used under either Apache-2.0 or Apache-1.1.", + Contributor: []string{ "John Doe jdoe@example.com", "EvilCorp", }, - FileDependencies: []string{ + Dependencies: []string{ "f-1.txt", "g.txt", }, @@ -104,21 +104,21 @@ FileDependency: g.txt func TestSaver2_1FileSavesSnippetsAlso(t *testing.T) { sn1 := &spdx.Snippet2_1{ - SnippetSPDXIdentifier: spdx.ElementID("Snippet19"), + SPDXIdentifier: spdx.ElementID("Snippet19"), SnippetFromFileSPDXIdentifier: spdx.MakeDocElementID("", "File123"), - SnippetByteRangeStart: 17, - SnippetByteRangeEnd: 209, - SnippetLicenseConcluded: "GPL-2.0-or-later", - SnippetCopyrightText: "Copyright (c) John Doe 20x6", + ByteRangeStart: 17, + ByteRangeEnd: 209, + LicenseConcluded: "GPL-2.0-or-later", + CopyrightText: "Copyright (c) John Doe 20x6", } sn2 := &spdx.Snippet2_1{ - SnippetSPDXIdentifier: spdx.ElementID("Snippet20"), + SPDXIdentifier: spdx.ElementID("Snippet20"), SnippetFromFileSPDXIdentifier: spdx.MakeDocElementID("", "File123"), - SnippetByteRangeStart: 268, - SnippetByteRangeEnd: 309, - SnippetLicenseConcluded: "WTFPL", - SnippetCopyrightText: "NOASSERTION", + ByteRangeStart: 268, + ByteRangeEnd: 309, + LicenseConcluded: "WTFPL", + CopyrightText: "NOASSERTION", } sns := map[spdx.ElementID]*spdx.Snippet2_1{ @@ -127,15 +127,15 @@ func TestSaver2_1FileSavesSnippetsAlso(t *testing.T) { } f := &spdx.File2_1{ - FileName: "/tmp/whatever.txt", - FileSPDXIdentifier: spdx.ElementID("File123"), - FileChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983c", - LicenseConcluded: "Apache-2.0", + Name: "/tmp/whatever.txt", + SPDXIdentifier: spdx.ElementID("File123"), + ChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983c", + LicenseConcluded: "Apache-2.0", LicenseInfoInFile: []string{ "Apache-2.0", }, - FileCopyrightText: "Copyright (c) Jane Doe", - Snippets: sns, + CopyrightText: "Copyright (c) Jane Doe", + Snippets: sns, } // what we want to get, as a buffer of bytes @@ -176,14 +176,14 @@ SnippetCopyrightText: NOASSERTION func TestSaver2_1FileOmitsOptionalFieldsIfEmpty(t *testing.T) { f := &spdx.File2_1{ - FileName: "/tmp/whatever.txt", - FileSPDXIdentifier: spdx.ElementID("File123"), - FileChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983c", - LicenseConcluded: "Apache-2.0", + Name: "/tmp/whatever.txt", + SPDXIdentifier: spdx.ElementID("File123"), + ChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983c", + LicenseConcluded: "Apache-2.0", LicenseInfoInFile: []string{ "Apache-2.0", }, - FileCopyrightText: "Copyright (c) Jane Doe", + CopyrightText: "Copyright (c) Jane Doe", } // what we want to get, as a buffer of bytes @@ -212,14 +212,14 @@ FileCopyrightText: Copyright (c) Jane Doe func TestSaver2_1FileWrapsCopyrightMultiLine(t *testing.T) { f := &spdx.File2_1{ - FileName: "/tmp/whatever.txt", - FileSPDXIdentifier: spdx.ElementID("File123"), - FileChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983c", - LicenseConcluded: "Apache-2.0", + Name: "/tmp/whatever.txt", + SPDXIdentifier: spdx.ElementID("File123"), + ChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983c", + LicenseConcluded: "Apache-2.0", LicenseInfoInFile: []string{ "Apache-2.0", }, - FileCopyrightText: `Copyright (c) Jane Doe + CopyrightText: `Copyright (c) Jane Doe Copyright (c) John Doe`, } diff --git a/tvsaver/saver2v1/save_other_license.go b/tvsaver/saver2v1/save_other_license.go index ea48b807..13a8cebe 100644 --- a/tvsaver/saver2v1/save_other_license.go +++ b/tvsaver/saver2v1/save_other_license.go @@ -10,20 +10,20 @@ import ( ) func renderOtherLicense2_1(ol *spdx.OtherLicense2_1, w io.Writer) error { - if ol.LicenseIdentifier != "" { - fmt.Fprintf(w, "LicenseID: %s\n", ol.LicenseIdentifier) + if ol.Identifier != "" { + fmt.Fprintf(w, "LicenseID: %s\n", ol.Identifier) } if ol.ExtractedText != "" { fmt.Fprintf(w, "ExtractedText: %s\n", textify(ol.ExtractedText)) } - if ol.LicenseName != "" { - fmt.Fprintf(w, "LicenseName: %s\n", ol.LicenseName) + if ol.Name != "" { + fmt.Fprintf(w, "LicenseName: %s\n", ol.Name) } - for _, s := range ol.LicenseCrossReferences { + for _, s := range ol.CrossReferences { fmt.Fprintf(w, "LicenseCrossReference: %s\n", s) } - if ol.LicenseComment != "" { - fmt.Fprintf(w, "LicenseComment: %s\n", textify(ol.LicenseComment)) + if ol.Comment != "" { + fmt.Fprintf(w, "LicenseComment: %s\n", textify(ol.Comment)) } fmt.Fprintf(w, "\n") diff --git a/tvsaver/saver2v1/save_other_license_test.go b/tvsaver/saver2v1/save_other_license_test.go index 5feb96ee..ffe9274f 100644 --- a/tvsaver/saver2v1/save_other_license_test.go +++ b/tvsaver/saver2v1/save_other_license_test.go @@ -12,16 +12,16 @@ import ( // ===== Other License section Saver tests ===== func TestSaver2_1OtherLicenseSavesText(t *testing.T) { ol := &spdx.OtherLicense2_1{ - LicenseIdentifier: "LicenseRef-1", + Identifier: "LicenseRef-1", ExtractedText: `License 1 text blah blah blah blah blah blah blah`, - LicenseName: "License 1", - LicenseCrossReferences: []string{ + Name: "License 1", + CrossReferences: []string{ "http://example.com/License1/", "http://example.com/License1AnotherURL/", }, - LicenseComment: "this is a license comment", + Comment: "this is a license comment", } // what we want to get, as a buffer of bytes @@ -52,11 +52,11 @@ LicenseComment: this is a license comment func TestSaver2_1OtherLicenseOmitsOptionalFieldsIfEmpty(t *testing.T) { ol := &spdx.OtherLicense2_1{ - LicenseIdentifier: "LicenseRef-1", + Identifier: "LicenseRef-1", ExtractedText: `License 1 text blah blah blah blah blah blah blah`, - LicenseName: "License 1", + Name: "License 1", } // what we want to get, as a buffer of bytes diff --git a/tvsaver/saver2v1/save_package.go b/tvsaver/saver2v1/save_package.go index 619fa398..b822d1d7 100644 --- a/tvsaver/saver2v1/save_package.go +++ b/tvsaver/saver2v1/save_package.go @@ -11,38 +11,38 @@ import ( ) func renderPackage2_1(pkg *spdx.Package2_1, w io.Writer) error { - if pkg.PackageName != "" { - fmt.Fprintf(w, "PackageName: %s\n", pkg.PackageName) + if pkg.Name != "" { + fmt.Fprintf(w, "PackageName: %s\n", pkg.Name) } - if pkg.PackageSPDXIdentifier != "" { - fmt.Fprintf(w, "SPDXID: %s\n", spdx.RenderElementID(pkg.PackageSPDXIdentifier)) + if pkg.SPDXIdentifier != "" { + fmt.Fprintf(w, "SPDXID: %s\n", spdx.RenderElementID(pkg.SPDXIdentifier)) } - if pkg.PackageVersion != "" { - fmt.Fprintf(w, "PackageVersion: %s\n", pkg.PackageVersion) + if pkg.Version != "" { + fmt.Fprintf(w, "PackageVersion: %s\n", pkg.Version) } - if pkg.PackageFileName != "" { - fmt.Fprintf(w, "PackageFileName: %s\n", pkg.PackageFileName) + if pkg.FileName != "" { + fmt.Fprintf(w, "PackageFileName: %s\n", pkg.FileName) } - if pkg.PackageSupplierPerson != "" { - fmt.Fprintf(w, "PackageSupplier: Person: %s\n", pkg.PackageSupplierPerson) + if pkg.SupplierPerson != "" { + fmt.Fprintf(w, "PackageSupplier: Person: %s\n", pkg.SupplierPerson) } - if pkg.PackageSupplierOrganization != "" { - fmt.Fprintf(w, "PackageSupplier: Organization: %s\n", pkg.PackageSupplierOrganization) + if pkg.SupplierOrganization != "" { + fmt.Fprintf(w, "PackageSupplier: Organization: %s\n", pkg.SupplierOrganization) } - if pkg.PackageSupplierNOASSERTION == true { + if pkg.SupplierNOASSERTION == true { fmt.Fprintf(w, "PackageSupplier: NOASSERTION\n") } - if pkg.PackageOriginatorPerson != "" { - fmt.Fprintf(w, "PackageOriginator: Person: %s\n", pkg.PackageOriginatorPerson) + if pkg.OriginatorPerson != "" { + fmt.Fprintf(w, "PackageOriginator: Person: %s\n", pkg.OriginatorPerson) } - if pkg.PackageOriginatorOrganization != "" { - fmt.Fprintf(w, "PackageOriginator: Organization: %s\n", pkg.PackageOriginatorOrganization) + if pkg.OriginatorOrganization != "" { + fmt.Fprintf(w, "PackageOriginator: Organization: %s\n", pkg.OriginatorOrganization) } - if pkg.PackageOriginatorNOASSERTION == true { + if pkg.OriginatorNOASSERTION == true { fmt.Fprintf(w, "PackageOriginator: NOASSERTION\n") } - if pkg.PackageDownloadLocation != "" { - fmt.Fprintf(w, "PackageDownloadLocation: %s\n", pkg.PackageDownloadLocation) + if pkg.DownloadLocation != "" { + fmt.Fprintf(w, "PackageDownloadLocation: %s\n", pkg.DownloadLocation) } if pkg.FilesAnalyzed == true { if pkg.IsFilesAnalyzedTagPresent == true { @@ -51,55 +51,55 @@ func renderPackage2_1(pkg *spdx.Package2_1, w io.Writer) error { } else { fmt.Fprintf(w, "FilesAnalyzed: false\n") } - if pkg.PackageVerificationCode != "" && pkg.FilesAnalyzed == true { - if pkg.PackageVerificationCodeExcludedFile == "" { - fmt.Fprintf(w, "PackageVerificationCode: %s\n", pkg.PackageVerificationCode) + if pkg.VerificationCode != "" && pkg.FilesAnalyzed == true { + if pkg.VerificationCodeExcludedFile == "" { + fmt.Fprintf(w, "PackageVerificationCode: %s\n", pkg.VerificationCode) } else { - fmt.Fprintf(w, "PackageVerificationCode: %s (excludes %s)\n", pkg.PackageVerificationCode, pkg.PackageVerificationCodeExcludedFile) + fmt.Fprintf(w, "PackageVerificationCode: %s (excludes %s)\n", pkg.VerificationCode, pkg.VerificationCodeExcludedFile) } } - if pkg.PackageChecksumSHA1 != "" { - fmt.Fprintf(w, "PackageChecksum: SHA1: %s\n", pkg.PackageChecksumSHA1) + if pkg.ChecksumSHA1 != "" { + fmt.Fprintf(w, "PackageChecksum: SHA1: %s\n", pkg.ChecksumSHA1) } - if pkg.PackageChecksumSHA256 != "" { - fmt.Fprintf(w, "PackageChecksum: SHA256: %s\n", pkg.PackageChecksumSHA256) + if pkg.ChecksumSHA256 != "" { + fmt.Fprintf(w, "PackageChecksum: SHA256: %s\n", pkg.ChecksumSHA256) } - if pkg.PackageChecksumMD5 != "" { - fmt.Fprintf(w, "PackageChecksum: MD5: %s\n", pkg.PackageChecksumMD5) + if pkg.ChecksumMD5 != "" { + fmt.Fprintf(w, "PackageChecksum: MD5: %s\n", pkg.ChecksumMD5) } - if pkg.PackageHomePage != "" { - fmt.Fprintf(w, "PackageHomePage: %s\n", pkg.PackageHomePage) + if pkg.HomePage != "" { + fmt.Fprintf(w, "PackageHomePage: %s\n", pkg.HomePage) } - if pkg.PackageSourceInfo != "" { - fmt.Fprintf(w, "PackageSourceInfo: %s\n", textify(pkg.PackageSourceInfo)) + if pkg.SourceInfo != "" { + fmt.Fprintf(w, "PackageSourceInfo: %s\n", textify(pkg.SourceInfo)) } - if pkg.PackageLicenseConcluded != "" { - fmt.Fprintf(w, "PackageLicenseConcluded: %s\n", pkg.PackageLicenseConcluded) + if pkg.LicenseConcluded != "" { + fmt.Fprintf(w, "PackageLicenseConcluded: %s\n", pkg.LicenseConcluded) } if pkg.FilesAnalyzed == true { - for _, s := range pkg.PackageLicenseInfoFromFiles { + for _, s := range pkg.LicenseInfoFromFiles { fmt.Fprintf(w, "PackageLicenseInfoFromFiles: %s\n", s) } } - if pkg.PackageLicenseDeclared != "" { - fmt.Fprintf(w, "PackageLicenseDeclared: %s\n", pkg.PackageLicenseDeclared) + if pkg.LicenseDeclared != "" { + fmt.Fprintf(w, "PackageLicenseDeclared: %s\n", pkg.LicenseDeclared) } - if pkg.PackageLicenseComments != "" { - fmt.Fprintf(w, "PackageLicenseComments: %s\n", textify(pkg.PackageLicenseComments)) + if pkg.LicenseComments != "" { + fmt.Fprintf(w, "PackageLicenseComments: %s\n", textify(pkg.LicenseComments)) } - if pkg.PackageCopyrightText != "" { - fmt.Fprintf(w, "PackageCopyrightText: %s\n", pkg.PackageCopyrightText) + if pkg.CopyrightText != "" { + fmt.Fprintf(w, "PackageCopyrightText: %s\n", pkg.CopyrightText) } - if pkg.PackageSummary != "" { - fmt.Fprintf(w, "PackageSummary: %s\n", textify(pkg.PackageSummary)) + if pkg.Summary != "" { + fmt.Fprintf(w, "PackageSummary: %s\n", textify(pkg.Summary)) } - if pkg.PackageDescription != "" { - fmt.Fprintf(w, "PackageDescription: %s\n", textify(pkg.PackageDescription)) + if pkg.Description != "" { + fmt.Fprintf(w, "PackageDescription: %s\n", textify(pkg.Description)) } - if pkg.PackageComment != "" { - fmt.Fprintf(w, "PackageComment: %s\n", textify(pkg.PackageComment)) + if pkg.Comment != "" { + fmt.Fprintf(w, "PackageComment: %s\n", textify(pkg.Comment)) } - for _, s := range pkg.PackageExternalReferences { + for _, s := range pkg.ExternalReferences { fmt.Fprintf(w, "ExternalRef: %s %s %s\n", s.Category, s.RefType, s.Locator) if s.ExternalRefComment != "" { fmt.Fprintf(w, "ExternalRefComment: %s\n", s.ExternalRefComment) diff --git a/tvsaver/saver2v1/save_package_test.go b/tvsaver/saver2v1/save_package_test.go index fcde876a..3f9df978 100644 --- a/tvsaver/saver2v1/save_package_test.go +++ b/tvsaver/saver2v1/save_package_test.go @@ -40,35 +40,35 @@ func TestSaver2_1PackageSavesTextCombo1(t *testing.T) { } pkg := &spdx.Package2_1{ - PackageName: "p1", - PackageSPDXIdentifier: spdx.ElementID("p1"), - PackageVersion: "0.1.0", - PackageFileName: "p1-0.1.0-master.tar.gz", - PackageSupplierOrganization: "John Doe, Inc.", - PackageOriginatorPerson: "John Doe", - PackageDownloadLocation: "http://example.com/p1/p1-0.1.0-master.tar.gz", - FilesAnalyzed: true, - IsFilesAnalyzedTagPresent: true, - PackageVerificationCode: "0123456789abcdef0123456789abcdef01234567", - PackageVerificationCodeExcludedFile: "p1-0.1.0.spdx", - PackageChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983c", - PackageChecksumSHA256: "11b6d3ee554eedf79299905a98f9b9a04e498210b59f15094c916c91d150efcd", - PackageChecksumMD5: "624c1abb3664f4b35547e7c73864ad24", - PackageHomePage: "http://example.com/p1", - PackageSourceInfo: "this is a source comment", - PackageLicenseConcluded: "GPL-2.0-or-later", - PackageLicenseInfoFromFiles: []string{ + Name: "p1", + SPDXIdentifier: spdx.ElementID("p1"), + Version: "0.1.0", + FileName: "p1-0.1.0-master.tar.gz", + SupplierOrganization: "John Doe, Inc.", + OriginatorPerson: "John Doe", + DownloadLocation: "http://example.com/p1/p1-0.1.0-master.tar.gz", + FilesAnalyzed: true, + IsFilesAnalyzedTagPresent: true, + VerificationCode: "0123456789abcdef0123456789abcdef01234567", + VerificationCodeExcludedFile: "p1-0.1.0.spdx", + ChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983c", + ChecksumSHA256: "11b6d3ee554eedf79299905a98f9b9a04e498210b59f15094c916c91d150efcd", + ChecksumMD5: "624c1abb3664f4b35547e7c73864ad24", + HomePage: "http://example.com/p1", + SourceInfo: "this is a source comment", + LicenseConcluded: "GPL-2.0-or-later", + LicenseInfoFromFiles: []string{ "Apache-1.1", "Apache-2.0", "GPL-2.0-or-later", }, - PackageLicenseDeclared: "Apache-2.0 OR GPL-2.0-or-later", - PackageLicenseComments: "this is a license comment(s)", - PackageCopyrightText: "Copyright (c) John Doe, Inc.", - PackageSummary: "this is a summary comment", - PackageDescription: "this is a description comment", - PackageComment: "this is a comment comment", - PackageExternalReferences: []*spdx.PackageExternalReference2_1{ + LicenseDeclared: "Apache-2.0 OR GPL-2.0-or-later", + LicenseComments: "this is a license comment(s)", + CopyrightText: "Copyright (c) John Doe, Inc.", + Summary: "this is a summary comment", + Description: "this is a description comment", + Comment: "this is a comment comment", + ExternalReferences: []*spdx.PackageExternalReference2_1{ per1, per2, per3, @@ -128,33 +128,33 @@ func TestSaver2_1PackageSavesTextCombo2(t *testing.T) { // PackageVerificationCodeExcludedFile is empty pkg := &spdx.Package2_1{ - PackageName: "p1", - PackageSPDXIdentifier: spdx.ElementID("p1"), - PackageVersion: "0.1.0", - PackageFileName: "p1-0.1.0-master.tar.gz", - PackageSupplierNOASSERTION: true, - PackageOriginatorOrganization: "John Doe, Inc.", - PackageDownloadLocation: "http://example.com/p1/p1-0.1.0-master.tar.gz", - FilesAnalyzed: true, - IsFilesAnalyzedTagPresent: false, - PackageVerificationCode: "0123456789abcdef0123456789abcdef01234567", - PackageChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983c", - PackageChecksumSHA256: "11b6d3ee554eedf79299905a98f9b9a04e498210b59f15094c916c91d150efcd", - PackageChecksumMD5: "624c1abb3664f4b35547e7c73864ad24", - PackageHomePage: "http://example.com/p1", - PackageSourceInfo: "this is a source comment", - PackageLicenseConcluded: "GPL-2.0-or-later", - PackageLicenseInfoFromFiles: []string{ + Name: "p1", + SPDXIdentifier: spdx.ElementID("p1"), + Version: "0.1.0", + FileName: "p1-0.1.0-master.tar.gz", + SupplierNOASSERTION: true, + OriginatorOrganization: "John Doe, Inc.", + DownloadLocation: "http://example.com/p1/p1-0.1.0-master.tar.gz", + FilesAnalyzed: true, + IsFilesAnalyzedTagPresent: false, + VerificationCode: "0123456789abcdef0123456789abcdef01234567", + ChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983c", + ChecksumSHA256: "11b6d3ee554eedf79299905a98f9b9a04e498210b59f15094c916c91d150efcd", + ChecksumMD5: "624c1abb3664f4b35547e7c73864ad24", + HomePage: "http://example.com/p1", + SourceInfo: "this is a source comment", + LicenseConcluded: "GPL-2.0-or-later", + LicenseInfoFromFiles: []string{ "Apache-1.1", "Apache-2.0", "GPL-2.0-or-later", }, - PackageLicenseDeclared: "Apache-2.0 OR GPL-2.0-or-later", - PackageLicenseComments: "this is a license comment(s)", - PackageCopyrightText: "Copyright (c) John Doe, Inc.", - PackageSummary: "this is a summary comment", - PackageDescription: "this is a description comment", - PackageComment: "this is a comment comment", + LicenseDeclared: "Apache-2.0 OR GPL-2.0-or-later", + LicenseComments: "this is a license comment(s)", + CopyrightText: "Copyright (c) John Doe, Inc.", + Summary: "this is a summary comment", + Description: "this is a description comment", + Comment: "this is a comment comment", } // what we want to get, as a buffer of bytes @@ -205,37 +205,37 @@ func TestSaver2_1PackageSavesTextCombo3(t *testing.T) { // PackageVerificationCodeExcludedFile is empty pkg := &spdx.Package2_1{ - PackageName: "p1", - PackageSPDXIdentifier: spdx.ElementID("p1"), - PackageVersion: "0.1.0", - PackageFileName: "p1-0.1.0-master.tar.gz", - PackageSupplierPerson: "John Doe", - PackageOriginatorNOASSERTION: true, - PackageDownloadLocation: "http://example.com/p1/p1-0.1.0-master.tar.gz", - FilesAnalyzed: false, - IsFilesAnalyzedTagPresent: true, + Name: "p1", + SPDXIdentifier: spdx.ElementID("p1"), + Version: "0.1.0", + FileName: "p1-0.1.0-master.tar.gz", + SupplierPerson: "John Doe", + OriginatorNOASSERTION: true, + DownloadLocation: "http://example.com/p1/p1-0.1.0-master.tar.gz", + FilesAnalyzed: false, + IsFilesAnalyzedTagPresent: true, // NOTE that verification code MUST be omitted from output // since FilesAnalyzed is false - PackageVerificationCode: "0123456789abcdef0123456789abcdef01234567", - PackageChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983c", - PackageChecksumSHA256: "11b6d3ee554eedf79299905a98f9b9a04e498210b59f15094c916c91d150efcd", - PackageChecksumMD5: "624c1abb3664f4b35547e7c73864ad24", - PackageHomePage: "http://example.com/p1", - PackageSourceInfo: "this is a source comment", - PackageLicenseConcluded: "GPL-2.0-or-later", + VerificationCode: "0123456789abcdef0123456789abcdef01234567", + ChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983c", + ChecksumSHA256: "11b6d3ee554eedf79299905a98f9b9a04e498210b59f15094c916c91d150efcd", + ChecksumMD5: "624c1abb3664f4b35547e7c73864ad24", + HomePage: "http://example.com/p1", + SourceInfo: "this is a source comment", + LicenseConcluded: "GPL-2.0-or-later", // NOTE that license info from files MUST be omitted from output // since FilesAnalyzed is false - PackageLicenseInfoFromFiles: []string{ + LicenseInfoFromFiles: []string{ "Apache-1.1", "Apache-2.0", "GPL-2.0-or-later", }, - PackageLicenseDeclared: "Apache-2.0 OR GPL-2.0-or-later", - PackageLicenseComments: "this is a license comment(s)", - PackageCopyrightText: "Copyright (c) John Doe, Inc.", - PackageSummary: "this is a summary comment", - PackageDescription: "this is a description comment", - PackageComment: "this is a comment comment", + LicenseDeclared: "Apache-2.0 OR GPL-2.0-or-later", + LicenseComments: "this is a license comment(s)", + CopyrightText: "Copyright (c) John Doe, Inc.", + Summary: "this is a summary comment", + Description: "this is a description comment", + Comment: "this is a comment comment", } // what we want to get, as a buffer of bytes @@ -278,23 +278,23 @@ PackageComment: this is a comment comment func TestSaver2_1PackageSaveOmitsOptionalFieldsIfEmpty(t *testing.T) { pkg := &spdx.Package2_1{ - PackageName: "p1", - PackageSPDXIdentifier: spdx.ElementID("p1"), - PackageDownloadLocation: "http://example.com/p1/p1-0.1.0-master.tar.gz", + Name: "p1", + SPDXIdentifier: spdx.ElementID("p1"), + DownloadLocation: "http://example.com/p1/p1-0.1.0-master.tar.gz", FilesAnalyzed: false, IsFilesAnalyzedTagPresent: true, // NOTE that verification code MUST be omitted from output, // even if present in model, since FilesAnalyzed is false - PackageLicenseConcluded: "GPL-2.0-or-later", + LicenseConcluded: "GPL-2.0-or-later", // NOTE that license info from files MUST be omitted from output // even if present in model, since FilesAnalyzed is false - PackageLicenseInfoFromFiles: []string{ + LicenseInfoFromFiles: []string{ "Apache-1.1", "Apache-2.0", "GPL-2.0-or-later", }, - PackageLicenseDeclared: "Apache-2.0 OR GPL-2.0-or-later", - PackageCopyrightText: "Copyright (c) John Doe, Inc.", + LicenseDeclared: "Apache-2.0 OR GPL-2.0-or-later", + CopyrightText: "Copyright (c) John Doe, Inc.", } // what we want to get, as a buffer of bytes @@ -324,41 +324,41 @@ PackageCopyrightText: Copyright (c) John Doe, Inc. func TestSaver2_1PackageSavesFilesIfPresent(t *testing.T) { f1 := &spdx.File2_1{ - FileName: "/tmp/whatever1.txt", - FileSPDXIdentifier: spdx.ElementID("File1231"), - FileChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983c", - LicenseConcluded: "Apache-2.0", - LicenseInfoInFile: []string{"Apache-2.0"}, - FileCopyrightText: "Copyright (c) Jane Doe", + Name: "/tmp/whatever1.txt", + SPDXIdentifier: spdx.ElementID("File1231"), + ChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983c", + LicenseConcluded: "Apache-2.0", + LicenseInfoInFile: []string{"Apache-2.0"}, + CopyrightText: "Copyright (c) Jane Doe", } f2 := &spdx.File2_1{ - FileName: "/tmp/whatever2.txt", - FileSPDXIdentifier: spdx.ElementID("File1232"), - FileChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983d", - LicenseConcluded: "MIT", - LicenseInfoInFile: []string{"MIT"}, - FileCopyrightText: "Copyright (c) John Doe", + Name: "/tmp/whatever2.txt", + SPDXIdentifier: spdx.ElementID("File1232"), + ChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983d", + LicenseConcluded: "MIT", + LicenseInfoInFile: []string{"MIT"}, + CopyrightText: "Copyright (c) John Doe", } pkg := &spdx.Package2_1{ - PackageName: "p1", - PackageSPDXIdentifier: spdx.ElementID("p1"), - PackageDownloadLocation: "http://example.com/p1/p1-0.1.0-master.tar.gz", + Name: "p1", + SPDXIdentifier: spdx.ElementID("p1"), + DownloadLocation: "http://example.com/p1/p1-0.1.0-master.tar.gz", FilesAnalyzed: false, IsFilesAnalyzedTagPresent: true, // NOTE that verification code MUST be omitted from output, // even if present in model, since FilesAnalyzed is false - PackageLicenseConcluded: "GPL-2.0-or-later", + LicenseConcluded: "GPL-2.0-or-later", // NOTE that license info from files MUST be omitted from output // even if present in model, since FilesAnalyzed is false - PackageLicenseInfoFromFiles: []string{ + LicenseInfoFromFiles: []string{ "Apache-1.1", "Apache-2.0", "GPL-2.0-or-later", }, - PackageLicenseDeclared: "Apache-2.0 OR GPL-2.0-or-later", - PackageCopyrightText: "Copyright (c) John Doe, Inc.", + LicenseDeclared: "Apache-2.0 OR GPL-2.0-or-later", + CopyrightText: "Copyright (c) John Doe, Inc.", Files: map[spdx.ElementID]*spdx.File2_1{ spdx.ElementID("File1231"): f1, spdx.ElementID("File1232"): f2, diff --git a/tvsaver/saver2v1/save_relationship.go b/tvsaver/saver2v1/save_relationship.go index 6bde4b3e..3ce883a8 100644 --- a/tvsaver/saver2v1/save_relationship.go +++ b/tvsaver/saver2v1/save_relationship.go @@ -15,8 +15,8 @@ func renderRelationship2_1(rln *spdx.Relationship2_1, w io.Writer) error { if rlnAStr != "SPDXRef-" && rlnBStr != "SPDXRef-" && rln.Relationship != "" { fmt.Fprintf(w, "Relationship: %s %s %s\n", rlnAStr, rln.Relationship, rlnBStr) } - if rln.RelationshipComment != "" { - fmt.Fprintf(w, "RelationshipComment: %s\n", rln.RelationshipComment) + if rln.Comment != "" { + fmt.Fprintf(w, "RelationshipComment: %s\n", rln.Comment) } return nil diff --git a/tvsaver/saver2v1/save_relationship_test.go b/tvsaver/saver2v1/save_relationship_test.go index e8635b1d..7ef36359 100644 --- a/tvsaver/saver2v1/save_relationship_test.go +++ b/tvsaver/saver2v1/save_relationship_test.go @@ -12,10 +12,10 @@ import ( // ===== Relationship section Saver tests ===== func TestSaver2_1RelationshipSavesText(t *testing.T) { rln := &spdx.Relationship2_1{ - RefA: spdx.MakeDocElementID("", "DOCUMENT"), - RefB: spdx.MakeDocElementID("", "2"), - Relationship: "DESCRIBES", - RelationshipComment: "this is a comment", + RefA: spdx.MakeDocElementID("", "DOCUMENT"), + RefB: spdx.MakeDocElementID("", "2"), + Relationship: "DESCRIBES", + Comment: "this is a comment", } // what we want to get, as a buffer of bytes diff --git a/tvsaver/saver2v1/save_review.go b/tvsaver/saver2v1/save_review.go index 8d192ba5..07643a88 100644 --- a/tvsaver/saver2v1/save_review.go +++ b/tvsaver/saver2v1/save_review.go @@ -13,11 +13,11 @@ func renderReview2_1(rev *spdx.Review2_1, w io.Writer) error { if rev.Reviewer != "" && rev.ReviewerType != "" { fmt.Fprintf(w, "Reviewer: %s: %s\n", rev.ReviewerType, rev.Reviewer) } - if rev.ReviewDate != "" { - fmt.Fprintf(w, "ReviewDate: %s\n", rev.ReviewDate) + if rev.Date != "" { + fmt.Fprintf(w, "ReviewDate: %s\n", rev.Date) } - if rev.ReviewComment != "" { - fmt.Fprintf(w, "ReviewComment: %s\n", rev.ReviewComment) + if rev.Comment != "" { + fmt.Fprintf(w, "ReviewComment: %s\n", rev.Comment) } fmt.Fprintf(w, "\n") diff --git a/tvsaver/saver2v1/save_review_test.go b/tvsaver/saver2v1/save_review_test.go index d7804670..8a6ff3b6 100644 --- a/tvsaver/saver2v1/save_review_test.go +++ b/tvsaver/saver2v1/save_review_test.go @@ -12,10 +12,10 @@ import ( // ===== Review section Saver tests ===== func TestSaver2_1ReviewSavesText(t *testing.T) { rev := &spdx.Review2_1{ - Reviewer: "John Doe", - ReviewerType: "Person", - ReviewDate: "2018-10-14T10:28:00Z", - ReviewComment: "this is a review comment", + Reviewer: "John Doe", + ReviewerType: "Person", + Date: "2018-10-14T10:28:00Z", + Comment: "this is a review comment", } // what we want to get, as a buffer of bytes @@ -43,7 +43,7 @@ func TestSaver2_1ReviewOmitsOptionalFieldsIfEmpty(t *testing.T) { rev := &spdx.Review2_1{ Reviewer: "John Doe", ReviewerType: "Person", - ReviewDate: "2018-10-14T10:28:00Z", + Date: "2018-10-14T10:28:00Z", } // what we want to get, as a buffer of bytes diff --git a/tvsaver/saver2v1/save_snippet.go b/tvsaver/saver2v1/save_snippet.go index e82bc5a4..849d735f 100644 --- a/tvsaver/saver2v1/save_snippet.go +++ b/tvsaver/saver2v1/save_snippet.go @@ -10,36 +10,36 @@ import ( ) func renderSnippet2_1(sn *spdx.Snippet2_1, w io.Writer) error { - if sn.SnippetSPDXIdentifier != "" { - fmt.Fprintf(w, "SnippetSPDXIdentifier: %s\n", spdx.RenderElementID(sn.SnippetSPDXIdentifier)) + if sn.SPDXIdentifier != "" { + fmt.Fprintf(w, "SnippetSPDXIdentifier: %s\n", spdx.RenderElementID(sn.SPDXIdentifier)) } snFromFileIDStr := spdx.RenderDocElementID(sn.SnippetFromFileSPDXIdentifier) if snFromFileIDStr != "" { fmt.Fprintf(w, "SnippetFromFileSPDXID: %s\n", snFromFileIDStr) } - if sn.SnippetByteRangeStart != 0 && sn.SnippetByteRangeEnd != 0 { - fmt.Fprintf(w, "SnippetByteRange: %d:%d\n", sn.SnippetByteRangeStart, sn.SnippetByteRangeEnd) + if sn.ByteRangeStart != 0 && sn.ByteRangeEnd != 0 { + fmt.Fprintf(w, "SnippetByteRange: %d:%d\n", sn.ByteRangeStart, sn.ByteRangeEnd) } - if sn.SnippetLineRangeStart != 0 && sn.SnippetLineRangeEnd != 0 { - fmt.Fprintf(w, "SnippetLineRange: %d:%d\n", sn.SnippetLineRangeStart, sn.SnippetLineRangeEnd) + if sn.LineRangeStart != 0 && sn.LineRangeEnd != 0 { + fmt.Fprintf(w, "SnippetLineRange: %d:%d\n", sn.LineRangeStart, sn.LineRangeEnd) } - if sn.SnippetLicenseConcluded != "" { - fmt.Fprintf(w, "SnippetLicenseConcluded: %s\n", sn.SnippetLicenseConcluded) + if sn.LicenseConcluded != "" { + fmt.Fprintf(w, "SnippetLicenseConcluded: %s\n", sn.LicenseConcluded) } for _, s := range sn.LicenseInfoInSnippet { fmt.Fprintf(w, "LicenseInfoInSnippet: %s\n", s) } - if sn.SnippetLicenseComments != "" { - fmt.Fprintf(w, "SnippetLicenseComments: %s\n", textify(sn.SnippetLicenseComments)) + if sn.LicenseComments != "" { + fmt.Fprintf(w, "SnippetLicenseComments: %s\n", textify(sn.LicenseComments)) } - if sn.SnippetCopyrightText != "" { - fmt.Fprintf(w, "SnippetCopyrightText: %s\n", sn.SnippetCopyrightText) + if sn.CopyrightText != "" { + fmt.Fprintf(w, "SnippetCopyrightText: %s\n", sn.CopyrightText) } - if sn.SnippetComment != "" { - fmt.Fprintf(w, "SnippetComment: %s\n", textify(sn.SnippetComment)) + if sn.Comment != "" { + fmt.Fprintf(w, "SnippetComment: %s\n", textify(sn.Comment)) } - if sn.SnippetName != "" { - fmt.Fprintf(w, "SnippetName: %s\n", sn.SnippetName) + if sn.Name != "" { + fmt.Fprintf(w, "SnippetName: %s\n", sn.Name) } fmt.Fprintf(w, "\n") diff --git a/tvsaver/saver2v1/save_snippet_test.go b/tvsaver/saver2v1/save_snippet_test.go index 88b39c99..de25008e 100644 --- a/tvsaver/saver2v1/save_snippet_test.go +++ b/tvsaver/saver2v1/save_snippet_test.go @@ -12,21 +12,21 @@ import ( // ===== Snippet section Saver tests ===== func TestSaver2_1SnippetSavesText(t *testing.T) { sn := &spdx.Snippet2_1{ - SnippetSPDXIdentifier: spdx.ElementID("Snippet17"), + SPDXIdentifier: spdx.ElementID("Snippet17"), SnippetFromFileSPDXIdentifier: spdx.MakeDocElementID("", "File292"), - SnippetByteRangeStart: 17, - SnippetByteRangeEnd: 209, - SnippetLineRangeStart: 3, - SnippetLineRangeEnd: 8, - SnippetLicenseConcluded: "GPL-2.0-or-later", + ByteRangeStart: 17, + ByteRangeEnd: 209, + LineRangeStart: 3, + LineRangeEnd: 8, + LicenseConcluded: "GPL-2.0-or-later", LicenseInfoInSnippet: []string{ "GPL-2.0-or-later", "MIT", }, - SnippetLicenseComments: "this is a comment(s) about the snippet license", - SnippetCopyrightText: "Copyright (c) John Doe 20x6", - SnippetComment: "this is a snippet comment", - SnippetName: "from John's program", + LicenseComments: "this is a comment(s) about the snippet license", + CopyrightText: "Copyright (c) John Doe 20x6", + Comment: "this is a snippet comment", + Name: "from John's program", } // what we want to get, as a buffer of bytes @@ -60,12 +60,12 @@ SnippetName: from John's program func TestSaver2_1SnippetOmitsOptionalFieldsIfEmpty(t *testing.T) { sn := &spdx.Snippet2_1{ - SnippetSPDXIdentifier: spdx.ElementID("Snippet17"), + SPDXIdentifier: spdx.ElementID("Snippet17"), SnippetFromFileSPDXIdentifier: spdx.MakeDocElementID("", "File292"), - SnippetByteRangeStart: 17, - SnippetByteRangeEnd: 209, - SnippetLicenseConcluded: "GPL-2.0-or-later", - SnippetCopyrightText: "Copyright (c) John Doe 20x6", + ByteRangeStart: 17, + ByteRangeEnd: 209, + LicenseConcluded: "GPL-2.0-or-later", + CopyrightText: "Copyright (c) John Doe 20x6", } // what we want to get, as a buffer of bytes diff --git a/tvsaver/saver2v2/save_annotation.go b/tvsaver/saver2v2/save_annotation.go index c0f1449b..c30c78db 100644 --- a/tvsaver/saver2v2/save_annotation.go +++ b/tvsaver/saver2v2/save_annotation.go @@ -13,18 +13,18 @@ func renderAnnotation2_2(ann *spdx.Annotation2_2, w io.Writer) error { if ann.Annotator != "" && ann.AnnotatorType != "" { fmt.Fprintf(w, "Annotator: %s: %s\n", ann.AnnotatorType, ann.Annotator) } - if ann.AnnotationDate != "" { - fmt.Fprintf(w, "AnnotationDate: %s\n", ann.AnnotationDate) + if ann.Date != "" { + fmt.Fprintf(w, "AnnotationDate: %s\n", ann.Date) } - if ann.AnnotationType != "" { - fmt.Fprintf(w, "AnnotationType: %s\n", ann.AnnotationType) + if ann.Type != "" { + fmt.Fprintf(w, "AnnotationType: %s\n", ann.Type) } - annIDStr := spdx.RenderDocElementID(ann.AnnotationSPDXIdentifier) + annIDStr := spdx.RenderDocElementID(ann.SPDXIdentifier) if annIDStr != "SPDXRef-" { fmt.Fprintf(w, "SPDXREF: %s\n", annIDStr) } - if ann.AnnotationComment != "" { - fmt.Fprintf(w, "AnnotationComment: %s\n", textify(ann.AnnotationComment)) + if ann.Comment != "" { + fmt.Fprintf(w, "AnnotationComment: %s\n", textify(ann.Comment)) } return nil diff --git a/tvsaver/saver2v2/save_annotation_test.go b/tvsaver/saver2v2/save_annotation_test.go index d938646d..616b358b 100644 --- a/tvsaver/saver2v2/save_annotation_test.go +++ b/tvsaver/saver2v2/save_annotation_test.go @@ -12,12 +12,12 @@ import ( // ===== Annotation section Saver tests ===== func TestSaver2_2AnnotationSavesTextForPerson(t *testing.T) { ann := &spdx.Annotation2_2{ - Annotator: "John Doe", - AnnotatorType: "Person", - AnnotationDate: "2018-10-10T17:52:00Z", - AnnotationType: "REVIEW", - AnnotationSPDXIdentifier: spdx.MakeDocElementID("", "DOCUMENT"), - AnnotationComment: "This is an annotation about the SPDX document", + Annotator: "John Doe", + AnnotatorType: "Person", + Date: "2018-10-10T17:52:00Z", + Type: "REVIEW", + SPDXIdentifier: spdx.MakeDocElementID("", "DOCUMENT"), + Comment: "This is an annotation about the SPDX document", } // what we want to get, as a buffer of bytes @@ -45,12 +45,12 @@ AnnotationComment: This is an annotation about the SPDX document func TestSaver2_2AnnotationSavesTextForOrganization(t *testing.T) { ann := &spdx.Annotation2_2{ - Annotator: "John Doe, Inc.", - AnnotatorType: "Organization", - AnnotationDate: "2018-10-10T17:52:00Z", - AnnotationType: "REVIEW", - AnnotationSPDXIdentifier: spdx.MakeDocElementID("", "DOCUMENT"), - AnnotationComment: "This is an annotation about the SPDX document", + Annotator: "John Doe, Inc.", + AnnotatorType: "Organization", + Date: "2018-10-10T17:52:00Z", + Type: "REVIEW", + SPDXIdentifier: spdx.MakeDocElementID("", "DOCUMENT"), + Comment: "This is an annotation about the SPDX document", } // what we want to get, as a buffer of bytes @@ -78,12 +78,12 @@ AnnotationComment: This is an annotation about the SPDX document func TestSaver2_2AnnotationSavesTextForTool(t *testing.T) { ann := &spdx.Annotation2_2{ - Annotator: "magictool-1.1", - AnnotatorType: "Tool", - AnnotationDate: "2018-10-10T17:52:00Z", - AnnotationType: "REVIEW", - AnnotationSPDXIdentifier: spdx.MakeDocElementID("", "DOCUMENT"), - AnnotationComment: "This is an annotation about the SPDX document", + Annotator: "magictool-1.1", + AnnotatorType: "Tool", + Date: "2018-10-10T17:52:00Z", + Type: "REVIEW", + SPDXIdentifier: spdx.MakeDocElementID("", "DOCUMENT"), + Comment: "This is an annotation about the SPDX document", } // what we want to get, as a buffer of bytes diff --git a/tvsaver/saver2v2/save_document.go b/tvsaver/saver2v2/save_document.go index 8db23630..02f15b1b 100644 --- a/tvsaver/saver2v2/save_document.go +++ b/tvsaver/saver2v2/save_document.go @@ -45,7 +45,7 @@ func RenderDocument2_2(doc *spdx.Document2_2, w io.Writer) error { sort.Strings(packageKeys) for _, pkgID := range packageKeys { pkg := doc.Packages[spdx.ElementID(pkgID)] - fmt.Fprintf(w, "##### Package: %s\n\n", pkg.PackageName) + fmt.Fprintf(w, "##### Package: %s\n\n", pkg.Name) renderPackage2_2(pkg, w) } diff --git a/tvsaver/saver2v2/save_document_test.go b/tvsaver/saver2v2/save_document_test.go index d6d112bb..5709a125 100644 --- a/tvsaver/saver2v2/save_document_test.go +++ b/tvsaver/saver2v2/save_document_test.go @@ -27,21 +27,21 @@ func TestSaver2_2DocumentSavesText(t *testing.T) { // unpackaged files f1 := &spdx.File2_2{ - FileName: "/tmp/whatever1.txt", - FileSPDXIdentifier: spdx.ElementID("File1231"), - FileChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983c", - LicenseConcluded: "Apache-2.0", - LicenseInfoInFile: []string{"Apache-2.0"}, - FileCopyrightText: "Copyright (c) Jane Doe", + Name: "/tmp/whatever1.txt", + SPDXIdentifier: spdx.ElementID("File1231"), + ChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983c", + LicenseConcluded: "Apache-2.0", + LicenseInfoInFile: []string{"Apache-2.0"}, + CopyrightText: "Copyright (c) Jane Doe", } f2 := &spdx.File2_2{ - FileName: "/tmp/whatever2.txt", - FileSPDXIdentifier: spdx.ElementID("File1232"), - FileChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983d", - LicenseConcluded: "MIT", - LicenseInfoInFile: []string{"MIT"}, - FileCopyrightText: "Copyright (c) John Doe", + Name: "/tmp/whatever2.txt", + SPDXIdentifier: spdx.ElementID("File1232"), + ChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983d", + LicenseConcluded: "MIT", + LicenseInfoInFile: []string{"MIT"}, + CopyrightText: "Copyright (c) John Doe", } unFiles := map[spdx.ElementID]*spdx.File2_2{ @@ -51,34 +51,34 @@ func TestSaver2_2DocumentSavesText(t *testing.T) { // Package 1: packaged files with snippets sn1 := &spdx.Snippet2_2{ - SnippetSPDXIdentifier: "Snippet19", + SPDXIdentifier: "Snippet19", SnippetFromFileSPDXIdentifier: spdx.MakeDocElementID("", "FileHasSnippets"), - SnippetByteRangeStart: 17, - SnippetByteRangeEnd: 209, - SnippetLicenseConcluded: "GPL-2.0-or-later", - SnippetCopyrightText: "Copyright (c) John Doe 20x6", + ByteRangeStart: 17, + ByteRangeEnd: 209, + LicenseConcluded: "GPL-2.0-or-later", + CopyrightText: "Copyright (c) John Doe 20x6", } sn2 := &spdx.Snippet2_2{ - SnippetSPDXIdentifier: "Snippet20", + SPDXIdentifier: "Snippet20", SnippetFromFileSPDXIdentifier: spdx.MakeDocElementID("", "FileHasSnippets"), - SnippetByteRangeStart: 268, - SnippetByteRangeEnd: 309, - SnippetLicenseConcluded: "WTFPL", - SnippetCopyrightText: "NOASSERTION", + ByteRangeStart: 268, + ByteRangeEnd: 309, + LicenseConcluded: "WTFPL", + CopyrightText: "NOASSERTION", } f3 := &spdx.File2_2{ - FileName: "/tmp/file-with-snippets.txt", - FileSPDXIdentifier: spdx.ElementID("FileHasSnippets"), - FileChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983e", - LicenseConcluded: "GPL-2.0-or-later AND WTFPL", + Name: "/tmp/file-with-snippets.txt", + SPDXIdentifier: spdx.ElementID("FileHasSnippets"), + ChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983e", + LicenseConcluded: "GPL-2.0-or-later AND WTFPL", LicenseInfoInFile: []string{ "Apache-2.0", "GPL-2.0-or-later", "WTFPL", }, - FileCopyrightText: "Copyright (c) Jane Doe", + CopyrightText: "Copyright (c) Jane Doe", Snippets: map[spdx.ElementID]*spdx.Snippet2_2{ spdx.ElementID("Snippet19"): sn1, spdx.ElementID("Snippet20"): sn2, @@ -86,30 +86,30 @@ func TestSaver2_2DocumentSavesText(t *testing.T) { } f4 := &spdx.File2_2{ - FileName: "/tmp/another-file.txt", - FileSPDXIdentifier: spdx.ElementID("FileAnother"), - FileChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983f", - LicenseConcluded: "BSD-3-Clause", - LicenseInfoInFile: []string{"BSD-3-Clause"}, - FileCopyrightText: "Copyright (c) Jane Doe LLC", + Name: "/tmp/another-file.txt", + SPDXIdentifier: spdx.ElementID("FileAnother"), + ChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983f", + LicenseConcluded: "BSD-3-Clause", + LicenseInfoInFile: []string{"BSD-3-Clause"}, + CopyrightText: "Copyright (c) Jane Doe LLC", } pkgWith := &spdx.Package2_2{ - PackageName: "p1", - PackageSPDXIdentifier: spdx.ElementID("p1"), - PackageDownloadLocation: "http://example.com/p1/p1-0.1.0-master.tar.gz", + Name: "p1", + SPDXIdentifier: spdx.ElementID("p1"), + DownloadLocation: "http://example.com/p1/p1-0.1.0-master.tar.gz", FilesAnalyzed: true, IsFilesAnalyzedTagPresent: true, - PackageVerificationCode: "0123456789abcdef0123456789abcdef01234567", - PackageLicenseConcluded: "GPL-2.0-or-later AND BSD-3-Clause AND WTFPL", - PackageLicenseInfoFromFiles: []string{ + VerificationCode: "0123456789abcdef0123456789abcdef01234567", + LicenseConcluded: "GPL-2.0-or-later AND BSD-3-Clause AND WTFPL", + LicenseInfoFromFiles: []string{ "Apache-2.0", "GPL-2.0-or-later", "WTFPL", "BSD-3-Clause", }, - PackageLicenseDeclared: "Apache-2.0 OR GPL-2.0-or-later", - PackageCopyrightText: "Copyright (c) John Doe, Inc.", + LicenseDeclared: "Apache-2.0 OR GPL-2.0-or-later", + CopyrightText: "Copyright (c) John Doe, Inc.", Files: map[spdx.ElementID]*spdx.File2_2{ spdx.ElementID("FileHasSnippets"): f3, spdx.ElementID("FileAnother"): f4, @@ -118,17 +118,17 @@ func TestSaver2_2DocumentSavesText(t *testing.T) { // Other Licenses 1 and 2 ol1 := &spdx.OtherLicense2_2{ - LicenseIdentifier: "LicenseRef-1", + Identifier: "LicenseRef-1", ExtractedText: `License 1 text blah blah blah blah blah blah blah`, - LicenseName: "License 1", + Name: "License 1", } ol2 := &spdx.OtherLicense2_2{ - LicenseIdentifier: "LicenseRef-2", - ExtractedText: `License 2 text - this is a license that does some stuff`, - LicenseName: "License 2", + Identifier: "LicenseRef-2", + ExtractedText: `License 2 text - this is a license that does some stuff`, + Name: "License 2", } // Relationships @@ -152,34 +152,34 @@ blah blah blah blah`, // Annotations ann1 := &spdx.Annotation2_2{ - Annotator: "John Doe", - AnnotatorType: "Person", - AnnotationDate: "2018-10-10T17:52:00Z", - AnnotationType: "REVIEW", - AnnotationSPDXIdentifier: spdx.MakeDocElementID("", "DOCUMENT"), - AnnotationComment: "This is an annotation about the SPDX document", + Annotator: "John Doe", + AnnotatorType: "Person", + Date: "2018-10-10T17:52:00Z", + Type: "REVIEW", + SPDXIdentifier: spdx.MakeDocElementID("", "DOCUMENT"), + Comment: "This is an annotation about the SPDX document", } ann2 := &spdx.Annotation2_2{ - Annotator: "John Doe, Inc.", - AnnotatorType: "Organization", - AnnotationDate: "2018-10-10T17:52:00Z", - AnnotationType: "REVIEW", - AnnotationSPDXIdentifier: spdx.MakeDocElementID("", "p1"), - AnnotationComment: "This is an annotation about Package p1", + Annotator: "John Doe, Inc.", + AnnotatorType: "Organization", + Date: "2018-10-10T17:52:00Z", + Type: "REVIEW", + SPDXIdentifier: spdx.MakeDocElementID("", "p1"), + Comment: "This is an annotation about Package p1", } // Reviews rev1 := &spdx.Review2_2{ Reviewer: "John Doe", ReviewerType: "Person", - ReviewDate: "2018-10-14T10:28:00Z", + Date: "2018-10-14T10:28:00Z", } rev2 := &spdx.Review2_2{ - Reviewer: "Jane Doe LLC", - ReviewerType: "Organization", - ReviewDate: "2018-10-14T10:28:00Z", - ReviewComment: "I have reviewed this SPDX document and it is awesome", + Reviewer: "Jane Doe LLC", + ReviewerType: "Organization", + Date: "2018-10-14T10:28:00Z", + Comment: "I have reviewed this SPDX document and it is awesome", } // now, build the document diff --git a/tvsaver/saver2v2/save_file.go b/tvsaver/saver2v2/save_file.go index 8edacfc5..bc63c234 100644 --- a/tvsaver/saver2v2/save_file.go +++ b/tvsaver/saver2v2/save_file.go @@ -11,23 +11,23 @@ import ( ) func renderFile2_2(f *spdx.File2_2, w io.Writer) error { - if f.FileName != "" { - fmt.Fprintf(w, "FileName: %s\n", f.FileName) + if f.Name != "" { + fmt.Fprintf(w, "FileName: %s\n", f.Name) } - if f.FileSPDXIdentifier != "" { - fmt.Fprintf(w, "SPDXID: %s\n", spdx.RenderElementID(f.FileSPDXIdentifier)) + if f.SPDXIdentifier != "" { + fmt.Fprintf(w, "SPDXID: %s\n", spdx.RenderElementID(f.SPDXIdentifier)) } - for _, s := range f.FileType { + for _, s := range f.Type { fmt.Fprintf(w, "FileType: %s\n", s) } - if f.FileChecksumSHA1 != "" { - fmt.Fprintf(w, "FileChecksum: SHA1: %s\n", f.FileChecksumSHA1) + if f.ChecksumSHA1 != "" { + fmt.Fprintf(w, "FileChecksum: SHA1: %s\n", f.ChecksumSHA1) } - if f.FileChecksumSHA256 != "" { - fmt.Fprintf(w, "FileChecksum: SHA256: %s\n", f.FileChecksumSHA256) + if f.ChecksumSHA256 != "" { + fmt.Fprintf(w, "FileChecksum: SHA256: %s\n", f.ChecksumSHA256) } - if f.FileChecksumMD5 != "" { - fmt.Fprintf(w, "FileChecksum: MD5: %s\n", f.FileChecksumMD5) + if f.ChecksumMD5 != "" { + fmt.Fprintf(w, "FileChecksum: MD5: %s\n", f.ChecksumMD5) } if f.LicenseConcluded != "" { fmt.Fprintf(w, "LicenseConcluded: %s\n", f.LicenseConcluded) @@ -38,8 +38,8 @@ func renderFile2_2(f *spdx.File2_2, w io.Writer) error { if f.LicenseComments != "" { fmt.Fprintf(w, "LicenseComments: %s\n", f.LicenseComments) } - if f.FileCopyrightText != "" { - fmt.Fprintf(w, "FileCopyrightText: %s\n", textify(f.FileCopyrightText)) + if f.CopyrightText != "" { + fmt.Fprintf(w, "FileCopyrightText: %s\n", textify(f.CopyrightText)) } for _, aop := range f.ArtifactOfProjects { fmt.Fprintf(w, "ArtifactOfProjectName: %s\n", aop.Name) @@ -50,19 +50,19 @@ func renderFile2_2(f *spdx.File2_2, w io.Writer) error { fmt.Fprintf(w, "ArtifactOfProjectURI: %s\n", aop.URI) } } - if f.FileComment != "" { - fmt.Fprintf(w, "FileComment: %s\n", f.FileComment) + if f.Comment != "" { + fmt.Fprintf(w, "FileComment: %s\n", f.Comment) } - if f.FileNotice != "" { - fmt.Fprintf(w, "FileNotice: %s\n", f.FileNotice) + if f.Notice != "" { + fmt.Fprintf(w, "FileNotice: %s\n", f.Notice) } - for _, s := range f.FileContributor { + for _, s := range f.Contributor { fmt.Fprintf(w, "FileContributor: %s\n", s) } - for _, s := range f.FileAttributionTexts { + for _, s := range f.AttributionTexts { fmt.Fprintf(w, "FileAttributionText: %s\n", textify(s)) } - for _, s := range f.FileDependencies { + for _, s := range f.Dependencies { fmt.Fprintf(w, "FileDependency: %s\n", s) } diff --git a/tvsaver/saver2v2/save_file_test.go b/tvsaver/saver2v2/save_file_test.go index 1fd4fcad..a91fb50d 100644 --- a/tvsaver/saver2v2/save_file_test.go +++ b/tvsaver/saver2v2/save_file_test.go @@ -12,22 +12,22 @@ import ( // ===== File section Saver tests ===== func TestSaver2_2FileSavesText(t *testing.T) { f := &spdx.File2_2{ - FileName: "/tmp/whatever.txt", - FileSPDXIdentifier: spdx.ElementID("File123"), - FileType: []string{ + Name: "/tmp/whatever.txt", + SPDXIdentifier: spdx.ElementID("File123"), + Type: []string{ "TEXT", "DOCUMENTATION", }, - FileChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983c", - FileChecksumSHA256: "11b6d3ee554eedf79299905a98f9b9a04e498210b59f15094c916c91d150efcd", - FileChecksumMD5: "624c1abb3664f4b35547e7c73864ad24", - LicenseConcluded: "Apache-2.0", + ChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983c", + ChecksumSHA256: "11b6d3ee554eedf79299905a98f9b9a04e498210b59f15094c916c91d150efcd", + ChecksumMD5: "624c1abb3664f4b35547e7c73864ad24", + LicenseConcluded: "Apache-2.0", LicenseInfoInFile: []string{ "Apache-2.0", "Apache-1.1", }, - LicenseComments: "this is a license comment(s)", - FileCopyrightText: "Copyright (c) Jane Doe", + LicenseComments: "this is a license comment(s)", + CopyrightText: "Copyright (c) Jane Doe", ArtifactOfProjects: []*spdx.ArtifactOfProject2_2{ &spdx.ArtifactOfProject2_2{ Name: "project1", @@ -46,16 +46,16 @@ func TestSaver2_2FileSavesText(t *testing.T) { URI: "http://example.com/4/uri.whatever", }, }, - FileComment: "this is a file comment", - FileNotice: "This file may be used under either Apache-2.0 or Apache-1.1.", - FileContributor: []string{ + Comment: "this is a file comment", + Notice: "This file may be used under either Apache-2.0 or Apache-1.1.", + Contributor: []string{ "John Doe jdoe@example.com", "EvilCorp", }, - FileAttributionTexts: []string{ + AttributionTexts: []string{ "attributions", }, - FileDependencies: []string{ + Dependencies: []string{ "f-1.txt", "g.txt", }, @@ -108,21 +108,21 @@ FileDependency: g.txt func TestSaver2_2FileSavesSnippetsAlso(t *testing.T) { sn1 := &spdx.Snippet2_2{ - SnippetSPDXIdentifier: spdx.ElementID("Snippet19"), + SPDXIdentifier: spdx.ElementID("Snippet19"), SnippetFromFileSPDXIdentifier: spdx.MakeDocElementID("", "File123"), - SnippetByteRangeStart: 17, - SnippetByteRangeEnd: 209, - SnippetLicenseConcluded: "GPL-2.0-or-later", - SnippetCopyrightText: "Copyright (c) John Doe 20x6", + ByteRangeStart: 17, + ByteRangeEnd: 209, + LicenseConcluded: "GPL-2.0-or-later", + CopyrightText: "Copyright (c) John Doe 20x6", } sn2 := &spdx.Snippet2_2{ - SnippetSPDXIdentifier: spdx.ElementID("Snippet20"), + SPDXIdentifier: spdx.ElementID("Snippet20"), SnippetFromFileSPDXIdentifier: spdx.MakeDocElementID("", "File123"), - SnippetByteRangeStart: 268, - SnippetByteRangeEnd: 309, - SnippetLicenseConcluded: "WTFPL", - SnippetCopyrightText: "NOASSERTION", + ByteRangeStart: 268, + ByteRangeEnd: 309, + LicenseConcluded: "WTFPL", + CopyrightText: "NOASSERTION", } sns := map[spdx.ElementID]*spdx.Snippet2_2{ @@ -131,15 +131,15 @@ func TestSaver2_2FileSavesSnippetsAlso(t *testing.T) { } f := &spdx.File2_2{ - FileName: "/tmp/whatever.txt", - FileSPDXIdentifier: spdx.ElementID("File123"), - FileChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983c", - LicenseConcluded: "Apache-2.0", + Name: "/tmp/whatever.txt", + SPDXIdentifier: spdx.ElementID("File123"), + ChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983c", + LicenseConcluded: "Apache-2.0", LicenseInfoInFile: []string{ "Apache-2.0", }, - FileCopyrightText: "Copyright (c) Jane Doe", - Snippets: sns, + CopyrightText: "Copyright (c) Jane Doe", + Snippets: sns, } // what we want to get, as a buffer of bytes @@ -180,14 +180,14 @@ SnippetCopyrightText: NOASSERTION func TestSaver2_2FileOmitsOptionalFieldsIfEmpty(t *testing.T) { f := &spdx.File2_2{ - FileName: "/tmp/whatever.txt", - FileSPDXIdentifier: spdx.ElementID("File123"), - FileChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983c", - LicenseConcluded: "Apache-2.0", + Name: "/tmp/whatever.txt", + SPDXIdentifier: spdx.ElementID("File123"), + ChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983c", + LicenseConcluded: "Apache-2.0", LicenseInfoInFile: []string{ "Apache-2.0", }, - FileCopyrightText: "Copyright (c) Jane Doe", + CopyrightText: "Copyright (c) Jane Doe", } // what we want to get, as a buffer of bytes @@ -216,14 +216,14 @@ FileCopyrightText: Copyright (c) Jane Doe func TestSaver2_2FileWrapsCopyrightMultiLine(t *testing.T) { f := &spdx.File2_2{ - FileName: "/tmp/whatever.txt", - FileSPDXIdentifier: spdx.ElementID("File123"), - FileChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983c", - LicenseConcluded: "Apache-2.0", + Name: "/tmp/whatever.txt", + SPDXIdentifier: spdx.ElementID("File123"), + ChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983c", + LicenseConcluded: "Apache-2.0", LicenseInfoInFile: []string{ "Apache-2.0", }, - FileCopyrightText: `Copyright (c) Jane Doe + CopyrightText: `Copyright (c) Jane Doe Copyright (c) John Doe`, } diff --git a/tvsaver/saver2v2/save_other_license.go b/tvsaver/saver2v2/save_other_license.go index eaac9ac2..44bdd16c 100644 --- a/tvsaver/saver2v2/save_other_license.go +++ b/tvsaver/saver2v2/save_other_license.go @@ -10,20 +10,20 @@ import ( ) func renderOtherLicense2_2(ol *spdx.OtherLicense2_2, w io.Writer) error { - if ol.LicenseIdentifier != "" { - fmt.Fprintf(w, "LicenseID: %s\n", ol.LicenseIdentifier) + if ol.Identifier != "" { + fmt.Fprintf(w, "LicenseID: %s\n", ol.Identifier) } if ol.ExtractedText != "" { fmt.Fprintf(w, "ExtractedText: %s\n", textify(ol.ExtractedText)) } - if ol.LicenseName != "" { - fmt.Fprintf(w, "LicenseName: %s\n", ol.LicenseName) + if ol.Name != "" { + fmt.Fprintf(w, "LicenseName: %s\n", ol.Name) } - for _, s := range ol.LicenseCrossReferences { + for _, s := range ol.CrossReferences { fmt.Fprintf(w, "LicenseCrossReference: %s\n", s) } - if ol.LicenseComment != "" { - fmt.Fprintf(w, "LicenseComment: %s\n", textify(ol.LicenseComment)) + if ol.Comment != "" { + fmt.Fprintf(w, "LicenseComment: %s\n", textify(ol.Comment)) } fmt.Fprintf(w, "\n") diff --git a/tvsaver/saver2v2/save_other_license_test.go b/tvsaver/saver2v2/save_other_license_test.go index 982e1094..9f526c12 100644 --- a/tvsaver/saver2v2/save_other_license_test.go +++ b/tvsaver/saver2v2/save_other_license_test.go @@ -12,16 +12,16 @@ import ( // ===== Other License section Saver tests ===== func TestSaver2_2OtherLicenseSavesText(t *testing.T) { ol := &spdx.OtherLicense2_2{ - LicenseIdentifier: "LicenseRef-1", + Identifier: "LicenseRef-1", ExtractedText: `License 1 text blah blah blah blah blah blah blah`, - LicenseName: "License 1", - LicenseCrossReferences: []string{ + Name: "License 1", + CrossReferences: []string{ "http://example.com/License1/", "http://example.com/License1AnotherURL/", }, - LicenseComment: "this is a license comment", + Comment: "this is a license comment", } // what we want to get, as a buffer of bytes @@ -52,11 +52,11 @@ LicenseComment: this is a license comment func TestSaver2_2OtherLicenseOmitsOptionalFieldsIfEmpty(t *testing.T) { ol := &spdx.OtherLicense2_2{ - LicenseIdentifier: "LicenseRef-1", + Identifier: "LicenseRef-1", ExtractedText: `License 1 text blah blah blah blah blah blah blah`, - LicenseName: "License 1", + Name: "License 1", } // what we want to get, as a buffer of bytes diff --git a/tvsaver/saver2v2/save_package.go b/tvsaver/saver2v2/save_package.go index 3a413cb7..b1369b7e 100644 --- a/tvsaver/saver2v2/save_package.go +++ b/tvsaver/saver2v2/save_package.go @@ -11,38 +11,38 @@ import ( ) func renderPackage2_2(pkg *spdx.Package2_2, w io.Writer) error { - if pkg.PackageName != "" { - fmt.Fprintf(w, "PackageName: %s\n", pkg.PackageName) + if pkg.Name != "" { + fmt.Fprintf(w, "PackageName: %s\n", pkg.Name) } - if pkg.PackageSPDXIdentifier != "" { - fmt.Fprintf(w, "SPDXID: %s\n", spdx.RenderElementID(pkg.PackageSPDXIdentifier)) + if pkg.SPDXIdentifier != "" { + fmt.Fprintf(w, "SPDXID: %s\n", spdx.RenderElementID(pkg.SPDXIdentifier)) } - if pkg.PackageVersion != "" { - fmt.Fprintf(w, "PackageVersion: %s\n", pkg.PackageVersion) + if pkg.Version != "" { + fmt.Fprintf(w, "PackageVersion: %s\n", pkg.Version) } - if pkg.PackageFileName != "" { - fmt.Fprintf(w, "PackageFileName: %s\n", pkg.PackageFileName) + if pkg.FileName != "" { + fmt.Fprintf(w, "PackageFileName: %s\n", pkg.FileName) } - if pkg.PackageSupplierPerson != "" { - fmt.Fprintf(w, "PackageSupplier: Person: %s\n", pkg.PackageSupplierPerson) + if pkg.SupplierPerson != "" { + fmt.Fprintf(w, "PackageSupplier: Person: %s\n", pkg.SupplierPerson) } - if pkg.PackageSupplierOrganization != "" { - fmt.Fprintf(w, "PackageSupplier: Organization: %s\n", pkg.PackageSupplierOrganization) + if pkg.SupplierOrganization != "" { + fmt.Fprintf(w, "PackageSupplier: Organization: %s\n", pkg.SupplierOrganization) } - if pkg.PackageSupplierNOASSERTION == true { + if pkg.SupplierNOASSERTION == true { fmt.Fprintf(w, "PackageSupplier: NOASSERTION\n") } - if pkg.PackageOriginatorPerson != "" { - fmt.Fprintf(w, "PackageOriginator: Person: %s\n", pkg.PackageOriginatorPerson) + if pkg.OriginatorPerson != "" { + fmt.Fprintf(w, "PackageOriginator: Person: %s\n", pkg.OriginatorPerson) } - if pkg.PackageOriginatorOrganization != "" { - fmt.Fprintf(w, "PackageOriginator: Organization: %s\n", pkg.PackageOriginatorOrganization) + if pkg.OriginatorOrganization != "" { + fmt.Fprintf(w, "PackageOriginator: Organization: %s\n", pkg.OriginatorOrganization) } - if pkg.PackageOriginatorNOASSERTION == true { + if pkg.OriginatorNOASSERTION == true { fmt.Fprintf(w, "PackageOriginator: NOASSERTION\n") } - if pkg.PackageDownloadLocation != "" { - fmt.Fprintf(w, "PackageDownloadLocation: %s\n", pkg.PackageDownloadLocation) + if pkg.DownloadLocation != "" { + fmt.Fprintf(w, "PackageDownloadLocation: %s\n", pkg.DownloadLocation) } if pkg.FilesAnalyzed == true { if pkg.IsFilesAnalyzedTagPresent == true { @@ -51,61 +51,61 @@ func renderPackage2_2(pkg *spdx.Package2_2, w io.Writer) error { } else { fmt.Fprintf(w, "FilesAnalyzed: false\n") } - if pkg.PackageVerificationCode != "" && pkg.FilesAnalyzed == true { - if pkg.PackageVerificationCodeExcludedFile == "" { - fmt.Fprintf(w, "PackageVerificationCode: %s\n", pkg.PackageVerificationCode) + if pkg.VerificationCode != "" && pkg.FilesAnalyzed == true { + if pkg.VerificationCodeExcludedFile == "" { + fmt.Fprintf(w, "PackageVerificationCode: %s\n", pkg.VerificationCode) } else { - fmt.Fprintf(w, "PackageVerificationCode: %s (excludes %s)\n", pkg.PackageVerificationCode, pkg.PackageVerificationCodeExcludedFile) + fmt.Fprintf(w, "PackageVerificationCode: %s (excludes %s)\n", pkg.VerificationCode, pkg.VerificationCodeExcludedFile) } } - if pkg.PackageChecksumSHA1 != "" { - fmt.Fprintf(w, "PackageChecksum: SHA1: %s\n", pkg.PackageChecksumSHA1) + if pkg.ChecksumSHA1 != "" { + fmt.Fprintf(w, "PackageChecksum: SHA1: %s\n", pkg.ChecksumSHA1) } - if pkg.PackageChecksumSHA256 != "" { - fmt.Fprintf(w, "PackageChecksum: SHA256: %s\n", pkg.PackageChecksumSHA256) + if pkg.ChecksumSHA256 != "" { + fmt.Fprintf(w, "PackageChecksum: SHA256: %s\n", pkg.ChecksumSHA256) } - if pkg.PackageChecksumMD5 != "" { - fmt.Fprintf(w, "PackageChecksum: MD5: %s\n", pkg.PackageChecksumMD5) + if pkg.ChecksumMD5 != "" { + fmt.Fprintf(w, "PackageChecksum: MD5: %s\n", pkg.ChecksumMD5) } - if pkg.PackageHomePage != "" { - fmt.Fprintf(w, "PackageHomePage: %s\n", pkg.PackageHomePage) + if pkg.HomePage != "" { + fmt.Fprintf(w, "PackageHomePage: %s\n", pkg.HomePage) } - if pkg.PackageSourceInfo != "" { - fmt.Fprintf(w, "PackageSourceInfo: %s\n", textify(pkg.PackageSourceInfo)) + if pkg.SourceInfo != "" { + fmt.Fprintf(w, "PackageSourceInfo: %s\n", textify(pkg.SourceInfo)) } - if pkg.PackageLicenseConcluded != "" { - fmt.Fprintf(w, "PackageLicenseConcluded: %s\n", pkg.PackageLicenseConcluded) + if pkg.LicenseConcluded != "" { + fmt.Fprintf(w, "PackageLicenseConcluded: %s\n", pkg.LicenseConcluded) } if pkg.FilesAnalyzed == true { - for _, s := range pkg.PackageLicenseInfoFromFiles { + for _, s := range pkg.LicenseInfoFromFiles { fmt.Fprintf(w, "PackageLicenseInfoFromFiles: %s\n", s) } } - if pkg.PackageLicenseDeclared != "" { - fmt.Fprintf(w, "PackageLicenseDeclared: %s\n", pkg.PackageLicenseDeclared) + if pkg.LicenseDeclared != "" { + fmt.Fprintf(w, "PackageLicenseDeclared: %s\n", pkg.LicenseDeclared) } - if pkg.PackageLicenseComments != "" { - fmt.Fprintf(w, "PackageLicenseComments: %s\n", textify(pkg.PackageLicenseComments)) + if pkg.LicenseComments != "" { + fmt.Fprintf(w, "PackageLicenseComments: %s\n", textify(pkg.LicenseComments)) } - if pkg.PackageCopyrightText != "" { - fmt.Fprintf(w, "PackageCopyrightText: %s\n", pkg.PackageCopyrightText) + if pkg.CopyrightText != "" { + fmt.Fprintf(w, "PackageCopyrightText: %s\n", pkg.CopyrightText) } - if pkg.PackageSummary != "" { - fmt.Fprintf(w, "PackageSummary: %s\n", textify(pkg.PackageSummary)) + if pkg.Summary != "" { + fmt.Fprintf(w, "PackageSummary: %s\n", textify(pkg.Summary)) } - if pkg.PackageDescription != "" { - fmt.Fprintf(w, "PackageDescription: %s\n", textify(pkg.PackageDescription)) + if pkg.Description != "" { + fmt.Fprintf(w, "PackageDescription: %s\n", textify(pkg.Description)) } - if pkg.PackageComment != "" { - fmt.Fprintf(w, "PackageComment: %s\n", textify(pkg.PackageComment)) + if pkg.Comment != "" { + fmt.Fprintf(w, "PackageComment: %s\n", textify(pkg.Comment)) } - for _, s := range pkg.PackageExternalReferences { + for _, s := range pkg.ExternalReferences { fmt.Fprintf(w, "ExternalRef: %s %s %s\n", s.Category, s.RefType, s.Locator) if s.ExternalRefComment != "" { fmt.Fprintf(w, "ExternalRefComment: %s\n", s.ExternalRefComment) } } - for _, s := range pkg.PackageAttributionTexts { + for _, s := range pkg.AttributionTexts { fmt.Fprintf(w, "PackageAttributionText: %s\n", textify(s)) } diff --git a/tvsaver/saver2v2/save_package_test.go b/tvsaver/saver2v2/save_package_test.go index 466ff7ff..f1002bef 100644 --- a/tvsaver/saver2v2/save_package_test.go +++ b/tvsaver/saver2v2/save_package_test.go @@ -48,36 +48,36 @@ func TestSaver2_2PackageSavesTextCombo1(t *testing.T) { } pkg := &spdx.Package2_2{ - PackageName: "p1", - PackageSPDXIdentifier: spdx.ElementID("p1"), - PackageVersion: "0.1.0", - PackageFileName: "p1-0.1.0-master.tar.gz", - PackageSupplierOrganization: "John Doe, Inc.", - PackageOriginatorPerson: "John Doe", - PackageDownloadLocation: "http://example.com/p1/p1-0.1.0-master.tar.gz", - FilesAnalyzed: true, - IsFilesAnalyzedTagPresent: true, - PackageVerificationCode: "0123456789abcdef0123456789abcdef01234567", - PackageVerificationCodeExcludedFile: "p1-0.1.0.spdx", - PackageChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983c", - PackageChecksumSHA256: "11b6d3ee554eedf79299905a98f9b9a04e498210b59f15094c916c91d150efcd", - PackageChecksumMD5: "624c1abb3664f4b35547e7c73864ad24", - PackageHomePage: "http://example.com/p1", - PackageSourceInfo: "this is a source comment", - PackageLicenseConcluded: "GPL-2.0-or-later", - PackageLicenseInfoFromFiles: []string{ + Name: "p1", + SPDXIdentifier: spdx.ElementID("p1"), + Version: "0.1.0", + FileName: "p1-0.1.0-master.tar.gz", + SupplierOrganization: "John Doe, Inc.", + OriginatorPerson: "John Doe", + DownloadLocation: "http://example.com/p1/p1-0.1.0-master.tar.gz", + FilesAnalyzed: true, + IsFilesAnalyzedTagPresent: true, + VerificationCode: "0123456789abcdef0123456789abcdef01234567", + VerificationCodeExcludedFile: "p1-0.1.0.spdx", + ChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983c", + ChecksumSHA256: "11b6d3ee554eedf79299905a98f9b9a04e498210b59f15094c916c91d150efcd", + ChecksumMD5: "624c1abb3664f4b35547e7c73864ad24", + HomePage: "http://example.com/p1", + SourceInfo: "this is a source comment", + LicenseConcluded: "GPL-2.0-or-later", + LicenseInfoFromFiles: []string{ "Apache-1.1", "Apache-2.0", "GPL-2.0-or-later", }, - PackageLicenseDeclared: "Apache-2.0 OR GPL-2.0-or-later", - PackageLicenseComments: "this is a license comment(s)", - PackageCopyrightText: "Copyright (c) John Doe, Inc.", - PackageSummary: "this is a summary comment", - PackageDescription: "this is a description comment", - PackageComment: "this is a comment comment", - PackageAttributionTexts: []string{"Include this notice in all advertising materials"}, - PackageExternalReferences: []*spdx.PackageExternalReference2_2{ + LicenseDeclared: "Apache-2.0 OR GPL-2.0-or-later", + LicenseComments: "this is a license comment(s)", + CopyrightText: "Copyright (c) John Doe, Inc.", + Summary: "this is a summary comment", + Description: "this is a description comment", + Comment: "this is a comment comment", + AttributionTexts: []string{"Include this notice in all advertising materials"}, + ExternalReferences: []*spdx.PackageExternalReference2_2{ per1, per2, per3, @@ -140,34 +140,34 @@ func TestSaver2_2PackageSavesTextCombo2(t *testing.T) { // PackageVerificationCodeExcludedFile is empty pkg := &spdx.Package2_2{ - PackageName: "p1", - PackageSPDXIdentifier: spdx.ElementID("p1"), - PackageVersion: "0.1.0", - PackageFileName: "p1-0.1.0-master.tar.gz", - PackageSupplierNOASSERTION: true, - PackageOriginatorOrganization: "John Doe, Inc.", - PackageDownloadLocation: "http://example.com/p1/p1-0.1.0-master.tar.gz", - FilesAnalyzed: true, - IsFilesAnalyzedTagPresent: false, - PackageVerificationCode: "0123456789abcdef0123456789abcdef01234567", - PackageChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983c", - PackageChecksumSHA256: "11b6d3ee554eedf79299905a98f9b9a04e498210b59f15094c916c91d150efcd", - PackageChecksumMD5: "624c1abb3664f4b35547e7c73864ad24", - PackageHomePage: "http://example.com/p1", - PackageSourceInfo: "this is a source comment", - PackageLicenseConcluded: "GPL-2.0-or-later", - PackageLicenseInfoFromFiles: []string{ + Name: "p1", + SPDXIdentifier: spdx.ElementID("p1"), + Version: "0.1.0", + FileName: "p1-0.1.0-master.tar.gz", + SupplierNOASSERTION: true, + OriginatorOrganization: "John Doe, Inc.", + DownloadLocation: "http://example.com/p1/p1-0.1.0-master.tar.gz", + FilesAnalyzed: true, + IsFilesAnalyzedTagPresent: false, + VerificationCode: "0123456789abcdef0123456789abcdef01234567", + ChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983c", + ChecksumSHA256: "11b6d3ee554eedf79299905a98f9b9a04e498210b59f15094c916c91d150efcd", + ChecksumMD5: "624c1abb3664f4b35547e7c73864ad24", + HomePage: "http://example.com/p1", + SourceInfo: "this is a source comment", + LicenseConcluded: "GPL-2.0-or-later", + LicenseInfoFromFiles: []string{ "Apache-1.1", "Apache-2.0", "GPL-2.0-or-later", }, - PackageLicenseDeclared: "Apache-2.0 OR GPL-2.0-or-later", - PackageLicenseComments: "this is a license comment(s)", - PackageCopyrightText: "Copyright (c) John Doe, Inc.", - PackageSummary: "this is a summary comment", - PackageDescription: "this is a description comment", - PackageComment: "this is a comment comment", - PackageAttributionTexts: []string{"Include this notice in all advertising materials"}, + LicenseDeclared: "Apache-2.0 OR GPL-2.0-or-later", + LicenseComments: "this is a license comment(s)", + CopyrightText: "Copyright (c) John Doe, Inc.", + Summary: "this is a summary comment", + Description: "this is a description comment", + Comment: "this is a comment comment", + AttributionTexts: []string{"Include this notice in all advertising materials"}, } // what we want to get, as a buffer of bytes @@ -220,38 +220,38 @@ func TestSaver2_2PackageSavesTextCombo3(t *testing.T) { // three PackageAttributionTexts, one with multi-line text pkg := &spdx.Package2_2{ - PackageName: "p1", - PackageSPDXIdentifier: spdx.ElementID("p1"), - PackageVersion: "0.1.0", - PackageFileName: "p1-0.1.0-master.tar.gz", - PackageSupplierPerson: "John Doe", - PackageOriginatorNOASSERTION: true, - PackageDownloadLocation: "http://example.com/p1/p1-0.1.0-master.tar.gz", - FilesAnalyzed: false, - IsFilesAnalyzedTagPresent: true, + Name: "p1", + SPDXIdentifier: spdx.ElementID("p1"), + Version: "0.1.0", + FileName: "p1-0.1.0-master.tar.gz", + SupplierPerson: "John Doe", + OriginatorNOASSERTION: true, + DownloadLocation: "http://example.com/p1/p1-0.1.0-master.tar.gz", + FilesAnalyzed: false, + IsFilesAnalyzedTagPresent: true, // NOTE that verification code MUST be omitted from output // since FilesAnalyzed is false - PackageVerificationCode: "0123456789abcdef0123456789abcdef01234567", - PackageChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983c", - PackageChecksumSHA256: "11b6d3ee554eedf79299905a98f9b9a04e498210b59f15094c916c91d150efcd", - PackageChecksumMD5: "624c1abb3664f4b35547e7c73864ad24", - PackageHomePage: "http://example.com/p1", - PackageSourceInfo: "this is a source comment", - PackageLicenseConcluded: "GPL-2.0-or-later", + VerificationCode: "0123456789abcdef0123456789abcdef01234567", + ChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983c", + ChecksumSHA256: "11b6d3ee554eedf79299905a98f9b9a04e498210b59f15094c916c91d150efcd", + ChecksumMD5: "624c1abb3664f4b35547e7c73864ad24", + HomePage: "http://example.com/p1", + SourceInfo: "this is a source comment", + LicenseConcluded: "GPL-2.0-or-later", // NOTE that license info from files MUST be omitted from output // since FilesAnalyzed is false - PackageLicenseInfoFromFiles: []string{ + LicenseInfoFromFiles: []string{ "Apache-1.1", "Apache-2.0", "GPL-2.0-or-later", }, - PackageLicenseDeclared: "Apache-2.0 OR GPL-2.0-or-later", - PackageLicenseComments: "this is a license comment(s)", - PackageCopyrightText: "Copyright (c) John Doe, Inc.", - PackageSummary: "this is a summary comment", - PackageDescription: "this is a description comment", - PackageComment: "this is a comment comment", - PackageAttributionTexts: []string{ + LicenseDeclared: "Apache-2.0 OR GPL-2.0-or-later", + LicenseComments: "this is a license comment(s)", + CopyrightText: "Copyright (c) John Doe, Inc.", + Summary: "this is a summary comment", + Description: "this is a description comment", + Comment: "this is a comment comment", + AttributionTexts: []string{ "Include this notice in all advertising materials", "and also this notice", `and this multi-line notice @@ -303,23 +303,23 @@ which goes across two lines func TestSaver2_2PackageSaveOmitsOptionalFieldsIfEmpty(t *testing.T) { pkg := &spdx.Package2_2{ - PackageName: "p1", - PackageSPDXIdentifier: spdx.ElementID("p1"), - PackageDownloadLocation: "http://example.com/p1/p1-0.1.0-master.tar.gz", + Name: "p1", + SPDXIdentifier: spdx.ElementID("p1"), + DownloadLocation: "http://example.com/p1/p1-0.1.0-master.tar.gz", FilesAnalyzed: false, IsFilesAnalyzedTagPresent: true, // NOTE that verification code MUST be omitted from output, // even if present in model, since FilesAnalyzed is false - PackageLicenseConcluded: "GPL-2.0-or-later", + LicenseConcluded: "GPL-2.0-or-later", // NOTE that license info from files MUST be omitted from output // even if present in model, since FilesAnalyzed is false - PackageLicenseInfoFromFiles: []string{ + LicenseInfoFromFiles: []string{ "Apache-1.1", "Apache-2.0", "GPL-2.0-or-later", }, - PackageLicenseDeclared: "Apache-2.0 OR GPL-2.0-or-later", - PackageCopyrightText: "Copyright (c) John Doe, Inc.", + LicenseDeclared: "Apache-2.0 OR GPL-2.0-or-later", + CopyrightText: "Copyright (c) John Doe, Inc.", } // what we want to get, as a buffer of bytes @@ -349,41 +349,41 @@ PackageCopyrightText: Copyright (c) John Doe, Inc. func TestSaver2_2PackageSavesFilesIfPresent(t *testing.T) { f1 := &spdx.File2_2{ - FileName: "/tmp/whatever1.txt", - FileSPDXIdentifier: spdx.ElementID("File1231"), - FileChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983c", - LicenseConcluded: "Apache-2.0", - LicenseInfoInFile: []string{"Apache-2.0"}, - FileCopyrightText: "Copyright (c) Jane Doe", + Name: "/tmp/whatever1.txt", + SPDXIdentifier: spdx.ElementID("File1231"), + ChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983c", + LicenseConcluded: "Apache-2.0", + LicenseInfoInFile: []string{"Apache-2.0"}, + CopyrightText: "Copyright (c) Jane Doe", } f2 := &spdx.File2_2{ - FileName: "/tmp/whatever2.txt", - FileSPDXIdentifier: spdx.ElementID("File1232"), - FileChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983d", - LicenseConcluded: "MIT", - LicenseInfoInFile: []string{"MIT"}, - FileCopyrightText: "Copyright (c) John Doe", + Name: "/tmp/whatever2.txt", + SPDXIdentifier: spdx.ElementID("File1232"), + ChecksumSHA1: "85ed0817af83a24ad8da68c2b5094de69833983d", + LicenseConcluded: "MIT", + LicenseInfoInFile: []string{"MIT"}, + CopyrightText: "Copyright (c) John Doe", } pkg := &spdx.Package2_2{ - PackageName: "p1", - PackageSPDXIdentifier: spdx.ElementID("p1"), - PackageDownloadLocation: "http://example.com/p1/p1-0.1.0-master.tar.gz", + Name: "p1", + SPDXIdentifier: spdx.ElementID("p1"), + DownloadLocation: "http://example.com/p1/p1-0.1.0-master.tar.gz", FilesAnalyzed: false, IsFilesAnalyzedTagPresent: true, // NOTE that verification code MUST be omitted from output, // even if present in model, since FilesAnalyzed is false - PackageLicenseConcluded: "GPL-2.0-or-later", + LicenseConcluded: "GPL-2.0-or-later", // NOTE that license info from files MUST be omitted from output // even if present in model, since FilesAnalyzed is false - PackageLicenseInfoFromFiles: []string{ + LicenseInfoFromFiles: []string{ "Apache-1.1", "Apache-2.0", "GPL-2.0-or-later", }, - PackageLicenseDeclared: "Apache-2.0 OR GPL-2.0-or-later", - PackageCopyrightText: "Copyright (c) John Doe, Inc.", + LicenseDeclared: "Apache-2.0 OR GPL-2.0-or-later", + CopyrightText: "Copyright (c) John Doe, Inc.", Files: map[spdx.ElementID]*spdx.File2_2{ spdx.ElementID("File1231"): f1, spdx.ElementID("File1232"): f2, diff --git a/tvsaver/saver2v2/save_relationship.go b/tvsaver/saver2v2/save_relationship.go index cff5a4a2..08ede32d 100644 --- a/tvsaver/saver2v2/save_relationship.go +++ b/tvsaver/saver2v2/save_relationship.go @@ -15,8 +15,8 @@ func renderRelationship2_2(rln *spdx.Relationship2_2, w io.Writer) error { if rlnAStr != "SPDXRef-" && rlnBStr != "SPDXRef-" && rln.Relationship != "" { fmt.Fprintf(w, "Relationship: %s %s %s\n", rlnAStr, rln.Relationship, rlnBStr) } - if rln.RelationshipComment != "" { - fmt.Fprintf(w, "RelationshipComment: %s\n", rln.RelationshipComment) + if rln.Comment != "" { + fmt.Fprintf(w, "RelationshipComment: %s\n", rln.Comment) } return nil diff --git a/tvsaver/saver2v2/save_relationship_test.go b/tvsaver/saver2v2/save_relationship_test.go index eecbb6c3..84591bcd 100644 --- a/tvsaver/saver2v2/save_relationship_test.go +++ b/tvsaver/saver2v2/save_relationship_test.go @@ -12,10 +12,10 @@ import ( // ===== Relationship section Saver tests ===== func TestSaver2_2RelationshipSavesText(t *testing.T) { rln := &spdx.Relationship2_2{ - RefA: spdx.MakeDocElementID("", "DOCUMENT"), - RefB: spdx.MakeDocElementID("", "2"), - Relationship: "DESCRIBES", - RelationshipComment: "this is a comment", + RefA: spdx.MakeDocElementID("", "DOCUMENT"), + RefB: spdx.MakeDocElementID("", "2"), + Relationship: "DESCRIBES", + Comment: "this is a comment", } // what we want to get, as a buffer of bytes diff --git a/tvsaver/saver2v2/save_review.go b/tvsaver/saver2v2/save_review.go index 5e2da6e3..4ec008c2 100644 --- a/tvsaver/saver2v2/save_review.go +++ b/tvsaver/saver2v2/save_review.go @@ -13,11 +13,11 @@ func renderReview2_2(rev *spdx.Review2_2, w io.Writer) error { if rev.Reviewer != "" && rev.ReviewerType != "" { fmt.Fprintf(w, "Reviewer: %s: %s\n", rev.ReviewerType, rev.Reviewer) } - if rev.ReviewDate != "" { - fmt.Fprintf(w, "ReviewDate: %s\n", rev.ReviewDate) + if rev.Date != "" { + fmt.Fprintf(w, "ReviewDate: %s\n", rev.Date) } - if rev.ReviewComment != "" { - fmt.Fprintf(w, "ReviewComment: %s\n", rev.ReviewComment) + if rev.Comment != "" { + fmt.Fprintf(w, "ReviewComment: %s\n", rev.Comment) } fmt.Fprintf(w, "\n") diff --git a/tvsaver/saver2v2/save_review_test.go b/tvsaver/saver2v2/save_review_test.go index 15fa28dd..772a52cc 100644 --- a/tvsaver/saver2v2/save_review_test.go +++ b/tvsaver/saver2v2/save_review_test.go @@ -12,10 +12,10 @@ import ( // ===== Review section Saver tests ===== func TestSaver2_2ReviewSavesText(t *testing.T) { rev := &spdx.Review2_2{ - Reviewer: "John Doe", - ReviewerType: "Person", - ReviewDate: "2018-10-14T10:28:00Z", - ReviewComment: "this is a review comment", + Reviewer: "John Doe", + ReviewerType: "Person", + Date: "2018-10-14T10:28:00Z", + Comment: "this is a review comment", } // what we want to get, as a buffer of bytes @@ -43,7 +43,7 @@ func TestSaver2_2ReviewOmitsOptionalFieldsIfEmpty(t *testing.T) { rev := &spdx.Review2_2{ Reviewer: "John Doe", ReviewerType: "Person", - ReviewDate: "2018-10-14T10:28:00Z", + Date: "2018-10-14T10:28:00Z", } // what we want to get, as a buffer of bytes diff --git a/tvsaver/saver2v2/save_snippet.go b/tvsaver/saver2v2/save_snippet.go index 5cf2f2a7..86ad8822 100644 --- a/tvsaver/saver2v2/save_snippet.go +++ b/tvsaver/saver2v2/save_snippet.go @@ -10,38 +10,38 @@ import ( ) func renderSnippet2_2(sn *spdx.Snippet2_2, w io.Writer) error { - if sn.SnippetSPDXIdentifier != "" { - fmt.Fprintf(w, "SnippetSPDXIdentifier: %s\n", spdx.RenderElementID(sn.SnippetSPDXIdentifier)) + if sn.SPDXIdentifier != "" { + fmt.Fprintf(w, "SnippetSPDXIdentifier: %s\n", spdx.RenderElementID(sn.SPDXIdentifier)) } snFromFileIDStr := spdx.RenderDocElementID(sn.SnippetFromFileSPDXIdentifier) if snFromFileIDStr != "" { fmt.Fprintf(w, "SnippetFromFileSPDXID: %s\n", snFromFileIDStr) } - if sn.SnippetByteRangeStart != 0 && sn.SnippetByteRangeEnd != 0 { - fmt.Fprintf(w, "SnippetByteRange: %d:%d\n", sn.SnippetByteRangeStart, sn.SnippetByteRangeEnd) + if sn.ByteRangeStart != 0 && sn.ByteRangeEnd != 0 { + fmt.Fprintf(w, "SnippetByteRange: %d:%d\n", sn.ByteRangeStart, sn.ByteRangeEnd) } - if sn.SnippetLineRangeStart != 0 && sn.SnippetLineRangeEnd != 0 { - fmt.Fprintf(w, "SnippetLineRange: %d:%d\n", sn.SnippetLineRangeStart, sn.SnippetLineRangeEnd) + if sn.LineRangeStart != 0 && sn.LineRangeEnd != 0 { + fmt.Fprintf(w, "SnippetLineRange: %d:%d\n", sn.LineRangeStart, sn.LineRangeEnd) } - if sn.SnippetLicenseConcluded != "" { - fmt.Fprintf(w, "SnippetLicenseConcluded: %s\n", sn.SnippetLicenseConcluded) + if sn.LicenseConcluded != "" { + fmt.Fprintf(w, "SnippetLicenseConcluded: %s\n", sn.LicenseConcluded) } for _, s := range sn.LicenseInfoInSnippet { fmt.Fprintf(w, "LicenseInfoInSnippet: %s\n", s) } - if sn.SnippetLicenseComments != "" { - fmt.Fprintf(w, "SnippetLicenseComments: %s\n", textify(sn.SnippetLicenseComments)) + if sn.LicenseComments != "" { + fmt.Fprintf(w, "SnippetLicenseComments: %s\n", textify(sn.LicenseComments)) } - if sn.SnippetCopyrightText != "" { - fmt.Fprintf(w, "SnippetCopyrightText: %s\n", sn.SnippetCopyrightText) + if sn.CopyrightText != "" { + fmt.Fprintf(w, "SnippetCopyrightText: %s\n", sn.CopyrightText) } - if sn.SnippetComment != "" { - fmt.Fprintf(w, "SnippetComment: %s\n", textify(sn.SnippetComment)) + if sn.Comment != "" { + fmt.Fprintf(w, "SnippetComment: %s\n", textify(sn.Comment)) } - if sn.SnippetName != "" { - fmt.Fprintf(w, "SnippetName: %s\n", sn.SnippetName) + if sn.Name != "" { + fmt.Fprintf(w, "SnippetName: %s\n", sn.Name) } - for _, s := range sn.SnippetAttributionTexts { + for _, s := range sn.AttributionTexts { fmt.Fprintf(w, "SnippetAttributionText: %s\n", textify(s)) } diff --git a/tvsaver/saver2v2/save_snippet_test.go b/tvsaver/saver2v2/save_snippet_test.go index 72378b40..dfffa979 100644 --- a/tvsaver/saver2v2/save_snippet_test.go +++ b/tvsaver/saver2v2/save_snippet_test.go @@ -12,22 +12,22 @@ import ( // ===== Snippet section Saver tests ===== func TestSaver2_2SnippetSavesText(t *testing.T) { sn := &spdx.Snippet2_2{ - SnippetSPDXIdentifier: spdx.ElementID("Snippet17"), + SPDXIdentifier: spdx.ElementID("Snippet17"), SnippetFromFileSPDXIdentifier: spdx.MakeDocElementID("", "File292"), - SnippetByteRangeStart: 17, - SnippetByteRangeEnd: 209, - SnippetLineRangeStart: 3, - SnippetLineRangeEnd: 8, - SnippetLicenseConcluded: "GPL-2.0-or-later", + ByteRangeStart: 17, + ByteRangeEnd: 209, + LineRangeStart: 3, + LineRangeEnd: 8, + LicenseConcluded: "GPL-2.0-or-later", LicenseInfoInSnippet: []string{ "GPL-2.0-or-later", "MIT", }, - SnippetLicenseComments: "this is a comment(s) about the snippet license", - SnippetCopyrightText: "Copyright (c) John Doe 20x6", - SnippetComment: "this is a snippet comment", - SnippetName: "from John's program", - SnippetAttributionTexts: []string{"some attributions"}, + LicenseComments: "this is a comment(s) about the snippet license", + CopyrightText: "Copyright (c) John Doe 20x6", + Comment: "this is a snippet comment", + Name: "from John's program", + AttributionTexts: []string{"some attributions"}, } // what we want to get, as a buffer of bytes @@ -62,12 +62,12 @@ SnippetAttributionText: some attributions func TestSaver2_2SnippetOmitsOptionalFieldsIfEmpty(t *testing.T) { sn := &spdx.Snippet2_2{ - SnippetSPDXIdentifier: spdx.ElementID("Snippet17"), + SPDXIdentifier: spdx.ElementID("Snippet17"), SnippetFromFileSPDXIdentifier: spdx.MakeDocElementID("", "File292"), - SnippetByteRangeStart: 17, - SnippetByteRangeEnd: 209, - SnippetLicenseConcluded: "GPL-2.0-or-later", - SnippetCopyrightText: "Copyright (c) John Doe 20x6", + ByteRangeStart: 17, + ByteRangeEnd: 209, + LicenseConcluded: "GPL-2.0-or-later", + CopyrightText: "Copyright (c) John Doe 20x6", } // what we want to get, as a buffer of bytes diff --git a/utils/verification.go b/utils/verification.go index 2d55e164..22596317 100644 --- a/utils/verification.go +++ b/utils/verification.go @@ -22,8 +22,8 @@ func GetVerificationCode2_1(files map[spdx.ElementID]*spdx.File2_1, excludeFile if f == nil { return "", fmt.Errorf("got nil file for identifier %v", i) } - if f.FileName != excludeFile { - shas = append(shas, f.FileChecksumSHA1) + if f.Name != excludeFile { + shas = append(shas, f.ChecksumSHA1) } } @@ -52,8 +52,8 @@ func GetVerificationCode2_2(files map[spdx.ElementID]*spdx.File2_2, excludeFile if f == nil { return "", fmt.Errorf("got nil file for identifier %v", i) } - if f.FileName != excludeFile { - shas = append(shas, f.FileChecksumSHA1) + if f.Name != excludeFile { + shas = append(shas, f.ChecksumSHA1) } } diff --git a/utils/verification_test.go b/utils/verification_test.go index 7f95d3ce..b86538fb 100644 --- a/utils/verification_test.go +++ b/utils/verification_test.go @@ -13,29 +13,29 @@ import ( func TestPackage2_1CanGetVerificationCode(t *testing.T) { files := map[spdx.ElementID]*spdx.File2_1{ "File0": &spdx.File2_1{ - FileName: "file2.txt", - FileSPDXIdentifier: "File0", - FileChecksumSHA1: "aaaaaaaaaabbbbbbbbbbccccccccccdddddddddd", + Name: "file2.txt", + SPDXIdentifier: "File0", + ChecksumSHA1: "aaaaaaaaaabbbbbbbbbbccccccccccdddddddddd", }, "File1": &spdx.File2_1{ - FileName: "file1.txt", - FileSPDXIdentifier: "File1", - FileChecksumSHA1: "3333333333bbbbbbbbbbccccccccccdddddddddd", + Name: "file1.txt", + SPDXIdentifier: "File1", + ChecksumSHA1: "3333333333bbbbbbbbbbccccccccccdddddddddd", }, "File2": &spdx.File2_1{ - FileName: "file3.txt", - FileSPDXIdentifier: "File2", - FileChecksumSHA1: "8888888888bbbbbbbbbbccccccccccdddddddddd", + Name: "file3.txt", + SPDXIdentifier: "File2", + ChecksumSHA1: "8888888888bbbbbbbbbbccccccccccdddddddddd", }, "File3": &spdx.File2_1{ - FileName: "file5.txt", - FileSPDXIdentifier: "File3", - FileChecksumSHA1: "2222222222bbbbbbbbbbccccccccccdddddddddd", + Name: "file5.txt", + SPDXIdentifier: "File3", + ChecksumSHA1: "2222222222bbbbbbbbbbccccccccccdddddddddd", }, "File4": &spdx.File2_1{ - FileName: "file4.txt", - FileSPDXIdentifier: "File4", - FileChecksumSHA1: "bbbbbbbbbbccccccccccddddddddddaaaaaaaaaa", + Name: "file4.txt", + SPDXIdentifier: "File4", + ChecksumSHA1: "bbbbbbbbbbccccccccccddddddddddaaaaaaaaaa", }, } @@ -54,29 +54,29 @@ func TestPackage2_1CanGetVerificationCode(t *testing.T) { func TestPackage2_1CanGetVerificationCodeIgnoringExcludesFile(t *testing.T) { files := map[spdx.ElementID]*spdx.File2_1{ spdx.ElementID("File0"): &spdx.File2_1{ - FileName: "file1.txt", - FileSPDXIdentifier: "File0", - FileChecksumSHA1: "aaaaaaaaaabbbbbbbbbbccccccccccdddddddddd", + Name: "file1.txt", + SPDXIdentifier: "File0", + ChecksumSHA1: "aaaaaaaaaabbbbbbbbbbccccccccccdddddddddd", }, spdx.ElementID("File1"): &spdx.File2_1{ - FileName: "file2.txt", - FileSPDXIdentifier: "File1", - FileChecksumSHA1: "3333333333bbbbbbbbbbccccccccccdddddddddd", + Name: "file2.txt", + SPDXIdentifier: "File1", + ChecksumSHA1: "3333333333bbbbbbbbbbccccccccccdddddddddd", }, spdx.ElementID("File2"): &spdx.File2_1{ - FileName: "thisfile.spdx", - FileSPDXIdentifier: "File2", - FileChecksumSHA1: "bbbbbbbbbbccccccccccddddddddddaaaaaaaaaa", + Name: "thisfile.spdx", + SPDXIdentifier: "File2", + ChecksumSHA1: "bbbbbbbbbbccccccccccddddddddddaaaaaaaaaa", }, spdx.ElementID("File3"): &spdx.File2_1{ - FileName: "file3.txt", - FileSPDXIdentifier: "File3", - FileChecksumSHA1: "8888888888bbbbbbbbbbccccccccccdddddddddd", + Name: "file3.txt", + SPDXIdentifier: "File3", + ChecksumSHA1: "8888888888bbbbbbbbbbccccccccccdddddddddd", }, spdx.ElementID("File4"): &spdx.File2_1{ - FileName: "file4.txt", - FileSPDXIdentifier: "File4", - FileChecksumSHA1: "2222222222bbbbbbbbbbccccccccccdddddddddd", + Name: "file4.txt", + SPDXIdentifier: "File4", + ChecksumSHA1: "2222222222bbbbbbbbbbccccccccccdddddddddd", }, } @@ -95,15 +95,15 @@ func TestPackage2_1CanGetVerificationCodeIgnoringExcludesFile(t *testing.T) { func TestPackage2_1GetVerificationCodeFailsIfNilFileInSlice(t *testing.T) { files := map[spdx.ElementID]*spdx.File2_1{ spdx.ElementID("File0"): &spdx.File2_1{ - FileName: "file2.txt", - FileSPDXIdentifier: "File0", - FileChecksumSHA1: "aaaaaaaaaabbbbbbbbbbccccccccccdddddddddd", + Name: "file2.txt", + SPDXIdentifier: "File0", + ChecksumSHA1: "aaaaaaaaaabbbbbbbbbbccccccccccdddddddddd", }, spdx.ElementID("File1"): nil, spdx.ElementID("File2"): &spdx.File2_1{ - FileName: "file3.txt", - FileSPDXIdentifier: "File2", - FileChecksumSHA1: "8888888888bbbbbbbbbbccccccccccdddddddddd", + Name: "file3.txt", + SPDXIdentifier: "File2", + ChecksumSHA1: "8888888888bbbbbbbbbbccccccccccdddddddddd", }, } @@ -118,29 +118,29 @@ func TestPackage2_1GetVerificationCodeFailsIfNilFileInSlice(t *testing.T) { func TestPackage2_2CanGetVerificationCode(t *testing.T) { files := map[spdx.ElementID]*spdx.File2_2{ "File0": &spdx.File2_2{ - FileName: "file2.txt", - FileSPDXIdentifier: "File0", - FileChecksumSHA1: "aaaaaaaaaabbbbbbbbbbccccccccccdddddddddd", + Name: "file2.txt", + SPDXIdentifier: "File0", + ChecksumSHA1: "aaaaaaaaaabbbbbbbbbbccccccccccdddddddddd", }, "File1": &spdx.File2_2{ - FileName: "file1.txt", - FileSPDXIdentifier: "File1", - FileChecksumSHA1: "3333333333bbbbbbbbbbccccccccccdddddddddd", + Name: "file1.txt", + SPDXIdentifier: "File1", + ChecksumSHA1: "3333333333bbbbbbbbbbccccccccccdddddddddd", }, "File2": &spdx.File2_2{ - FileName: "file3.txt", - FileSPDXIdentifier: "File2", - FileChecksumSHA1: "8888888888bbbbbbbbbbccccccccccdddddddddd", + Name: "file3.txt", + SPDXIdentifier: "File2", + ChecksumSHA1: "8888888888bbbbbbbbbbccccccccccdddddddddd", }, "File3": &spdx.File2_2{ - FileName: "file5.txt", - FileSPDXIdentifier: "File3", - FileChecksumSHA1: "2222222222bbbbbbbbbbccccccccccdddddddddd", + Name: "file5.txt", + SPDXIdentifier: "File3", + ChecksumSHA1: "2222222222bbbbbbbbbbccccccccccdddddddddd", }, "File4": &spdx.File2_2{ - FileName: "file4.txt", - FileSPDXIdentifier: "File4", - FileChecksumSHA1: "bbbbbbbbbbccccccccccddddddddddaaaaaaaaaa", + Name: "file4.txt", + SPDXIdentifier: "File4", + ChecksumSHA1: "bbbbbbbbbbccccccccccddddddddddaaaaaaaaaa", }, } @@ -159,29 +159,29 @@ func TestPackage2_2CanGetVerificationCode(t *testing.T) { func TestPackage2_2CanGetVerificationCodeIgnoringExcludesFile(t *testing.T) { files := map[spdx.ElementID]*spdx.File2_2{ spdx.ElementID("File0"): &spdx.File2_2{ - FileName: "file1.txt", - FileSPDXIdentifier: "File0", - FileChecksumSHA1: "aaaaaaaaaabbbbbbbbbbccccccccccdddddddddd", + Name: "file1.txt", + SPDXIdentifier: "File0", + ChecksumSHA1: "aaaaaaaaaabbbbbbbbbbccccccccccdddddddddd", }, spdx.ElementID("File1"): &spdx.File2_2{ - FileName: "file2.txt", - FileSPDXIdentifier: "File1", - FileChecksumSHA1: "3333333333bbbbbbbbbbccccccccccdddddddddd", + Name: "file2.txt", + SPDXIdentifier: "File1", + ChecksumSHA1: "3333333333bbbbbbbbbbccccccccccdddddddddd", }, spdx.ElementID("File2"): &spdx.File2_2{ - FileName: "thisfile.spdx", - FileSPDXIdentifier: "File2", - FileChecksumSHA1: "bbbbbbbbbbccccccccccddddddddddaaaaaaaaaa", + Name: "thisfile.spdx", + SPDXIdentifier: "File2", + ChecksumSHA1: "bbbbbbbbbbccccccccccddddddddddaaaaaaaaaa", }, spdx.ElementID("File3"): &spdx.File2_2{ - FileName: "file3.txt", - FileSPDXIdentifier: "File3", - FileChecksumSHA1: "8888888888bbbbbbbbbbccccccccccdddddddddd", + Name: "file3.txt", + SPDXIdentifier: "File3", + ChecksumSHA1: "8888888888bbbbbbbbbbccccccccccdddddddddd", }, spdx.ElementID("File4"): &spdx.File2_2{ - FileName: "file4.txt", - FileSPDXIdentifier: "File4", - FileChecksumSHA1: "2222222222bbbbbbbbbbccccccccccdddddddddd", + Name: "file4.txt", + SPDXIdentifier: "File4", + ChecksumSHA1: "2222222222bbbbbbbbbbccccccccccdddddddddd", }, } @@ -200,15 +200,15 @@ func TestPackage2_2CanGetVerificationCodeIgnoringExcludesFile(t *testing.T) { func TestPackage2_2GetVerificationCodeFailsIfNilFileInSlice(t *testing.T) { files := map[spdx.ElementID]*spdx.File2_2{ spdx.ElementID("File0"): &spdx.File2_2{ - FileName: "file2.txt", - FileSPDXIdentifier: "File0", - FileChecksumSHA1: "aaaaaaaaaabbbbbbbbbbccccccccccdddddddddd", + Name: "file2.txt", + SPDXIdentifier: "File0", + ChecksumSHA1: "aaaaaaaaaabbbbbbbbbbccccccccccdddddddddd", }, spdx.ElementID("File1"): nil, spdx.ElementID("File2"): &spdx.File2_2{ - FileName: "file3.txt", - FileSPDXIdentifier: "File2", - FileChecksumSHA1: "8888888888bbbbbbbbbbccccccccccdddddddddd", + Name: "file3.txt", + SPDXIdentifier: "File2", + ChecksumSHA1: "8888888888bbbbbbbbbbccccccccccdddddddddd", }, }