Skip to content

Commit 397b585

Browse files
author
Dave Bartolomeo
committed
Fix test adapter tests
1 parent e986b07 commit 397b585

1 file changed

Lines changed: 13 additions & 6 deletions

File tree

extensions/ql-vscode/test/vscode-tests/no-workspace/test-adapter.test.ts

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import {
99
FullDatabaseOptions,
1010
} from "../../../src/local-databases";
1111
import { mockedObject } from "../utils/mocking.helpers";
12+
import { TestRunner } from "../../../src/test-runner";
1213

1314
jest.mock("fs-extra", () => {
1415
const original = jest.requireActual("fs-extra");
@@ -19,8 +20,10 @@ jest.mock("fs-extra", () => {
1920
});
2021

2122
describe("test-adapter", () => {
23+
let testRunner: TestRunner;
2224
let adapter: QLTestAdapter;
2325
let fakeDatabaseManager: DatabaseManager;
26+
let fakeCliServer: CodeQLCliServer;
2427
let currentDatabaseItem: DatabaseItem | undefined;
2528
let databaseItems: DatabaseItem[] = [];
2629
const openDatabaseSpy = jest.fn();
@@ -73,17 +76,21 @@ describe("test-adapter", () => {
7376

7477
jest.spyOn(preTestDatabaseItem, "isAffectedByTest").mockResolvedValue(true);
7578

79+
fakeCliServer = mockedObject<CodeQLCliServer>({
80+
runTests: runTestsSpy,
81+
resolveQlpacks: resolveQlpacksSpy,
82+
resolveTests: resolveTestsSpy,
83+
});
84+
85+
testRunner = new TestRunner(fakeDatabaseManager, fakeCliServer);
86+
7687
adapter = new QLTestAdapter(
7788
mockedObject<WorkspaceFolder>({
7889
name: "ABC",
7990
uri: Uri.parse("file:/ab/c"),
8091
}),
81-
mockedObject<CodeQLCliServer>({
82-
runTests: runTestsSpy,
83-
resolveQlpacks: resolveQlpacksSpy,
84-
resolveTests: resolveTestsSpy,
85-
}),
86-
fakeDatabaseManager,
92+
testRunner,
93+
fakeCliServer,
8794
);
8895
});
8996

0 commit comments

Comments
 (0)