Skip to content

Fix error in extension.test.ts #1134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 10, 2024
Merged

Fix error in extension.test.ts #1134

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
591d1be
fix error in extension.test.ts
matthewbastien Oct 10, 2024
6b75409
use assert to check if there is a workspace folder
matthewbastien Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 20 additions & 15 deletions test/integration-tests/extension.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,32 +14,37 @@

import * as vscode from "vscode";
import * as assert from "assert";
import * as swiftExtension from "../../src/extension";
import { Api } from "../../src/extension";
import { WorkspaceContext } from "../../src/WorkspaceContext";
import { getBuildAllTask } from "../../src/tasks/SwiftTaskProvider";
import { SwiftExecution } from "../../src/tasks/SwiftExecution";
import { testAssetUri } from "../fixtures";
import { FolderContext } from "../../src/FolderContext";

export const rootWorkspaceFolder = vscode.workspace.workspaceFolders?.values().next().value;
export const globalWorkspaceContextPromise = new Promise<WorkspaceContext>(resolve => {
const workspaceFolder = vscode.workspace.workspaceFolders?.values().next().value;
if (!workspaceFolder) {
throw new Error("No workspace folders found in workspace");
function getRootWorkspaceFolder(): vscode.WorkspaceFolder {
const result = vscode.workspace.workspaceFolders?.at(0);
assert(result, "No workspace folders were opened for the tests to use");
return result;
}

export const globalWorkspaceContextPromise: Promise<WorkspaceContext> = (async () => {
const workspaceFolder = getRootWorkspaceFolder();
const ext = vscode.extensions.getExtension<Api>("sswg.swift-lang");
if (!ext) {
throw new Error(`Unable to find extension "sswg.swift-lang"`);
}
const ext = vscode.extensions.getExtension<swiftExtension.Api>("sswg.swift-lang")!;
ext.activate().then(api => {
const packageFolder = testAssetUri("defaultPackage");
api.workspaceContext
.addPackageFolder(packageFolder, rootWorkspaceFolder)
.then(() => resolve(api.workspaceContext));
});
});
const api = await ext.activate();
const packageFolder = testAssetUri("defaultPackage");
await api.workspaceContext.addPackageFolder(packageFolder, workspaceFolder);
return api.workspaceContext;
})();

export const folderContextPromise = async (name: string): Promise<FolderContext> => {
const workspaceFolder = getRootWorkspaceFolder();
const workspaceContext = await globalWorkspaceContextPromise;
let folder = workspaceContext.folders.find(f => f.workspaceFolder.name === `test/${name}`);
if (!folder) {
folder = await workspaceContext.addPackageFolder(testAssetUri(name), rootWorkspaceFolder);
folder = await workspaceContext.addPackageFolder(testAssetUri(name), workspaceFolder);
}
return folder;
};
Expand Down