fix some more tests

attiasas · attiasas · commit c40a287e488e · 2024-11-28T17:09:50.000+02:00
diff --git a/audit_test.go b/audit_test.go
@@ -40,17 +40,17 @@ import (
 func TestXrayAuditNpmJson(t *testing.T) {
 	output := testAuditNpm(t, string(format.Json), false)
 	validations.VerifyJsonResults(t, output, validations.ValidationParams{
-		SecurityViolations: 1,
-		Licenses:           1,
+		ScaSecurityViolations: 1,
+		Licenses:              1,
 	})
 }
 
 func TestXrayAuditNpmSimpleJson(t *testing.T) {
 	output := testAuditNpm(t, string(format.SimpleJson), true)
 	validations.VerifySimpleJsonResults(t, output, validations.ValidationParams{
-		SecurityViolations: 1,
-		Vulnerabilities:    1,
-		Licenses:           1,
+		ScaSecurityViolations: 1,
+		Vulnerabilities:       1,
+		Licenses:              1,
 	})
 }
 
diff --git a/scans_test.go b/scans_test.go
@@ -52,9 +52,9 @@ func TestXrayBinaryScanJson(t *testing.T) {
 func TestXrayBinaryScanSimpleJson(t *testing.T) {
 	output := testXrayBinaryScan(t, string(format.SimpleJson), true)
 	validations.VerifySimpleJsonResults(t, output, validations.ValidationParams{
-		Vulnerabilities:    1,
-		SecurityViolations: 1,
-		Licenses:           1,
+		Vulnerabilities:       1,
+		ScaSecurityViolations: 1,
+		Licenses:              1,
 	})
 }
 
@@ -73,9 +73,9 @@ func TestXrayBinaryScanSimpleJsonWithProgress(t *testing.T) {
 	defer callback()
 	output := testXrayBinaryScan(t, string(format.SimpleJson), true)
 	validations.VerifySimpleJsonResults(t, output, validations.ValidationParams{
-		Vulnerabilities:    1,
-		SecurityViolations: 1,
-		Licenses:           1,
+		Vulnerabilities:       1,
+		ScaSecurityViolations: 1,
+		Licenses:              1,
 	})
 }
 
@@ -181,7 +181,7 @@ func runDockerScan(t *testing.T, testCli *coreTests.JfrogCli, imageName, watchNa
 		cmdArgs = append(cmdArgs, "--watches="+watchName)
 		output = testCli.WithoutCredentials().RunCliCmdWithOutput(t, cmdArgs...)
 		if assert.NotEmpty(t, output) {
-			validations.VerifyJsonResults(t, output, validations.ValidationParams{SecurityViolations: minViolations})
+			validations.VerifyJsonResults(t, output, validations.ValidationParams{ScaSecurityViolations: minViolations})
 		}
 	}
 }
diff --git a/tests/testdata/output/audit/audit_results.json b/tests/testdata/output/audit/audit_results.json
diff --git a/tests/testdata/output/audit/audit_simple_json.json b/tests/testdata/output/audit/audit_simple_json.json
diff --git a/tests/testdata/output/dockerscan/docker_results.json b/tests/testdata/output/dockerscan/docker_results.json
diff --git a/tests/testdata/output/dockerscan/docker_summary.json b/tests/testdata/output/dockerscan/docker_summary.json
@@ -32,10 +32,23 @@
           "sast": {}
         },
         "violations": {
+          "watches": [
+            "Security_watch_2"
+          ],
           "sca": {
             "scan_ids": [
               "27da9106-88ea-416b-799b-bc7d15783473"
-            ]
+            ],
+            "security": {
+              "Critical": {
+                "Undetermined": 1
+              }
+            }
+          },
+          "secrets": {
+            "Medium": {
+              "": 2
+            }
           }
         }
       }
diff --git a/utils/results/conversion/convertor_test.go b/utils/results/conversion/convertor_test.go
@@ -39,13 +39,12 @@ func getAuditValidationParams() validations.ValidationParams {
 		SastVulnerabilities:          4,
 		SecretsVulnerabilities:       3,
 
-		Violations:              18,
-		SecurityViolations:      11,
+		Violations:              7,
+		ScaSecurityViolations:   5,
 		ApplicableViolations:    1,
-		NotApplicableViolations: 7,
-		NotCoveredViolations:    3,
-		SastViolations:          4,
-		SecretsViolations:       3,
+		NotApplicableViolations: 4,
+		SastViolations:          1,
+		SecretsViolations:       1,
 	}
 }
 
@@ -55,6 +54,11 @@ func getDockerScanValidationParams(unique bool) validations.ValidationParams {
 	params := validations.ValidationParams{
 		ExactResultsMatch:      true,
 		SecretsVulnerabilities: 3,
+
+		Violations:             3,
+		ScaSecurityViolations:  1,
+		UndeterminedViolations: 1,
+		SecretsViolations:      2,
 	}
 	if unique {
 		params.Vulnerabilities = 11
diff --git a/utils/validations/test_validate_sarif.go b/utils/validations/test_validate_sarif.go
@@ -68,7 +68,7 @@ func ValidateSarifIssuesCount(t *testing.T, params ValidationParams, report *sar
 	ValidateContent(t, params.ExactResultsMatch,
 		// Total
 		CountValidation[int]{Expected: params.Vulnerabilities, Actual: vulnerabilities, Msg: GetValidationCountErrMsg("vulnerabilities", "sarif report", params.ExactResultsMatch, params.Vulnerabilities, vulnerabilities)},
-		CountValidation[int]{Expected: params.SecurityViolations, Actual: violations, Msg: GetValidationCountErrMsg("violations", "sarif report", params.ExactResultsMatch, params.SecurityViolations, violations)},
+		CountValidation[int]{Expected: params.ScaSecurityViolations, Actual: violations, Msg: GetValidationCountErrMsg("violations", "sarif report", params.ExactResultsMatch, params.ScaSecurityViolations, violations)},
 		// JAS Vulnerabilities
 		CountValidation[int]{Expected: params.SastVulnerabilities, Actual: sastVulnerabilities, Msg: GetValidationCountErrMsg("sast vulnerabilities", "sarif report", params.ExactResultsMatch, params.SastVulnerabilities, sastVulnerabilities)},
 		CountValidation[int]{Expected: params.IacVulnerabilities, Actual: iacVulnerabilities, Msg: GetValidationCountErrMsg("Iac vulnerabilities", "sarif report", params.ExactResultsMatch, params.IacVulnerabilities, iacVulnerabilities)},
@@ -91,7 +91,7 @@ func ValidateSarifIssuesCount(t *testing.T, params ValidationParams, report *sar
 		CountValidation[int]{Expected: params.NotCoveredViolations, Actual: notCoveredViolationsResults, Msg: GetValidationCountErrMsg("not covered violations", "sarif report", params.ExactResultsMatch, params.NotCoveredViolations, notCoveredViolationsResults)},
 		CountValidation[int]{Expected: params.NotApplicableViolations, Actual: notApplicableViolationsResults, Msg: GetValidationCountErrMsg("not applicable violations", "sarif report", params.ExactResultsMatch, params.NotApplicableViolations, notApplicableViolationsResults)},
 		CountValidation[int]{Expected: params.MissingContextViolations, Actual: missingContextViolationsResults, Msg: GetValidationCountErrMsg("missing context violations", "sarif report", params.ExactResultsMatch, params.MissingContextViolations, missingContextViolationsResults)},
-		CountValidation[int]{Expected: params.SecurityViolations, Actual: securityViolations, Msg: GetValidationCountErrMsg("security violations", "sarif report", params.ExactResultsMatch, params.SecurityViolations, securityViolations)},
+		CountValidation[int]{Expected: params.ScaSecurityViolations, Actual: securityViolations, Msg: GetValidationCountErrMsg("security violations", "sarif report", params.ExactResultsMatch, params.ScaSecurityViolations, securityViolations)},
 		CountValidation[int]{Expected: params.LicenseViolations, Actual: licenseViolations, Msg: GetValidationCountErrMsg("license violations", "sarif report", params.ExactResultsMatch, params.LicenseViolations, licenseViolations)},
 	)
 }
diff --git a/utils/validations/test_validate_sca.go b/utils/validations/test_validate_sca.go
@@ -58,7 +58,7 @@ func ValidateScanResponseIssuesCount(t *testing.T, params ValidationParams, cont
 	ValidateContent(t, params.ExactResultsMatch,
 		CountValidation[int]{Expected: params.Vulnerabilities, Actual: vulnerabilities, Msg: GetValidationCountErrMsg("vulnerabilities", "scan responses", params.ExactResultsMatch, params.Vulnerabilities, vulnerabilities)},
 		CountValidation[int]{Expected: params.Licenses, Actual: licenses, Msg: GetValidationCountErrMsg("licenses", "scan responses", params.ExactResultsMatch, params.Licenses, licenses)},
-		CountValidation[int]{Expected: params.SecurityViolations, Actual: securityViolations, Msg: GetValidationCountErrMsg("security violations", "scan responses", params.ExactResultsMatch, params.SecurityViolations, securityViolations)},
+		CountValidation[int]{Expected: params.ScaSecurityViolations, Actual: securityViolations, Msg: GetValidationCountErrMsg("security violations", "scan responses", params.ExactResultsMatch, params.ScaSecurityViolations, securityViolations)},
 		CountValidation[int]{Expected: params.LicenseViolations, Actual: licenseViolations, Msg: GetValidationCountErrMsg("license violations", "scan responses", params.ExactResultsMatch, params.LicenseViolations, licenseViolations)},
 		CountValidation[int]{Expected: params.OperationalViolations, Actual: operationalViolations, Msg: GetValidationCountErrMsg("operational risk violations", "scan responses", params.ExactResultsMatch, params.OperationalViolations, operationalViolations)},
 	)
diff --git a/utils/validations/test_validate_simple_json.go b/utils/validations/test_validate_simple_json.go
@@ -133,7 +133,7 @@ func ValidateSimpleJsonIssuesCount(t *testing.T, params ValidationParams, result
 		CountValidation[int]{Expected: params.NotCoveredViolations, Actual: notCoveredViolationsResults, Msg: GetValidationCountErrMsg("not covered violations", "simple-json", params.ExactResultsMatch, params.NotCoveredViolations, notCoveredViolationsResults)},
 		CountValidation[int]{Expected: params.NotApplicableViolations, Actual: notApplicableViolationsResults, Msg: GetValidationCountErrMsg("not applicable violations", "simple-json", params.ExactResultsMatch, params.NotApplicableViolations, notApplicableViolationsResults)},
 		CountValidation[int]{Expected: params.MissingContextViolations, Actual: missingContextViolationsResults, Msg: GetValidationCountErrMsg("missing context violations", "simple-json", params.ExactResultsMatch, params.MissingContextViolations, missingContextViolationsResults)},
-		CountValidation[int]{Expected: params.SecurityViolations, Actual: securityViolations, Msg: GetValidationCountErrMsg("security violations", "simple-json", params.ExactResultsMatch, params.SecurityViolations, securityViolations)},
+		CountValidation[int]{Expected: params.ScaSecurityViolations, Actual: securityViolations, Msg: GetValidationCountErrMsg("security violations", "simple-json", params.ExactResultsMatch, params.ScaSecurityViolations, securityViolations)},
 		CountValidation[int]{Expected: params.LicenseViolations, Actual: licenseViolations, Msg: GetValidationCountErrMsg("license violations", "simple-json", params.ExactResultsMatch, params.LicenseViolations, licenseViolations)},
 		CountValidation[int]{Expected: params.OperationalViolations, Actual: opRiskViolations, Msg: GetValidationCountErrMsg("operational risk violations", "simple-json", params.ExactResultsMatch, params.OperationalViolations, opRiskViolations)},
 	)
diff --git a/utils/validations/test_validate_summary.go b/utils/validations/test_validate_summary.go
@@ -104,7 +104,7 @@ func ValidateSummaryIssuesCount(t *testing.T, params ValidationParams, results f
 		CountValidation[int]{Expected: params.NotCoveredViolations, Actual: notCoveredViolationsResults, Msg: GetValidationCountErrMsg("not covered violations", "summary", params.ExactResultsMatch, params.NotCoveredViolations, notCoveredViolationsResults)},
 		CountValidation[int]{Expected: params.NotApplicableViolations, Actual: notApplicableViolationsResults, Msg: GetValidationCountErrMsg("not applicable violations", "summary", params.ExactResultsMatch, params.NotApplicableViolations, notApplicableViolationsResults)},
 		CountValidation[int]{Expected: params.MissingContextViolations, Actual: missingContextViolationsResults, Msg: GetValidationCountErrMsg("missing context violations", "summary", params.ExactResultsMatch, params.MissingContextViolations, missingContextViolationsResults)},
-		CountValidation[int]{Expected: params.SecurityViolations, Actual: securityViolations, Msg: GetValidationCountErrMsg("security violations", "summary", params.ExactResultsMatch, params.SecurityViolations, securityViolations)},
+		CountValidation[int]{Expected: params.ScaSecurityViolations, Actual: securityViolations, Msg: GetValidationCountErrMsg("security violations", "summary", params.ExactResultsMatch, params.ScaSecurityViolations, securityViolations)},
 		CountValidation[int]{Expected: params.LicenseViolations, Actual: licenseViolations, Msg: GetValidationCountErrMsg("license violations", "summary", params.ExactResultsMatch, params.LicenseViolations, licenseViolations)},
 		CountValidation[int]{Expected: params.OperationalViolations, Actual: opRiskViolations, Msg: GetValidationCountErrMsg("operational risk violations", "summary", params.ExactResultsMatch, params.OperationalViolations, opRiskViolations)},
 	)
diff --git a/utils/validations/test_validation.go b/utils/validations/test_validation.go
@@ -59,7 +59,7 @@ type ValidationParams struct {
 	// Expected number of contextual statuses for violations (sca/secrets)
 	InactiveViolations int
 	// Expected number of sca violations by type
-	SecurityViolations int
+	ScaSecurityViolations int
 	// Expected number of sca violations by type
 	LicenseViolations int
 	// Expected number of sca violations by type
diff --git a/xsc_test.go b/xsc_test.go
@@ -33,8 +33,8 @@ func TestXscAuditNpmJsonWithWatch(t *testing.T) {
 	defer cleanUp()
 	output := testAuditNpm(t, string(format.Json), false)
 	validations.VerifyJsonResults(t, output, validations.ValidationParams{
-		SecurityViolations: 1,
-		Licenses:           1,
+		ScaSecurityViolations: 1,
+		Licenses:              1,
 	})
 }
 
@@ -43,9 +43,9 @@ func TestXscAuditNpmSimpleJsonWithWatch(t *testing.T) {
 	defer cleanUp()
 	output := testAuditNpm(t, string(format.SimpleJson), true)
 	validations.VerifySimpleJsonResults(t, output, validations.ValidationParams{
-		SecurityViolations: 1,
-		Vulnerabilities:    1,
-		Licenses:           1,
+		ScaSecurityViolations: 1,
+		Vulnerabilities:       1,
+		Licenses:              1,
 	})
 }
 

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ func ValidateScanResponseIssuesCount(t *testing.T, params ValidationParams, cont`
`58`	`58`	`ValidateContent(t, params.ExactResultsMatch,`
`59`	`59`	`CountValidation[int]{Expected: params.Vulnerabilities, Actual: vulnerabilities, Msg: GetValidationCountErrMsg("vulnerabilities", "scan responses", params.ExactResultsMatch, params.Vulnerabilities, vulnerabilities)},`
`60`	`60`	`CountValidation[int]{Expected: params.Licenses, Actual: licenses, Msg: GetValidationCountErrMsg("licenses", "scan responses", params.ExactResultsMatch, params.Licenses, licenses)},`
`61`		`- CountValidation[int]{Expected: params.SecurityViolations, Actual: securityViolations, Msg: GetValidationCountErrMsg("security violations", "scan responses", params.ExactResultsMatch, params.SecurityViolations, securityViolations)},`
	`61`	`+ CountValidation[int]{Expected: params.ScaSecurityViolations, Actual: securityViolations, Msg: GetValidationCountErrMsg("security violations", "scan responses", params.ExactResultsMatch, params.ScaSecurityViolations, securityViolations)},`
`62`	`62`	`CountValidation[int]{Expected: params.LicenseViolations, Actual: licenseViolations, Msg: GetValidationCountErrMsg("license violations", "scan responses", params.ExactResultsMatch, params.LicenseViolations, licenseViolations)},`
`63`	`63`	`CountValidation[int]{Expected: params.OperationalViolations, Actual: operationalViolations, Msg: GetValidationCountErrMsg("operational risk violations", "scan responses", params.ExactResultsMatch, params.OperationalViolations, operationalViolations)},`
`64`	`64`	`)`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ func ValidateSimpleJsonIssuesCount(t *testing.T, params ValidationParams, result`
`133`	`133`	`CountValidation[int]{Expected: params.NotCoveredViolations, Actual: notCoveredViolationsResults, Msg: GetValidationCountErrMsg("not covered violations", "simple-json", params.ExactResultsMatch, params.NotCoveredViolations, notCoveredViolationsResults)},`
`134`	`134`	`CountValidation[int]{Expected: params.NotApplicableViolations, Actual: notApplicableViolationsResults, Msg: GetValidationCountErrMsg("not applicable violations", "simple-json", params.ExactResultsMatch, params.NotApplicableViolations, notApplicableViolationsResults)},`
`135`	`135`	`CountValidation[int]{Expected: params.MissingContextViolations, Actual: missingContextViolationsResults, Msg: GetValidationCountErrMsg("missing context violations", "simple-json", params.ExactResultsMatch, params.MissingContextViolations, missingContextViolationsResults)},`
`136`		`- CountValidation[int]{Expected: params.SecurityViolations, Actual: securityViolations, Msg: GetValidationCountErrMsg("security violations", "simple-json", params.ExactResultsMatch, params.SecurityViolations, securityViolations)},`
	`136`	`+ CountValidation[int]{Expected: params.ScaSecurityViolations, Actual: securityViolations, Msg: GetValidationCountErrMsg("security violations", "simple-json", params.ExactResultsMatch, params.ScaSecurityViolations, securityViolations)},`
`137`	`137`	`CountValidation[int]{Expected: params.LicenseViolations, Actual: licenseViolations, Msg: GetValidationCountErrMsg("license violations", "simple-json", params.ExactResultsMatch, params.LicenseViolations, licenseViolations)},`
`138`	`138`	`CountValidation[int]{Expected: params.OperationalViolations, Actual: opRiskViolations, Msg: GetValidationCountErrMsg("operational risk violations", "simple-json", params.ExactResultsMatch, params.OperationalViolations, opRiskViolations)},`
`139`	`139`	`)`