Skip to content

Commit 1326c0a

Browse files
robertbrignullrobertbrignull
committed
Remove unnecessary checks
1 parent 1b9a7f8 commit 1326c0a

7 files changed

Lines changed: 80 additions & 124 deletions

File tree

‎extensions/ql-vscode/test/vscode-tests/cli-integration/databaseFetcher.test.ts‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,7 @@ describe("DatabaseFetcher", () => {
3636
jest.spyOn(window, "showInformationMessage").mockResolvedValue(undefined);
3737

3838
const extension = await getActivatedExtension();
39-
if ("databaseManager" in extension) {
40-
databaseManager = extension.databaseManager;
41-
} else {
42-
throw new Error(
43-
"Extension not initialized. Make sure cli is downloaded and installed properly.",
44-
);
45-
}
39+
databaseManager = extension.databaseManager;
4640

4741
await cleanDatabases(databaseManager);
4842
});

‎extensions/ql-vscode/test/vscode-tests/cli-integration/helpers.test.ts‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,7 @@ describe("helpers (with CLI)", () => {
1414

1515
beforeEach(async () => {
1616
const extension = await getActivatedExtension();
17-
if ("cliServer" in extension) {
18-
cli = extension.cliServer;
19-
} else {
20-
throw new Error(
21-
"Extension not initialized. Make sure cli is downloaded and installed properly.",
22-
);
23-
}
17+
cli = extension.cliServer;
2418
});
2519

2620
it("should get query metadata when available", async () => {

‎extensions/ql-vscode/test/vscode-tests/cli-integration/legacy-query.test.ts‎

Lines changed: 23 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -112,36 +112,29 @@ describeWithCodeQL()("using the legacy query server", () => {
112112

113113
beforeAll(async () => {
114114
const extension = await getActivatedExtension();
115-
if ("cliServer" in extension) {
116-
cliServer = extension.cliServer;
117-
cliServer.quiet = true;
118-
119-
qs = new QueryServerClient(
120-
createMockApp({}),
121-
{
122-
codeQlPath:
123-
(await extension.distributionManager.getCodeQlPathWithoutVersionCheck()) ||
124-
"",
125-
debug: false,
126-
cacheSize: 0,
127-
numThreads: 1,
128-
saveCache: false,
129-
timeoutSecs: 0,
130-
},
131-
cliServer,
132-
{
133-
contextStoragePath: tmpDir.name,
134-
logger: extLogger,
135-
},
136-
(task) =>
137-
task(nullProgressReporter, new CancellationTokenSource().token),
138-
);
139-
await qs.startQueryServer();
140-
} else {
141-
throw new Error(
142-
"Extension not initialized. Make sure cli is downloaded and installed properly.",
143-
);
144-
}
115+
cliServer = extension.cliServer;
116+
cliServer.quiet = true;
117+
118+
qs = new QueryServerClient(
119+
createMockApp({}),
120+
{
121+
codeQlPath:
122+
(await extension.distributionManager.getCodeQlPathWithoutVersionCheck()) ||
123+
"",
124+
debug: false,
125+
cacheSize: 0,
126+
numThreads: 1,
127+
saveCache: false,
128+
timeoutSecs: 0,
129+
},
130+
cliServer,
131+
{
132+
contextStoragePath: tmpDir.name,
133+
logger: extLogger,
134+
},
135+
(task) => task(nullProgressReporter, new CancellationTokenSource().token),
136+
);
137+
await qs.startQueryServer();
145138
});
146139

147140
for (const queryTestCase of queryTestCases) {

‎extensions/ql-vscode/test/vscode-tests/cli-integration/new-query.test.ts‎

Lines changed: 43 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -115,58 +115,51 @@ describeWithCodeQL()("using the new query server", () => {
115115

116116
beforeAll(async () => {
117117
const extension = await getActivatedExtension();
118-
if ("cliServer" in extension && "databaseManager" in extension) {
119-
cliServer = extension.cliServer;
118+
cliServer = extension.cliServer;
120119

121-
cliServer.quiet = true;
122-
if (!(await cliServer.cliConstraints.supportsNewQueryServerForTests())) {
123-
supportNewQueryServer = false;
124-
}
125-
qs = new QueryServerClient(
126-
{
127-
codeQlPath:
128-
(await extension.distributionManager.getCodeQlPathWithoutVersionCheck()) ||
129-
"",
130-
debug: false,
131-
cacheSize: 0,
132-
numThreads: 1,
133-
saveCache: false,
134-
timeoutSecs: 0,
135-
},
136-
cliServer,
137-
{
138-
contextStoragePath: tmpDir.name,
139-
logger: extLogger,
140-
},
141-
(task) =>
142-
task(nullProgressReporter, new CancellationTokenSource().token),
143-
);
144-
await qs.startQueryServer();
145-
146-
// Unlike the old query sevre the new one wants a database and the empty direcrtory is not valid.
147-
// Add a database, but make sure the database manager is empty first
148-
await cleanDatabases(extension.databaseManager);
149-
const uri = Uri.file(dbLoc);
150-
const maybeDbItem = await importArchiveDatabase(
151-
createMockCommandManager(),
152-
uri.toString(true),
153-
extension.databaseManager,
154-
storagePath,
155-
() => {
156-
/**ignore progress */
157-
},
158-
token,
159-
);
160-
161-
if (!maybeDbItem) {
162-
throw new Error("Could not import database");
163-
}
164-
db = maybeDbItem.databaseUri.fsPath;
165-
} else {
166-
throw new Error(
167-
"Extension not initialized. Make sure cli is downloaded and installed properly.",
168-
);
120+
cliServer.quiet = true;
121+
if (!(await cliServer.cliConstraints.supportsNewQueryServerForTests())) {
122+
supportNewQueryServer = false;
123+
}
124+
qs = new QueryServerClient(
125+
{
126+
codeQlPath:
127+
(await extension.distributionManager.getCodeQlPathWithoutVersionCheck()) ||
128+
"",
129+
debug: false,
130+
cacheSize: 0,
131+
numThreads: 1,
132+
saveCache: false,
133+
timeoutSecs: 0,
134+
},
135+
cliServer,
136+
{
137+
contextStoragePath: tmpDir.name,
138+
logger: extLogger,
139+
},
140+
(task) => task(nullProgressReporter, new CancellationTokenSource().token),
141+
);
142+
await qs.startQueryServer();
143+
144+
// Unlike the old query sevre the new one wants a database and the empty direcrtory is not valid.
145+
// Add a database, but make sure the database manager is empty first
146+
await cleanDatabases(extension.databaseManager);
147+
const uri = Uri.file(dbLoc);
148+
const maybeDbItem = await importArchiveDatabase(
149+
createMockCommandManager(),
150+
uri.toString(true),
151+
extension.databaseManager,
152+
storagePath,
153+
() => {
154+
/**ignore progress */
155+
},
156+
token,
157+
);
158+
159+
if (!maybeDbItem) {
160+
throw new Error("Could not import database");
169161
}
162+
db = maybeDbItem.databaseUri.fsPath;
170163
});
171164

172165
for (const queryTestCase of queryTestCases) {

‎extensions/ql-vscode/test/vscode-tests/cli-integration/packaging.test.ts‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,7 @@ describe("Packaging commands", () => {
4242
.mockResolvedValue(undefined);
4343

4444
const extension = await getActivatedExtension();
45-
if ("cliServer" in extension) {
46-
cli = extension.cliServer;
47-
} else {
48-
throw new Error(
49-
"Extension not initialized. Make sure cli is downloaded and installed properly.",
50-
);
51-
}
45+
cli = extension.cliServer;
5246
});
5347

5448
it("should download all core query packs", async () => {

‎extensions/ql-vscode/test/vscode-tests/cli-integration/queries.test.ts‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -47,21 +47,15 @@ describeWithCodeQL()("Queries", () => {
4747

4848
beforeEach(async () => {
4949
const extension = await getActivatedExtension();
50-
if ("databaseManager" in extension) {
51-
databaseManager = extension.databaseManager;
52-
cli = extension.cliServer;
53-
qs = extension.qs;
54-
cli.quiet = true;
55-
ctx = extension.ctx;
56-
qlpackFile = `${ctx.storageUri?.fsPath}/quick-queries/qlpack.yml`;
57-
qlpackLockFile = `${ctx.storageUri?.fsPath}/quick-queries/codeql-pack.lock.yml`;
58-
oldQlpackLockFile = `${ctx.storageUri?.fsPath}/quick-queries/qlpack.lock.yml`;
59-
qlFile = `${ctx.storageUri?.fsPath}/quick-queries/quick-query.ql`;
60-
} else {
61-
throw new Error(
62-
"Extension not initialized. Make sure cli is downloaded and installed properly.",
63-
);
64-
}
50+
databaseManager = extension.databaseManager;
51+
cli = extension.cliServer;
52+
qs = extension.qs;
53+
cli.quiet = true;
54+
ctx = extension.ctx;
55+
qlpackFile = `${ctx.storageUri?.fsPath}/quick-queries/qlpack.yml`;
56+
qlpackLockFile = `${ctx.storageUri?.fsPath}/quick-queries/codeql-pack.lock.yml`;
57+
oldQlpackLockFile = `${ctx.storageUri?.fsPath}/quick-queries/qlpack.lock.yml`;
58+
qlFile = `${ctx.storageUri?.fsPath}/quick-queries/quick-query.ql`;
6559

6660
// Ensure we are starting from a clean slate.
6761
safeDel(qlFile);

‎extensions/ql-vscode/test/vscode-tests/cli-integration/run-cli.test.ts‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,8 @@ describe("Use cli", () => {
2525

2626
beforeEach(async () => {
2727
const extension = await getActivatedExtension();
28-
if ("cliServer" in extension) {
29-
cli = extension.cliServer;
30-
supportedLanguages = await cli.getSupportedLanguages();
31-
} else {
32-
throw new Error(
33-
"Extension not initialized. Make sure cli is downloaded and installed properly.",
34-
);
35-
}
28+
cli = extension.cliServer;
29+
supportedLanguages = await cli.getSupportedLanguages();
3630
});
3731

3832
if (process.env.CLI_VERSION && process.env.CLI_VERSION !== "nightly") {

0 commit comments

Comments
 (0)