updates for code coverage

Signed-off-by: Pujal <[email protected]>
zowe · Dec 12, 2024 · a4972b1 · a4972b1
1 parent 8e1a828
commit a4972b1
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 6 deletions.
diff --git a/packages/zosfiles/__tests__/__unit__/methods/copy/Copy.unit.test.ts b/packages/zosfiles/__tests__/__unit__/methods/copy/Copy.unit.test.ts
@@ -43,7 +43,9 @@ describe("Copy", () => {
             });
             isPDSSpy = jest.spyOn(Copy as any, "isPDS").mockResolvedValue(false);
         });
-
+        afterAll(() => {
+            isPDSSpy.mockRestore();
+        });
         describe("Success Scenarios", () => {
             describe("Sequential > Sequential", () => {
                 it("should send a request", async () => {
@@ -451,8 +453,9 @@ describe("Copy", () => {
                     });
                     isPDSSpy = jest.spyOn(Copy as any, "isPDS").mockResolvedValue(true);
                 });
-                afterEach(() => {
+                afterAll(() => {
                     copyPDSSpy.mockRestore();
+                    isPDSSpy.mockRestore();
                 });
                 it("should call copyPDS to copy members of source PDS to target PDS", async () => {
                     const response = await Copy.dataSet(
@@ -561,6 +564,42 @@ describe("Copy", () => {
         const toDataSetName = "USER.DATA.TO";
         const readStream = jest.spyOn(IO, "createReadStream");
         const rmSync = jest.spyOn(fs, "rmSync");
+        const listDatasetSpy = jest.spyOn(List, "dataSet");
+
+        const dsPO = {
+            dsname: fromDataSetName,
+            dsorg: "PO",
+        };
+        const dsPS = {
+            dsname: fromDataSetName,
+            dsorg: "PS",
+        };
+
+        it("should detect PDS datasets correctly during copy", async () => {
+            listDatasetSpy.mockImplementation(async (): Promise<any>  => {
+                return {
+                    apiResponse: {
+                        items: [dsPO]
+                    }
+                };
+            });
+            const response = await Copy.isPDS(dummySession, dsPO.dsname);
+            expect(response).toEqual(true);
+            expect(listDatasetSpy).toHaveBeenCalledWith(dummySession, dsPO.dsname, { attributes: true });
+        });
+
+        it("should return false if the data set is not partitioned", async () => {
+            listDatasetSpy.mockImplementation(async (): Promise<any>  => {
+                return {
+                    apiResponse: {
+                        items: [dsPS]
+                    }
+                };
+            });
+            const response = await Copy.isPDS(dummySession, dsPS.dsname);
+            expect(response).toEqual(false);
+            expect(listDatasetSpy).toHaveBeenCalledWith(dummySession, dsPS.dsname, { attributes: true });
+        });
 
         it("should successfully copy members from source to target PDS", async () => {
             const sourceResponse = {

diff --git a/packages/zosfiles/src/methods/copy/Copy.ts b/packages/zosfiles/src/methods/copy/Copy.ts
@@ -106,16 +106,14 @@ export class Copy {
     /**
      * Private function that checks if a dataset is type PDS
     **/
-    private static async isPDS(
+    public static async isPDS(
         session: AbstractSession,
         dataSetName: string
     ): Promise<boolean> {
         try {
             const response = await List.dataSet(session, dataSetName, {attributes: true});
-            const dsntp = response.apiResponse.items[0].dsntp;
             const dsorg = response.apiResponse.items[0].dsorg;
-            return dsntp === "PDS" && dsorg === "PO";
-            // return response;
+            return dsorg === "POE" || dsorg === "PO";
         }
         catch(error) {
             Logger.getAppLogger().error(error);