replace all v2_1, v2_2 with new convention

Signed-off-by: Brandon Lum <lumjjb@gmail.com>

1 files changed, 37 insertions, 35 deletions

diff --git a/spdxlib/relationships_test.go b/spdxlib/relationships_test.go
index e710d6e..5772887 100644
--- a/spdxlib/relationships_test.go
+++ b/spdxlib/relationships_test.go
@@ -5,56 +5,58 @@ package spdxlib
 import (
 	"testing"
 
-	"github.com/spdx/tools-golang/spdx"
+	"github.com/spdx/tools-golang/spdx/common"
+	"github.com/spdx/tools-golang/spdx/v2_1"
+	"github.com/spdx/tools-golang/spdx/v2_2"
 )
 
 // ===== 2.1 tests =====
 
 func Test2_1FilterForDependencies(t *testing.T) {
 	// set up document and some packages and relationships
-	doc := &spdx.Document2_1{
+	doc := &v2_1.Document{
 		SPDXVersion:    "SPDX-2.1",
 		DataLicense:    "CC0-1.0",
-		SPDXIdentifier: spdx.ElementID("DOCUMENT"),
-		CreationInfo:   &spdx.CreationInfo2_1{},
-		Packages: []*spdx.Package2_1{
+		SPDXIdentifier: common.ElementID("DOCUMENT"),
+		CreationInfo:   &v2_1.CreationInfo{},
+		Packages: []*v2_1.Package{
 			{PackageName: "pkg1", PackageSPDXIdentifier: "p1"},
 			{PackageName: "pkg2", PackageSPDXIdentifier: "p2"},
 			{PackageName: "pkg3", PackageSPDXIdentifier: "p3"},
 			{PackageName: "pkg4", PackageSPDXIdentifier: "p4"},
 			{PackageName: "pkg5", PackageSPDXIdentifier: "p5"},
 		},
-		Relationships: []*spdx.Relationship2_1{
+		Relationships: []*v2_1.Relationship{
 			{
-				RefA:         spdx.MakeDocElementID("", "DOCUMENT"),
-				RefB:         spdx.MakeDocElementID("", "p1"),
+				RefA:         common.MakeDocElementID("", "DOCUMENT"),
+				RefB:         common.MakeDocElementID("", "p1"),
 				Relationship: "DESCRIBES",
 			},
 			{
-				RefA:         spdx.MakeDocElementID("", "DOCUMENT"),
-				RefB:         spdx.MakeDocElementID("", "p5"),
+				RefA:         common.MakeDocElementID("", "DOCUMENT"),
+				RefB:         common.MakeDocElementID("", "p5"),
 				Relationship: "DESCRIBES",
 			},
 			{
-				RefA:         spdx.MakeDocElementID("", "p4"),
-				RefB:         spdx.MakeDocElementID("", "DOCUMENT"),
+				RefA:         common.MakeDocElementID("", "p4"),
+				RefB:         common.MakeDocElementID("", "DOCUMENT"),
 				Relationship: "DESCRIBED_BY",
 			},
 			{
-				RefA:         spdx.MakeDocElementID("", "p1"),
-				RefB:         spdx.MakeDocElementID("", "p2"),
+				RefA:         common.MakeDocElementID("", "p1"),
+				RefB:         common.MakeDocElementID("", "p2"),
 				Relationship: "DEPENDS_ON",
 			},
 			{
-				RefA:         spdx.MakeDocElementID("", "p3"),
-				RefB:         spdx.MakeDocElementID("", "p4"),
+				RefA:         common.MakeDocElementID("", "p3"),
+				RefB:         common.MakeDocElementID("", "p4"),
 				Relationship: "DEPENDENCY_OF",
 			},
 		},
 	}
 
-	eIDs, err := FilterRelationships2_1(doc, func(relationship *spdx.Relationship2_1) *spdx.ElementID {
-		p1EID := spdx.MakeDocElementID("", "p1")
+	eIDs, err := FilterRelationships2_1(doc, func(relationship *v2_1.Relationship) *common.ElementID {
+		p1EID := common.MakeDocElementID("", "p1")
 		if relationship.Relationship == "DEPENDS_ON" && relationship.RefA == p1EID {
 			return &relationship.RefB.ElementRefID
 		} else if relationship.Relationship == "DEPENDENCY_OF" && relationship.RefB == p1EID {
@@ -71,7 +73,7 @@ func Test2_1FilterForDependencies(t *testing.T) {
 		t.Fatalf("expected 1 ElementID, got: %v", eIDs)
 	}
 
-	if eIDs[0] != spdx.MakeDocElementID("", "p2").ElementRefID {
+	if eIDs[0] != common.MakeDocElementID("", "p2").ElementRefID {
 		t.Fatalf("received unexpected relationship: %v", eIDs[0])
 	}
 }
@@ -80,46 +82,46 @@ func Test2_1FilterForDependencies(t *testing.T) {
 
 func Test2_2FindsDependsOnRelationships(t *testing.T) {
 	// set up document and some packages and relationships
-	doc := &spdx.Document2_2{
+	doc := &v2_2.Document{
 		SPDXVersion:    "SPDX-2.2",
 		DataLicense:    "CC0-1.0",
-		SPDXIdentifier: spdx.ElementID("DOCUMENT"),
-		CreationInfo:   &spdx.CreationInfo2_2{},
-		Packages: []*spdx.Package2_2{
+		SPDXIdentifier: common.ElementID("DOCUMENT"),
+		CreationInfo:   &v2_2.CreationInfo{},
+		Packages: []*v2_2.Package{
 			{PackageName: "pkg1", PackageSPDXIdentifier: "p1"},
 			{PackageName: "pkg2", PackageSPDXIdentifier: "p2"},
 			{PackageName: "pkg3", PackageSPDXIdentifier: "p3"},
 			{PackageName: "pkg4", PackageSPDXIdentifier: "p4"},
 			{PackageName: "pkg5", PackageSPDXIdentifier: "p5"},
 		},
-		Relationships: []*spdx.Relationship2_2{
+		Relationships: []*v2_2.Relationship{
 			{
-				RefA:         spdx.MakeDocElementID("", "DOCUMENT"),
-				RefB:         spdx.MakeDocElementID("", "p1"),
+				RefA:         common.MakeDocElementID("", "DOCUMENT"),
+				RefB:         common.MakeDocElementID("", "p1"),
 				Relationship: "DESCRIBES",
 			},
 			{
-				RefA:         spdx.MakeDocElementID("", "DOCUMENT"),
-				RefB:         spdx.MakeDocElementID("", "p5"),
+				RefA:         common.MakeDocElementID("", "DOCUMENT"),
+				RefB:         common.MakeDocElementID("", "p5"),
 				Relationship: "DESCRIBES",
 			},
 			// inverse relationship -- should also get detected
 			{
-				RefA:         spdx.MakeDocElementID("", "p4"),
-				RefB:         spdx.MakeDocElementID("", "DOCUMENT"),
+				RefA:         common.MakeDocElementID("", "p4"),
+				RefB:         common.MakeDocElementID("", "DOCUMENT"),
 				Relationship: "DESCRIBED_BY",
 			},
 			// different relationship
 			{
-				RefA:         spdx.MakeDocElementID("", "p1"),
-				RefB:         spdx.MakeDocElementID("", "p2"),
+				RefA:         common.MakeDocElementID("", "p1"),
+				RefB:         common.MakeDocElementID("", "p2"),
 				Relationship: "DEPENDS_ON",
 			},
 		},
 	}
 
-	eIDs, err := FilterRelationships2_2(doc, func(relationship *spdx.Relationship2_2) *spdx.ElementID {
-		p1EID := spdx.MakeDocElementID("", "p1")
+	eIDs, err := FilterRelationships2_2(doc, func(relationship *v2_2.Relationship) *common.ElementID {
+		p1EID := common.MakeDocElementID("", "p1")
 		if relationship.Relationship == "DEPENDS_ON" && relationship.RefA == p1EID {
 			return &relationship.RefB.ElementRefID
 		} else if relationship.Relationship == "DEPENDENCY_OF" && relationship.RefB == p1EID {
@@ -136,7 +138,7 @@ func Test2_2FindsDependsOnRelationships(t *testing.T) {
 		t.Fatalf("expected 1 ElementID, got: %v", eIDs)
 	}
 
-	if eIDs[0] != spdx.MakeDocElementID("", "p2").ElementRefID {
+	if eIDs[0] != common.MakeDocElementID("", "p2").ElementRefID {
 		t.Fatalf("received unexpected relationship: %v", eIDs[0])
 	}
 }