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

Author: charisk

extensions/ql-vscode/src/extension.ts

@@ -86,7 +86,7 @@ import {
   LegacyQueryRunner,
   QueryServerClient as LegacyQueryServerClient,
 } from "./query-server/legacy";
-import { QLTestAdapterFactory } from "./test-adapter";
+import { QLTestAdapterFactory } from "./query-testing/test-adapter";
 import { TestUIService } from "./test-ui";
 import { CompareView } from "./compare/compare-view";
 import { initializeTelemetry } from "./telemetry";

extensions/ql-vscode/src/test-adapter.ts …vscode/src/query-testing/test-adapter.tsextensions/ql-vscode/src/test-adapter.ts renamed to extensions/ql-vscode/src/query-testing/test-adapter.ts extensions/ql-vscode/src/test-adapter.ts renamed to extensions/ql-vscode/src/query-testing/test-adapter.ts

@@ -18,12 +18,12 @@ import {
   QLTestNode,
   QLTestDirectory,
   QLTestDiscovery,
-} from "./qltest-discovery";
+} 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 { TestRunner } from "./test-runner";
+import { DisposableObject } from "../pure/disposable-object";
+import { CodeQLCliServer, TestCompleted } from "../codeql-cli/cli";
+import { testLogger } from "../common";
+import { TestRunner } from "../test-runner";
 
 /**
  * Get the full path of the `.expected` file for the specified QL test.

extensions/ql-vscode/src/test-manager-base.ts

@@ -1,7 +1,7 @@
 import { copy, createFile, lstat, pathExists } from "fs-extra";
 import { TestUICommands } from "./common/commands";
 import { DisposableObject } from "./pure/disposable-object";
-import { getActualFile, getExpectedFile } from "./test-adapter";
+import { getActualFile, getExpectedFile } from "./query-testing/test-adapter";
 import { TestItem, TextDocumentShowOptions, Uri, window } from "vscode";
 import { basename } from "path";
 import { App } from "./common/app";

extensions/ql-vscode/src/test-ui.ts

@@ -9,7 +9,7 @@ import {
 } from "vscode-test-adapter-api";
 import { TestTreeNode } from "./test-tree-node";
 import { DisposableObject } from "./pure/disposable-object";
-import { QLTestAdapter } from "./test-adapter";
+import { QLTestAdapter } from "./query-testing/test-adapter";
 import { App } from "./common/app";
 import { TestManagerBase } from "./test-manager-base";
 

…-tests/no-workspace/test-adapter.test.ts …space/query-testing/test-adapter.test.tsextensions/ql-vscode/test/vscode-tests/no-workspace/test-adapter.test.ts renamed to extensions/ql-vscode/test/vscode-tests/no-workspace/query-testing/test-adapter.test.ts extensions/ql-vscode/test/vscode-tests/no-workspace/test-adapter.test.ts renamed to 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/test-runner";
 import {
   createMockCliServerForTestRun,
   mockEmptyDatabaseManager,
   mockTestsInfo,
-} from "./test-runner-helpers";
-import { TestManager } from "../../../src/test-manager";
-import { createMockApp } from "../../__mocks__/appMock";
+} from "../test-runner-helpers";
+import { TestManager } from "../../../../src/test-manager";
+import { createMockApp } from "../../../__mocks__/appMock";
 
 type IdTestItemPair = [id: string, testItem: TestItem];