Merge pull request #95 from swinslow/issue-93

Fix incorrect tag for Snippet IDs in tvsaver
spdx · Jul 31, 2021 · 9813e3e · 9813e3e
2 parents c872465 + 1c7eb4d
commit 9813e3e
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 18 deletions.
diff --git a/tvsaver/saver2v1/save_document_test.go b/tvsaver/saver2v1/save_document_test.go
@@ -263,13 +263,13 @@ LicenseInfoInFile: GPL-2.0-or-later
 LicenseInfoInFile: WTFPL
 FileCopyrightText: Copyright (c) Jane Doe
 
-SnippetSPDXIdentifier: SPDXRef-Snippet19
+SnippetSPDXID: SPDXRef-Snippet19
 SnippetFromFileSPDXID: SPDXRef-FileHasSnippets
 SnippetByteRange: 17:209
 SnippetLicenseConcluded: GPL-2.0-or-later
 SnippetCopyrightText: Copyright (c) John Doe 20x6
 
-SnippetSPDXIdentifier: SPDXRef-Snippet20
+SnippetSPDXID: SPDXRef-Snippet20
 SnippetFromFileSPDXID: SPDXRef-FileHasSnippets
 SnippetByteRange: 268:309
 SnippetLicenseConcluded: WTFPL

diff --git a/tvsaver/saver2v1/save_file_test.go b/tvsaver/saver2v1/save_file_test.go
@@ -146,13 +146,13 @@ LicenseConcluded: Apache-2.0
 LicenseInfoInFile: Apache-2.0
 FileCopyrightText: Copyright (c) Jane Doe
 
-SnippetSPDXIdentifier: SPDXRef-Snippet19
+SnippetSPDXID: SPDXRef-Snippet19
 SnippetFromFileSPDXID: SPDXRef-File123
 SnippetByteRange: 17:209
 SnippetLicenseConcluded: GPL-2.0-or-later
 SnippetCopyrightText: Copyright (c) John Doe 20x6
 
-SnippetSPDXIdentifier: SPDXRef-Snippet20
+SnippetSPDXID: SPDXRef-Snippet20
 SnippetFromFileSPDXID: SPDXRef-File123
 SnippetByteRange: 268:309
 SnippetLicenseConcluded: WTFPL

diff --git a/tvsaver/saver2v1/save_snippet.go b/tvsaver/saver2v1/save_snippet.go
@@ -11,7 +11,7 @@ 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))
+		fmt.Fprintf(w, "SnippetSPDXID: %s\n", spdx.RenderElementID(sn.SnippetSPDXIdentifier))
 	}
 	snFromFileIDStr := spdx.RenderDocElementID(sn.SnippetFromFileSPDXIdentifier)
 	if snFromFileIDStr != "" {

diff --git a/tvsaver/saver2v1/save_snippet_test.go b/tvsaver/saver2v1/save_snippet_test.go
@@ -30,7 +30,7 @@ func TestSaver2_1SnippetSavesText(t *testing.T) {
 	}
 
 	// what we want to get, as a buffer of bytes
-	want := bytes.NewBufferString(`SnippetSPDXIdentifier: SPDXRef-Snippet17
+	want := bytes.NewBufferString(`SnippetSPDXID: SPDXRef-Snippet17
 SnippetFromFileSPDXID: SPDXRef-File292
 SnippetByteRange: 17:209
 SnippetLineRange: 3:8
@@ -69,7 +69,7 @@ func TestSaver2_1SnippetOmitsOptionalFieldsIfEmpty(t *testing.T) {
 	}
 
 	// what we want to get, as a buffer of bytes
-	want := bytes.NewBufferString(`SnippetSPDXIdentifier: SPDXRef-Snippet17
+	want := bytes.NewBufferString(`SnippetSPDXID: SPDXRef-Snippet17
 SnippetFromFileSPDXID: SPDXRef-File292
 SnippetByteRange: 17:209
 SnippetLicenseConcluded: GPL-2.0-or-later
@@ -98,12 +98,12 @@ func TestSaver2_1SnippetWrapsCopyrightMultiline(t *testing.T) {
 		SnippetByteRangeStart:         17,
 		SnippetByteRangeEnd:           209,
 		SnippetLicenseConcluded:       "GPL-2.0-or-later",
-		SnippetCopyrightText:          `Copyright (c) John Doe 20x6
+		SnippetCopyrightText: `Copyright (c) John Doe 20x6
 Copyright (c) John Doe 20x6`,
 	}
 
 	// what we want to get, as a buffer of bytes
-	want := bytes.NewBufferString(`SnippetSPDXIdentifier: SPDXRef-Snippet17
+	want := bytes.NewBufferString(`SnippetSPDXID: SPDXRef-Snippet17
 SnippetFromFileSPDXID: SPDXRef-File292
 SnippetByteRange: 17:209
 SnippetLicenseConcluded: GPL-2.0-or-later

diff --git a/tvsaver/saver2v2/save_document_test.go b/tvsaver/saver2v2/save_document_test.go
@@ -283,13 +283,13 @@ LicenseInfoInFile: GPL-2.0-or-later
 LicenseInfoInFile: WTFPL
 FileCopyrightText: Copyright (c) Jane Doe
 
-SnippetSPDXIdentifier: SPDXRef-Snippet19
+SnippetSPDXID: SPDXRef-Snippet19
 SnippetFromFileSPDXID: SPDXRef-FileHasSnippets
 SnippetByteRange: 17:209
 SnippetLicenseConcluded: GPL-2.0-or-later
 SnippetCopyrightText: Copyright (c) John Doe 20x6
 
-SnippetSPDXIdentifier: SPDXRef-Snippet20
+SnippetSPDXID: SPDXRef-Snippet20
 SnippetFromFileSPDXID: SPDXRef-FileHasSnippets
 SnippetByteRange: 268:309
 SnippetLicenseConcluded: WTFPL

diff --git a/tvsaver/saver2v2/save_file_test.go b/tvsaver/saver2v2/save_file_test.go
@@ -170,13 +170,13 @@ LicenseConcluded: Apache-2.0
 LicenseInfoInFile: Apache-2.0
 FileCopyrightText: Copyright (c) Jane Doe
 
-SnippetSPDXIdentifier: SPDXRef-Snippet19
+SnippetSPDXID: SPDXRef-Snippet19
 SnippetFromFileSPDXID: SPDXRef-File123
 SnippetByteRange: 17:209
 SnippetLicenseConcluded: GPL-2.0-or-later
 SnippetCopyrightText: Copyright (c) John Doe 20x6
 
-SnippetSPDXIdentifier: SPDXRef-Snippet20
+SnippetSPDXID: SPDXRef-Snippet20
 SnippetFromFileSPDXID: SPDXRef-File123
 SnippetByteRange: 268:309
 SnippetLicenseConcluded: WTFPL

diff --git a/tvsaver/saver2v2/save_snippet.go b/tvsaver/saver2v2/save_snippet.go
@@ -11,7 +11,7 @@ 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))
+		fmt.Fprintf(w, "SnippetSPDXID: %s\n", spdx.RenderElementID(sn.SnippetSPDXIdentifier))
 	}
 	snFromFileIDStr := spdx.RenderDocElementID(sn.SnippetFromFileSPDXIdentifier)
 	if snFromFileIDStr != "" {

diff --git a/tvsaver/saver2v2/save_snippet_test.go b/tvsaver/saver2v2/save_snippet_test.go
@@ -31,7 +31,7 @@ func TestSaver2_2SnippetSavesText(t *testing.T) {
 	}
 
 	// what we want to get, as a buffer of bytes
-	want := bytes.NewBufferString(`SnippetSPDXIdentifier: SPDXRef-Snippet17
+	want := bytes.NewBufferString(`SnippetSPDXID: SPDXRef-Snippet17
 SnippetFromFileSPDXID: SPDXRef-File292
 SnippetByteRange: 17:209
 SnippetLineRange: 3:8
@@ -71,7 +71,7 @@ func TestSaver2_2SnippetOmitsOptionalFieldsIfEmpty(t *testing.T) {
 	}
 
 	// what we want to get, as a buffer of bytes
-	want := bytes.NewBufferString(`SnippetSPDXIdentifier: SPDXRef-Snippet17
+	want := bytes.NewBufferString(`SnippetSPDXID: SPDXRef-Snippet17
 SnippetFromFileSPDXID: SPDXRef-File292
 SnippetByteRange: 17:209
 SnippetLicenseConcluded: GPL-2.0-or-later
@@ -100,12 +100,12 @@ func TestSaver2_2SnippetWrapsCopyrightMultiline(t *testing.T) {
 		SnippetByteRangeStart:         17,
 		SnippetByteRangeEnd:           209,
 		SnippetLicenseConcluded:       "GPL-2.0-or-later",
-		SnippetCopyrightText:          `Copyright (c) John Doe 20x6
+		SnippetCopyrightText: `Copyright (c) John Doe 20x6
 Copyright (c) John Doe 20x6`,
 	}
 
 	// what we want to get, as a buffer of bytes
-	want := bytes.NewBufferString(`SnippetSPDXIdentifier: SPDXRef-Snippet17
+	want := bytes.NewBufferString(`SnippetSPDXID: SPDXRef-Snippet17
 SnippetFromFileSPDXID: SPDXRef-File292
 SnippetByteRange: 17:209
 SnippetLicenseConcluded: GPL-2.0-or-later