diff options
| author | Brandon Lum <lumjjb@gmail.com> | 2022-07-19 16:43:48 -0400 |
|---|---|---|
| committer | Brandon Lum <lumjjb@gmail.com> | 2022-07-19 22:43:24 -0400 |
| commit | 9ae1bd2f8e0dabb0845f1225b54f23e8f3a429f1 (patch) | |
| tree | a43213aadfb9bde3d9ec15634a39305f19ff38b2 /tvsaver/saver2v2/save_snippet_test.go | |
| parent | 41d2272711255f5a25e16e3507ec3318bc550189 (diff) | |
| download | spdx-tools-9ae1bd2f8e0dabb0845f1225b54f23e8f3a429f1.tar.gz | |
replace all v2_1, v2_2 with new convention
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
Diffstat (limited to 'tvsaver/saver2v2/save_snippet_test.go')
| -rw-r--r-- | tvsaver/saver2v2/save_snippet_test.go | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/tvsaver/saver2v2/save_snippet_test.go b/tvsaver/saver2v2/save_snippet_test.go index da91b99..72daf15 100644 --- a/tvsaver/saver2v2/save_snippet_test.go +++ b/tvsaver/saver2v2/save_snippet_test.go @@ -6,22 +6,23 @@ import ( "bytes" "testing" - "github.com/spdx/tools-golang/spdx" + "github.com/spdx/tools-golang/spdx/common" + "github.com/spdx/tools-golang/spdx/v2_2" ) // ===== Snippet section Saver tests ===== func TestSaver2_2SnippetSavesText(t *testing.T) { - sn := &spdx.Snippet2_2{ - SnippetSPDXIdentifier: spdx.ElementID("Snippet17"), - SnippetFromFileSPDXIdentifier: spdx.MakeDocElementID("", "File292").ElementRefID, - Ranges: []spdx.SnippetRange{ + sn := &v2_2.Snippet{ + SnippetSPDXIdentifier: common.ElementID("Snippet17"), + SnippetFromFileSPDXIdentifier: common.MakeDocElementID("", "File292").ElementRefID, + Ranges: []common.SnippetRange{ { - StartPointer: spdx.SnippetRangePointer{LineNumber: 3}, - EndPointer: spdx.SnippetRangePointer{LineNumber: 8}, + StartPointer: common.SnippetRangePointer{LineNumber: 3}, + EndPointer: common.SnippetRangePointer{LineNumber: 8}, }, { - StartPointer: spdx.SnippetRangePointer{Offset: 17}, - EndPointer: spdx.SnippetRangePointer{Offset: 209}, + StartPointer: common.SnippetRangePointer{Offset: 17}, + EndPointer: common.SnippetRangePointer{Offset: 209}, }, }, SnippetLicenseConcluded: "GPL-2.0-or-later", @@ -67,13 +68,13 @@ SnippetAttributionText: some attributions } func TestSaver2_2SnippetOmitsOptionalFieldsIfEmpty(t *testing.T) { - sn := &spdx.Snippet2_2{ - SnippetSPDXIdentifier: spdx.ElementID("Snippet17"), - SnippetFromFileSPDXIdentifier: spdx.MakeDocElementID("", "File292").ElementRefID, - Ranges: []spdx.SnippetRange{ + sn := &v2_2.Snippet{ + SnippetSPDXIdentifier: common.ElementID("Snippet17"), + SnippetFromFileSPDXIdentifier: common.MakeDocElementID("", "File292").ElementRefID, + Ranges: []common.SnippetRange{ { - StartPointer: spdx.SnippetRangePointer{Offset: 17}, - EndPointer: spdx.SnippetRangePointer{Offset: 209}, + StartPointer: common.SnippetRangePointer{Offset: 17}, + EndPointer: common.SnippetRangePointer{Offset: 209}, }, }, SnippetLicenseConcluded: "GPL-2.0-or-later", @@ -104,13 +105,13 @@ SnippetCopyrightText: Copyright (c) John Doe 20x6 } func TestSaver2_2SnippetWrapsCopyrightMultiline(t *testing.T) { - sn := &spdx.Snippet2_2{ - SnippetSPDXIdentifier: spdx.ElementID("Snippet17"), - SnippetFromFileSPDXIdentifier: spdx.MakeDocElementID("", "File292").ElementRefID, - Ranges: []spdx.SnippetRange{ + sn := &v2_2.Snippet{ + SnippetSPDXIdentifier: common.ElementID("Snippet17"), + SnippetFromFileSPDXIdentifier: common.MakeDocElementID("", "File292").ElementRefID, + Ranges: []common.SnippetRange{ { - StartPointer: spdx.SnippetRangePointer{Offset: 17}, - EndPointer: spdx.SnippetRangePointer{Offset: 209}, + StartPointer: common.SnippetRangePointer{Offset: 17}, + EndPointer: common.SnippetRangePointer{Offset: 209}, }, }, SnippetLicenseConcluded: "GPL-2.0-or-later", |