Skip to content

Commit 50f50f5

Browse files
committed
Use new type in tests
1 parent abbc130 commit 50f50f5

File tree

4 files changed

+18
-10
lines changed

4 files changed

+18
-10
lines changed

extensions/ql-vscode/test/unit-tests/databases/db-tree-creator.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import {
1616
createLocalTree,
1717
createRemoteTree,
1818
} from "../../../src/databases/db-tree-creator";
19+
import { QueryLanguage } from "../../../src/types/query-language";
1920
import { createDbConfig } from "../../factories/db-config-factories";
2021

2122
describe("db tree creator", () => {
@@ -334,7 +335,7 @@ describe("db tree creator", () => {
334335
{
335336
name: "db1",
336337
dateAdded: 1668428293677,
337-
language: "cpp",
338+
language: QueryLanguage.Cpp,
338339
storagePath: "/path/to/db1/",
339340
},
340341
{

extensions/ql-vscode/test/vscode-tests/minimal-workspace/databases/db-panel-rendering.test.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import { ExtensionApp } from "../../../../src/common/vscode/vscode-app";
1414
import { createMockExtensionContext } from "../../../factories/extension-context";
1515
import { createDbConfig } from "../../../factories/db-config-factories";
1616
import { setRemoteControllerRepo } from "../../../../src/config";
17+
import { QueryLanguage } from "../../../../src/types/query-language";
1718

1819
describe("db panel rendering nodes", () => {
1920
const workspaceStoragePath = join(__dirname, "test-workspace-storage");
@@ -183,13 +184,13 @@ describe("db panel rendering nodes", () => {
183184
{
184185
name: "db1",
185186
dateAdded: 1668428293677,
186-
language: "cpp",
187+
language: QueryLanguage.Cpp,
187188
storagePath: "/path/to/db1/",
188189
},
189190
{
190191
name: "db2",
191192
dateAdded: 1668428472731,
192-
language: "cpp",
193+
language: QueryLanguage.Cpp,
193194
storagePath: "/path/to/db2/",
194195
},
195196
],
@@ -234,15 +235,15 @@ describe("db panel rendering nodes", () => {
234235
kind: DbItemKind.LocalDatabase,
235236
databaseName: "db1",
236237
dateAdded: 1668428293677,
237-
language: "cpp",
238+
language: QueryLanguage.Cpp,
238239
storagePath: "/path/to/db1/",
239240
selected: false,
240241
},
241242
{
242243
kind: DbItemKind.LocalDatabase,
243244
databaseName: "db2",
244245
dateAdded: 1668428472731,
245-
language: "cpp",
246+
language: QueryLanguage.Cpp,
246247
storagePath: "/path/to/db2/",
247248
selected: false,
248249
},

extensions/ql-vscode/test/vscode-tests/minimal-workspace/qlpack-generator.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { join } from "path";
22
import { existsSync } from "fs";
3-
import { QlPackGenerator, QueryLanguage } from "../../../src/qlpack-generator";
3+
import { QlPackGenerator } from "../../../src/qlpack-generator";
4+
import { QueryLanguage } from "../../../src/types/query-language";
45
import { CodeQLCliServer } from "../../../src/cli";
56
import { Uri, workspace } from "vscode";
67
import { getErrorMessage } from "../../../src/pure/helpers-pure";

extensions/ql-vscode/test/vscode-tests/no-workspace/local-databases-ui.test.ts

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import { Uri } from "vscode";
1212
import { DatabaseUI } from "../../../src/local-databases-ui";
1313
import { testDisposeHandler } from "../test-dispose-handler";
1414
import { createMockApp } from "../../__mocks__/appMock";
15+
import { QueryLanguage } from "../../../src/types/query-language";
1516

1617
describe("local-databases-ui", () => {
1718
describe("fixDbUri", () => {
@@ -64,21 +65,25 @@ describe("local-databases-ui", () => {
6465

6566
it("should delete orphaned databases", async () => {
6667
const storageDir = dirSync().name;
67-
const db1 = createDatabase(storageDir, "db1-imported", "cpp");
68-
const db2 = createDatabase(storageDir, "db2-notimported", "cpp");
68+
const db1 = createDatabase(storageDir, "db1-imported", QueryLanguage.Cpp);
69+
const db2 = createDatabase(
70+
storageDir,
71+
"db2-notimported",
72+
QueryLanguage.Cpp,
73+
);
6974
const db3 = createDatabase(storageDir, "db3-invalidlanguage", "hucairz");
7075

7176
// these two should be deleted
7277
const db4 = createDatabase(
7378
storageDir,
7479
"db2-notimported-with-db-info",
75-
"cpp",
80+
QueryLanguage.Cpp,
7681
".dbinfo",
7782
);
7883
const db5 = createDatabase(
7984
storageDir,
8085
"db2-notimported-with-codeql-database.yml",
81-
"cpp",
86+
QueryLanguage.Cpp,
8287
"codeql-database.yml",
8388
);
8489

0 commit comments

Comments
 (0)