Fix expected args in tests

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

@@ -142,14 +142,7 @@ describeWithCodeQL()("using the legacy query server", () => {
     const parsedResults = new Checkpoint<void>();
 
     it("should register the database if necessary", async () => {
-      await qs.sendRequest(
-        messages.registerDatabases,
-        { databases: [db] },
-        token,
-        (() => {
-          /**/
-        }) as any,
-      );
+      await qs.sendRequest(messages.registerDatabases, { databases: [db] });
     });
 
     it(`should be able to compile query ${queryName}`, async () => {

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

@@ -152,14 +152,7 @@ describeWithCodeQL()("using the new query server", () => {
         return;
       }
 
-      await qs.sendRequest(
-        messages.registerDatabases,
-        { databases: [db] },
-        token,
-        (() => {
-          /**/
-        }) as any,
-      );
+      await qs.sendRequest(messages.registerDatabases, { databases: [db] });
     });
 
     it(`should be able to run query ${queryName}`, async () => {

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

@@ -1,7 +1,7 @@
 import * as tmp from "tmp";
 import * as fs from "fs-extra";
 import { join } from "path";
-import { CancellationToken, ExtensionContext, Uri, workspace } from "vscode";
+import { ExtensionContext, Uri, workspace } from "vscode";
 
 import {
   DatabaseContentsWithDbScheme,
@@ -12,7 +12,6 @@ import {
   FullDatabaseOptions,
 } from "../../../src/databases/local-databases";
 import { Logger } from "../../../src/common";
-import { ProgressCallback } from "../../../src/common/vscode/progress";
 import { CodeQLCliServer, DbInfo } from "../../../src/codeql-cli/cli";
 import {
   encodeArchiveBasePath,
@@ -119,11 +118,7 @@ describe("local databases", () => {
     const mockDbItem = createMockDB(dir);
     const onDidChangeDatabaseItem = jest.fn();
     databaseManager.onDidChangeDatabaseItem(onDidChangeDatabaseItem);
-    await (databaseManager as any).addDatabaseItem(
-      {} as ProgressCallback,
-      {} as CancellationToken,
-      mockDbItem,
-    );
+    await (databaseManager as any).addDatabaseItem(mockDbItem);
 
     expect((databaseManager as any)._databaseItems).toEqual([mockDbItem]);
     expect(updateSpy).toBeCalledWith("databaseList", [
@@ -155,11 +150,7 @@ describe("local databases", () => {
       const mockDbItem = createMockDB(dir);
       const onDidChangeDatabaseItem = jest.fn();
       databaseManager.onDidChangeDatabaseItem(onDidChangeDatabaseItem);
-      await (databaseManager as any).addDatabaseItem(
-        {} as ProgressCallback,
-        {} as CancellationToken,
-        mockDbItem,
-      );
+      await (databaseManager as any).addDatabaseItem(mockDbItem);
 
       await databaseManager.renameDatabaseItem(mockDbItem, "new name");
 
@@ -184,11 +175,7 @@ describe("local databases", () => {
       databaseManager.onDidChangeDatabaseItem(onDidChangeDatabaseItem);
       const mockDbItem = createMockDB(dir);
 
-      await (databaseManager as any).addDatabaseItem(
-        {} as ProgressCallback,
-        {} as CancellationToken,
-        mockDbItem,
-      );
+      await (databaseManager as any).addDatabaseItem(mockDbItem);
 
       expect(databaseManager.databaseItems).toEqual([mockDbItem]);
       expect(updateSpy).toBeCalledWith("databaseList", [
@@ -231,11 +218,7 @@ describe("local databases", () => {
         .spyOn(mockDbItem, "belongsToSourceArchiveExplorerUri")
         .mockReturnValue(true);
 
-      await (databaseManager as any).addDatabaseItem(
-        {} as ProgressCallback,
-        {} as CancellationToken,
-        mockDbItem,
-      );
+      await (databaseManager as any).addDatabaseItem(mockDbItem);
 
       updateSpy.mockClear();
 
@@ -260,11 +243,7 @@ describe("local databases", () => {
       jest
         .spyOn(mockDbItem, "belongsToSourceArchiveExplorerUri")
         .mockReturnValue(true);
-      await (databaseManager as any).addDatabaseItem(
-        {} as ProgressCallback,
-        {} as CancellationToken,
-        mockDbItem,
-      );
+      await (databaseManager as any).addDatabaseItem(mockDbItem);
       updateSpy.mockClear();
 
       // pretend that the database location is not controlled by the extension
@@ -289,18 +268,14 @@ describe("local databases", () => {
       // registration messages.
       const mockDbItem = createMockDB(dir);
 
-      await (databaseManager as any).addDatabaseItem(
-        {} as ProgressCallback,
-        {} as CancellationToken,
-        mockDbItem,
-      );
+      await (databaseManager as any).addDatabaseItem(mockDbItem);
       // Should have registered this database
-      expect(registerSpy).toBeCalledWith({}, {}, mockDbItem);
+      expect(registerSpy).toBeCalledWith(mockDbItem);
 
       await databaseManager.removeDatabaseItem(mockDbItem);
 
       // Should have deregistered this database
-      expect(deregisterSpy).toBeCalledWith({}, {}, mockDbItem);
+      expect(deregisterSpy).toBeCalledWith(mockDbItem);
     });
   });
 

extensions/ql-vscode/test/vscode-tests/no-workspace/query-testing/test-runner.test.ts

@@ -155,16 +155,10 @@ describe("test-runner", () => {
     ).toBeGreaterThan(openDatabaseSpy.mock.invocationCallOrder[0]);
 
     expect(removeDatabaseItemSpy).toBeCalledTimes(1);
-    expect(removeDatabaseItemSpy).toBeCalledWith(
-      expect.anything(),
-      expect.anything(),
-      preTestDatabaseItem,
-    );
+    expect(removeDatabaseItemSpy).toBeCalledWith(preTestDatabaseItem);
 
     expect(openDatabaseSpy).toBeCalledTimes(1);
     expect(openDatabaseSpy).toBeCalledWith(
-      expect.anything(),
-      expect.anything(),
       preTestDatabaseItem.databaseUri,
       false,
     );

extensions/ql-vscode/test/vscode-tests/no-workspace/run-queries.test.ts

@@ -232,8 +232,6 @@ describe("run-queries", () => {
     it("should register", async () => {
       const qs = createMockQueryServerClient();
       const runner = new LegacyQueryRunner(qs);
-      const mockProgress = "progress-monitor";
-      const mockCancel = "cancel-token";
       const datasetUri = Uri.file("dataset-uri");
 
       const dbItem: DatabaseItem = {
@@ -245,26 +243,19 @@ describe("run-queries", () => {
       await runner.registerDatabase(dbItem);
 
       expect(qs.sendRequest).toHaveBeenCalledTimes(1);
-      expect(qs.sendRequest).toHaveBeenCalledWith(
-        registerDatabases,
-        {
-          databases: [
-            {
-              dbDir: datasetUri.fsPath,
-              workingSet: "default",
-            },
-          ],
-        },
-        mockCancel,
-        mockProgress,
-      );
+      expect(qs.sendRequest).toHaveBeenCalledWith(registerDatabases, {
+        databases: [
+          {
+            dbDir: datasetUri.fsPath,
+            workingSet: "default",
+          },
+        ],
+      });
     });
 
     it("should deregister", async () => {
       const qs = createMockQueryServerClient();
       const runner = new LegacyQueryRunner(qs);
-      const mockProgress = "progress-monitor";
-      const mockCancel = "cancel-token";
       const datasetUri = Uri.file("dataset-uri");
 
       const dbItem: DatabaseItem = {
@@ -276,19 +267,14 @@ describe("run-queries", () => {
       await runner.deregisterDatabase(dbItem);
 
       expect(qs.sendRequest).toHaveBeenCalledTimes(1);
-      expect(qs.sendRequest).toHaveBeenCalledWith(
-        deregisterDatabases,
-        {
-          databases: [
-            {
-              dbDir: datasetUri.fsPath,
-              workingSet: "default",
-            },
-          ],
-        },
-        mockCancel,
-        mockProgress,
-      );
+      expect(qs.sendRequest).toHaveBeenCalledWith(deregisterDatabases, {
+        databases: [
+          {
+            dbDir: datasetUri.fsPath,
+            workingSet: "default",
+          },
+        ],
+      });
     });
   });