Skip to content

Commit c215072

Browse files
chariskcharisk
committed
Move test-runner.ts to /query-testing/test-runner.ts
1 parent 7662b39 commit c215072

File tree

7 files changed

+29
-29
lines changed

7 files changed

+29
-29
lines changed

‎extensions/ql-vscode/src/extension.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ import { App } from "./common/app";
121121
import { registerCommandWithErrorHandling } from "./common/vscode/commands";
122122
import { DebuggerUI } from "./debugger/debugger-ui";
123123
import { DataExtensionsEditorModule } from "./data-extensions-editor/data-extensions-editor-module";
124-
import { TestManager } from "./test-manager";
125-
import { TestRunner } from "./test-runner";
124+
import { TestManager } from "./query-testing/test-manager";
125+
import { TestRunner } from "./query-testing/test-runner";
126126
import { TestManagerBase } from "./query-testing/test-manager-base";
127127
import { NewQueryRunner, QueryRunner, QueryServerClient } from "./query-server";
128128

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import { Event, EventEmitter, CancellationTokenSource } from "vscode";
2323
import { DisposableObject } from "../pure/disposable-object";
2424
import { CodeQLCliServer, TestCompleted } from "../codeql-cli/cli";
2525
import { testLogger } from "../common";
26-
import { TestRunner } from "../test-runner";
26+
import { TestRunner } from "./test-runner";
2727

2828
/**
2929
* Get the full path of the `.expected` file for the specified QL test.

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,20 @@ import {
1515
tests,
1616
workspace,
1717
} from "vscode";
18-
import { DisposableObject } from "./pure/disposable-object";
18+
import { DisposableObject } from "../pure/disposable-object";
1919
import {
2020
QLTestDirectory,
2121
QLTestDiscovery,
2222
QLTestFile,
2323
QLTestNode,
24-
} from "./qltest-discovery";
25-
import { CodeQLCliServer } from "./codeql-cli/cli";
26-
import { getErrorMessage } from "./pure/helpers-pure";
27-
import { BaseLogger, LogOptions } from "./common";
24+
} from "../qltest-discovery";
25+
import { CodeQLCliServer } from "../codeql-cli/cli";
26+
import { getErrorMessage } from "../pure/helpers-pure";
27+
import { BaseLogger, LogOptions } from "../common";
2828
import { TestRunner } from "./test-runner";
29-
import { TestManagerBase } from "./query-testing/test-manager-base";
30-
import { App } from "./common/app";
31-
import { isWorkspaceFolderOnDisk } from "./helpers";
29+
import { TestManagerBase } from "./test-manager-base";
30+
import { App } from "../common/app";
31+
import { isWorkspaceFolderOnDisk } from "../helpers";
3232

3333
/**
3434
* Returns the complete text content of the specified file. If there is an error reading the file,

extensions/ql-vscode/src/test-runner.ts renamed to extensions/ql-vscode/src/query-testing/test-runner.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
import { CancellationToken, Uri } from "vscode";
2-
import { CodeQLCliServer, TestCompleted } from "./codeql-cli/cli";
3-
import { DatabaseItem, DatabaseManager } from "./databases/local-databases";
2+
import { CodeQLCliServer, TestCompleted } from "../codeql-cli/cli";
3+
import { DatabaseItem, DatabaseManager } from "../databases/local-databases";
44
import {
55
getOnDiskWorkspaceFolders,
66
showAndLogExceptionWithTelemetry,
77
showAndLogWarningMessage,
8-
} from "./helpers";
9-
import { asError, getErrorMessage } from "./pure/helpers-pure";
10-
import { redactableError } from "./pure/errors";
8+
} from "../helpers";
9+
import { asError, getErrorMessage } from "../pure/helpers-pure";
10+
import { redactableError } from "../pure/errors";
1111
import { access } from "fs-extra";
12-
import { BaseLogger } from "./common";
13-
import { DisposableObject } from "./pure/disposable-object";
12+
import { BaseLogger } from "../common";
13+
import { DisposableObject } from "../pure/disposable-object";
1414

1515
async function isFileAccessible(uri: Uri): Promise<boolean> {
1616
try {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ import { QLTestAdapter } from "../../../../src/query-testing/test-adapter";
1414
import { CodeQLCliServer } from "../../../../src/codeql-cli/cli";
1515
import { DatabaseManager } from "../../../../src/databases/local-databases";
1616
import { mockedObject } from "../../utils/mocking.helpers";
17-
import { TestRunner } from "../../../../src/test-runner";
17+
import { TestRunner } from "../../../../src/query-testing/test-runner";
1818
import {
1919
createMockCliServerForTestRun,
2020
mockEmptyDatabaseManager,
2121
mockTestsInfo,
22-
} from "../test-runner-helpers";
23-
import { TestManager } from "../../../../src/test-manager";
22+
} from "./test-runner-helpers";
23+
import { TestManager } from "../../../../src/query-testing/test-manager";
2424
import { createMockApp } from "../../../__mocks__/appMock";
2525

2626
type IdTestItemPair = [id: string, testItem: TestItem];

extensions/ql-vscode/test/vscode-tests/no-workspace/test-runner-helpers.ts renamed to extensions/ql-vscode/test/vscode-tests/no-workspace/query-testing/test-runner-helpers.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Uri } from "vscode";
2-
import { mockedObject } from "../utils/mocking.helpers";
3-
import { CodeQLCliServer } from "../../../src/codeql-cli/cli";
4-
import { DatabaseManager } from "../../../src/databases/local-databases";
2+
import { mockedObject } from "../../utils/mocking.helpers";
3+
import { CodeQLCliServer } from "../../../../src/codeql-cli/cli";
4+
import { DatabaseManager } from "../../../../src/databases/local-databases";
55

66
/**
77
* Fake QL tests used by various tests.

extensions/ql-vscode/test/vscode-tests/no-workspace/test-runner.test.ts renamed to extensions/ql-vscode/test/vscode-tests/no-workspace/query-testing/test-runner.test.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import { CancellationTokenSource, Uri } from "vscode";
2-
import { CodeQLCliServer } from "../../../src/codeql-cli/cli";
2+
import { CodeQLCliServer } from "../../../../src/codeql-cli/cli";
33
import {
44
DatabaseItem,
55
DatabaseItemImpl,
66
DatabaseManager,
77
FullDatabaseOptions,
8-
} from "../../../src/databases/local-databases";
9-
import { mockedObject } from "../utils/mocking.helpers";
10-
import { TestRunner } from "../../../src/test-runner";
11-
import { createMockLogger } from "../../__mocks__/loggerMock";
8+
} from "../../../../src/databases/local-databases";
9+
import { mockedObject } from "../../utils/mocking.helpers";
10+
import { TestRunner } from "../../../../src/query-testing/test-runner";
11+
import { createMockLogger } from "../../../__mocks__/loggerMock";
1212
import {
1313
createMockCliServerForTestRun,
1414
mockTestsInfo,

0 commit comments

Comments
 (0)