Skip to content

Commit

Permalink
Remove Redudant Prefixes #47
Browse files Browse the repository at this point in the history
  • Loading branch information
@epicadk
epicadk committed Nov 30, 2020
1 parent a16d50e commit af6bdbc
Show file tree
Hide file tree
Showing 105 changed files with 2,624 additions and 2,632 deletions.
8 changes: 4 additions & 4 deletions builder/build.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand All @@ -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},
}

Expand Down Expand Up @@ -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
}
Expand All @@ -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},
}

Expand Down
324 changes: 162 additions & 162 deletions builder/build_test.go
View file

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions builder/builder2v1/build_file.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
24 changes: 12 additions & 12 deletions builder/builder2v1/build_file_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,29 +22,29 @@ 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)
}
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)
}

}
Expand Down
24 changes: 12 additions & 12 deletions builder/builder2v1/build_package.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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++
}

Expand All @@ -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
Expand Down
66 changes: 33 additions & 33 deletions builder/builder2v1/build_package_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,35 +23,35 @@ 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)
}
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
Expand All @@ -65,29 +65,29 @@ 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)
}
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)
}
}

Expand All @@ -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)
}
Expand Down
16 changes: 8 additions & 8 deletions builder/builder2v2/build_file.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
24 changes: 12 additions & 12 deletions builder/builder2v2/build_file_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,29 +22,29 @@ 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)
}
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)
}

}
Expand Down
24 changes: 12 additions & 12 deletions builder/builder2v2/build_package.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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++
}

Expand All @@ -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
Expand Down

0 comments on commit af6bdbc

Please sign in to comment.