Skip to content

Commit 6e53ed0

Browse files
committed
Rename tests for databaseFetcher
These are not testing anything in the databases.ts file as we're invoking functions from the DatabaseFetcher. Let's name the file accordingly
1 parent 0eff277 commit 6e53ed0

1 file changed

Lines changed: 37 additions & 32 deletions

File tree

extensions/ql-vscode/test/vscode-tests/cli-integration/databases.test.ts renamed to extensions/ql-vscode/test/vscode-tests/cli-integration/databaseFetcher.test.ts

Lines changed: 37 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jest.setTimeout(60_000);
1515
/**
1616
* Run various integration tests for databases
1717
*/
18-
describe("Databases", () => {
18+
describe("DatabaseFetcher", () => {
1919
let databaseManager: DatabaseManager;
2020
let inputBoxStub: jest.SpiedFunction<typeof window.showInputBox>;
2121
let cli: CodeQLCliServer;
@@ -49,39 +49,44 @@ describe("Databases", () => {
4949
await cleanDatabases(databaseManager);
5050
});
5151

52-
it("should add a database from a folder", async () => {
53-
const uri = Uri.file(dbLoc);
54-
let dbItem = await importArchiveDatabase(
55-
uri.toString(true),
56-
databaseManager,
57-
storagePath,
58-
progressCallback,
59-
{} as CancellationToken,
60-
cli,
61-
);
62-
expect(dbItem).toBe(databaseManager.currentDatabaseItem);
63-
expect(dbItem).toBe(databaseManager.databaseItems[0]);
64-
expect(dbItem).toBeDefined();
65-
dbItem = dbItem!;
66-
expect(dbItem.name).toBe("db");
67-
expect(dbItem.databaseUri.fsPath).toBe(join(storagePath, "db", "db"));
52+
describe("importArchiveDatabase", () => {
53+
it("should add a database from a folder", async () => {
54+
const uri = Uri.file(dbLoc);
55+
let dbItem = await importArchiveDatabase(
56+
uri.toString(true),
57+
databaseManager,
58+
storagePath,
59+
progressCallback,
60+
{} as CancellationToken,
61+
cli,
62+
);
63+
expect(dbItem).toBe(databaseManager.currentDatabaseItem);
64+
expect(dbItem).toBe(databaseManager.databaseItems[0]);
65+
expect(dbItem).toBeDefined();
66+
dbItem = dbItem!;
67+
expect(dbItem.name).toBe("db");
68+
expect(dbItem.databaseUri.fsPath).toBe(join(storagePath, "db", "db"));
69+
});
6870
});
6971

70-
it("should add a database from a url", async () => {
71-
inputBoxStub.mockResolvedValue(DB_URL);
72+
describe("promptImportInternetDatabase", () => {
73+
it("should add a database from a url", async () => {
74+
// Provide a database URL when prompted
75+
inputBoxStub.mockResolvedValue(DB_URL);
7276

73-
let dbItem = await promptImportInternetDatabase(
74-
databaseManager,
75-
storagePath,
76-
progressCallback,
77-
{} as CancellationToken,
78-
cli,
79-
);
80-
expect(dbItem).toBeDefined();
81-
dbItem = dbItem!;
82-
expect(dbItem.name).toBe("db");
83-
expect(dbItem.databaseUri.fsPath).toBe(
84-
join(storagePath, "simple-db", "db"),
85-
);
77+
let dbItem = await promptImportInternetDatabase(
78+
databaseManager,
79+
storagePath,
80+
progressCallback,
81+
{} as CancellationToken,
82+
cli,
83+
);
84+
expect(dbItem).toBeDefined();
85+
dbItem = dbItem!;
86+
expect(dbItem.name).toBe("db");
87+
expect(dbItem.databaseUri.fsPath).toBe(
88+
join(storagePath, "simple-db", "db"),
89+
);
90+
});
8691
});
8792
});

0 commit comments

Comments
 (0)