diff options
| author | specter25 <ujjwalcoding012@gmail.com> | 2021-03-21 03:44:52 +0530 |
|---|---|---|
| committer | specter25 <ujjwalcoding012@gmail.com> | 2021-03-21 03:44:52 +0530 |
| commit | e62e0b5ac8d26d7cf76e185c62bf69fa5ddf6f11 (patch) | |
| tree | 2b86e4241549f26981a3da50604539c361d4ceb5 /builder/builder2v2 | |
| parent | af976619f2cc0badd250fb12628a0ac42b5a18ca (diff) | |
| download | spdx-tools-e62e0b5ac8d26d7cf76e185c62bf69fa5ddf6f11.tar.gz | |
Change naming convention of checksum struct
- Change the name of Checksum struct so that it can be used by all spdx versions
- Remove unnecessary commented code
Signed-off-by: specter25 <ujjwalcoding012@gmail.com>
Diffstat (limited to 'builder/builder2v2')
| -rw-r--r-- | builder/builder2v2/build_file.go | 11 | ||||
| -rw-r--r-- | builder/builder2v2/build_package_test.go | 9 |
2 files changed, 4 insertions, 16 deletions
diff --git a/builder/builder2v2/build_file.go b/builder/builder2v2/build_file.go index 2791160..7a267ad 100644 --- a/builder/builder2v2/build_file.go +++ b/builder/builder2v2/build_file.go @@ -32,24 +32,21 @@ func BuildFileSection2_2(filePath string, prefix string, fileNumber int) (*spdx. f := &spdx.File2_2{ FileName: filePath, FileSPDXIdentifier: spdx.ElementID(i), - FileChecksums: map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{ - spdx.SHA1: spdx.Checksum2_2{ + FileChecksums: map[spdx.ChecksumAlgorithm]spdx.Checksum{ + spdx.SHA1: spdx.Checksum{ Algorithm: spdx.SHA1, Value: ssha1, }, - spdx.SHA256: spdx.Checksum2_2{ + spdx.SHA256: spdx.Checksum{ Algorithm: spdx.SHA256, Value: ssha256, }, - spdx.MD5: spdx.Checksum2_2{ + spdx.MD5: spdx.Checksum{ Algorithm: spdx.MD5, Value: smd5, }, }, - // FileChecksumSHA1: ssha1, - // FileChecksumSHA256: ssha256, - // FileChecksumMD5: smd5, LicenseConcluded: "NOASSERTION", LicenseInfoInFile: []string{}, FileCopyrightText: "NOASSERTION", diff --git a/builder/builder2v2/build_package_test.go b/builder/builder2v2/build_package_test.go index 47f7604..044721f 100644 --- a/builder/builder2v2/build_package_test.go +++ b/builder/builder2v2/build_package_test.go @@ -88,15 +88,6 @@ func TestBuilder2_2CanBuildPackageSection(t *testing.T) { } } - // if fileEmpty.FileChecksumSHA1 != "da39a3ee5e6b4b0d3255bfef95601890afd80709" { - // t.Errorf("expected %v, got %v", "da39a3ee5e6b4b0d3255bfef95601890afd80709", fileEmpty.FileChecksumSHA1) - // } - // if fileEmpty.FileChecksumSHA256 != "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" { - // t.Errorf("expected %v, got %v", "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", fileEmpty.FileChecksumSHA256) - // } - // if fileEmpty.FileChecksumMD5 != "d41d8cd98f00b204e9800998ecf8427e" { - // t.Errorf("expected %v, got %v", "d41d8cd98f00b204e9800998ecf8427e", fileEmpty.FileChecksumMD5) - // } if fileEmpty.LicenseConcluded != "NOASSERTION" { t.Errorf("expected %v, got %v", "NOASSERTION", fileEmpty.LicenseConcluded) } |