From 1503ea9db9131686a03e0938892630543776ecdd Mon Sep 17 00:00:00 2001 From: ATorrise Date: Thu, 12 Sep 2024 11:33:29 -0400 Subject: [PATCH] small modifications for quality Signed-off-by: ATorrise --- .../delete/ds/cli.files.delete.ds.system.test.ts | 10 ++++++---- .../vsam/cli.files.delete.vsam.system.test.ts | 16 +++++++++------- .../zfs/cli.files.delete.zfs.system.test.ts | 14 ++++++++------ .../__unit__/delete/zfs/zfs.handler.unit.test.ts | 4 ++-- 4 files changed, 25 insertions(+), 19 deletions(-) diff --git a/packages/cli/__tests__/zosfiles/__system__/delete/ds/cli.files.delete.ds.system.test.ts b/packages/cli/__tests__/zosfiles/__system__/delete/ds/cli.files.delete.ds.system.test.ts index 5026db497..7a078fae4 100644 --- a/packages/cli/__tests__/zosfiles/__system__/delete/ds/cli.files.delete.ds.system.test.ts +++ b/packages/cli/__tests__/zosfiles/__system__/delete/ds/cli.files.delete.ds.system.test.ts @@ -138,12 +138,14 @@ describe("Delete Data Set", () => { }); it("should delete a data set with --quiet flag", async () => { - let response = runCliScript(__dirname + "/__scripts__/command/command_create_data_set.sh", + let createResponse = runCliScript(__dirname + '/__scripts__/command/command_create_data_set.sh', TEST_ENVIRONMENT, [dsname]); - response = runCliScript(__dirname + "/__scripts__/command/command_delete_data_set.sh", + expect(createResponse.status).toBe(0); // Ensure the data set is created successfully + + // Now delete the data set, verify no output in quiet mode + let deleteResponse = runCliScript(__dirname + "/__scripts__/command/command_delete_data_set.sh", TEST_ENVIRONMENT, [dsname, "--for-sure", "--quiet"]); - expect(response.stderr.toString()).toBe(""); - expect(response.status).toBe(0); + expect(deleteResponse.stderr.toString()).toBe(""); }); }); diff --git a/packages/cli/__tests__/zosfiles/__system__/delete/vsam/cli.files.delete.vsam.system.test.ts b/packages/cli/__tests__/zosfiles/__system__/delete/vsam/cli.files.delete.vsam.system.test.ts index b5fb5b870..6dc8c9a7c 100644 --- a/packages/cli/__tests__/zosfiles/__system__/delete/vsam/cli.files.delete.vsam.system.test.ts +++ b/packages/cli/__tests__/zosfiles/__system__/delete/vsam/cli.files.delete.vsam.system.test.ts @@ -119,8 +119,6 @@ describe("Delete VSAM Data Set", () => { }); it("should delete a VSAM data set that has a retention period", async () => { - let response = runCliScript(__dirname + "/__scripts__/command/command_invoke_ams_define_for_statement.sh", - TEST_ENVIRONMENT, [dsname, volume]); response = runCliScript(__dirname + "/__scripts__/command/command_delete_vsam_data_set.sh", TEST_ENVIRONMENT, [dsname, "--for-sure", "--purge"]); expect(response.stderr.toString()).toBe(""); @@ -129,13 +127,17 @@ describe("Delete VSAM Data Set", () => { }); it("should successfully delete a VSAM data set with --quiet flag", async () => { - let response = runCliScript(__dirname + "/__scripts__/command/command_invoke_ams_define_statement.sh", + // create vsam + let createResponse = runCliScript(__dirname + "/__scripts__/command/command_invoke_ams_define_statement.sh", TEST_ENVIRONMENT, [dsname, volume]); - response = runCliScript(__dirname + "/__scripts__/command/command_delete_vsam_data_set.sh", + expect(createResponse.status).toBe(0); + + // now delete + let deleteResponse = runCliScript(__dirname + "/__scripts__/command/command_delete_vsam_data_set.sh", TEST_ENVIRONMENT, [dsname, "--for-sure", "--quiet"]); - expect(response.stderr.toString()).toBe(""); - expect(response.status).toBe(0); - expect(response.stdout.toString()).toMatchSnapshot(); + expect(deleteResponse.stderr.toString()).toBe(""); + expect(deleteResponse.status).toBe(0); + expect(deleteResponse.stdout.toString()).toMatchSnapshot(); }); }); diff --git a/packages/cli/__tests__/zosfiles/__system__/delete/zfs/cli.files.delete.zfs.system.test.ts b/packages/cli/__tests__/zosfiles/__system__/delete/zfs/cli.files.delete.zfs.system.test.ts index 4264caf34..cb728d622 100644 --- a/packages/cli/__tests__/zosfiles/__system__/delete/zfs/cli.files.delete.zfs.system.test.ts +++ b/packages/cli/__tests__/zosfiles/__system__/delete/zfs/cli.files.delete.zfs.system.test.ts @@ -115,16 +115,18 @@ describe("Delete z/OS File System", () => { }); it("should delete a ZFS with --quiet flag", async () => { - let response = runCliScript(__dirname + "/__scripts__/command/command_create_zfs.sh", + // first create zfs + let createResponse = runCliScript(__dirname + "/__scripts__/command/command_create_zfs.sh", TEST_ENVIRONMENT, [fsname, volume]); + expect(createResponse.status).toBe(0); - response = runCliScript(__dirname + "/__scripts__/command/command_delete_zfs.sh", + let deleteResponse = runCliScript(__dirname + "/__scripts__/command/command_delete_zfs.sh", TEST_ENVIRONMENT, [fsname, "--for-sure", "--quiet"]); - - expect(response.stderr.toString()).toBe(""); - expect(response.status).toBe(0); - expect(response.stdout.toString()).toMatchSnapshot(); + expect(deleteResponse.stderr.toString()).toBe(""); + expect(deleteResponse.status).toBe(0); + expect(deleteResponse.stdout.toString()).toMatchSnapshot(); }); + }); describe("Expected failures", () => { diff --git a/packages/cli/__tests__/zosfiles/__unit__/delete/zfs/zfs.handler.unit.test.ts b/packages/cli/__tests__/zosfiles/__unit__/delete/zfs/zfs.handler.unit.test.ts index bdbf0c039..b07ec2c01 100644 --- a/packages/cli/__tests__/zosfiles/__unit__/delete/zfs/zfs.handler.unit.test.ts +++ b/packages/cli/__tests__/zosfiles/__unit__/delete/zfs/zfs.handler.unit.test.ts @@ -34,7 +34,7 @@ describe("ZfsHandler", () => { }); deleteZfsSpy = jest.spyOn(Delete, "zfs"); deleteZfsSpy.mockClear(); - deleteZfsSpy.mockImplementation(async () => defaultReturn); + deleteZfsSpy.mockImplementationOnce(async () => defaultReturn); }); it("should call Delete.zfs", async () => { @@ -66,7 +66,7 @@ describe("ZfsHandler", () => { }); it("should return success: true when --quiet (-fq) flag is used and file is not found", async () => { - deleteZfsSpy.mockImplementation(() => { + deleteZfsSpy.mockImplementationOnce(() => { throw fileNotFoundError; });