Skip to content

Commit f8ec2d1

Browse files
pcooppcoop
committed
more tests
1 parent 30360d4 commit f8ec2d1

File tree

4 files changed

+147
-12
lines changed

4 files changed

+147
-12
lines changed

‎__tests__/api/BundleDeploy/BundleDeployer.test.ts

Lines changed: 46 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,28 @@ describe("BundleDeployer01", () => {
287287
parms.arguments.resgroup = "12345678";
288288
await testDeployJCL(parms);
289289
});
290+
it("should support verbose=true output for deploy", async () => {
291+
292+
let parms: IHandlerParameters;
293+
parms = DEFAULT_PARAMTERS;
294+
setCommonParmsForDeployTests(parms);
295+
parms.arguments.targetstate = "disabled";
296+
parms.arguments.resgroup = "12345678";
297+
parms.arguments.verbose = true;
298+
await testDeployJCL(parms);
299+
});
300+
it("should support verbose=false output for deploy", async () => {
301+
302+
let parms: IHandlerParameters;
303+
parms = DEFAULT_PARAMTERS;
304+
setCommonParmsForDeployTests(parms);
305+
parms.arguments.targetstate = "disabled";
306+
parms.arguments.resgroup = "12345678";
307+
parms.arguments.verbose = false;
308+
await testDeployJCL(parms);
309+
});
310+
311+
// ** UNDEPLOY TESTS **
290312
it("should generate undeploy JCL for csdgroup", async () => {
291313

292314
let parms: IHandlerParameters;
@@ -325,7 +347,7 @@ describe("BundleDeployer01", () => {
325347

326348
let parms: IHandlerParameters;
327349
parms = DEFAULT_PARAMTERS;
328-
setCommonParmsForDeployTests(parms);
350+
setCommonParmsForUndeployTests(parms);
329351
parms.arguments.targetstate = "UNAVAILABLE";
330352
parms.arguments.resgroup = "12345678";
331353
await testUndeployJCL(parms);
@@ -334,7 +356,7 @@ describe("BundleDeployer01", () => {
334356

335357
let parms: IHandlerParameters;
336358
parms = DEFAULT_PARAMTERS;
337-
setCommonParmsForDeployTests(parms);
359+
setCommonParmsForUndeployTests(parms);
338360
parms.arguments.targetstate = "DISABLED";
339361
parms.arguments.resgroup = "12345678";
340362
await testUndeployJCL(parms);
@@ -343,7 +365,7 @@ describe("BundleDeployer01", () => {
343365

344366
let parms: IHandlerParameters;
345367
parms = DEFAULT_PARAMTERS;
346-
setCommonParmsForDeployTests(parms);
368+
setCommonParmsForUndeployTests(parms);
347369
parms.arguments.targetstate = "DISCARDED";
348370
parms.arguments.resgroup = "12345678";
349371
await testUndeployJCL(parms);
@@ -352,11 +374,31 @@ describe("BundleDeployer01", () => {
352374

353375
let parms: IHandlerParameters;
354376
parms = DEFAULT_PARAMTERS;
355-
setCommonParmsForDeployTests(parms);
377+
setCommonParmsForUndeployTests(parms);
356378
parms.arguments.targetstate = "discarded";
357379
parms.arguments.resgroup = "12345678";
358380
await testUndeployJCL(parms);
359381
});
382+
it("should support verbose=true output for undeploy", async () => {
383+
384+
let parms: IHandlerParameters;
385+
parms = DEFAULT_PARAMTERS;
386+
setCommonParmsForUndeployTests(parms);
387+
parms.arguments.targetstate = "disabled";
388+
parms.arguments.resgroup = "12345678";
389+
parms.arguments.verbose = true;
390+
await testUndeployJCL(parms);
391+
});
392+
it("should support verbose=false output for undeploy", async () => {
393+
394+
let parms: IHandlerParameters;
395+
parms = DEFAULT_PARAMTERS;
396+
setCommonParmsForUndeployTests(parms);
397+
parms.arguments.targetstate = "disabled";
398+
parms.arguments.resgroup = "12345678";
399+
parms.arguments.verbose = false;
400+
await testUndeployJCL(parms);
401+
});
360402
});
361403

362404
async function runDeployTestWithError() {

‎__tests__/api/BundleDeploy/__snapshots__/BundleDeployer.test.ts.snap

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,84 @@ DEPLOY BUNDLE(12345678)
417417
"
418418
`;
419419

420+
exports[`BundleDeployer01 should support verbose=false output for deploy 1`] = `
421+
"//DFHDPLOY JOB DFHDPLOY,CLASS=A,MSGCLASS=X,TIME=NOLIMIT
422+
//DFHDPLOY EXEC PGM=DFHDPLOY,REGION=100M
423+
//STEPLIB DD DISP=SHR,DSN=12345678901234567890123456789012345.SDFHLOAD
424+
// DD DISP=SHR,DSN=abcde12345abcde12345abcde12345abcde.SEYUAUTH
425+
//SYSTSPRT DD SYSOUT=*
426+
//SYSIN DD *
427+
*
428+
SET CICSPLEX(12345678);
429+
*
430+
DEPLOY BUNDLE(12345678)
431+
BUNDLEDIR(1234567890)
432+
SCOPE(12345678)
433+
STATE(DISABLED)
434+
RESGROUP(12345678);
435+
/*
436+
"
437+
`;
438+
439+
exports[`BundleDeployer01 should support verbose=false output for undeploy 1`] = `
440+
"//DFHDPLOY JOB DFHDPLOY,CLASS=A,MSGCLASS=X,TIME=NOLIMIT
441+
//DFHDPLOY EXEC PGM=DFHDPLOY,REGION=100M
442+
//STEPLIB DD DISP=SHR,DSN=12345678901234567890123456789012345.SDFHLOAD
443+
// DD DISP=SHR,DSN=abcde12345abcde12345abcde12345abcde.SEYUAUTH
444+
//SYSTSPRT DD SYSOUT=*
445+
//SYSIN DD *
446+
*
447+
SET CICSPLEX(12345678);
448+
*
449+
UNDEPLOY BUNDLE(12345678)
450+
SCOPE(12345678)
451+
STATE(DISABLED)
452+
RESGROUP(12345678);
453+
/*
454+
"
455+
`;
456+
457+
exports[`BundleDeployer01 should support verbose=true output for deploy 1`] = `"DFHRL2037I"`;
458+
459+
exports[`BundleDeployer01 should support verbose=true output for deploy 2`] = `
460+
"//DFHDPLOY JOB DFHDPLOY,CLASS=A,MSGCLASS=X,TIME=NOLIMIT
461+
//DFHDPLOY EXEC PGM=DFHDPLOY,REGION=100M
462+
//STEPLIB DD DISP=SHR,DSN=12345678901234567890123456789012345.SDFHLOAD
463+
// DD DISP=SHR,DSN=abcde12345abcde12345abcde12345abcde.SEYUAUTH
464+
//SYSTSPRT DD SYSOUT=*
465+
//SYSIN DD *
466+
*
467+
SET CICSPLEX(12345678);
468+
*
469+
DEPLOY BUNDLE(12345678)
470+
BUNDLEDIR(1234567890)
471+
SCOPE(12345678)
472+
STATE(DISABLED)
473+
RESGROUP(12345678);
474+
/*
475+
"
476+
`;
477+
478+
exports[`BundleDeployer01 should support verbose=true output for undeploy 1`] = `"DFHRL2037I"`;
479+
480+
exports[`BundleDeployer01 should support verbose=true output for undeploy 2`] = `
481+
"//DFHDPLOY JOB DFHDPLOY,CLASS=A,MSGCLASS=X,TIME=NOLIMIT
482+
//DFHDPLOY EXEC PGM=DFHDPLOY,REGION=100M
483+
//STEPLIB DD DISP=SHR,DSN=12345678901234567890123456789012345.SDFHLOAD
484+
// DD DISP=SHR,DSN=abcde12345abcde12345abcde12345abcde.SEYUAUTH
485+
//SYSTSPRT DD SYSOUT=*
486+
//SYSIN DD *
487+
*
488+
SET CICSPLEX(12345678);
489+
*
490+
UNDEPLOY BUNDLE(12345678)
491+
SCOPE(12345678)
492+
STATE(DISABLED)
493+
RESGROUP(12345678);
494+
/*
495+
"
496+
`;
497+
420498
exports[`BundleDeployer01 should tolerate empty output from DFHDPLOY 1`] = `"DFHDPLOY did not generate any output. Most recent status update: 'Submitting DFHDPLOY JCL'."`;
421499

422500
exports[`BundleDeployer01 should undeploy successfully 1`] = `"Bundle undeployment successful."`;

‎__tests__/cli/undeploy/bundle/UndeployBundle.handler.test.ts

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,29 @@ describe("bundle Handler", () => {
100100
expect(err.message).toContain("--timeout parameter is too small");
101101
});
102102

103+
it("should complain with no targetstate parameter UNDEPLOY", async () => {
104+
await testTargetStateUndeployError(undefined, "--targetstate parameter is not set");
105+
});
106+
it("should complain with invalid type for targetstate parameter UNDEPLOY", async () => {
107+
108+
const params = Object.assign({}, ...[DEFAULT_PARAMETERS]);
109+
setCommonParmsForTargetStateTests(params);
110+
params.arguments.targetstate = 50;
111+
112+
let err: Error;
113+
try {
114+
const handler = new UndeployBundleHandler.default();
115+
await handler.process(params);
116+
} catch (e) {
117+
err = e;
118+
}
119+
expect(err).toBeDefined();
120+
expect(err).toBeInstanceOf(ImperativeError);
121+
expect(err.message).toContain("--targetstate parameter is not a string");
122+
});
123+
it("should complain with empty targetstate parameter UNDEPLOY", async () => {
124+
await testTargetStateUndeployError("", "--targetstate parameter is empty");
125+
});
103126
it("should complain with invalid targetstate parameter UNDEPLOY", async () => {
104127
await testTargetStateUndeployError("Wibble", "--targetstate has invalid value. Found WIBBLE but expected one of UNAVAILABLE, DISABLED or DISCARDED.");
105128
});

‎src/api/BundleDeploy/ParmValidator.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,6 @@ export class ParmValidator {
121121
}
122122

123123
private static validateCicsplex(params: IHandlerParameters) {
124-
// cicsplex is optional
125-
if (params.arguments.cicsplex === undefined) {
126-
return;
127-
}
128124

129125
if (typeof params.arguments.cicsplex !== "string") {
130126
throw new Error("--cicsplex parameter is not a string");
@@ -141,10 +137,6 @@ export class ParmValidator {
141137
}
142138

143139
private static validateScope(params: IHandlerParameters) {
144-
// scope is optional
145-
if (params.arguments.scope === undefined) {
146-
return;
147-
}
148140

149141
if (typeof params.arguments.scope !== "string") {
150142
throw new Error("--scope parameter is not a string");

0 commit comments

Comments
 (0)