resolve conversation

CheckmarxDev · Oct 8, 2024 · 1936d9c · 1936d9c
1 parent c1bbe76
commit 1936d9c
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 11 deletions.
diff --git a/...a/com/checkmarx/ast/ScanResult/Error.java → ...in/java/com/checkmarx/ast/asca/Error.java b/...a/com/checkmarx/ast/ScanResult/Error.java → ...in/java/com/checkmarx/ast/asca/Error.java
@@ -1,4 +1,4 @@
-package com.checkmarx.ast.ScanResult;
+package com.checkmarx.ast.asca;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Value;

diff --git a/.../checkmarx/ast/ScanResult/ScanDetail.java → ...va/com/checkmarx/ast/asca/ScanDetail.java b/.../checkmarx/ast/ScanResult/ScanDetail.java → ...va/com/checkmarx/ast/asca/ScanDetail.java
@@ -1,4 +1,4 @@
-package com.checkmarx.ast.ScanResult;
+package com.checkmarx.ast.asca;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

diff --git a/.../checkmarx/ast/ScanResult/ScanResult.java → ...va/com/checkmarx/ast/asca/ScanResult.java b/.../checkmarx/ast/ScanResult/ScanResult.java → ...va/com/checkmarx/ast/asca/ScanResult.java
@@ -1,4 +1,4 @@
-package com.checkmarx.ast.ScanResult;
+package com.checkmarx.ast.asca;
 
 import com.checkmarx.ast.utils.JsonParser;
 import com.fasterxml.jackson.annotation.JsonCreator;

diff --git a/src/main/java/com/checkmarx/ast/wrapper/CxWrapper.java b/src/main/java/com/checkmarx/ast/wrapper/CxWrapper.java
@@ -1,6 +1,6 @@
 package com.checkmarx.ast.wrapper;
 
-import com.checkmarx.ast.ScanResult.ScanResult;
+import com.checkmarx.ast.asca.ScanResult;
 import com.checkmarx.ast.codebashing.CodeBashing;
 import com.checkmarx.ast.kicsRealtimeResults.KicsRealtimeResults;
 import com.checkmarx.ast.learnMore.LearnMore;
@@ -224,7 +224,7 @@ public ScanResult ScanAsca(String fileSource, boolean ascaLatestVersion, String
         List<String> arguments = new ArrayList<>();
         arguments.add(CxConstants.CMD_SCAN);
         arguments.add(CxConstants.SUB_CMD_ASCA);
-        arguments.add(CxConstants.FILE);
+        arguments.add(CxConstants.FILE_SOURCE);
         arguments.add(fileSource);
         if (ascaLatestVersion) {
             arguments.add(CxConstants.ASCA_LATEST_VERSION);
@@ -365,7 +365,7 @@ public KicsRealtimeResults kicsRealtimeScan(@NonNull String fileSources, String
         List<String> arguments = new ArrayList<>();
         arguments.add(CxConstants.CMD_SCAN);
         arguments.add(CxConstants.SUB_CMD_KICS_REALTIME);
-        arguments.add(CxConstants.FILE_SOURCE);
+        arguments.add(CxConstants.FILE);
         arguments.add(fileSources);
         arguments.add(CxConstants.ADDITONAL_PARAMS);
         arguments.add(additionalParams);

diff --git a/src/main/java/com/checkmarx/ast/wrapper/Execution.java b/src/main/java/com/checkmarx/ast/wrapper/Execution.java
@@ -1,6 +1,5 @@
 package com.checkmarx.ast.wrapper;
 
-import com.checkmarx.ast.ScanResult.ScanResult;
 import org.slf4j.Logger;
 
 import java.io.*;

diff --git a/src/test/java/com/checkmarx/ast/ScanTest.java b/src/test/java/com/checkmarx/ast/ScanTest.java
@@ -1,11 +1,9 @@
 package com.checkmarx.ast;
 
-import com.checkmarx.ast.ScanResult.Error;
-import com.checkmarx.ast.ScanResult.ScanDetail;
-import com.checkmarx.ast.ScanResult.ScanResult;
+import com.checkmarx.ast.asca.ScanDetail;
+import com.checkmarx.ast.asca.ScanResult;
 import com.checkmarx.ast.kicsRealtimeResults.KicsRealtimeResults;
 import com.checkmarx.ast.scan.Scan;
-import com.checkmarx.ast.wrapper.CxException;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
@@ -50,6 +48,7 @@ void testScanAsca_WhenFileWithoutVulnerabilitiesIsSent_ReturnSuccessfulResponseW
         Assertions.assertNotNull(scanResult.getRequestId());
         Assertions.assertTrue(scanResult.isStatus());
         Assertions.assertNull(scanResult.getError());
+        Assertions.assertNull(scanResult.getScanDetails()); // When no vulnerabilities are found, scan details is null
     }
 
     @Test