Remove calls to fail

Instead of calling `fail` and catching an error, this will use the
`rejects.toThrow` assertion to check that a Promise rejects with a
specific error.

Author: koesie10

extensions/ql-vscode/src/vscode-tests/no-workspace/query-history.test.ts

@@ -20,7 +20,6 @@ import {
   TWO_HOURS_IN_MS,
 } from "../../pure/time";
 import { tmpDir } from "../../helpers";
-import { getErrorMessage } from "../../pure/helpers-pure";
 import { HistoryItemLabelProvider } from "../../history-item-label-provider";
 import { RemoteQueriesManager } from "../../remote-queries/remote-queries-manager";
 import { ResultsView } from "../../interface";
@@ -939,52 +938,38 @@ describe("query-history", () => {
             }),
           });
 
-          try {
-            await (queryHistoryManager as any).findOtherQueryToCompare(
+          await expect(
+            (queryHistoryManager as any).findOtherQueryToCompare(thisQuery, [
               thisQuery,
-              [thisQuery, allHistory[0]],
-            );
-            fail("Should have thrown");
-          } catch (e) {
-            expect(getErrorMessage(e)).toBe(
-              "Please select a successful query.",
-            );
-          }
+              allHistory[0],
+            ]),
+          ).rejects.toThrow("Please select a successful query.");
         });
 
         it("should throw an error when a databases are not the same", async () => {
           queryHistoryManager = await createMockQueryHistory(allHistory);
 
-          try {
-            // localQueryHistory[0] is database a
-            // localQueryHistory[1] is database b
-            await (queryHistoryManager as any).findOtherQueryToCompare(
+          // localQueryHistory[0] is database a
+          // localQueryHistory[1] is database b
+          await expect(
+            (queryHistoryManager as any).findOtherQueryToCompare(
               localQueryHistory[0],
               [localQueryHistory[0], localQueryHistory[1]],
-            );
-            fail("Should have thrown");
-          } catch (e) {
-            expect(getErrorMessage(e)).toBe(
-              "Query databases must be the same.",
-            );
-          }
+            ),
+          ).rejects.toThrow("Query databases must be the same.");
         });
 
         it("should throw an error when more than 2 queries selected", async () => {
           const thisQuery = localQueryHistory[3];
           queryHistoryManager = await createMockQueryHistory(allHistory);
 
-          try {
-            await (queryHistoryManager as any).findOtherQueryToCompare(
+          await expect(
+            (queryHistoryManager as any).findOtherQueryToCompare(thisQuery, [
               thisQuery,
-              [thisQuery, localQueryHistory[0], localQueryHistory[1]],
-            );
-            fail("Should have thrown");
-          } catch (e) {
-            expect(getErrorMessage(e)).toBe(
-              "Please select no more than 2 queries.",
-            );
-          }
+              localQueryHistory[0],
+              localQueryHistory[1],
+            ]),
+          ).rejects.toThrow("Please select no more than 2 queries.");
         });
       });
 

extensions/ql-vscode/src/vscode-tests/no-workspace/remote-queries/gh-api/gh-actions-api-client.test.ts

@@ -1,4 +1,3 @@
-import { fail } from "assert";
 import { Credentials } from "../../../../authentication";
 import {
   cancelRemoteQuery,
@@ -124,7 +123,7 @@ describe("gh-actions-api-client real responses", () => {
   function skip() {
     if (!process.env.VSCODE_CODEQL_GITHUB_TOKEN) {
       if (process.env.CI) {
-        fail(
+        throw new Error(
           "The VSCODE_CODEQL_GITHUB_TOKEN must be set to a valid GITHUB token on CI",
         );
       } else {

extensions/ql-vscode/src/vscode-tests/no-workspace/remote-queries/remote-query-history.test.ts

@@ -20,7 +20,6 @@ import { RemoteQueryResult } from "../../../remote-queries/shared/remote-query-r
 import { DisposableBucket } from "../../disposable-bucket";
 import { testDisposeHandler } from "../../test-dispose-handler";
 import { walkDirectory } from "../../../helpers";
-import { getErrorMessage } from "../../../pure/helpers-pure";
 import { HistoryItemLabelProvider } from "../../../history-item-label-provider";
 import { RemoteQueriesManager } from "../../../remote-queries/remote-queries-manager";
 import { ResultsView } from "../../../interface";
@@ -394,18 +393,15 @@ describe("Remote queries and query history manager", () => {
       const publisher = jest.fn();
       const analysisSummaries = [...remoteQueryResult0.analysisSummaries];
 
-      try {
-        await arm.loadAnalysesResults(
+      await expect(
+        arm.loadAnalysesResults(
           analysisSummaries,
           {
             isCancellationRequested: true,
           } as CancellationToken,
           publisher,
-        );
-        fail("Should have thrown");
-      } catch (e) {
-        expect(getErrorMessage(e)).toContain("cancelled");
-      }
+        ),
+      ).rejects.toThrow(/cancelled/);
 
       expect(publisher).not.toBeCalled();
     });

extensions/ql-vscode/src/vscode-tests/no-workspace/telemetry.test.ts

@@ -10,7 +10,6 @@ import {
   telemetryListener as globalTelemetryListener,
 } from "../../telemetry";
 import { UserCancellationException } from "../../commandRunner";
-import { fail } from "assert";
 import { ENABLE_TELEMETRY } from "../../config";
 import { createMockExtensionContext } from "./index";
 
@@ -105,27 +104,19 @@ describe("telemetry reporting", () => {
   });
 
   it("should initialize telemetry when global option disabled", async () => {
-    try {
-      await enableTelemetry("telemetry", false);
-      await telemetryListener.initialize();
-      expect(telemetryListener._reporter).toBeDefined();
+    await enableTelemetry("telemetry", false);
+    await telemetryListener.initialize();
+    expect(telemetryListener._reporter).toBeDefined();
 
-      const reporter: any = telemetryListener._reporter;
-      expect(reporter.userOptIn).toBe(false); // disabled
-    } catch (e) {
-      fail(e as Error);
-    }
+    const reporter: any = telemetryListener._reporter;
+    expect(reporter.userOptIn).toBe(false); // disabled
   });
 
   it("should not initialize telemetry when extension option disabled", async () => {
-    try {
-      await enableTelemetry("codeQL.telemetry", false);
-      await telemetryListener.initialize();
+    await enableTelemetry("codeQL.telemetry", false);
+    await telemetryListener.initialize();
 
-      expect(telemetryListener._reporter).toBeUndefined();
-    } catch (e) {
-      fail(e as Error);
-    }
+    expect(telemetryListener._reporter).toBeUndefined();
   });
 
   it("should not initialize telemetry when both options disabled", async () => {