Add ErrorHandling for OpenWithEncoding function (#3438)

* Add ErrorHandling Signed-off-by: likhithanimma1 <[email protected]> * Increase unit test coverage Signed-off-by: likhithanimma1 <[email protected]> --------- Signed-off-by: likhithanimma1 <[email protected]> Co-authored-by: Fernando Rijo Cedeno <[email protected]>
zowe · Feb 17, 2025 · dc10fe9 · dc10fe9
1 parent 8baa860
commit dc10fe9
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/packages/zowe-explorer/__tests__/__unit__/trees/job/JobTree.unit.test.ts b/packages/zowe-explorer/__tests__/__unit__/trees/job/JobTree.unit.test.ts
@@ -1393,4 +1393,17 @@ describe("openWithEncoding", () => {
         expect(fetchSpoolAtUriMock).toHaveBeenCalledTimes(0);
         expect(executeCommandMock).toHaveBeenCalledTimes(0);
     });
+
+    it("should catch if error is thrown", async () => {
+        const testTree = new JobTree();
+        const spoolNode = new ZoweSpoolNode({ label: "SPOOL", collapsibleState: vscode.TreeItemCollapsibleState.None, spool: createIJobFile() });
+        const encoding: ZosEncoding = { kind: "other", codepage: "IBM-1147" };
+        const promptMock = jest.spyOn(SharedUtils, "promptForEncoding").mockResolvedValue(encoding);
+        jest.spyOn(JobFSProvider.instance, "fetchSpoolAtUri").mockImplementationOnce(() => {
+            throw new Error("testError");
+        });
+        await testTree.openWithEncoding(spoolNode);
+        expect(promptMock).toHaveBeenCalledWith(spoolNode);
+        expect(promptMock).toHaveBeenCalledTimes(1);
+    });
 });
diff --git a/packages/zowe-explorer/src/trees/job/JobTree.ts b/packages/zowe-explorer/src/trees/job/JobTree.ts
@@ -1186,11 +1186,15 @@ export class JobTree extends ZoweTreeProvider<IZoweJobTreeNode> implements Types
 
     public async openWithEncoding(node: IZoweJobTreeNode, encoding?: ZosEncoding): Promise<void> {
         encoding ??= await SharedUtils.promptForEncoding(node);
-        if (encoding !== undefined) {
-            // Set the encoding, fetch the new contents with the encoding, and open the spool file.
-            await node.setEncoding(encoding);
-            await JobFSProvider.instance.fetchSpoolAtUri(node.resourceUri);
-            await vscode.commands.executeCommand("vscode.open", node.resourceUri);
+        try {
+            if (encoding !== undefined) {
+                // Set the encoding, fetch the new contents with the encoding, and open the spool file.
+                await node.setEncoding(encoding);
+                await JobFSProvider.instance.fetchSpoolAtUri(node.resourceUri);
+                await vscode.commands.executeCommand("vscode.open", node.resourceUri);
+            }
+        } catch (err) {
+            await AuthUtils.errorHandling(err, { profile: node.getProfile() });
         }
     }
 }