Move createMockUri to mocking helpers

Author: koesie10

extensions/ql-vscode/test/vscode-tests/no-workspace/data-extensions-editor/auto-model-codeml-queries.test.ts

@@ -1,5 +1,4 @@
 import { createMockLogger } from "../../../__mocks__/loggerMock";
-import type { Uri } from "vscode";
 import {
   DatabaseItem,
   DatabaseKind,
@@ -8,25 +7,12 @@ import { file } from "tmp-promise";
 import { QueryResultType } from "../../../../src/query-server/new-messages";
 import { runAutoModelQueries } from "../../../../src/data-extensions-editor/auto-model-codeml-queries";
 import { Mode } from "../../../../src/data-extensions-editor/shared/mode";
-import { mockedObject } from "../../utils/mocking.helpers";
+import { mockedObject, mockedUri } from "../../utils/mocking.helpers";
 import { CodeQLCliServer } from "../../../../src/codeql-cli/cli";
 import { QueryRunner } from "../../../../src/query-server";
 import * as queryResolver from "../../../../src/local-queries/query-resolver";
 import * as standardQueries from "../../../../src/local-queries/standard-queries";
 
-function createMockUri(path = "/a/b/c/foo"): Uri {
-  return {
-    scheme: "file",
-    authority: "",
-    path,
-    query: "",
-    fragment: "",
-    fsPath: path,
-    with: jest.fn(),
-    toJSON: jest.fn(),
-  };
-}
-
 describe("runAutoModelQueries", () => {
   const qlpack = {
     dbschemePack: "dbschemePack",
@@ -134,17 +120,17 @@ describe("runAutoModelQueries", () => {
         logger: createMockLogger(),
       }),
       databaseItem: mockedObject<DatabaseItem>({
-        databaseUri: createMockUri("/a/b/c/src.zip"),
+        databaseUri: mockedUri("/a/b/c/src.zip"),
         contents: {
           kind: DatabaseKind.Database,
           name: "foo",
-          datasetUri: createMockUri(),
+          datasetUri: mockedUri(),
         },
         language: "java",
         getSourceLocationPrefix: jest
           .fn()
           .mockResolvedValue("/home/runner/work/my-repo/my-repo"),
-        sourceArchive: createMockUri("/a/b/c/src.zip"),
+        sourceArchive: mockedUri("/a/b/c/src.zip"),
       }),
       queryStorageDir: "/tmp/queries",
       progress: jest.fn(),

extensions/ql-vscode/test/vscode-tests/no-workspace/data-extensions-editor/external-api-usage-query.test.ts

@@ -3,7 +3,6 @@ import {
   runQuery,
 } from "../../../../src/data-extensions-editor/external-api-usage-query";
 import { createMockLogger } from "../../../__mocks__/loggerMock";
-import type { Uri } from "vscode";
 import { DatabaseKind } from "../../../../src/databases/local-databases";
 import { file } from "tmp-promise";
 import { QueryResultType } from "../../../../src/query-server/new-messages";
@@ -16,19 +15,7 @@ import { RedactableError } from "../../../../src/common/errors";
 import { showAndLogExceptionWithTelemetry } from "../../../../src/common/logging";
 import { QueryLanguage } from "../../../../src/common/query-language";
 import { Query } from "../../../../src/data-extensions-editor/queries/query";
-
-function createMockUri(path = "/a/b/c/foo"): Uri {
-  return {
-    scheme: "file",
-    authority: "",
-    path,
-    query: "",
-    fragment: "",
-    fsPath: path,
-    with: jest.fn(),
-    toJSON: jest.fn(),
-  };
-}
+import { mockedUri } from "../../utils/mocking.helpers";
 
 describe("runQuery", () => {
   const cases = Object.keys(fetchExternalApiQueries).flatMap((lang) => {
@@ -74,11 +61,11 @@ describe("runQuery", () => {
           logger: createMockLogger(),
         },
         databaseItem: {
-          databaseUri: createMockUri("/a/b/c/src.zip"),
+          databaseUri: mockedUri("/a/b/c/src.zip"),
           contents: {
             kind: DatabaseKind.Database,
             name: "foo",
-            datasetUri: createMockUri(),
+            datasetUri: mockedUri(),
           },
           language,
         },

extensions/ql-vscode/test/vscode-tests/utils/mocking.helpers.ts

@@ -1,4 +1,4 @@
-import { QuickPickItem, window, Uri } from "vscode";
+import type { QuickPickItem, window, Uri } from "vscode";
 import { DatabaseItem } from "../../../src/databases/local-databases";
 
 export type DeepPartial<T> = T extends object
@@ -61,11 +61,11 @@ export function mockDatabaseItem(
   props: DeepPartial<DatabaseItem> = {},
 ): DatabaseItem {
   return mockedObject<DatabaseItem>({
-    databaseUri: Uri.file("abc"),
+    databaseUri: mockedUri("abc"),
     name: "github/codeql",
     language: "javascript",
     sourceArchive: undefined,
-    resolveSourceFile: jest.fn().mockReturnValue(Uri.file("abc")),
+    resolveSourceFile: jest.fn().mockReturnValue(mockedUri("abc")),
     ...props,
   });
 }
@@ -75,3 +75,16 @@ export function mockedQuickPickItem<T extends QuickPickItem | string>(
 ): Awaited<ReturnType<typeof window.showQuickPick>> {
   return value as Awaited<ReturnType<typeof window.showQuickPick>>;
 }
+
+export function mockedUri(path = "/a/b/c/foo"): Uri {
+  return {
+    scheme: "file",
+    authority: "",
+    path,
+    query: "",
+    fragment: "",
+    fsPath: path,
+    with: jest.fn(),
+    toJSON: jest.fn(),
+  };
+}