fix tests

commands/audit/audit_test.go

@@ -1,6 +1,10 @@
 package audit
 
 import (
+	"path/filepath"
+	"strings"
+	"testing"
+
 	biutils "github.com/jfrog/build-info-go/utils"
 	"github.com/jfrog/jfrog-cli-core/v2/common/format"
 	coreTests "github.com/jfrog/jfrog-cli-core/v2/utils/tests"
@@ -10,9 +14,6 @@ import (
 	scanservices "github.com/jfrog/jfrog-client-go/xray/services"
 	"github.com/jfrog/jfrog-client-go/xsc/services"
 	"github.com/stretchr/testify/assert"
-	"path/filepath"
-	"strings"
-	"testing"
 )
 
 // Note: Currently, if a config profile is provided, the scan will use the profile's settings, IGNORING jfrog-apps-config if exists.
@@ -181,16 +182,24 @@ func TestAuditWithScansOutputDir(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Len(t, filesList, 5)
 
-	var fileNamesWithoutSuffix []string
-	for _, fileName := range filesList {
-		// Removing <hash>.json suffix to so we can check by suffix all expected files exist
-		splitName := strings.Split(fileName, "_")
-		fileNamesWithoutSuffix = append(fileNamesWithoutSuffix, splitName[0])
-	}
+	searchForStrWithSubString(t, filesList, "sca_results")
+	searchForStrWithSubString(t, filesList, "iac_results")
+	searchForStrWithSubString(t, filesList, "sast_results")
+	searchForStrWithSubString(t, filesList, "secrets_results")
+	searchForStrWithSubString(t, filesList, "applicability_results")
+
+	// assert.Contains(t, filesList, "sca_results")
+	// assert.Contains(t, filesList, "iac_results")
+	// assert.Contains(t, filesList, "sast_results")
+	// assert.Contains(t, filesList, "secrets_results")
+	// assert.Contains(t, filesList, "applicability_results")
+}
 
-	assert.Contains(t, fileNamesWithoutSuffix, filepath.Join(outputDirPath, "sca"))
-	assert.Contains(t, fileNamesWithoutSuffix, filepath.Join(outputDirPath, "iac"))
-	assert.Contains(t, fileNamesWithoutSuffix, filepath.Join(outputDirPath, "sast"))
-	assert.Contains(t, fileNamesWithoutSuffix, filepath.Join(outputDirPath, "secrets"))
-	assert.Contains(t, fileNamesWithoutSuffix, filepath.Join(outputDirPath, "applicability"))
+func searchForStrWithSubString(t *testing.T, filesList []string, subString string) {
+	for _, file := range filesList {
+		if strings.Contains(file, subString) {
+			return
+		}
+	}
+	assert.Fail(t, "File %s not found in the list", subString)
 }