Improve Audit result table views

Signed-off-by: Michael Sverdlov <[email protected]>

xray/audit/go/gloang_test.go

@@ -43,7 +43,7 @@ func TestBuildGoDependencyList(t *testing.T) {
 	}
 	rootNode, uniqueDeps, err := BuildDependencyTree(server, "test-remote")
 	assert.NoError(t, err)
-	assert.ElementsMatch(t, uniqueDeps, expectedUniqueDeps)
+	assert.ElementsMatch(t, uniqueDeps, expectedUniqueDeps, "First is actual, Second is Expected")
 
 	assert.Equal(t, "https://user:[email protected]/artifactoryapi/go/test-remote|direct", os.Getenv("GOPROXY"))
 	assert.NotEmpty(t, rootNode)

xray/audit/java/gradle_test.go

@@ -96,10 +96,10 @@ func TestGradleTreesExcludeTestDeps(t *testing.T) {
 	// Run getModulesDependencyTrees
 	modulesDependencyTrees, uniqueDeps, err := buildGradleDependencyTree(&DependencyTreeParams{UseWrapper: true})
 	if assert.NoError(t, err) && assert.NotNil(t, modulesDependencyTrees) {
-		assert.Len(t, modulesDependencyTrees, 3)
+		assert.Len(t, modulesDependencyTrees, 2)
 		assert.Len(t, uniqueDeps, 11)
 		// Check direct dependency
-		directDependency := audit.GetAndAssertNode(t, modulesDependencyTrees, "services")
+		directDependency := audit.GetAndAssertNode(t, modulesDependencyTrees, "api")
 		assert.Empty(t, directDependency.Nodes)
 	}
 }
@@ -178,9 +178,9 @@ func TestGetGraphFromDepTree(t *testing.T) {
 	}()
 	assert.NoError(t, os.Chmod(filepath.Join(tempDirPath, "gradlew"), 0700))
 	testCase := struct {
-		name           string
-		expectedTree   map[string]map[string]string
-		expectedUnique []string
+		name               string
+		expectedTree       map[string]map[string]string
+		expectedUniqueDeps []string
 	}{
 		name: "ValidOutputFileContent",
 		expectedTree: map[string]map[string]string{
@@ -202,7 +202,7 @@ func TestGetGraphFromDepTree(t *testing.T) {
 				GavPackageTypeIdentifier + "commons-lang:commons-lang:2.4":       "",
 			},
 		},
-		expectedUnique: []string{
+		expectedUniqueDeps: []string{
 			GavPackageTypeIdentifier + "webservice",
 			GavPackageTypeIdentifier + "junit:junit:4.11",
 			GavPackageTypeIdentifier + "commons-io:commons-io:1.2",
@@ -222,7 +222,7 @@ func TestGetGraphFromDepTree(t *testing.T) {
 	assert.NoError(t, err)
 	depTree, uniqueDeps, err := (&depTreeManager{}).getGraphFromDepTree(outputFileContent)
 	assert.NoError(t, err)
-	assert.ElementsMatch(t, uniqueDeps, testCase.expectedUnique)
+	assert.ElementsMatch(t, uniqueDeps, testCase.expectedUniqueDeps, "First is actual, Second is Expected")
 
 	for _, dependency := range depTree {
 		depChild, exists := testCase.expectedTree[dependency.Id]

xray/audit/java/mvn_test.go

@@ -31,7 +31,7 @@ func TestMavenTreesMultiModule(t *testing.T) {
 	// Run getModulesDependencyTrees
 	modulesDependencyTrees, uniqueDeps, err := buildMvnDependencyTree(&DependencyTreeParams{IgnoreConfigFile: true})
 	if assert.NoError(t, err) && assert.NotEmpty(t, modulesDependencyTrees) {
-		assert.ElementsMatch(t, uniqueDeps, expectedUniqueDeps)
+		assert.ElementsMatch(t, uniqueDeps, expectedUniqueDeps, "First is actual, Second is Expected")
 		// Check root module
 		multi := audit.GetAndAssertNode(t, modulesDependencyTrees, "org.jfrog.test:multi:3.7-SNAPSHOT")
 		if assert.NotNil(t, multi) {
@@ -81,7 +81,7 @@ func TestMavenWrapperTrees(t *testing.T) {
 
 	modulesDependencyTrees, uniqueDeps, err := buildMvnDependencyTree(&DependencyTreeParams{IgnoreConfigFile: true, UseWrapper: true})
 	if assert.NoError(t, err) && assert.NotEmpty(t, modulesDependencyTrees) {
-		assert.ElementsMatch(t, uniqueDeps, expectedUniqueDeps)
+		assert.ElementsMatch(t, uniqueDeps, expectedUniqueDeps, "First is actual, Second is Expected")
 		// Check root module
 		multi := audit.GetAndAssertNode(t, modulesDependencyTrees, "org.jfrog.test:multi:3.7-SNAPSHOT")
 		if assert.NotNil(t, multi) {

xray/audit/npm/npm_test.go

@@ -105,7 +105,7 @@ func TestParseNpmDependenciesList(t *testing.T) {
 	for _, dep := range dependencies {
 		expectedUniqueDeps = append(expectedUniqueDeps, npmPackageTypeIdentifier+dep.Id)
 	}
-	assert.ElementsMatch(t, uniqueDeps, expectedUniqueDeps)
+	assert.ElementsMatch(t, uniqueDeps, expectedUniqueDeps, "First is actual, Second is Expected")
 
 }
 

xray/audit/nuget/nuget_test.go

@@ -35,7 +35,7 @@ func TestBuildNugetDependencyTree(t *testing.T) {
 		nugetPackageTypeIdentifier + "MsbuildLibrary",
 	}
 	xrayDependenciesTree, uniqueDeps := parseNugetDependencyTree(dependencies)
-	assert.ElementsMatch(t, uniqueDeps, expectedUniqueDeps)
+	assert.ElementsMatch(t, uniqueDeps, expectedUniqueDeps, "First is actual, Second is Expected")
 	expectedTreeJson, err := os.ReadFile("expectedTree.json")
 	assert.NoError(t, err)
 

xray/audit/python/python_test.go

@@ -89,7 +89,7 @@ func TestBuildPipenvDependencyList(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	assert.ElementsMatch(t, uniqueDeps, expectedPipenvUniqueDeps)
+	assert.ElementsMatch(t, uniqueDeps, expectedPipenvUniqueDeps, "First is actual, Second is Expected")
 	assert.Len(t, rootNode, 1)
 	if len(rootNode) > 0 {
 		assert.NotEmpty(t, rootNode[0].Nodes)
@@ -124,7 +124,7 @@ func TestBuildPoetryDependencyList(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	assert.ElementsMatch(t, uniqueDeps, expectedPoetryUniqueDeps)
+	assert.ElementsMatch(t, uniqueDeps, expectedPoetryUniqueDeps, "First is actual, Second is Expected")
 	assert.Len(t, rootNode, 1)
 	if len(rootNode) > 0 {
 		assert.NotEmpty(t, rootNode[0].Nodes)

xray/audit/yarn/yarn_test.go

@@ -45,6 +45,6 @@ func TestParseYarnDependenciesList(t *testing.T) {
 	}
 
 	xrayDependenciesTree, uniqueDeps := parseYarnDependenciesMap(yarnDependencies, rootXrayId)
-	assert.ElementsMatch(t, uniqueDeps, expectedUniqueDeps)
+	assert.ElementsMatch(t, uniqueDeps, expectedUniqueDeps, "First is actual, Second is Expected")
 	assert.True(t, tests.CompareTree(expectedTree, xrayDependenciesTree), "expected:", expectedTree.Nodes, "got:", xrayDependenciesTree.Nodes)
 }