Smarter finding of the root "test" folder

Author: award999

test/integration-tests/WorkspaceContext.test.ts

@@ -20,7 +20,11 @@ import { FolderOperation, WorkspaceContext } from "../../src/WorkspaceContext";
 import { createBuildAllTask } from "../../src/tasks/SwiftTaskProvider";
 import { Version } from "../../src/utilities/version";
 import { SwiftExecution } from "../../src/tasks/SwiftExecution";
-import { activateExtensionForSuite, updateSettings } from "./utilities/testutilities";
+import {
+    activateExtensionForSuite,
+    getRootWorkspaceFolder,
+    updateSettings,
+} from "./utilities/testutilities";
 import { FolderContext } from "../../src/FolderContext";
 import { assertContains } from "./testexplorer/utilities";
 
@@ -60,7 +64,7 @@ suite("WorkspaceContext Test Suite", () => {
                     recordedFolders.push(changedFolderRecord);
                 });
 
-                const workspaceFolder = vscode.workspace.workspaceFolders?.values().next().value;
+                const workspaceFolder = getRootWorkspaceFolder();
 
                 assert.ok(workspaceFolder, "No workspace folders found in workspace");
 
@@ -102,7 +106,7 @@ suite("WorkspaceContext Test Suite", () => {
         });
 
         // Was hitting a timeout in suiteSetup during CI build once in a while
-        this.timeout(5000);
+        this.timeout(15000);
 
         test("Default Task values", async () => {
             const folder = workspaceContext.folders.find(
@@ -244,4 +248,4 @@ suite("WorkspaceContext Test Suite", () => {
             });
         }).timeout(1000);
     });
-}).timeout(10000);
+}).timeout(15000);

test/integration-tests/configuration.test.ts

@@ -12,9 +12,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-import * as vscode from "vscode";
 import * as path from "path";
-import { activateExtensionForSuite, updateSettings } from "./utilities/testutilities";
+import {
+    activateExtensionForSuite,
+    getRootWorkspaceFolder,
+    updateSettings,
+} from "./utilities/testutilities";
 import { expect } from "chai";
 import { afterEach } from "mocha";
 import configuration from "../../src/configuration";
@@ -47,7 +50,7 @@ suite("Configuration Test Suite", function () {
         expect(task.definition.args).to.not.be.undefined;
         const index = task.definition.args.indexOf("--scratch-path");
         expect(task.definition.args[index + 1]).to.equal(
-            vscode.workspace.workspaceFolders?.at(0)?.uri.fsPath + "/somepath"
+            getRootWorkspaceFolder()?.uri.fsPath + "/somepath"
         );
     });
 
@@ -56,7 +59,7 @@ suite("Configuration Test Suite", function () {
             "swift.buildPath": "${workspaceFolder}${pathSeparator}${workspaceFolderBasename}",
         });
 
-        const basePath = vscode.workspace.workspaceFolders?.at(0)?.uri.fsPath;
+        const basePath = getRootWorkspaceFolder()?.uri.fsPath;
         const baseName = path.basename(basePath ?? "");
         const sep = path.sep;
         expect(configuration.buildPath).to.equal(`${basePath}${sep}${baseName}`);

test/integration-tests/utilities/testutilities.ts

@@ -29,8 +29,8 @@ import { resetBuildAllTaskCache } from "../../../src/tasks/SwiftTaskProvider";
 
 const codeWorkspaceFolders = ["defaultPackage", "diagnostics", "command-plugin"];
 
-function getRootWorkspaceFolder(): vscode.WorkspaceFolder {
-    const result = vscode.workspace.workspaceFolders?.at(0);
+export function getRootWorkspaceFolder(): vscode.WorkspaceFolder {
+    const result = vscode.workspace.workspaceFolders?.find(f => f.name === "test");
     assert(result, "No workspace folders were opened for the tests to use");
     return result;
 }