Move qltest-discovery.ts to /query-testing/qltest-discovery.ts

extensions/ql-vscode/src/query-testing/qltest-discovery.ts

@@ -1,5 +1,5 @@
 import { dirname, basename, join, normalize, relative, extname } from "path";
-import { Discovery } from "./query-testing/discovery";
+import { Discovery } from "./discovery";
 import {
   EventEmitter,
   Event,
@@ -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";
 
 /**

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

@@ -18,7 +18,7 @@ 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";

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

@@ -21,7 +21,7 @@ import {
   QLTestDiscovery,
   QLTestFile,
   QLTestNode,
-} from "../qltest-discovery";
+} from "./qltest-discovery";
 import { CodeQLCliServer } from "../codeql-cli/cli";
 import { getErrorMessage } from "../pure/helpers-pure";
 import { BaseLogger, LogOptions } from "../common";

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", () => {