aboutsummaryrefslogtreecommitdiff
path: root/tvsaver
diff options
context:
space:
mode:
authorSteve Winslow <steve@swinslow.net>2021-07-31 16:13:45 -0400
committerSteve Winslow <steve@swinslow.net>2021-07-31 16:13:45 -0400
commit1c7eb4daa895a799d433fbe2c50f9f420c360bce (patch)
tree6525468f486794c39a80826d9b5c8cca519b736f /tvsaver
parentc8724656ef8141867ced1a6dc872b8c96da9e7d5 (diff)
downloadspdx-tools-1c7eb4daa895a799d433fbe2c50f9f420c360bce.tar.gz
Fix incorrect tag for Snippet IDs in tvsaver
Signed-off-by: Steve Winslow <steve@swinslow.net>
Diffstat (limited to 'tvsaver')
-rw-r--r--tvsaver/saver2v1/save_document_test.go4
-rw-r--r--tvsaver/saver2v1/save_file_test.go4
-rw-r--r--tvsaver/saver2v1/save_snippet.go2
-rw-r--r--tvsaver/saver2v1/save_snippet_test.go8
-rw-r--r--tvsaver/saver2v2/save_document_test.go4
-rw-r--r--tvsaver/saver2v2/save_file_test.go4
-rw-r--r--tvsaver/saver2v2/save_snippet.go2
-rw-r--r--tvsaver/saver2v2/save_snippet_test.go8
8 files changed, 18 insertions, 18 deletions
diff --git a/tvsaver/saver2v1/save_document_test.go b/tvsaver/saver2v1/save_document_test.go
index 980c6df..708eabf 100644
--- 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
index 9d6b09b..cdd6d25 100644
--- 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
index 645f7f5..e9e1a07 100644
--- 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
index 536545d..07c9e2a 100644
--- 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
index 8745db4..1970580 100644
--- 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
index 76ba839..f90a1bb 100644
--- 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
index a8ede6c..8423e53 100644
--- 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
index c4b16bd..b749c7d 100644
--- 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