Skip to content

Commit b0ba74b

Browse files
committed
Fix tests
1 parent 3b27de1 commit b0ba74b

File tree

4 files changed

+58
-14
lines changed

4 files changed

+58
-14
lines changed

audit_test.go

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -362,13 +362,13 @@ func testXscAuditMaven(t *testing.T, format string) string {
362362
}
363363

364364
func TestXrayAuditGoJson(t *testing.T) {
365-
output := testXrayAuditGo(t, string(format.Json), "go-project")
366-
validations.VerifyJsonResults(t, output, validations.ValidationParams{ExactResultsMatch: true})
365+
output := testXrayAuditGo(t, string(format.Json), "simple-project")
366+
validations.VerifyJsonResults(t, output, validations.ValidationParams{Licenses: 1, Vulnerabilities: 4})
367367
}
368368

369369
func TestXrayAuditGoSimpleJson(t *testing.T) {
370-
output := testXrayAuditGo(t, string(format.SimpleJson), "missing-context")
371-
validations.VerifySimpleJsonResults(t, output, validations.ValidationParams{ExactResultsMatch: true})
370+
output := testXrayAuditGo(t, string(format.SimpleJson), "simple-project")
371+
validations.VerifySimpleJsonResults(t, output, validations.ValidationParams{Licenses: 3, Vulnerabilities: 4, NotCovered: 2, NotApplicable: 2})
372372
}
373373

374374
func testXrayAuditGo(t *testing.T, format, project string) string {
@@ -377,7 +377,7 @@ func testXrayAuditGo(t *testing.T, format, project string) string {
377377
defer cleanUp()
378378
// Add dummy descriptor file to check that we run only specific audit
379379
addDummyPackageDescriptor(t, false)
380-
return securityTests.PlatformCli.RunCliCmdWithOutput(t, "audit", "--go", "--licenses", "--format="+format)
380+
return securityTests.PlatformCli.WithoutCredentials().RunCliCmdWithOutput(t, "audit", "--go", "--licenses", "--format="+format)
381381
}
382382

383383
func TestXrayAuditNoTech(t *testing.T) {
@@ -396,9 +396,9 @@ func TestXrayAuditMultiProjects(t *testing.T) {
396396
_, cleanUp := securityTestUtils.CreateTestProjectEnvAndChdir(t, filepath.Join(filepath.FromSlash(securityTests.GetTestResourcesPath()), "projects"))
397397
defer cleanUp()
398398
// Set working-dirs flag with multiple projects
399-
workingDirsFlag := fmt.Sprintf("--working-dirs=%s, %s ,%s, %s, %s",
399+
workingDirsFlag := fmt.Sprintf("--working-dirs=%s, %s ,%s, %s",
400400
filepath.Join("package-managers", "maven", "maven"), filepath.Join("package-managers", "nuget", "single4.0"),
401-
filepath.Join("package-managers", "python", "pip", "pip-project"), filepath.Join("jas", "jas"), filepath.Join("package-managers", "go", "missing-context"))
401+
filepath.Join("package-managers", "python", "pip", "pip-project"), filepath.Join("jas", "jas"))
402402
// Configure a new server named "default"
403403
securityIntegrationTestUtils.CreateJfrogHomeConfig(t, true)
404404
defer securityTestUtils.CleanTestsHomeEnv()
@@ -414,7 +414,6 @@ func TestXrayAuditMultiProjects(t *testing.T) {
414414
Undetermined: 0,
415415
NotCovered: 22,
416416
NotApplicable: 2,
417-
MissingContext: 1,
418417
})
419418
}
420419

@@ -534,6 +533,11 @@ func TestXrayAuditWithoutSastCppFlagSimpleJson(t *testing.T) {
534533
validations.VerifySimpleJsonResults(t, output, validations.ValidationParams{})
535534
}
536535

536+
func TestXrayAuditJasMissingContextSimpleJson(t *testing.T) {
537+
output := testXrayAuditJas(t, securityTests.PlatformCli, filepath.Join("package-managers", "maven", "missing-context"), "3", false, false)
538+
validations.VerifySimpleJsonResults(t, output, validations.ValidationParams{MissingContext: 1})
539+
}
540+
537541
func TestXrayAuditNotEntitledForJas(t *testing.T) {
538542
integration.InitAuditGeneralTests(t, scangraph.GraphScanMinXrayVersion)
539543
cliToRun, cleanUp := integration.InitTestWithMockCommandOrParams(t, getNoJasAuditMockCommand)

tests/testdata/projects/package-managers/go/missing-context/go.mod

Lines changed: 0 additions & 5 deletions
This file was deleted.

tests/testdata/projects/package-managers/go/missing-context/go.sum

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
6+
<groupId>org.jfrog</groupId>
7+
<artifactId>cli-test</artifactId>
8+
<version>1.0</version>
9+
<packaging>jar</packaging>
10+
11+
<name>cli-test</name>
12+
<url>http://maven.apache.org</url>
13+
14+
<properties>
15+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
16+
<java.version>1.8</java.version>
17+
</properties>
18+
19+
<build>
20+
<plugins>
21+
<plugin>
22+
<groupId>org.apache.maven.plugins</groupId>
23+
<artifactId>maven-compiler-plugin</artifactId>
24+
<version>3.1</version>
25+
<configuration>
26+
<source>${java.version}</source>
27+
<target>${java.version}</target>
28+
</configuration>
29+
</plugin>
30+
</plugins>
31+
</build>
32+
33+
<dependencies>
34+
<dependency>
35+
<groupId>junit</groupId>
36+
<artifactId>junit</artifactId>
37+
<version>4.11</version>
38+
<scope>test</scope>
39+
</dependency>
40+
<dependency>
41+
<groupId>org.apache.logging.log4j</groupId>
42+
<artifactId>log4j-core</artifactId>
43+
<version>2.15.0</version>
44+
</dependency>
45+
</dependencies>
46+
</project>

0 commit comments

Comments
 (0)