Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/dev' into run-jas-scanners-in-…
Browse files Browse the repository at this point in the history
…parallel

# Conflicts:
#	audit_test.go
  • Loading branch information
orz25 committed Jun 18, 2024
2 parents dbc7a82 + 3546ec2 commit 68eeb28
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions audit_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ func TestXrayAuditMultiProjects(t *testing.T) {
defer securityTestUtils.CleanTestsHomeEnv()
output := securityTests.PlatformCli.WithoutCredentials().RunCliCmdWithOutput(t, "audit", "--format="+string(format.SimpleJson), workingDirsFlag)
securityTestUtils.VerifySimpleJsonScanResults(t, output, 0, 35, 0)
securityTestUtils.VerifySimpleJsonJasResults(t, output, 1, 9, 7, 3, 0, 25, 2)
securityTestUtils.VerifySimpleJsonJasResults(t, output, 1, 9, 6, 3, 0, 25, 2)
}

func TestXrayAuditPipJson(t *testing.T) {
Expand Down Expand Up @@ -436,12 +436,12 @@ func addDummyPackageDescriptor(t *testing.T, hasPackageJson bool) {

func TestXrayAuditJasSimpleJson(t *testing.T) {
output := testXrayAuditJas(t, filepath.Join("jas", "jas"), "3")
securityTestUtils.VerifySimpleJsonJasResults(t, output, 1, 9, 7, 3, 0, 2, 2)
securityTestUtils.VerifySimpleJsonJasResults(t, output, 1, 9, 6, 3, 0, 2, 2)
}

func TestXrayAuditJasSimpleJsonWithOneThread(t *testing.T) {
output := testXrayAuditJas(t, filepath.Join("jas", "jas"), "1")
securityTestUtils.VerifySimpleJsonJasResults(t, output, 1, 9, 7, 3, 0, 2, 2)
securityTestUtils.VerifySimpleJsonJasResults(t, output, 1, 9, 6, 3, 0, 2, 2)
}

func TestXrayAuditJasSimpleJsonWithConfig(t *testing.T) {
Expand Down

0 comments on commit 68eeb28

Please sign in to comment.