Skip to content

Commit b5638e4

Browse files
committed
Improve folder add test again
1 parent 5c7c06b commit b5638e4

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

test/integration-tests/DiagnosticsManager.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ suite("DiagnosticsManager Test Suite", async function () {
125125

126126
activateExtensionForSuite({
127127
async setup(ctx) {
128-
this.timeout(60000);
128+
this.timeout(60000 * 2);
129129

130130
workspaceContext = ctx;
131131
toolchain = workspaceContext.toolchain;

test/integration-tests/WorkspaceContext.test.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import { Version } from "../../src/utilities/version";
2121
import { SwiftExecution } from "../../src/tasks/SwiftExecution";
2222
import { activateExtensionForSuite } from "./utilities/testutilities";
2323
import { FolderContext } from "../../src/FolderContext";
24+
import { assertContains } from "./testexplorer/utilities";
2425

2526
function assertContainsArg(execution: SwiftExecution, arg: string) {
2627
assert(execution?.args.find(a => a === arg));
@@ -65,12 +66,16 @@ suite("WorkspaceContext Test Suite", () => {
6566
await workspaceContext.addPackageFolder(testAssetUri("package2"), workspaceFolder);
6667

6768
const foldersNames = recordedFolders.map(({ folder }) => folder?.swiftPackage.name);
68-
assert.deepStrictEqual(foldersNames, ["package2"]);
69+
assertContains(foldersNames, "package2");
6970

7071
const addedCount = recordedFolders.filter(
7172
({ operation }) => operation === FolderOperation.add
7273
).length;
73-
assert.strictEqual(addedCount, 1, "Expected only one add folder operation");
74+
assert.strictEqual(
75+
addedCount,
76+
1,
77+
`Expected only one add folder operation, instead got folders: ${recordedFolders}`
78+
);
7479
} finally {
7580
observer?.dispose();
7681
}

0 commit comments

Comments
 (0)