Skip to content

Commit 90e32de

Browse files
committed
Add --all flag
1 parent f1007c0 commit 90e32de

File tree

3 files changed

+15
-11
lines changed

3 files changed

+15
-11
lines changed

src/main/wrapper/CxConstants.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ export enum CxConstants {
3737
CMD_TRIAGE = "triage",
3838
SUB_CMD_UPDATE = "update",
3939
SUB_CMD_GET_STATES = "get-states",
40+
ALL_STATES_FLAG = "--all",
4041
CMD_RESULT = "results",
4142
SUB_CMD_BFL = "bfl",
4243
CMD_CODE_BASHING = "codebashing",

src/main/wrapper/CxWrapper.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,15 +200,16 @@ export class CxWrapper {
200200
return await exec.executeCommands(this.config.pathToExecutable, commands, CxConstants.PREDICATE_TYPE);
201201
}
202202

203-
async triageUpdate(projectId: string, similarityId: string, scanType: string, state: string, comment: string, severity: string, stateId=""): Promise<CxCommandOutput> {
203+
async triageUpdate(projectId: string, similarityId: string, scanType: string, state: string, comment: string, severity: string, stateId = ""): Promise<CxCommandOutput> {
204204
const commands: string[] = [CxConstants.CMD_TRIAGE, CxConstants.SUB_CMD_UPDATE, CxConstants.PROJECT_ID, projectId, CxConstants.SIMILARITY_ID, similarityId, CxConstants.SCAN_TYPES_SUB_CMD, scanType, CxConstants.STATE, state, CxConstants.STATE_ID, stateId, CxConstants.COMMENT, comment, CxConstants.SEVERITY, severity];
205205
commands.push(...this.initializeCommands(false));
206206
const exec = new ExecutionService();
207207
return await exec.executeCommands(this.config.pathToExecutable, commands);
208208
}
209209

210-
async triageGetStates(): Promise<CxCommandOutput> {
210+
async triageGetStates(all: boolean): Promise<CxCommandOutput> {
211211
const commands: string[] = [CxConstants.CMD_TRIAGE, CxConstants.SUB_CMD_GET_STATES];
212+
if (all) commands.push(CxConstants.ALL_STATES_FLAG)
212213
commands.push(...this.initializeCommands(false));
213214
const exec = new ExecutionService();
214215
return await exec.executeCommands(this.config.pathToExecutable, commands);

src/tests/PredicateTest.test.ts

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,21 @@ describe("Triage cases", () => {
3131
expect(cxShow.exitCode).toEqual(0);
3232
}
3333

34-
const handleTriageUpdate = async (scan: any, result: CxResult, newState: string, newSeverity: string, newStateId="") => {
34+
const handleTriageUpdate = async (scan: any, result: CxResult, newState: string, newSeverity: string, newStateId = "") => {
3535
const cxUpdate: CxCommandOutput = await auth.triageUpdate(
3636
scan.projectID, result.similarityId, result.type, newState,
3737
"Edited via JavascriptWrapper",
3838
newSeverity, newStateId
3939
);
4040
expect(cxUpdate.exitCode).toEqual(0);
4141
};
42+
const handlegetStates = async () => {
43+
const cxCommandOutput: CxCommandOutput = await auth.triageGetStates(false);
44+
console.log("Json object from states successful case: " + JSON.stringify(cxCommandOutput));
45+
expect(cxCommandOutput.payload.length).toBeGreaterThanOrEqual(1);
46+
expect(cxCommandOutput.exitCode).toBe(0);
47+
return cxCommandOutput
48+
};
4249

4350
it('Triage Successful case', async () => {
4451
const { scan, result } = await getScanAndResult();
@@ -49,10 +56,7 @@ describe("Triage cases", () => {
4956
it.skip('Triage with custom state Successful case', async () => {
5057
const { scan, result } = await getScanAndResult();
5158

52-
const cxCommandOutput: CxCommandOutput = await auth.triageGetStates();
53-
console.log("Json object from states successful case: " + JSON.stringify(cxCommandOutput));
54-
expect(cxCommandOutput.payload.length).toBeGreaterThan(1);
55-
expect(cxCommandOutput.exitCode).toBe(0);
59+
const cxCommandOutput = await handlegetStates();
5660

5761
let customState = cxCommandOutput.payload[0].name
5862

@@ -70,10 +74,8 @@ describe("Triage cases", () => {
7074
it.skip('Triage with custom state id Successful case', async () => {
7175
const { scan, result } = await getScanAndResult();
7276

73-
const cxCommandOutput: CxCommandOutput = await auth.triageGetStates();
74-
console.log("Json object from states successful case: " + JSON.stringify(cxCommandOutput));
75-
expect(cxCommandOutput.payload.length).toBeGreaterThan(1);
76-
expect(cxCommandOutput.exitCode).toBe(0);
77+
const cxCommandOutput = await handlegetStates();
78+
7779
const allStates = cxCommandOutput.payload;
7880
let customStateId = allStates[0].id
7981
const customStateName = allStates[0].name

0 commit comments

Comments
 (0)