From 0af8146f58be589b4ae414cdfad3b28cb9f573a9 Mon Sep 17 00:00:00 2001 From: Charis Kyriakou Date: Mon, 4 Apr 2022 11:25:49 +0100 Subject: [PATCH 1/2] Move remote queries test files to be under remote-queries dir --- .../run-remote-query.test.ts | 14 +++++----- .../remote-query-history.test.ts | 28 +++++++++---------- 2 files changed, 21 insertions(+), 21 deletions(-) rename extensions/ql-vscode/src/vscode-tests/cli-integration/{ => remote-queries}/run-remote-query.test.ts (96%) rename extensions/ql-vscode/src/vscode-tests/no-workspace/{ => remote-queries}/remote-query-history.test.ts (93%) diff --git a/extensions/ql-vscode/src/vscode-tests/cli-integration/run-remote-query.test.ts b/extensions/ql-vscode/src/vscode-tests/cli-integration/remote-queries/run-remote-query.test.ts similarity index 96% rename from extensions/ql-vscode/src/vscode-tests/cli-integration/run-remote-query.test.ts rename to extensions/ql-vscode/src/vscode-tests/cli-integration/remote-queries/run-remote-query.test.ts index c5a7d78de58..590c3173382 100644 --- a/extensions/ql-vscode/src/vscode-tests/cli-integration/run-remote-query.test.ts +++ b/extensions/ql-vscode/src/vscode-tests/cli-integration/remote-queries/run-remote-query.test.ts @@ -6,16 +6,16 @@ import * as fs from 'fs-extra'; import * as os from 'os'; import * as yaml from 'js-yaml'; -import { QlPack, runRemoteQuery } from '../../remote-queries/run-remote-query'; -import { Credentials } from '../../authentication'; -import { CliVersionConstraint, CodeQLCliServer } from '../../cli'; -import { CodeQLExtensionInterface } from '../../extension'; -import { setRemoteControllerRepo, setRemoteRepositoryLists } from '../../config'; -import { UserCancellationException } from '../../commandRunner'; +import { QlPack, runRemoteQuery } from '../../../remote-queries/run-remote-query'; +import { Credentials } from '../../../authentication'; +import { CliVersionConstraint, CodeQLCliServer } from '../../../cli'; +import { CodeQLExtensionInterface } from '../../../extension'; +import { setRemoteControllerRepo, setRemoteRepositoryLists } from '../../../config'; +import { UserCancellationException } from '../../../commandRunner'; import { lte } from 'semver'; describe('Remote queries', function() { - const baseDir = path.join(__dirname, '../../../src/vscode-tests/cli-integration'); + const baseDir = path.join(__dirname, '../../../../src/vscode-tests/cli-integration'); let sandbox: sinon.SinonSandbox; diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/remote-query-history.test.ts b/extensions/ql-vscode/src/vscode-tests/no-workspace/remote-queries/remote-query-history.test.ts similarity index 93% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/remote-query-history.test.ts rename to extensions/ql-vscode/src/vscode-tests/no-workspace/remote-queries/remote-query-history.test.ts index a25541bdbbc..bdf5ac9bc0d 100644 --- a/extensions/ql-vscode/src/vscode-tests/no-workspace/remote-query-history.test.ts +++ b/extensions/ql-vscode/src/vscode-tests/no-workspace/remote-queries/remote-query-history.test.ts @@ -4,18 +4,18 @@ import * as sinon from 'sinon'; import { expect } from 'chai'; import { CancellationToken, ExtensionContext, Uri, window, workspace } from 'vscode'; -import { QueryHistoryConfig } from '../../config'; -import { DatabaseManager } from '../../databases'; -import { tmpDir } from '../../helpers'; -import { QueryHistoryManager } from '../../query-history'; -import { QueryServerClient } from '../../queryserver-client'; -import { Credentials } from '../../authentication'; -import { AnalysesResultsManager } from '../../remote-queries/analyses-results-manager'; -import { RemoteQueryResult } from '../../remote-queries/shared/remote-query-result'; -import { DisposableBucket } from '../disposable-bucket'; -import { testDisposeHandler } from '../test-dispose-handler'; -import { walkDirectory } from '../../helpers'; -import { getErrorMessage } from '../../pure/helpers-pure'; +import { QueryHistoryConfig } from '../../../config'; +import { DatabaseManager } from '../../../databases'; +import { tmpDir } from '../../../helpers'; +import { QueryHistoryManager } from '../../../query-history'; +import { QueryServerClient } from '../../../queryserver-client'; +import { Credentials } from '../../../authentication'; +import { AnalysesResultsManager } from '../../../remote-queries/analyses-results-manager'; +import { RemoteQueryResult } from '../../../remote-queries/shared/remote-query-result'; +import { DisposableBucket } from '../../disposable-bucket'; +import { testDisposeHandler } from '../../test-dispose-handler'; +import { walkDirectory } from '../../../helpers'; +import { getErrorMessage } from '../../../pure/helpers-pure'; /** * Tests for remote queries and how they interact with the query history manager. @@ -23,7 +23,7 @@ import { getErrorMessage } from '../../pure/helpers-pure'; describe('Remote queries and query history manager', function() { - const EXTENSION_PATH = path.join(__dirname, '../../../'); + const EXTENSION_PATH = path.join(__dirname, '../../../../'); const STORAGE_DIR = Uri.file(path.join(tmpDir.name, 'remote-queries')).fsPath; const asyncNoop = async () => { /** noop */ }; @@ -353,7 +353,7 @@ describe('Remote queries and query history manager', function() { async function copyHistoryState() { fs.ensureDirSync(STORAGE_DIR); - fs.copySync(path.join(__dirname, 'data/remote-queries/'), path.join(tmpDir.name, 'remote-queries')); + fs.copySync(path.join(__dirname, '../data/remote-queries/'), path.join(tmpDir.name, 'remote-queries')); // also, replace the files with "PLACEHOLDER" so that they have the correct directory for await (const p of walkDirectory(STORAGE_DIR)) { From 68f9a606bbcbe468004e32fcc6c91b3db2e825e8 Mon Sep 17 00:00:00 2001 From: Charis Kyriakou Date: Mon, 4 Apr 2022 12:07:40 +0100 Subject: [PATCH 2/2] Remove leftover comment --- .../no-workspace/remote-queries/repository-selection.test.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/remote-queries/repository-selection.test.ts b/extensions/ql-vscode/src/vscode-tests/no-workspace/remote-queries/repository-selection.test.ts index 9b85396cccc..9fb1c8cf618 100644 --- a/extensions/ql-vscode/src/vscode-tests/no-workspace/remote-queries/repository-selection.test.ts +++ b/extensions/ql-vscode/src/vscode-tests/no-workspace/remote-queries/repository-selection.test.ts @@ -21,7 +21,6 @@ describe('repository-selection', function() { showInputBoxSpy = sandbox.stub(window, 'showInputBox'); getRemoteRepositoryListsSpy = sandbox.stub(); showAndLogErrorMessageSpy = sandbox.stub(); - // extensions/ql-vscode/src/remote-queries/repository-selection.ts mod = proxyquire('../../../remote-queries/repository-selection', { '../config': { getRemoteRepositoryLists: getRemoteRepositoryListsSpy