From 1c7eb4daa895a799d433fbe2c50f9f420c360bce Mon Sep 17 00:00:00 2001 From: Steve Winslow Date: Sat, 31 Jul 2021 16:13:45 -0400 Subject: Fix incorrect tag for Snippet IDs in tvsaver Signed-off-by: Steve Winslow --- tvsaver/saver2v2/save_document_test.go | 4 ++-- tvsaver/saver2v2/save_file_test.go | 4 ++-- tvsaver/saver2v2/save_snippet.go | 2 +- tvsaver/saver2v2/save_snippet_test.go | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'tvsaver/saver2v2') 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 -- cgit v1.2.3