Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix incorrect tag for Snippet IDs in tvsaver #95

Merged
merged 1 commit into from Jul 31, 2021
Merged

Fix incorrect tag for Snippet IDs in tvsaver #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions tvsaver/saver2v1/save_document_test.go
View file
Open in desktop
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tvsaver/saver2v1/save_file_test.go
View file
Open in desktop
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tvsaver/saver2v1/save_snippet.go
View file
Open in desktop
Expand Up @@ -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 != "" {
Expand Down
8 changes: 4 additions & 4 deletions tvsaver/saver2v1/save_snippet_test.go
View file
Open in desktop
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tvsaver/saver2v2/save_document_test.go
View file
Open in desktop
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tvsaver/saver2v2/save_file_test.go
View file
Open in desktop
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tvsaver/saver2v2/save_snippet.go
View file
Open in desktop
Expand Up @@ -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 != "" {
Expand Down
8 changes: 4 additions & 4 deletions tvsaver/saver2v2/save_snippet_test.go
View file
Open in desktop
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down