fix tests

jfrog · Sep 30, 2024 · 6c0b4b6 · 6c0b4b6
1 parent 8b3c1ab
commit 6c0b4b6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/tests/utils/test_utils.go b/tests/utils/test_utils.go
@@ -176,6 +176,15 @@ func convertSarifRunPathsForOS(runs ...*sarif.Run) {
 					*location.PhysicalLocation.ArtifactLocation.URI = getJasConvertedPath(sarifutils.GetLocationFileName(location))
 				}
 			}
+			for _, codeFlow := range result.CodeFlows {
+				for _, threadFlows := range codeFlow.ThreadFlows {
+					for _, location := range threadFlows.Locations {
+						if location != nil && location.Location != nil && location.Location.PhysicalLocation != nil && location.Location.PhysicalLocation.ArtifactLocation != nil && location.Location.PhysicalLocation.ArtifactLocation.URI != nil {
+							*location.Location.PhysicalLocation.ArtifactLocation.URI = getJasConvertedPath(sarifutils.GetLocationFileName(location.Location))
+						}
+					}
+				}
+			}
 		}
 	}
 }
@@ -217,6 +226,11 @@ func convertJasSimpleJsonPathsForOS(jas *formats.SourceCodeRow) {
 		return
 	}
 	jas.Location.File = getJasConvertedPath(jas.Location.File)
+	if jas.Applicability != nil {
+		for _, evidence := range jas.Applicability.Evidence {
+			evidence.Location.File = getJasConvertedPath(evidence.Location.File)
+		}
+	}
 	for _, codeFlow := range jas.CodeFlow {
 		for _, location := range codeFlow {
 			location.File = getJasConvertedPath(location.File)

diff --git a/utils/results/output/securityJobSummary_test.go b/utils/results/output/securityJobSummary_test.go
@@ -45,10 +45,6 @@ func TestSaveSarifOutputOnlyForJasEntitled(t *testing.T) {
 		name          string
 		isJasEntitled bool
 	}{
-		{
-			name:          "JAS entitled",
-			isJasEntitled: true,
-		},
 		{
 			name:          "JAS not entitled",
 			isJasEntitled: false,