fix static tests

Author: attiasas

tests/validations/test_validate_cyclonedx.go

@@ -38,10 +38,10 @@ func ValidateCommandCycloneDxOutput(t *testing.T, params ValidationParams) {
 func GetCycloneDxActualValues(t *testing.T, content string) (actualValues ValidationCountActualValues) {
 	var results *cdxutils.FullBOM
 	assert.NoError(t, json.Unmarshal([]byte(content), &results), "Failed to unmarshal content to json.")
-	return toActualValuesCycloneDx(t, results)
+	return toActualValuesCycloneDx(results)
 }
 
-func toActualValuesCycloneDx(t *testing.T, content *cdxutils.FullBOM) (actualValues ValidationCountActualValues) {
+func toActualValuesCycloneDx(content *cdxutils.FullBOM) (actualValues ValidationCountActualValues) {
 	actualValues.SbomComponents, actualValues.RootComponents, actualValues.DirectComponents, actualValues.TransitiveComponents, actualValues.Licenses = countSbomComponents(&content.BOM)
 	actualValues.ScaVulnerabilities, actualValues.ApplicableVulnerabilities, actualValues.UndeterminedVulnerabilities, actualValues.NotCoveredVulnerabilities, actualValues.NotApplicableVulnerabilities, actualValues.MissingContextVulnerabilities = countScaVulnerabilities(&content.BOM)
 	actualValues.SastVulnerabilities, actualValues.SecretsVulnerabilities, actualValues.IacVulnerabilities, actualValues.InactiveSecretsVulnerabilities = countJasVulnerabilities(content)
@@ -50,7 +50,7 @@ func toActualValuesCycloneDx(t *testing.T, content *cdxutils.FullBOM) (actualVal
 }
 
 func ValidateCycloneDxIssuesCount(t *testing.T, params ValidationParams, content *cdxutils.FullBOM) {
-	ValidateCount(t, "cyclonedx BOM", params, toActualValuesCycloneDx(t, content))
+	ValidateCount(t, "cyclonedx BOM", params, toActualValuesCycloneDx(content))
 }
 
 func countSbomComponents(content *cyclonedx.BOM) (sbomComponents, rootComponents, directComponents, transitiveComponents, licenses int) {

tests/validations/test_validate_sarif.go

@@ -43,10 +43,10 @@ func ValidateCommandSarifOutput(t *testing.T, params ValidationParams) {
 func GetSarifActualValues(t *testing.T, content string) (actualValues ValidationCountActualValues) {
 	results, err := sarif.FromString(content)
 	assert.NoError(t, err, "Failed to unmarshal content to sarif report.")
-	return toActualValuesSarif(t, results)
+	return toActualValuesSarif(results)
 }
 
-func toActualValuesSarif(t *testing.T, content *sarif.Report) (actualValues ValidationCountActualValues) {
+func toActualValuesSarif(content *sarif.Report) (actualValues ValidationCountActualValues) {
 	// SCA
 	actualValues.ScaVulnerabilities, actualValues.ApplicableVulnerabilities, actualValues.UndeterminedVulnerabilities, actualValues.NotCoveredVulnerabilities, actualValues.NotApplicableVulnerabilities, actualValues.MissingContextVulnerabilities, actualValues.ScaViolations, actualValues.SecurityViolations, actualValues.LicenseViolations, actualValues.ApplicableViolations, actualValues.UndeterminedViolations, actualValues.NotCoveredViolations, actualValues.NotApplicableViolations, actualValues.MissingContextViolations = countScaResults(content)
 	actualValues.Vulnerabilities += actualValues.ScaVulnerabilities
@@ -78,7 +78,7 @@ func toActualValuesSarif(t *testing.T, content *sarif.Report) (actualValues Vali
 // If Expected is provided, the validation will check if the Actual content matches the expected results.
 // If ExactResultsMatch is true, the validation will check exact values and not only the 'equal or grater' counts / existence of expected attributes. (For Integration tests with JFrog API, ExactResultsMatch should be set to false)
 func ValidateSarifIssuesCount(t *testing.T, params ValidationParams, report *sarif.Report) {
-	actualValues := toActualValuesSarif(t, report)
+	actualValues := toActualValuesSarif(report)
 	if params.Total != nil {
 		// Not supported in the summary output
 		params.Total.Licenses = 0

tests/validations/test_validate_simple_json.go

@@ -42,10 +42,10 @@ func ValidateCommandSimpleJsonOutput(t *testing.T, params ValidationParams) {
 func GetSimpleJsonActualValues(t *testing.T, content string) (actualValues ValidationCountActualValues) {
 	var results formats.SimpleJsonResults
 	assert.NoError(t, json.Unmarshal([]byte(content), &results), "Failed to unmarshal content to formats.SimpleJsonResults")
-	return toActualValuesSimpleJson(t, results)
+	return toActualValuesSimpleJson(results)
 }
 
-func toActualValuesSimpleJson(t *testing.T, results formats.SimpleJsonResults) (actualValues ValidationCountActualValues) {
+func toActualValuesSimpleJson(results formats.SimpleJsonResults) (actualValues ValidationCountActualValues) {
 	actualValues = ValidationCountActualValues{
 		// Total
 		Vulnerabilities: len(results.Vulnerabilities) + len(results.SecretsVulnerabilities) + len(results.SastVulnerabilities) + len(results.IacsVulnerabilities),
@@ -119,7 +119,7 @@ func toActualValuesSimpleJson(t *testing.T, results formats.SimpleJsonResults) (
 // If Expected is provided, the validation will check if the Actual content matches the expected results.
 // If ExactResultsMatch is true, the validation will check exact values and not only the 'equal or grater' counts / existence of expected attributes. (For Integration tests with JFrog API, ExactResultsMatch should be set to false)
 func ValidateSimpleJsonIssuesCount(t *testing.T, params ValidationParams, results formats.SimpleJsonResults) {
-	ValidateCount(t, "simple-json", params, toActualValuesSimpleJson(t, results))
+	ValidateCount(t, "simple-json", params, toActualValuesSimpleJson(results))
 }
 
 func ValidateSimpleJsonResults(t *testing.T, exactMatch bool, expected, actual formats.SimpleJsonResults) {

tests/validations/test_validate_summary.go

@@ -23,10 +23,10 @@ func ValidateCommandSummaryOutput(t *testing.T, params ValidationParams) {
 func GetSummaryActualValues(t *testing.T, content string) (actualValues ValidationCountActualValues) {
 	var results formats.ResultsSummary
 	assert.NoError(t, json.Unmarshal([]byte(content), &results), "Failed to unmarshal content to formats.ResultsSummary.")
-	return toActualValuesSummary(t, results)
+	return toActualValuesSummary(results)
 }
 
-func toActualValuesSummary(t *testing.T, results formats.ResultsSummary) (actualValues ValidationCountActualValues) {
+func toActualValuesSummary(results formats.ResultsSummary) (actualValues ValidationCountActualValues) {
 	actualValues = ValidationCountActualValues{
 		// Total
 		Vulnerabilities: results.GetTotalVulnerabilities(),
@@ -113,7 +113,7 @@ func toActualValuesSummary(t *testing.T, results formats.ResultsSummary) (actual
 }
 
 func ValidateSummaryIssuesCount(t *testing.T, params ValidationParams, results formats.ResultsSummary) {
-	actualValues := toActualValuesSummary(t, results)
+	actualValues := toActualValuesSummary(results)
 	if params.Total != nil {
 		// Not supported in the summary output
 		params.Total.Licenses = 0