Better cleanup for the error handling project panel test

Author: plemarquand

test/integration-tests/ui/ProjectPanelProvider.test.ts

@@ -16,6 +16,7 @@ import { afterEach, beforeEach } from "mocha";
 import * as path from "path";
 import * as vscode from "vscode";
 
+import { FolderContext } from "@src/FolderContext";
 import { WorkspaceContext } from "@src/WorkspaceContext";
 import { Commands } from "@src/commands";
 import { createBuildAllTask } from "@src/tasks/SwiftTaskProvider";
@@ -306,13 +307,6 @@ tag("medium").suite("ProjectPanelProvider Test Suite", function () {
     });
 
     suite("Dependencies", () => {
-        let errorTreeProvider: ProjectPanelProvider | undefined;
-
-        afterEach(() => {
-            errorTreeProvider?.dispose();
-            errorTreeProvider = undefined;
-        });
-
         test("Includes remote dependency", async () => {
             workspaceContext.contextKeys.flatDependenciesList = false;
             const items = await getHeaderChildren("Dependencies");
@@ -413,13 +407,31 @@ tag("medium").suite("ProjectPanelProvider Test Suite", function () {
             expect(items.find(n => n.name === "defaultpackage")).to.not.be.undefined;
         });
 
-        test("Shows an error node when there is a problem compiling Package.swift", async () => {
-            workspaceContext.folders[0].hasResolveErrors = true;
-            workspaceContext.currentFolder = workspaceContext.folders[0];
-            errorTreeProvider = new ProjectPanelProvider(workspaceContext);
-            const children = await errorTreeProvider.getChildren();
-            const errorNode = children.find(n => n.name === "Error Parsing Package.swift");
-            expect(errorNode).to.not.be.undefined;
+        suite("Error handling", () => {
+            let savedCurrentFolder: FolderContext | null | undefined;
+            let errorTreeProvider: ProjectPanelProvider | undefined;
+
+            beforeEach(async () => {
+                workspaceContext.folders[0].hasResolveErrors = true;
+                savedCurrentFolder = workspaceContext.currentFolder;
+                workspaceContext.currentFolder = workspaceContext.folders[0];
+            });
+
+            afterEach(() => {
+                errorTreeProvider?.dispose();
+                errorTreeProvider = undefined;
+                workspaceContext.folders[0].hasResolveErrors = false;
+                workspaceContext.currentFolder = savedCurrentFolder;
+            });
+
+            test("Shows an error node when there is a problem compiling Package.swift", async () => {
+                workspaceContext.folders[0].hasResolveErrors = true;
+                workspaceContext.currentFolder = workspaceContext.folders[0];
+                errorTreeProvider = new ProjectPanelProvider(workspaceContext);
+                const children = await errorTreeProvider.getChildren();
+                const errorNode = children.find(n => n.name === "Error Parsing Package.swift");
+                expect(errorNode).to.not.be.undefined;
+            });
         });
 
         suite("Excluded files", () => {