Move test-runner.ts to /query-testing/test-runner.ts

extensions/ql-vscode/src/extension.ts

@@ -121,8 +121,8 @@ 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 { 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";
 

extensions/ql-vscode/src/query-testing/test-adapter.ts

@@ -23,7 +23,7 @@ import { Event, EventEmitter, CancellationTokenSource } from "vscode";
 import { DisposableObject } from "../pure/disposable-object";
 import { CodeQLCliServer, TestCompleted } from "../codeql-cli/cli";
 import { testLogger } from "../common";
-import { TestRunner } from "../test-runner";
+import { TestRunner } from "./test-runner";
 
 /**
  * Get the full path of the `.expected` file for the specified QL test.

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";
+} from "../qltest-discovery";
+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 "./query-testing/test-manager-base";
-import { App } from "./common/app";
-import { isWorkspaceFolderOnDisk } from "./helpers";
+import { TestManagerBase } from "./test-manager-base";
+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,

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 {

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

@@ -14,13 +14,13 @@ 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/test-runner";
+import { TestRunner } from "../../../../src/query-testing/test-runner";
 import {
   createMockCliServerForTestRun,
   mockEmptyDatabaseManager,
   mockTestsInfo,
-} from "../test-runner-helpers";
-import { TestManager } from "../../../../src/test-manager";
+} from "./test-runner-helpers";
+import { TestManager } from "../../../../src/query-testing/test-manager";
 import { createMockApp } from "../../../__mocks__/appMock";
 
 type IdTestItemPair = [id: string, testItem: TestItem];

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.

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,