Merge pull request #2391 from github/charisk/move-query-testing-files

charisk · web-flow · commit c319d61dd505 · 2023-04-28T17:04:25.000+01:00
Move query testing related files to /query-testing
diff --git a/extensions/ql-vscode/src/common/commands.ts b/extensions/ql-vscode/src/common/commands.ts
@@ -5,7 +5,7 @@ import type { DbTreeViewItem } from "../databases/ui/db-tree-view-item";
 import type { DatabaseItem } from "../databases/local-databases";
 import type { QueryHistoryInfo } from "../query-history/query-history-info";
 import type { RepositoriesFilterSortStateWithIds } from "../pure/variant-analysis-filter-sort";
-import type { TestTreeNode } from "../test-tree-node";
+import type { TestTreeNode } from "../query-testing/test-tree-node";
 import type {
   VariantAnalysis,
   VariantAnalysisScannedRepository,
diff --git a/extensions/ql-vscode/src/extension.ts b/extensions/ql-vscode/src/extension.ts
@@ -86,8 +86,8 @@ import {
   LegacyQueryRunner,
   QueryServerClient as LegacyQueryServerClient,
 } from "./query-server/legacy";
-import { QLTestAdapterFactory } from "./test-adapter";
-import { TestUIService } from "./test-ui";
+import { QLTestAdapterFactory } from "./query-testing/test-adapter";
+import { TestUIService } from "./query-testing/test-ui";
 import { CompareView } from "./compare/compare-view";
 import { initializeTelemetry } from "./telemetry";
 import { ProgressCallback, withProgress } from "./common/vscode/progress";
@@ -121,9 +121,9 @@ import { App } from "./common/app";
 import { registerCommandWithErrorHandling } from "./common/vscode/commands";
 import { DebuggerUI } from "./debugger/debugger-ui";
 import { DataExtensionsEditorModule } from "./data-extensions-editor/data-extensions-editor-module";
-import { TestManager } from "./test-manager";
-import { TestRunner } from "./test-runner";
-import { TestManagerBase } from "./test-manager-base";
+import { TestManager } from "./query-testing/test-manager";
+import { TestRunner } from "./query-testing/test-runner";
+import { TestManagerBase } from "./query-testing/test-manager-base";
 import { NewQueryRunner, QueryRunner, QueryServerClient } from "./query-server";
 
 /**
diff --git a/extensions/ql-vscode/src/query-testing/discovery.ts b/extensions/ql-vscode/src/query-testing/discovery.ts
@@ -1,6 +1,6 @@
-import { DisposableObject } from "./pure/disposable-object";
-import { extLogger } from "./common";
-import { getErrorMessage } from "./pure/helpers-pure";
+import { DisposableObject } from "../pure/disposable-object";
+import { extLogger } from "../common";
+import { getErrorMessage } from "../pure/helpers-pure";
 
 /**
  * Base class for "discovery" operations, which scan the file system to find specific kinds of
diff --git a/extensions/ql-vscode/src/query-testing/qltest-discovery.ts b/extensions/ql-vscode/src/query-testing/qltest-discovery.ts
@@ -8,8 +8,8 @@ import {
   WorkspaceFolder,
   env,
 } from "vscode";
-import { MultiFileSystemWatcher } from "./common/vscode/multi-file-system-watcher";
-import { CodeQLCliServer } from "./codeql-cli/cli";
+import { MultiFileSystemWatcher } from "../common/vscode/multi-file-system-watcher";
+import { CodeQLCliServer } from "../codeql-cli/cli";
 import { pathExists } from "fs-extra";
 
 /**
diff --git a/extensions/ql-vscode/src/query-testing/test-adapter.ts b/extensions/ql-vscode/src/query-testing/test-adapter.ts
@@ -20,9 +20,9 @@ import {
   QLTestDiscovery,
 } from "./qltest-discovery";
 import { Event, EventEmitter, CancellationTokenSource } from "vscode";
-import { DisposableObject } from "./pure/disposable-object";
-import { CodeQLCliServer, TestCompleted } from "./codeql-cli/cli";
-import { testLogger } from "./common";
+import { DisposableObject } from "../pure/disposable-object";
+import { CodeQLCliServer, TestCompleted } from "../codeql-cli/cli";
+import { testLogger } from "../common";
 import { TestRunner } from "./test-runner";
 
 /**
diff --git a/extensions/ql-vscode/src/query-testing/test-manager-base.ts b/extensions/ql-vscode/src/query-testing/test-manager-base.ts
@@ -1,10 +1,10 @@
 import { copy, createFile, lstat, pathExists } from "fs-extra";
-import { TestUICommands } from "./common/commands";
-import { DisposableObject } from "./pure/disposable-object";
+import { TestUICommands } from "../common/commands";
+import { DisposableObject } from "../pure/disposable-object";
 import { getActualFile, getExpectedFile } from "./test-adapter";
 import { TestItem, TextDocumentShowOptions, Uri, window } from "vscode";
 import { basename } from "path";
-import { App } from "./common/app";
+import { App } from "../common/app";
 import { TestTreeNode } from "./test-tree-node";
 
 export type TestNode = TestTreeNode | TestItem;
diff --git a/extensions/ql-vscode/src/query-testing/test-manager.ts b/extensions/ql-vscode/src/query-testing/test-manager.ts
@@ -15,20 +15,20 @@ import {
   tests,
   workspace,
 } from "vscode";
-import { DisposableObject } from "./pure/disposable-object";
+import { DisposableObject } from "../pure/disposable-object";
 import {
   QLTestDirectory,
   QLTestDiscovery,
   QLTestFile,
   QLTestNode,
 } from "./qltest-discovery";
-import { CodeQLCliServer } from "./codeql-cli/cli";
-import { getErrorMessage } from "./pure/helpers-pure";
-import { BaseLogger, LogOptions } from "./common";
+import { CodeQLCliServer } from "../codeql-cli/cli";
+import { getErrorMessage } from "../pure/helpers-pure";
+import { BaseLogger, LogOptions } from "../common";
 import { TestRunner } from "./test-runner";
 import { TestManagerBase } from "./test-manager-base";
-import { App } from "./common/app";
-import { isWorkspaceFolderOnDisk } from "./helpers";
+import { App } from "../common/app";
+import { isWorkspaceFolderOnDisk } from "../helpers";
 
 /**
  * Returns the complete text content of the specified file. If there is an error reading the file,
diff --git a/extensions/ql-vscode/src/query-testing/test-runner.ts b/extensions/ql-vscode/src/query-testing/test-runner.ts
@@ -1,16 +1,16 @@
 import { CancellationToken, Uri } from "vscode";
-import { CodeQLCliServer, TestCompleted } from "./codeql-cli/cli";
-import { DatabaseItem, DatabaseManager } from "./databases/local-databases";
+import { CodeQLCliServer, TestCompleted } from "../codeql-cli/cli";
+import { DatabaseItem, DatabaseManager } from "../databases/local-databases";
 import {
   getOnDiskWorkspaceFolders,
   showAndLogExceptionWithTelemetry,
   showAndLogWarningMessage,
-} from "./helpers";
-import { asError, getErrorMessage } from "./pure/helpers-pure";
-import { redactableError } from "./pure/errors";
+} from "../helpers";
+import { asError, getErrorMessage } from "../pure/helpers-pure";
+import { redactableError } from "../pure/errors";
 import { access } from "fs-extra";
-import { BaseLogger } from "./common";
-import { DisposableObject } from "./pure/disposable-object";
+import { BaseLogger } from "../common";
+import { DisposableObject } from "../pure/disposable-object";
 
 async function isFileAccessible(uri: Uri): Promise<boolean> {
   try {
diff --git a/extensions/ql-vscode/src/query-testing/test-tree-node.ts b/extensions/ql-vscode/src/query-testing/test-tree-node.ts
diff --git a/extensions/ql-vscode/src/query-testing/test-ui.ts b/extensions/ql-vscode/src/query-testing/test-ui.ts
@@ -8,9 +8,9 @@ import {
   TestSuiteEvent,
 } from "vscode-test-adapter-api";
 import { TestTreeNode } from "./test-tree-node";
-import { DisposableObject } from "./pure/disposable-object";
+import { DisposableObject } from "../pure/disposable-object";
 import { QLTestAdapter } from "./test-adapter";
-import { App } from "./common/app";
+import { App } from "../common/app";
 import { TestManagerBase } from "./test-manager-base";
 
 type VSCodeTestEvent =
diff --git a/extensions/ql-vscode/test/vscode-tests/minimal-workspace/query-testing/qltest-discovery.test.ts b/extensions/ql-vscode/test/vscode-tests/minimal-workspace/query-testing/qltest-discovery.test.ts
@@ -2,12 +2,12 @@ import { Uri, WorkspaceFolder } from "vscode";
 import * as fs from "fs-extra";
 import { join } from "path";
 
-import { QLTestDiscovery } from "../../../src/qltest-discovery";
+import { QLTestDiscovery } from "../../../../src/query-testing/qltest-discovery";
 import { DirectoryResult } from "tmp-promise";
 import * as tmp from "tmp-promise";
 
-import "../../matchers/toEqualPath";
-import { mockedObject } from "../utils/mocking.helpers";
+import "../../../matchers/toEqualPath";
+import { mockedObject } from "../../utils/mocking.helpers";
 
 describe("qltest-discovery", () => {
   describe("discoverTests", () => {
diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/query-testing/test-adapter.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/query-testing/test-adapter.test.ts
@@ -10,18 +10,18 @@ import {
   tests,
 } from "vscode";
 
-import { QLTestAdapter } from "../../../src/test-adapter";
-import { CodeQLCliServer } from "../../../src/codeql-cli/cli";
-import { DatabaseManager } from "../../../src/databases/local-databases";
-import { mockedObject } from "../utils/mocking.helpers";
-import { TestRunner } from "../../../src/test-runner";
+import { QLTestAdapter } from "../../../../src/query-testing/test-adapter";
+import { CodeQLCliServer } from "../../../../src/codeql-cli/cli";
+import { DatabaseManager } from "../../../../src/databases/local-databases";
+import { mockedObject } from "../../utils/mocking.helpers";
+import { TestRunner } from "../../../../src/query-testing/test-runner";
 import {
   createMockCliServerForTestRun,
   mockEmptyDatabaseManager,
   mockTestsInfo,
 } from "./test-runner-helpers";
-import { TestManager } from "../../../src/test-manager";
-import { createMockApp } from "../../__mocks__/appMock";
+import { TestManager } from "../../../../src/query-testing/test-manager";
+import { createMockApp } from "../../../__mocks__/appMock";
 
 type IdTestItemPair = [id: string, testItem: TestItem];
 
diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/query-testing/test-runner-helpers.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/query-testing/test-runner-helpers.ts
@@ -1,7 +1,7 @@
 import { Uri } from "vscode";
-import { mockedObject } from "../utils/mocking.helpers";
-import { CodeQLCliServer } from "../../../src/codeql-cli/cli";
-import { DatabaseManager } from "../../../src/databases/local-databases";
+import { mockedObject } from "../../utils/mocking.helpers";
+import { CodeQLCliServer } from "../../../../src/codeql-cli/cli";
+import { DatabaseManager } from "../../../../src/databases/local-databases";
 
 /**
  * Fake QL tests used by various tests.
diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/query-testing/test-runner.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/query-testing/test-runner.test.ts
@@ -1,14 +1,14 @@
 import { CancellationTokenSource, Uri } from "vscode";
-import { CodeQLCliServer } from "../../../src/codeql-cli/cli";
+import { CodeQLCliServer } from "../../../../src/codeql-cli/cli";
 import {
   DatabaseItem,
   DatabaseItemImpl,
   DatabaseManager,
   FullDatabaseOptions,
-} from "../../../src/databases/local-databases";
-import { mockedObject } from "../utils/mocking.helpers";
-import { TestRunner } from "../../../src/test-runner";
-import { createMockLogger } from "../../__mocks__/loggerMock";
+} from "../../../../src/databases/local-databases";
+import { mockedObject } from "../../utils/mocking.helpers";
+import { TestRunner } from "../../../../src/query-testing/test-runner";
+import { createMockLogger } from "../../../__mocks__/loggerMock";
 import {
   createMockCliServerForTestRun,
   mockTestsInfo,
