fix integration tests, branch required

Author: tiagobcx

src/main/wrapper/CxWrapper.ts

@@ -126,16 +126,18 @@ export class CxWrapper {
         return await exec.executeCommands(this.pathToExecutable, commands, CxConstants.SCAN_TYPE);
     }
 
-    async scanList(): Promise<CxCommandOutput> {
-        const commands: string[] = [CxConstants.CMD_SCAN, CxConstants.SUB_CMD_LIST];
+    async scanList(filters:string): Promise<CxCommandOutput> {
+        const validated_filters = this.filterArguments(filters);
+        const commands: string[] = [CxConstants.CMD_SCAN, "list"].concat(validated_filters);
         commands.push(...this.initializeCommands(true));
 
         const exec = new ExecutionService();
         return await exec.executeCommands(this.pathToExecutable, commands, CxConstants.SCAN_TYPE);
     }
 
-    async projectList(): Promise<CxCommandOutput> {
-        const commands: string[] = [CxConstants.CMD_PROJECT, CxConstants.SUB_CMD_LIST];
+    async projectList(filters:string): Promise<CxCommandOutput> {
+        const validated_filters = this.filterArguments(filters);
+        const commands: string[] = [CxConstants.CMD_PROJECT, "list"].concat(validated_filters);
         commands.push(...this.initializeCommands(true));
 
         const exec = new ExecutionService();
@@ -144,7 +146,7 @@ export class CxWrapper {
 
     async projectBranches(projectId: string, filters: string): Promise<CxCommandOutput> {
         // Verify and add possible branch filter by name
-        const validated_filters = this.filterArguments(filters)
+        const validated_filters = this.filterArguments(CxConstants.BRANCH_NAME + filters)
         const commands: string[] = [CxConstants.CMD_PROJECT , CxConstants.SUB_CMD_BRANCHES, CxConstants.PROJECT_ID, projectId].concat(validated_filters);
         commands.push(...this.initializeCommands(false));
 
@@ -207,7 +209,7 @@ export class CxWrapper {
         let r = [];
         if(filters.length>0){
             r.push(CxConstants.FILTER);
-            r.push(CxConstants.BRANCH_NAME + filters);
+            r.push(filters);
         }
         return r;
     }

src/tests/ProjectTest.test.ts

@@ -8,7 +8,7 @@ describe("ProjectList cases",() => {
 
     it('ProjectList Successful case', async () => {
         const auth = new CxWrapper(cxScanConfig);
-        const data = await auth.projectList();
+        const data = await auth.projectList("");
         const cxCommandOutput: CxCommandOutput = data;
         expect(cxCommandOutput.payload.length).toBeGreaterThan(0);
     });

src/tests/ResultTest.test.ts

@@ -8,7 +8,7 @@ describe("Results cases",() => {
     let cxScanConfig = new BaseTest();
     it('Result Test Successful case', async () => {
         const auth = new CxWrapper(cxScanConfig);
-        const data = await auth.scanList();
+        const data = await auth.scanList("");
         const cxCommandOutput: CxCommandOutput = data
         let sampleId  = cxCommandOutput.payload.pop().ID;
         await auth.getResults(sampleId,"json","jsonList", ".")
@@ -18,7 +18,7 @@ describe("Results cases",() => {
 
     it('Result List Successful case', async () => {
         const auth = new CxWrapper(cxScanConfig);
-        const data = await auth.scanList();
+        const data = await auth.scanList("");
         const cxCommandOutput: CxCommandOutput = data
         let sampleId  = cxCommandOutput.payload.pop().ID;
         const written = await auth.getResultsList(sampleId)
@@ -27,7 +27,7 @@ describe("Results cases",() => {
 
     it('Result summary html file generation successful case', async () => {
         const auth = new CxWrapper(cxScanConfig);
-        const data = await auth.scanList();
+        const data = await auth.scanList("");
         const cxCommandOutput: CxCommandOutput = data
         let sampleId  = cxCommandOutput.payload.pop().ID;
         await auth.getResults(sampleId,"summaryHTML","test", ".")
@@ -37,7 +37,7 @@ describe("Results cases",() => {
 
     it('Result summary html string successful case', async () => {
         const auth = new CxWrapper(cxScanConfig);
-        const data = await auth.scanList();
+        const data = await auth.scanList("");
         const cxCommandOutput: CxCommandOutput = data
         let sampleId  = cxCommandOutput.payload.pop().ID;
         const written = await auth.getResultsSummary(sampleId)

src/tests/ScanTest.test.ts

@@ -76,7 +76,7 @@ describe("ScanCreate cases",() => {
 
     it('ScanList Successful case', async () => {
         const auth = new CxWrapper(cxScanConfig);
-        const data = await auth.scanList();
+        const data = await auth.scanList("");
         const cxCommandOutput: CxCommandOutput = data;
         expect(cxCommandOutput.payload.length).toBeGreaterThan(0);
     });