Refactor PredicateTest: extract scan/result helper

Extract getScanAndResult helper in PredicateTest to centralize logic for locating a completed scan and its SAST result. Add null-safe checks, use strict equality, and provide a fallback scanShow lookup when no scan is found to reduce flakiness. Update the test to use the helper and keep assertions for triageShow/triageUpdate. Improves readability and robustness of the test.

Author: cx-atish-jadhav

src/tests/PredicateTest.test.ts

@@ -9,35 +9,45 @@ const cxWrapperFactory = new CxWrapperFactory();
 describe("Triage cases", () => {
     const cxScanConfig = new BaseTest();
 
-    it('Triage Successful case', async () => {
-        const auth = await cxWrapperFactory.createWrapper(cxScanConfig);
-
+    const getScanAndResult = async (auth: any): Promise<{ scan: any, result: CxResult }> => {
         const scanList: CxCommandOutput = await auth.scanList("statuses=Completed,limit=100");
-        let result: CxResult;
-        let scan, output;
-        while (!output && scanList && scanList.payload && scanList.payload.length > 0) {
-            scan = scanList.payload.pop()
-            console.log("Triage Successful case -  ScanId " + scan.id)
-            output = await auth.getResultsList(scan.id)
-            if (output.status == "Error in the json file.") {
+        let scan, output, result;
+
+        while (!output && scanList?.payload?.length > 0) {
+            scan = scanList.payload.pop();
+            output = await auth.getResultsList(scan.id);
+            if (output?.status === "Error in the json file.") {
                 output = undefined;
             } else {
-                result = output.payload.find(res => res.type == CxConstants.SAST)
-                if (!result || !result.similarityId) {
+                result = output?.payload?.find(res => res.type === CxConstants.SAST);
+                if (!result?.similarityId) {
                     output = undefined;
                 }
             }
         }
 
-        const cxShow: CxCommandOutput = await auth.triageShow(scan.projectID, result.similarityId, result.type);
+        if (!scan) {
+            const scanShow = await auth.scanShow("d4354650-4ee1-4e10-9b1d-0feaf6c187a7");
+            scan = scanShow?.payload?.pop();
+            output = await auth.getResultsList(scan.id);
+            result = output?.payload?.find(res => res.type === CxConstants.SAST);
+        }
 
-        expect(cxShow.exitCode).toEqual(0);
+        return { scan, result };
+    };
+
+    it('Triage Successful case', async () => {
+        const auth = await cxWrapperFactory.createWrapper(cxScanConfig);
+        const { scan, result } = await getScanAndResult(auth);
 
-        const cxUpdate: CxCommandOutput = await
-            auth.triageUpdate(scan.projectID, result.similarityId, result.type, result.state,
-                "Edited via JavascriptWrapper",
-                result.severity.toLowerCase() == "high" ? CxConstants.SEVERITY_MEDIUM : CxConstants.SEVERITY_HIGH);
+        const cxShow: CxCommandOutput = await auth.triageShow(scan.projectID, result.similarityId, result.type);
+        expect(cxShow.exitCode).toEqual(0);
 
+        const cxUpdate: CxCommandOutput = await auth.triageUpdate(
+            scan.projectID, result.similarityId, result.type, result.state,
+            "Edited via JavascriptWrapper",
+            result.severity.toLowerCase() === "high" ? CxConstants.SEVERITY_MEDIUM : CxConstants.SEVERITY_HIGH
+        );
         expect(cxUpdate.exitCode).toEqual(0);
     });
 });