diff options
author | specter25 <ujjwalcoding012@gmail.com> | 2021-03-21 12:19:42 +0530 |
---|---|---|
committer | specter25 <ujjwalcoding012@gmail.com> | 2021-03-21 12:19:42 +0530 |
commit | 37228d58f091496f9721d3e90f7047d72ff9dfc7 (patch) | |
tree | af8b141f0fa5167ec92bd3805d3a07f170bd82d6 /tvsaver | |
parent | e62e0b5ac8d26d7cf76e185c62bf69fa5ddf6f11 (diff) | |
download | spdx-tools-37228d58f091496f9721d3e90f7047d72ff9dfc7.tar.gz |
Combine switch cases and remove redundant NL
- Combine the switch cases when defined enum for case type
- Rmoved redundant NL in the code
Signed-off-by: specter25 <ujjwalcoding012@gmail.com>
Diffstat (limited to 'tvsaver')
-rw-r--r-- | tvsaver/saver2v2/save_document_test.go | 2 | ||||
-rw-r--r-- | tvsaver/saver2v2/save_file.go | 5 | ||||
-rw-r--r-- | tvsaver/saver2v2/save_file_test.go | 4 | ||||
-rw-r--r-- | tvsaver/saver2v2/save_package.go | 5 | ||||
-rw-r--r-- | tvsaver/saver2v2/save_package_test.go | 4 |
5 files changed, 0 insertions, 20 deletions
diff --git a/tvsaver/saver2v2/save_document_test.go b/tvsaver/saver2v2/save_document_test.go index e6674a1..8745db4 100644 --- a/tvsaver/saver2v2/save_document_test.go +++ b/tvsaver/saver2v2/save_document_test.go @@ -87,7 +87,6 @@ func TestSaver2_2DocumentSavesText(t *testing.T) { Value: "85ed0817af83a24ad8da68c2b5094de69833983e", }, }, - LicenseConcluded: "GPL-2.0-or-later AND WTFPL", LicenseInfoInFile: []string{ "Apache-2.0", @@ -110,7 +109,6 @@ func TestSaver2_2DocumentSavesText(t *testing.T) { Value: "85ed0817af83a24ad8da68c2b5094de69833983f", }, }, - LicenseConcluded: "BSD-3-Clause", LicenseInfoInFile: []string{"BSD-3-Clause"}, FileCopyrightText: "Copyright (c) Jane Doe LLC", diff --git a/tvsaver/saver2v2/save_file.go b/tvsaver/saver2v2/save_file.go index e8c1d4d..18e95b0 100644 --- a/tvsaver/saver2v2/save_file.go +++ b/tvsaver/saver2v2/save_file.go @@ -20,20 +20,15 @@ func renderFile2_2(f *spdx.File2_2, w io.Writer) error { for _, s := range f.FileType { fmt.Fprintf(w, "FileType: %s\n", s) } - if f.FileChecksums[spdx.SHA1].Value != "" { fmt.Fprintf(w, "FileChecksum: SHA1: %s\n", f.FileChecksums[spdx.SHA1].Value) - } if f.FileChecksums[spdx.SHA256].Value != "" { fmt.Fprintf(w, "FileChecksum: SHA256: %s\n", f.FileChecksums[spdx.SHA256].Value) - } if f.FileChecksums[spdx.MD5].Value != "" { fmt.Fprintf(w, "FileChecksum: MD5: %s\n", f.FileChecksums[spdx.MD5].Value) - } - if f.LicenseConcluded != "" { fmt.Fprintf(w, "LicenseConcluded: %s\n", f.LicenseConcluded) } diff --git a/tvsaver/saver2v2/save_file_test.go b/tvsaver/saver2v2/save_file_test.go index 070efc6..159074d 100644 --- a/tvsaver/saver2v2/save_file_test.go +++ b/tvsaver/saver2v2/save_file_test.go @@ -32,7 +32,6 @@ func TestSaver2_2FileSavesText(t *testing.T) { Value: "624c1abb3664f4b35547e7c73864ad24", }, }, - LicenseConcluded: "Apache-2.0", LicenseInfoInFile: []string{ "Apache-2.0", @@ -151,7 +150,6 @@ func TestSaver2_2FileSavesSnippetsAlso(t *testing.T) { Value: "85ed0817af83a24ad8da68c2b5094de69833983c", }, }, - LicenseConcluded: "Apache-2.0", LicenseInfoInFile: []string{ "Apache-2.0", @@ -206,7 +204,6 @@ func TestSaver2_2FileOmitsOptionalFieldsIfEmpty(t *testing.T) { Value: "85ed0817af83a24ad8da68c2b5094de69833983c", }, }, - LicenseConcluded: "Apache-2.0", LicenseInfoInFile: []string{ "Apache-2.0", @@ -248,7 +245,6 @@ func TestSaver2_2FileWrapsCopyrightMultiLine(t *testing.T) { Value: "85ed0817af83a24ad8da68c2b5094de69833983c", }, }, - LicenseConcluded: "Apache-2.0", LicenseInfoInFile: []string{ "Apache-2.0", diff --git a/tvsaver/saver2v2/save_package.go b/tvsaver/saver2v2/save_package.go index 3fb9d7a..518da06 100644 --- a/tvsaver/saver2v2/save_package.go +++ b/tvsaver/saver2v2/save_package.go @@ -58,20 +58,15 @@ func renderPackage2_2(pkg *spdx.Package2_2, w io.Writer) error { fmt.Fprintf(w, "PackageVerificationCode: %s (excludes %s)\n", pkg.PackageVerificationCode, pkg.PackageVerificationCodeExcludedFile) } } - if pkg.PackageChecksums[spdx.SHA1].Value != "" { fmt.Fprintf(w, "PackageChecksum: SHA1: %s\n", pkg.PackageChecksums[spdx.SHA1].Value) - } if pkg.PackageChecksums[spdx.SHA256].Value != "" { fmt.Fprintf(w, "PackageChecksum: SHA256: %s\n", pkg.PackageChecksums[spdx.SHA256].Value) - } if pkg.PackageChecksums[spdx.MD5].Value != "" { fmt.Fprintf(w, "PackageChecksum: MD5: %s\n", pkg.PackageChecksums[spdx.MD5].Value) - } - if pkg.PackageHomePage != "" { fmt.Fprintf(w, "PackageHomePage: %s\n", pkg.PackageHomePage) } diff --git a/tvsaver/saver2v2/save_package_test.go b/tvsaver/saver2v2/save_package_test.go index bfca9e0..8221e73 100644 --- a/tvsaver/saver2v2/save_package_test.go +++ b/tvsaver/saver2v2/save_package_test.go @@ -73,7 +73,6 @@ func TestSaver2_2PackageSavesTextCombo1(t *testing.T) { Value: "624c1abb3664f4b35547e7c73864ad24", }, }, - PackageHomePage: "http://example.com/p1", PackageSourceInfo: "this is a source comment", PackageLicenseConcluded: "GPL-2.0-or-later", @@ -269,7 +268,6 @@ func TestSaver2_2PackageSavesTextCombo3(t *testing.T) { Value: "624c1abb3664f4b35547e7c73864ad24", }, }, - PackageHomePage: "http://example.com/p1", PackageSourceInfo: "this is a source comment", PackageLicenseConcluded: "GPL-2.0-or-later", @@ -392,7 +390,6 @@ func TestSaver2_2PackageSavesFilesIfPresent(t *testing.T) { Value: "85ed0817af83a24ad8da68c2b5094de69833983c", }, }, - LicenseConcluded: "Apache-2.0", LicenseInfoInFile: []string{"Apache-2.0"}, FileCopyrightText: "Copyright (c) Jane Doe", @@ -407,7 +404,6 @@ func TestSaver2_2PackageSavesFilesIfPresent(t *testing.T) { Value: "85ed0817af83a24ad8da68c2b5094de69833983d", }, }, - LicenseConcluded: "MIT", LicenseInfoInFile: []string{"MIT"}, FileCopyrightText: "Copyright (c) John Doe", |