Move VS Code integration tests to /test directory (#1912)

.vscode/launch.json

@@ -94,7 +94,7 @@
       "cwd": "${workspaceFolder}/extensions/ql-vscode",
       "args": [
         "--projects",
-        "src/vscode-tests/no-workspace"
+        "test/vscode-tests/no-workspace"
       ],
       "sourceMaps": true,
       "console": "integratedTerminal",
@@ -110,7 +110,7 @@
       "cwd": "${workspaceFolder}/extensions/ql-vscode",
       "args": [
         "--projects",
-        "src/vscode-tests/minimal-workspace"
+        "test/vscode-tests/minimal-workspace"
       ],
       "sourceMaps": true,
       "console": "integratedTerminal",
@@ -126,7 +126,7 @@
       "cwd": "${workspaceFolder}/extensions/ql-vscode",
       "args": [
         "--projects",
-        "src/vscode-tests/cli-integration"
+        "test/vscode-tests/cli-integration"
       ],
       "env": {
         // Optionally, set the version to use for the integration tests.

CONTRIBUTING.md

@@ -97,12 +97,12 @@ We have several types of tests:
 
 * Unit tests: these live in the `tests/pure-tests/` directory
 * View tests: these live in `src/view/variant-analysis/__tests__/`
-* VSCode integration tests: these live in `src/vscode-tests/no-workspace` and `src/vscode-tests/minimal-workspace`
+* VSCode integration tests: these live in `test/vscode-tests/no-workspace` and `test/vscode-tests/minimal-workspace`
-* CLI integration tests: these live in `src/vscode-tests/cli-integration`
+* CLI integration tests: these live in `test/vscode-tests/cli-integration`
 
 The CLI integration tests require an instance of the CodeQL CLI to run so they will require some extra setup steps. When adding new tests to our test suite, please be mindful of whether they need to be in the cli-integration folder. If the tests don't depend on the CLI, they are better suited to being a VSCode integration test.
 
-Any test data you're using (sample projects, config files, etc.) must go in a `src/vscode-tests/*/data` directory. When you run the tests, the test runner will copy the data directory to `out/vscode-tests/*/data`.
+Any test data you're using (sample projects, config files, etc.) must go in a `test/vscode-tests/*/data` directory. When you run the tests, the test runner will copy the data directory to `out/vscode-tests/*/data`.
 
 #### Running the tests
 
@@ -155,16 +155,16 @@ The CLI integration tests require the CodeQL standard libraries in order to run
 ##### 1. From the terminal
 
 The easiest way to run a single test is to change the `it` of the test to `it.only` and then run the test command with some additional options
-to only run tests for this specific file. For example, to run the test `src/vscode-tests/cli-integration/run-queries.test.ts`:
+to only run tests for this specific file. For example, to run the test `test/vscode-tests/cli-integration/run-queries.test.ts`:
 
 ```shell
-npm run cli-integration -- --runTestsByPath src/vscode-tests/cli-integration/run-queries.test.ts
+npm run cli-integration -- --runTestsByPath test/vscode-tests/cli-integration/run-queries.test.ts
 ```
 
-You can also use the `--testNamePattern` option to run a specific test within a file. For example, to run the test `src/vscode-tests/cli-integration/run-queries.test.ts`:
+You can also use the `--testNamePattern` option to run a specific test within a file. For example, to run the test `test/vscode-tests/cli-integration/run-queries.test.ts`:
 
 ```shell
-npm run cli-integration -- --runTestsByPath src/vscode-tests/cli-integration/run-queries.test.ts --testNamePattern "should create a QueryEvaluationInfo"
+npm run cli-integration -- --runTestsByPath test/vscode-tests/cli-integration/run-queries.test.ts --testNamePattern "should create a QueryEvaluationInfo"
 ```
 
 ##### 2. From VSCode

extensions/ql-vscode/gulpfile.ts/tests.ts

@@ -5,17 +5,17 @@ export function copyTestData() {
 }
 
 export function watchTestData() {
-  return watch(["src/vscode-tests/*/data/**/*"], copyTestData);
+  return watch(["test/vscode-tests/*/data/**/*"], copyTestData);
 }
 
 function copyNoWorkspaceData() {
-  return src("src/vscode-tests/no-workspace/data/**/*").pipe(
+  return src("test/vscode-tests/no-workspace/data/**/*").pipe(
     dest("out/vscode-tests/no-workspace/data"),
   );
 }
 
 function copyCliIntegrationData() {
-  return src("src/vscode-tests/cli-integration/data/**/*").pipe(
+  return src("test/vscode-tests/cli-integration/data/**/*").pipe(
     dest("out/vscode-tests/cli-integration/data"),
   );
 }

extensions/ql-vscode/jest.config.js

@@ -8,8 +8,8 @@ module.exports = {
   projects: [
     "<rootDir>/src/view",
     "<rootDir>/test/unit-tests",
-    "<rootDir>/src/vscode-tests/cli-integration",
+    "<rootDir>/test/vscode-tests/cli-integration",
-    "<rootDir>/src/vscode-tests/no-workspace",
+    "<rootDir>/test/vscode-tests/no-workspace",
-    "<rootDir>/src/vscode-tests/minimal-workspace",
+    "<rootDir>/test/vscode-tests/minimal-workspace",
   ],
 };

extensions/ql-vscode/package.json

@@ -1288,9 +1288,9 @@
     "test:unit": "cross-env TZ=UTC LANG=en-US jest --projects test/unit-tests",
     "test:view": "jest --projects src/view",
     "integration": "npm-run-all integration:*",
-    "integration:no-workspace": "jest --projects src/vscode-tests/no-workspace",
+    "integration:no-workspace": "jest --projects test/vscode-tests/no-workspace",
-    "integration:minimal-workspace": "jest --projects src/vscode-tests/minimal-workspace",
+    "integration:minimal-workspace": "jest --projects test/vscode-tests/minimal-workspace",
-    "cli-integration": "jest --projects src/vscode-tests/cli-integration",
+    "cli-integration": "jest --projects test/vscode-tests/cli-integration",
     "update-vscode": "node ./node_modules/vscode/bin/install",
     "format": "prettier --write **/*.{ts,tsx} && eslint . --ext .ts,.tsx --fix",
     "lint": "eslint . --ext .ts,.tsx --max-warnings=0",

extensions/ql-vscode/src/stories/tsconfig.json

@@ -7,7 +7,7 @@
     "lib": ["ES2021", "dom"],
     "jsx": "react",
     "sourceMap": true,
-    "rootDir": "..",
+    "rootDir": "../../..",
     "strict": true,
     "noUnusedLocals": true,
     "noImplicitReturns": true,

extensions/ql-vscode/src/stories/variant-analysis/RepoRow.stories.tsx

@@ -11,7 +11,7 @@ import {
   AnalysisAlert,
   AnalysisRawResults,
 } from "../../remote-queries/shared/analysis-result";
-import { createMockRepositoryWithMetadata } from "../../vscode-tests/factories/remote-queries/shared/repository";
+import { createMockRepositoryWithMetadata } from "../../../test/factories/remote-queries/shared/repository";
 
 import * as analysesResults from "../remote-queries/data/analysesResultsMessage.json";
 import * as rawResults from "../remote-queries/data/rawResults.json";

extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysis.stories.tsx

@@ -12,8 +12,8 @@ import {
   VariantAnalysisScannedRepositoryState,
   VariantAnalysisStatus,
 } from "../../remote-queries/shared/variant-analysis";
-import { createMockVariantAnalysis } from "../../vscode-tests/factories/remote-queries/shared/variant-analysis";
+import { createMockVariantAnalysis } from "../../../test/factories/remote-queries/shared/variant-analysis";
-import { createMockRepositoryWithMetadata } from "../../vscode-tests/factories/remote-queries/shared/repository";
+import { createMockRepositoryWithMetadata } from "../../../test/factories/remote-queries/shared/repository";
 
 export default {
   title: "Variant Analysis/Variant Analysis",

extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisAnalyzedRepos.stories.tsx

@@ -12,9 +12,9 @@ import {
   VariantAnalysisStatus,
 } from "../../remote-queries/shared/variant-analysis";
 import { AnalysisAlert } from "../../remote-queries/shared/analysis-result";
-import { createMockVariantAnalysis } from "../../vscode-tests/factories/remote-queries/shared/variant-analysis";
+import { createMockVariantAnalysis } from "../../../test/factories/remote-queries/shared/variant-analysis";
-import { createMockRepositoryWithMetadata } from "../../vscode-tests/factories/remote-queries/shared/repository";
+import { createMockRepositoryWithMetadata } from "../../../test/factories/remote-queries/shared/repository";
-import { createMockScannedRepo } from "../../vscode-tests/factories/remote-queries/shared/scanned-repositories";
+import { createMockScannedRepo } from "../../../test/factories/remote-queries/shared/scanned-repositories";
 
 import * as analysesResults from "../remote-queries/data/analysesResultsMessage.json";
 

extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisHeader.stories.tsx

@@ -8,8 +8,8 @@ import {
   VariantAnalysisRepoStatus,
   VariantAnalysisStatus,
 } from "../../remote-queries/shared/variant-analysis";
-import { createMockVariantAnalysis } from "../../vscode-tests/factories/remote-queries/shared/variant-analysis";
+import { createMockVariantAnalysis } from "../../../test/factories/remote-queries/shared/variant-analysis";
-import { createMockScannedRepo } from "../../vscode-tests/factories/remote-queries/shared/scanned-repositories";
+import { createMockScannedRepo } from "../../../test/factories/remote-queries/shared/scanned-repositories";
 
 export default {
   title: "Variant Analysis/Variant Analysis Header",

extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisOutcomePanels.stories.tsx

@@ -9,9 +9,9 @@ import {
   VariantAnalysisRepoStatus,
   VariantAnalysisStatus,
 } from "../../remote-queries/shared/variant-analysis";
-import { createMockScannedRepo } from "../../vscode-tests/factories/remote-queries/shared/scanned-repositories";
+import { createMockScannedRepo } from "../../../test/factories/remote-queries/shared/scanned-repositories";
-import { createMockVariantAnalysis } from "../../vscode-tests/factories/remote-queries/shared/variant-analysis";
+import { createMockVariantAnalysis } from "../../../test/factories/remote-queries/shared/variant-analysis";
-import { createMockRepositoryWithMetadata } from "../../vscode-tests/factories/remote-queries/shared/repository";
+import { createMockRepositoryWithMetadata } from "../../../test/factories/remote-queries/shared/repository";
 import {
   defaultFilterSortState,
   RepositoriesFilterSortState,

extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisSkippedRepositoriesTab.stories.tsx

@@ -4,7 +4,7 @@ import { ComponentMeta, ComponentStory } from "@storybook/react";
 
 import { VariantAnalysisContainer } from "../../view/variant-analysis/VariantAnalysisContainer";
 import { VariantAnalysisSkippedRepositoriesTab } from "../../view/variant-analysis/VariantAnalysisSkippedRepositoriesTab";
-import { createMockRepositoryWithMetadata } from "../../vscode-tests/factories/remote-queries/shared/repository";
+import { createMockRepositoryWithMetadata } from "../../../test/factories/remote-queries/shared/repository";
 
 export default {
   title: "Variant Analysis/Variant Analysis Skipped Repositories Tab",

extensions/ql-vscode/src/view/common/CodePaths/__tests__/CodePaths.spec.tsx

@@ -3,8 +3,8 @@ import { render as reactRender, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { CodePaths, CodePathsProps } from "../CodePaths";
 
-import { createMockCodeFlows } from "../../../../vscode-tests/factories/remote-queries/shared/CodeFlow";
+import { createMockCodeFlows } from "../../../../../test/factories/remote-queries/shared/CodeFlow";
-import { createMockAnalysisMessage } from "../../../../vscode-tests/factories/remote-queries/shared/AnalysisMessage";
+import { createMockAnalysisMessage } from "../../../../../test/factories/remote-queries/shared/AnalysisMessage";
 
 describe(CodePaths.name, () => {
   const render = (props?: CodePathsProps) =>

extensions/ql-vscode/src/view/tsconfig.json

@@ -7,7 +7,7 @@
     "lib": ["ES2021", "dom"],
     "jsx": "react",
     "sourceMap": true,
-    "rootDir": "..",
+    "rootDir": "../..",
     "strict": true,
     "noUnusedLocals": true,
     "noImplicitReturns": true,

extensions/ql-vscode/src/view/variant-analysis/__tests__/RepoRow.spec.tsx

@@ -6,7 +6,7 @@ import {
 } from "../../../remote-queries/shared/variant-analysis";
 import userEvent from "@testing-library/user-event";
 import { RepoRow, RepoRowProps } from "../RepoRow";
-import { createMockRepositoryWithMetadata } from "../../../vscode-tests/factories/remote-queries/shared/repository";
+import { createMockRepositoryWithMetadata } from "../../../../test/factories/remote-queries/shared/repository";
 
 describe(RepoRow.name, () => {
   const render = (props: Partial<RepoRowProps> = {}) => {

extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysis.spec.tsx

@@ -5,7 +5,7 @@ import {
   VariantAnalysisStatus,
 } from "../../../remote-queries/shared/variant-analysis";
 import { VariantAnalysis, VariantAnalysisProps } from "../VariantAnalysis";
-import { createMockVariantAnalysis } from "../../../vscode-tests/factories/remote-queries/shared/variant-analysis";
+import { createMockVariantAnalysis } from "../../../../test/factories/remote-queries/shared/variant-analysis";
 
 describe(VariantAnalysis.name, () => {
   const render = (props: Partial<VariantAnalysisProps> = {}) =>

extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisAnalyzedRepos.spec.tsx

@@ -10,9 +10,9 @@ import {
   VariantAnalysisAnalyzedRepos,
   VariantAnalysisAnalyzedReposProps,
 } from "../VariantAnalysisAnalyzedRepos";
-import { createMockVariantAnalysis } from "../../../vscode-tests/factories/remote-queries/shared/variant-analysis";
+import { createMockVariantAnalysis } from "../../../../test/factories/remote-queries/shared/variant-analysis";
-import { createMockRepositoryWithMetadata } from "../../../vscode-tests/factories/remote-queries/shared/repository";
+import { createMockRepositoryWithMetadata } from "../../../../test/factories/remote-queries/shared/repository";
-import { createMockScannedRepo } from "../../../vscode-tests/factories/remote-queries/shared/scanned-repositories";
+import { createMockScannedRepo } from "../../../../test/factories/remote-queries/shared/scanned-repositories";
 import {
   defaultFilterSortState,
   SortKey,

extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisOutcomePanels.spec.tsx

@@ -10,12 +10,12 @@ import {
   VariantAnalysisOutcomePanelProps,
   VariantAnalysisOutcomePanels,
 } from "../VariantAnalysisOutcomePanels";
-import { createMockVariantAnalysis } from "../../../vscode-tests/factories/remote-queries/shared/variant-analysis";
+import { createMockVariantAnalysis } from "../../../../test/factories/remote-queries/shared/variant-analysis";
-import { createMockRepositoryWithMetadata } from "../../../vscode-tests/factories/remote-queries/shared/repository";
+import { createMockRepositoryWithMetadata } from "../../../../test/factories/remote-queries/shared/repository";
 import {
   createMockScannedRepo,
   createMockScannedRepos,
-} from "../../../vscode-tests/factories/remote-queries/shared/scanned-repositories";
+} from "../../../../test/factories/remote-queries/shared/scanned-repositories";
 import { defaultFilterSortState } from "../../../pure/variant-analysis-filter-sort";
 
 describe(VariantAnalysisOutcomePanels.name, () => {

extensions/ql-vscode/test/__mocks__/appMock.ts

@@ -3,7 +3,7 @@ import { AppEvent, AppEventEmitter } from "../../src/common/events";
 import { Memento } from "../../src/common/memento";
 import { Disposable } from "../../src/pure/disposable-object";
 import { createMockLogger } from "./loggerMock";
-import { createMockMemento } from "../../src/vscode-tests/mock-memento";
+import { createMockMemento } from "../mock-memento";
 
 export function createMockApp({
   extensionPath = "/mock/extension/path",

extensions/ql-vscode/test/factories/db-config-factories.ts

@@ -5,7 +5,7 @@ import {
   LocalList,
   RemoteRepositoryList,
   SelectedDbItem,
-} from "../../databases/config/db-config";
+} from "../../src/databases/config/db-config";
 
 export function createDbConfig({
   remoteLists = [],

extensions/ql-vscode/test/factories/local-queries/local-query-history-item.ts

@@ -1,12 +1,12 @@
 import { faker } from "@faker-js/faker";
-import { InitialQueryInfo, LocalQueryInfo } from "../../../query-results";
+import { InitialQueryInfo, LocalQueryInfo } from "../../../src/query-results";
 import {
   QueryEvaluationInfo,
   QueryWithResults,
-} from "../../../run-queries-shared";
+} from "../../../src/run-queries-shared";
 import { CancellationTokenSource } from "vscode";
-import { QueryResultType } from "../../../pure/legacy-messages";
+import { QueryResultType } from "../../../src/pure/legacy-messages";
-import { QueryMetadata } from "../../../pure/interface-types";
+import { QueryMetadata } from "../../../src/pure/interface-types";
 
 export function createMockLocalQueryInfo({
   startTime = new Date(),

extensions/ql-vscode/test/factories/remote-queries/gh-api/repository.ts

@@ -2,7 +2,7 @@ import { faker } from "@faker-js/faker";
 import {
   Repository,
   RepositoryWithMetadata,
-} from "../../../../remote-queries/gh-api/repository";
+} from "../../../../src/remote-queries/gh-api/repository";
 
 export function createMockRepository(name = faker.random.word()): Repository {
   return {

extensions/ql-vscode/test/factories/remote-queries/gh-api/scanned-repositories.ts

@@ -2,7 +2,7 @@ import { faker } from "@faker-js/faker";
 import {
   VariantAnalysisRepoStatus,
   VariantAnalysisScannedRepository,
-} from "../../../../remote-queries/gh-api/variant-analysis";
+} from "../../../../src/remote-queries/gh-api/variant-analysis";
 import { createMockRepositoryWithMetadata } from "./repository";
 
 export function createMockScannedRepo(

extensions/ql-vscode/test/factories/remote-queries/gh-api/skipped-repositories.ts

@@ -3,7 +3,7 @@ import {
   VariantAnalysisNotFoundRepositoryGroup,
   VariantAnalysisSkippedRepositories,
   VariantAnalysisSkippedRepositoryGroup,
-} from "../../../../remote-queries/gh-api/variant-analysis";
+} from "../../../../src/remote-queries/gh-api/variant-analysis";
 import { createMockRepositoryWithMetadata } from "./repository";
 
 export function createMockSkippedRepos(): VariantAnalysisSkippedRepositories {

extensions/ql-vscode/test/factories/remote-queries/gh-api/variant-analysis-api-response.ts

@@ -4,8 +4,8 @@ import {
   VariantAnalysisScannedRepository,
   VariantAnalysisSkippedRepositories,
   VariantAnalysisStatus,
-} from "../../../../remote-queries/gh-api/variant-analysis";
+} from "../../../../src/remote-queries/gh-api/variant-analysis";
-import { VariantAnalysisQueryLanguage } from "../../../../remote-queries/shared/variant-analysis";
+import { VariantAnalysisQueryLanguage } from "../../../../src/remote-queries/shared/variant-analysis";
 import { createMockScannedRepos } from "./scanned-repositories";
 import { createMockSkippedRepos } from "./skipped-repositories";
 import { createMockRepository } from "./repository";

extensions/ql-vscode/test/factories/remote-queries/gh-api/variant-analysis-repo-task.ts

@@ -1,6 +1,6 @@
 import { faker } from "@faker-js/faker";
-import { VariantAnalysisRepoTask } from "../../../../remote-queries/gh-api/variant-analysis";
+import { VariantAnalysisRepoTask } from "../../../../src/remote-queries/gh-api/variant-analysis";
-import { VariantAnalysisRepoStatus } from "../../../../remote-queries/shared/variant-analysis";
+import { VariantAnalysisRepoStatus } from "../../../../src/remote-queries/shared/variant-analysis";
 import { createMockRepository } from "./repository";
 
 export function createMockVariantAnalysisRepoTask(): VariantAnalysisRepoTask {

extensions/ql-vscode/test/factories/remote-queries/remote-query-history-item.ts

@@ -1,6 +1,6 @@
 import { nanoid } from "nanoid";
-import { RemoteQueryHistoryItem } from "../../../remote-queries/remote-query-history-item";
+import { RemoteQueryHistoryItem } from "../../../src/remote-queries/remote-query-history-item";
-import { QueryStatus } from "../../../query-status";
+import { QueryStatus } from "../../../src/query-status";
 
 export function createMockRemoteQueryHistoryItem({
   date = new Date("2022-01-01T00:00:00.000Z"),

extensions/ql-vscode/test/factories/remote-queries/shared/AnalysisMessage.ts

@@ -1,4 +1,4 @@
-import { AnalysisMessage } from "../../../../remote-queries/shared/analysis-result";
+import { AnalysisMessage } from "../../../../src/remote-queries/shared/analysis-result";
 
 export function createMockAnalysisMessage(): AnalysisMessage {
   return {

extensions/ql-vscode/test/factories/remote-queries/shared/CodeFlow.ts

@@ -1,4 +1,4 @@
-import { CodeFlow } from "../../../../remote-queries/shared/analysis-result";
+import { CodeFlow } from "../../../../src/remote-queries/shared/analysis-result";
 import { createMockAnalysisMessage } from "./AnalysisMessage";
 
 export function createMockCodeFlows(): CodeFlow[] {

extensions/ql-vscode/test/factories/remote-queries/shared/repository.ts

@@ -2,7 +2,7 @@ import { faker } from "@faker-js/faker";
 import {
   Repository,
   RepositoryWithMetadata,
-} from "../../../../remote-queries/shared/repository";
+} from "../../../../src/remote-queries/shared/repository";
 
 export function createMockRepository(): Repository {
   return {

extensions/ql-vscode/test/factories/remote-queries/shared/scanned-repositories.ts

@@ -2,7 +2,7 @@ import { faker } from "@faker-js/faker";
 import {
   VariantAnalysisRepoStatus,
   VariantAnalysisScannedRepository,
-} from "../../../../remote-queries/shared/variant-analysis";
+} from "../../../../src/remote-queries/shared/variant-analysis";
 import { createMockRepositoryWithMetadata } from "./repository";
 
 export function createMockScannedRepo(

extensions/ql-vscode/test/factories/remote-queries/shared/skipped-repositories.ts

@@ -2,7 +2,7 @@ import { faker } from "@faker-js/faker";
 import {
   VariantAnalysisSkippedRepositories,
   VariantAnalysisSkippedRepositoryGroup,
-} from "../../../../remote-queries/shared/variant-analysis";
+} from "../../../../src/remote-queries/shared/variant-analysis";
 import { createMockRepositoryWithMetadata } from "./repository";
 
 export function createMockSkippedRepos(): VariantAnalysisSkippedRepositories {

extensions/ql-vscode/test/factories/remote-queries/shared/variant-analysis-repo-tasks.ts

@@ -2,7 +2,7 @@ import { faker } from "@faker-js/faker";
 import {
   VariantAnalysisRepositoryTask,
   VariantAnalysisRepoStatus,
-} from "../../../../remote-queries/shared/variant-analysis";
+} from "../../../../src/remote-queries/shared/variant-analysis";
 import { createMockRepositoryWithMetadata } from "./repository";
 
 export function createMockVariantAnalysisRepositoryTask(

extensions/ql-vscode/test/factories/remote-queries/shared/variant-analysis-submission.ts

@@ -2,7 +2,7 @@ import { faker } from "@faker-js/faker";
 import {
   VariantAnalysisQueryLanguage,
   VariantAnalysisSubmission,
-} from "../../../../remote-queries/shared/variant-analysis";
+} from "../../../../src/remote-queries/shared/variant-analysis";
 
 export function createMockSubmission(): VariantAnalysisSubmission {
   return {

extensions/ql-vscode/test/factories/remote-queries/shared/variant-analysis.ts

@@ -5,7 +5,7 @@ import {
   VariantAnalysisScannedRepository,
   VariantAnalysisSkippedRepositories,
   VariantAnalysisStatus,
-} from "../../../../remote-queries/shared/variant-analysis";
+} from "../../../../src/remote-queries/shared/variant-analysis";
 import { createMockScannedRepos } from "./scanned-repositories";
 import { createMockSkippedRepos } from "./skipped-repositories";
 import { createMockRepository } from "./repository";

extensions/ql-vscode/test/factories/remote-queries/variant-analysis-history-item.ts

@@ -1,6 +1,6 @@
-import { VariantAnalysisHistoryItem } from "../../../remote-queries/variant-analysis-history-item";
+import { VariantAnalysisHistoryItem } from "../../../src/remote-queries/variant-analysis-history-item";
-import { QueryStatus } from "../../../query-status";
+import { QueryStatus } from "../../../src/query-status";
-import { VariantAnalysisStatus } from "../../../remote-queries/shared/variant-analysis";
+import { VariantAnalysisStatus } from "../../../src/remote-queries/shared/variant-analysis";
 import { createMockVariantAnalysis } from "./shared/variant-analysis";
 
 export function createMockVariantAnalysisHistoryItem({

extensions/ql-vscode/test/mock-memento.ts

@@ -1,4 +1,4 @@
-import { Memento } from "../common/memento";
+import { Memento } from "../src/common/memento";
 
 export function createMockMemento(): Memento {
   return new MockMemento();

extensions/ql-vscode/test/tsconfig.json

@@ -1,13 +1,11 @@
 {
   "extends": "../tsconfig.json",
-  "include": [
+  "include": ["**/*.ts", "../src/**/*.ts"],
-    "**/*.ts",
-    "../src/vscode-tests/factories/db-config-factories.ts"
-  ],
   "exclude": [],
   "compilerOptions": {
     "noEmit": true,
     "resolveJsonModule": true,
-    "rootDir": ".."
+    "rootDir": "..",
+    "jsx": "react"
   }
 }

extensions/ql-vscode/test/unit-tests/databases/config/db-config-validator.test.ts

@@ -5,7 +5,7 @@ import { DbConfigValidationErrorKind } from "../../../../src/databases/db-valida
 import {
   createDbConfig,
   createLocalDbConfigItem,
-} from "../../../../src/vscode-tests/factories/db-config-factories";
+} from "../../../factories/db-config-factories";
 
 describe("db config validation", () => {
   const extensionPath = join(__dirname, "../../../..");

extensions/ql-vscode/test/unit-tests/databases/db-tree-creator.test.ts

@@ -14,7 +14,7 @@ import {
   createLocalTree,
   createRemoteTree,
 } from "../../../src/databases/db-tree-creator";
-import { createDbConfig } from "../../../src/vscode-tests/factories/db-config-factories";
+import { createDbConfig } from "../../factories/db-config-factories";
 
 describe("db tree creator", () => {
   describe("createRemoteTree", () => {

extensions/ql-vscode/test/unit-tests/remote-queries/gh-api/gh-api-client.test.ts

@@ -11,7 +11,7 @@ import {
   submitVariantAnalysis,
 } from "../../../../src/remote-queries/gh-api/gh-api-client";
 import { Credentials } from "../../../../src/authentication";
-import { createMockSubmission } from "../../../../src/vscode-tests/factories/remote-queries/shared/variant-analysis-submission";
+import { createMockSubmission } from "../../../factories/remote-queries/shared/variant-analysis-submission";
 import { MockGitHubApiServer } from "../../../../src/mocks/mock-gh-api-server";
 
 import { response } from "../../../../src/mocks/scenarios/problem-query-success/0-getRepo.json";

extensions/ql-vscode/test/unit-tests/remote-queries/variant-analysis-processor.test.ts

@@ -13,11 +13,11 @@ import {
 import {
   createMockScannedRepo,
   createMockScannedRepos,
-} from "../../../src/vscode-tests/factories/remote-queries/gh-api/scanned-repositories";
+} from "../../factories/remote-queries/gh-api/scanned-repositories";
-import { createMockSkippedRepos } from "../../../src/vscode-tests/factories/remote-queries/gh-api/skipped-repositories";
+import { createMockSkippedRepos } from "../../factories/remote-queries/gh-api/skipped-repositories";
-import { createMockApiResponse } from "../../../src/vscode-tests/factories/remote-queries/gh-api/variant-analysis-api-response";
+import { createMockApiResponse } from "../../factories/remote-queries/gh-api/variant-analysis-api-response";
-import { createMockSubmission } from "../../../src/vscode-tests/factories/remote-queries/shared/variant-analysis-submission";
+import { createMockSubmission } from "../../factories/remote-queries/shared/variant-analysis-submission";
-import { createMockVariantAnalysisRepoTask } from "../../../src/vscode-tests/factories/remote-queries/gh-api/variant-analysis-repo-task";
+import { createMockVariantAnalysisRepoTask } from "../../factories/remote-queries/gh-api/variant-analysis-repo-task";
 
 describe(processVariantAnalysis.name, () => {
   const scannedRepos = createMockScannedRepos();

extensions/ql-vscode/test/unit-tests/variant-analysis.test.ts

@@ -7,8 +7,8 @@ import {
   VariantAnalysisRepoStatus,
   getActionsWorkflowRunUrl,
 } from "../../src/remote-queries/shared/variant-analysis";
-import { createMockScannedRepo } from "../../src/vscode-tests/factories/remote-queries/shared/scanned-repositories";
+import { createMockScannedRepo } from "../factories/remote-queries/shared/scanned-repositories";
-import { createMockVariantAnalysis } from "../../src/vscode-tests/factories/remote-queries/shared/variant-analysis";
+import { createMockVariantAnalysis } from "../factories/remote-queries/shared/variant-analysis";
 
 describe("parseVariantAnalysisQueryLanguage", () => {
   it("parses a valid language", () => {

extensions/ql-vscode/test/vscode-tests/cli-integration/databases.test.ts

@@ -1,13 +1,13 @@
 import { join } from "path";
 import { extensions, CancellationToken, Uri, window } from "vscode";
 
-import { CodeQLExtensionInterface } from "../../extension";
+import { CodeQLExtensionInterface } from "../../../src/extension";
-import { CodeQLCliServer } from "../../cli";
+import { CodeQLCliServer } from "../../../src/cli";
-import { DatabaseManager } from "../../databases";
+import { DatabaseManager } from "../../../src/databases";
 import {
   importArchiveDatabase,
   promptImportInternetDatabase,
-} from "../../databaseFetcher";
+} from "../../../src/databaseFetcher";
 import { cleanDatabases, dbLoc, DB_URL, storagePath } from "./global.helper";
 
 jest.setTimeout(60_000);

extensions/ql-vscode/test/vscode-tests/cli-integration/databases/db-panel.test.ts

@@ -1,14 +1,14 @@
 import { commands, extensions, window } from "vscode";
 
-import { CodeQLExtensionInterface } from "../../../extension";
+import { CodeQLExtensionInterface } from "../../../../src/extension";
 import { readJson } from "fs-extra";
 import * as path from "path";
-import { DbConfig } from "../../../databases/config/db-config";
+import { DbConfig } from "../../../../src/databases/config/db-config";
 import {
   AddListQuickPickItem,
   RemoteDatabaseQuickPickItem,
-} from "../../../databases/ui/db-panel";
+} from "../../../../src/databases/ui/db-panel";
-import { DbListKind } from "../../../databases/db-item";
+import { DbListKind } from "../../../../src/databases/db-item";
 
 jest.setTimeout(60_000);
 

extensions/ql-vscode/test/vscode-tests/cli-integration/global.helper.ts

@@ -2,9 +2,9 @@ import { join } from "path";
 import { load, dump } from "js-yaml";
 import { realpathSync, readFileSync, writeFileSync } from "fs-extra";
 import { commands } from "vscode";
-import { DatabaseManager } from "../../databases";
+import { DatabaseManager } from "../../../src/databases";
-import { CodeQLCliServer } from "../../cli";
+import { CodeQLCliServer } from "../../../src/cli";
-import { removeWorkspaceRefs } from "../../remote-queries/run-remote-query";
+import { removeWorkspaceRefs } from "../../../src/remote-queries/run-remote-query";
 
 // This file contains helpers shared between actual tests.
 

extensions/ql-vscode/test/vscode-tests/cli-integration/helpers.test.ts

@@ -1,15 +1,15 @@
 import { join } from "path";
 import { extensions } from "vscode";
 
-import { CodeQLCliServer } from "../../cli";
+import { CodeQLCliServer } from "../../../src/cli";
-import { CodeQLExtensionInterface } from "../../extension";
+import { CodeQLExtensionInterface } from "../../../src/extension";
-import { tryGetQueryMetadata } from "../../helpers";
+import { tryGetQueryMetadata } from "../../../src/helpers";
 
 // up to 3 minutes per test
 jest.setTimeout(3 * 60 * 1000);
 
 describe("helpers (with CLI)", () => {
-  const baseDir = join(__dirname, "../../../src/vscode-tests/cli-integration");
+  const baseDir = __dirname;
 
   let cli: CodeQLCliServer;
 

extensions/ql-vscode/test/vscode-tests/cli-integration/jest.setup.ts

@@ -9,7 +9,7 @@ import fetch from "node-fetch";
 import { DB_URL, dbLoc, setStoragePath, storagePath } from "./global.helper";
 import * as tmp from "tmp";
 import { getTestSetting } from "../test-config";
-import { CUSTOM_CODEQL_PATH_SETTING } from "../../config";
+import { CUSTOM_CODEQL_PATH_SETTING } from "../../../src/config";
 import { extensions, workspace } from "vscode";
 
 import baseJestSetup from "../jest.setup";

extensions/ql-vscode/test/vscode-tests/cli-integration/legacy-query.test.ts

@@ -3,15 +3,15 @@ import { join, basename } from "path";
 import { dirSync } from "tmp";
 import { pathToFileURL } from "url";
 import { CancellationTokenSource } from "vscode-jsonrpc";
-import * as messages from "../../pure/legacy-messages";
+import * as messages from "../../../src/pure/legacy-messages";
-import * as qsClient from "../../legacy-query-server/queryserver-client";
+import * as qsClient from "../../../src/legacy-query-server/queryserver-client";
-import * as cli from "../../cli";
+import * as cli from "../../../src/cli";
-import { CellValue } from "../../pure/bqrs-cli-types";
+import { CellValue } from "../../../src/pure/bqrs-cli-types";
 import { extensions } from "vscode";
-import { CodeQLExtensionInterface } from "../../extension";
+import { CodeQLExtensionInterface } from "../../../src/extension";
 import { describeWithCodeQL } from "../cli";
-import { QueryServerClient } from "../../legacy-query-server/queryserver-client";
+import { QueryServerClient } from "../../../src/legacy-query-server/queryserver-client";
-import { extLogger, ProgressReporter } from "../../common";
+import { extLogger, ProgressReporter } from "../../../src/common";
 
 const baseDir = join(__dirname, "../../../test/data");
 

extensions/ql-vscode/test/vscode-tests/cli-integration/new-query.test.ts

@@ -1,18 +1,18 @@
 import { join, basename } from "path";
 import { dirSync } from "tmp";
 import { CancellationTokenSource } from "vscode-jsonrpc";
-import * as messages from "../../pure/new-messages";
+import * as messages from "../../../src/pure/new-messages";
-import * as qsClient from "../../query-server/queryserver-client";
+import * as qsClient from "../../../src/query-server/queryserver-client";
-import * as cli from "../../cli";
+import * as cli from "../../../src/cli";
-import { CellValue } from "../../pure/bqrs-cli-types";
+import { CellValue } from "../../../src/pure/bqrs-cli-types";
 import { extensions, Uri } from "vscode";
-import { CodeQLExtensionInterface } from "../../extension";
+import { CodeQLExtensionInterface } from "../../../src/extension";
 import { describeWithCodeQL } from "../cli";
-import { QueryServerClient } from "../../query-server/queryserver-client";
+import { QueryServerClient } from "../../../src/query-server/queryserver-client";
-import { extLogger, ProgressReporter } from "../../common";
+import { extLogger, ProgressReporter } from "../../../src/common";
-import { QueryResultType } from "../../pure/new-messages";
+import { QueryResultType } from "../../../src/pure/new-messages";
 import { cleanDatabases, dbLoc, storagePath } from "./global.helper";
-import { importArchiveDatabase } from "../../databaseFetcher";
+import { importArchiveDatabase } from "../../../src/databaseFetcher";
 
 const baseDir = join(__dirname, "../../../test/data");
 

extensions/ql-vscode/test/vscode-tests/cli-integration/packaging.test.ts

@@ -1,15 +1,15 @@
 import { extensions, QuickPickItem, window } from "vscode";
 import { join } from "path";
 
-import { CodeQLCliServer } from "../../cli";
+import { CodeQLCliServer } from "../../../src/cli";
-import { CodeQLExtensionInterface } from "../../extension";
+import { CodeQLExtensionInterface } from "../../../src/extension";
-import { getErrorMessage } from "../../pure/helpers-pure";
+import { getErrorMessage } from "../../../src/pure/helpers-pure";
 
-import * as helpers from "../../helpers";
+import * as helpers from "../../../src/helpers";
 import {
   handleDownloadPacks,
   handleInstallPackDependencies,
-} from "../../packaging";
+} from "../../../src/packaging";
 
 // up to 3 minutes per test
 jest.setTimeout(3 * 60 * 1000);
@@ -91,10 +91,7 @@ describe("Packaging commands", () => {
   });
 
   it("should install valid workspace pack", async () => {
-    const rootDir = join(
+    const rootDir = join(__dirname, "./data");
-      __dirname,
-      "../../../src/vscode-tests/cli-integration/data",
-    );
     quickPickSpy.mockResolvedValue([
       {
         label: "integration-test-queries-javascript",
@@ -109,10 +106,7 @@ describe("Packaging commands", () => {
   });
 
   it("should throw an error when installing invalid workspace pack", async () => {
-    const rootDir = join(
+    const rootDir = join(__dirname, "../data-invalid-pack");
-      __dirname,
-      "../../../src/vscode-tests/cli-integration/data-invalid-pack",
-    );
     quickPickSpy.mockResolvedValue([
       {
         label: "foo/bar",

extensions/ql-vscode/test/vscode-tests/cli-integration/queries.test.ts

@@ -15,15 +15,15 @@ import {
 } from "fs-extra";
 import { load, dump } from "js-yaml";
 
-import { DatabaseItem, DatabaseManager } from "../../databases";
+import { DatabaseItem, DatabaseManager } from "../../../src/databases";
-import { CodeQLExtensionInterface } from "../../extension";
+import { CodeQLExtensionInterface } from "../../../src/extension";
 import { cleanDatabases, dbLoc, storagePath } from "./global.helper";
-import { importArchiveDatabase } from "../../databaseFetcher";
+import { importArchiveDatabase } from "../../../src/databaseFetcher";
-import { CodeQLCliServer } from "../../cli";
+import { CodeQLCliServer } from "../../../src/cli";
 import { describeWithCodeQL } from "../cli";
-import { tmpDir } from "../../helpers";
+import { tmpDir } from "../../../src/helpers";
-import { createInitialQueryInfo } from "../../run-queries-shared";
+import { createInitialQueryInfo } from "../../../src/run-queries-shared";
-import { QueryRunner } from "../../queryRunner";
+import { QueryRunner } from "../../../src/queryRunner";
 
 jest.setTimeout(20_000);
 

extensions/ql-vscode/test/vscode-tests/cli-integration/remote-queries/remote-queries-manager.test.ts

@@ -10,22 +10,22 @@ import {
 } from "vscode";
 import { load } from "js-yaml";
 
-import { QlPack } from "../../../remote-queries/run-remote-query";
+import { QlPack } from "../../../../src/remote-queries/run-remote-query";
-import { CodeQLCliServer } from "../../../cli";
+import { CodeQLCliServer } from "../../../../src/cli";
-import { CodeQLExtensionInterface } from "../../../extension";
+import { CodeQLExtensionInterface } from "../../../../src/extension";
 import {
   setRemoteControllerRepo,
   setRemoteRepositoryLists,
-} from "../../../config";
+} from "../../../../src/config";
-import { UserCancellationException } from "../../../commandRunner";
+import { UserCancellationException } from "../../../../src/commandRunner";
-import * as ghApiClient from "../../../remote-queries/gh-api/gh-api-client";
+import * as ghApiClient from "../../../../src/remote-queries/gh-api/gh-api-client";
-import { Repository } from "../../../remote-queries/gh-api/repository";
+import { Repository } from "../../../../src/remote-queries/gh-api/repository";
 import { createMockExtensionContext } from "../../no-workspace";
-import { OutputChannelLogger } from "../../../common";
+import { OutputChannelLogger } from "../../../../src/common";
-import { RemoteQueriesSubmission } from "../../../remote-queries/shared/remote-queries";
+import { RemoteQueriesSubmission } from "../../../../src/remote-queries/shared/remote-queries";
 import { readBundledPack } from "../../utils/bundled-pack-helpers";
-import { RemoteQueriesManager } from "../../../remote-queries/remote-queries-manager";
+import { RemoteQueriesManager } from "../../../../src/remote-queries/remote-queries-manager";
-import { Credentials } from "../../../authentication";
+import { Credentials } from "../../../../src/authentication";
 import {
   fixWorkspaceReferences,
   restoreWorkspaceReferences,
@@ -35,10 +35,7 @@ import {
 jest.setTimeout(3 * 60 * 1000);
 
 describe("Remote queries", () => {
-  const baseDir = join(
+  const baseDir = join(__dirname, "..");
-    __dirname,
-    "../../../../src/vscode-tests/cli-integration",
-  );
 
   const qlpackFileWithWorkspaceRefs = getFile(
     "data-remote-qlpack/qlpack.yml",

extensions/ql-vscode/test/vscode-tests/cli-integration/remote-queries/variant-analysis-manager.test.ts

@@ -10,54 +10,54 @@ import {
   window,
   workspace,
 } from "vscode";
-import { CodeQLExtensionInterface } from "../../../extension";
+import { CodeQLExtensionInterface } from "../../../../src/extension";
-import { extLogger } from "../../../common";
+import { extLogger } from "../../../../src/common";
-import * as config from "../../../config";
+import * as config from "../../../../src/config";
 import {
   setRemoteControllerRepo,
   setRemoteRepositoryLists,
-} from "../../../config";
+} from "../../../../src/config";
-import * as ghApiClient from "../../../remote-queries/gh-api/gh-api-client";
+import * as ghApiClient from "../../../../src/remote-queries/gh-api/gh-api-client";
-import * as ghActionsApiClient from "../../../remote-queries/gh-api/gh-actions-api-client";
+import * as ghActionsApiClient from "../../../../src/remote-queries/gh-api/gh-actions-api-client";
-import { Credentials } from "../../../authentication";
+import { Credentials } from "../../../../src/authentication";
 import * as fs from "fs-extra";
 import { join } from "path";
 
-import { VariantAnalysisManager } from "../../../remote-queries/variant-analysis-manager";
+import { VariantAnalysisManager } from "../../../../src/remote-queries/variant-analysis-manager";
-import { CodeQLCliServer } from "../../../cli";
+import { CodeQLCliServer } from "../../../../src/cli";
 import {
   fixWorkspaceReferences,
   restoreWorkspaceReferences,
   storagePath,
 } from "../global.helper";
-import { VariantAnalysisResultsManager } from "../../../remote-queries/variant-analysis-results-manager";
+import { VariantAnalysisResultsManager } from "../../../../src/remote-queries/variant-analysis-results-manager";
-import { createMockVariantAnalysis } from "../../factories/remote-queries/shared/variant-analysis";
+import { createMockVariantAnalysis } from "../../../factories/remote-queries/shared/variant-analysis";
-import * as VariantAnalysisModule from "../../../remote-queries/shared/variant-analysis";
+import * as VariantAnalysisModule from "../../../../src/remote-queries/shared/variant-analysis";
 import {
   createMockScannedRepo,
   createMockScannedRepos,
-} from "../../factories/remote-queries/shared/scanned-repositories";
+} from "../../../factories/remote-queries/shared/scanned-repositories";
 import {
   VariantAnalysis,
   VariantAnalysisScannedRepository,
   VariantAnalysisScannedRepositoryDownloadStatus,
   VariantAnalysisScannedRepositoryState,
   VariantAnalysisStatus,
-} from "../../../remote-queries/shared/variant-analysis";
+} from "../../../../src/remote-queries/shared/variant-analysis";
-import { createTimestampFile } from "../../../helpers";
+import { createTimestampFile } from "../../../../src/helpers";
-import { createMockVariantAnalysisRepoTask } from "../../factories/remote-queries/gh-api/variant-analysis-repo-task";
+import { createMockVariantAnalysisRepoTask } from "../../../factories/remote-queries/gh-api/variant-analysis-repo-task";
 import {
   VariantAnalysis as VariantAnalysisApiResponse,
   VariantAnalysisRepoTask,
-} from "../../../remote-queries/gh-api/variant-analysis";
+} from "../../../../src/remote-queries/gh-api/variant-analysis";
-import { createMockApiResponse } from "../../factories/remote-queries/gh-api/variant-analysis-api-response";
+import { createMockApiResponse } from "../../../factories/remote-queries/gh-api/variant-analysis-api-response";
-import { UserCancellationException } from "../../../commandRunner";
+import { UserCancellationException } from "../../../../src/commandRunner";
-import { Repository } from "../../../remote-queries/gh-api/repository";
+import { Repository } from "../../../../src/remote-queries/gh-api/repository";
 import {
   defaultFilterSortState,
   SortKey,
-} from "../../../pure/variant-analysis-filter-sort";
+} from "../../../../src/pure/variant-analysis-filter-sort";
-import { DbManager } from "../../../databases/db-manager";
+import { DbManager } from "../../../../src/databases/db-manager";
 
 // up to 3 minutes per test
 jest.setTimeout(3 * 60 * 1000);
@@ -127,10 +127,7 @@ describe("Variant Analysis Manager", () => {
     let originalDeps: Record<string, string> | undefined;
     let executeCommandSpy: jest.SpiedFunction<typeof commands.executeCommand>;
 
-    const baseDir = join(
+    const baseDir = join(__dirname, "..");
-      __dirname,
-      "../../../../src/vscode-tests/cli-integration",
-    );
     const qlpackFileWithWorkspaceRefs = getFile(
       "data-remote-qlpack/qlpack.yml",
     ).fsPath;
@@ -395,7 +392,7 @@ describe("Variant Analysis Manager", () => {
 
       const sourceFilePath = join(
         __dirname,
-        "../../../../src/vscode-tests/cli-integration/data/variant-analysis-results.zip",
+        "../data/variant-analysis-results.zip",
       );
       arrayBuffer = fs.readFileSync(sourceFilePath).buffer;
 

extensions/ql-vscode/test/vscode-tests/cli-integration/remote-queries/variant-analysis-monitor.test.ts

@@ -1,31 +1,31 @@
 import { CancellationTokenSource, commands, extensions } from "vscode";
-import { CodeQLExtensionInterface } from "../../../extension";
+import { CodeQLExtensionInterface } from "../../../../src/extension";
-import * as config from "../../../config";
+import * as config from "../../../../src/config";
 
-import * as ghApiClient from "../../../remote-queries/gh-api/gh-api-client";
+import * as ghApiClient from "../../../../src/remote-queries/gh-api/gh-api-client";
-import { VariantAnalysisMonitor } from "../../../remote-queries/variant-analysis-monitor";
+import { VariantAnalysisMonitor } from "../../../../src/remote-queries/variant-analysis-monitor";
 import {
   VariantAnalysis as VariantAnalysisApiResponse,
   VariantAnalysisFailureReason,
   VariantAnalysisScannedRepository as ApiVariantAnalysisScannedRepository,
-} from "../../../remote-queries/gh-api/variant-analysis";
+} from "../../../../src/remote-queries/gh-api/variant-analysis";
 import {
   createFailedMockApiResponse,
   createMockApiResponse,
-} from "../../factories/remote-queries/gh-api/variant-analysis-api-response";
+} from "../../../factories/remote-queries/gh-api/variant-analysis-api-response";
 import {
   VariantAnalysis,
   VariantAnalysisStatus,
-} from "../../../remote-queries/shared/variant-analysis";
+} from "../../../../src/remote-queries/shared/variant-analysis";
-import { createMockScannedRepos } from "../../factories/remote-queries/gh-api/scanned-repositories";
+import { createMockScannedRepos } from "../../../factories/remote-queries/gh-api/scanned-repositories";
 import {
   processFailureReason,
   processScannedRepository,
   processUpdatedVariantAnalysis,
-} from "../../../remote-queries/variant-analysis-processor";
+} from "../../../../src/remote-queries/variant-analysis-processor";
-import { Credentials } from "../../../authentication";
+import { Credentials } from "../../../../src/authentication";
-import { createMockVariantAnalysis } from "../../factories/remote-queries/shared/variant-analysis";
+import { createMockVariantAnalysis } from "../../../factories/remote-queries/shared/variant-analysis";
-import { VariantAnalysisManager } from "../../../remote-queries/variant-analysis-manager";
+import { VariantAnalysisManager } from "../../../../src/remote-queries/variant-analysis-manager";
 
 jest.setTimeout(60_000);
 

extensions/ql-vscode/test/vscode-tests/cli-integration/remote-queries/variant-analysis-results-manager.test.ts

@@ -1,20 +1,20 @@
 import { extensions } from "vscode";
-import { CodeQLExtensionInterface } from "../../../extension";
+import { CodeQLExtensionInterface } from "../../../../src/extension";
-import { extLogger } from "../../../common";
+import { extLogger } from "../../../../src/common";
-import { Credentials } from "../../../authentication";
+import { Credentials } from "../../../../src/authentication";
 import * as fs from "fs-extra";
 import { join, resolve } from "path";
 
-import { VariantAnalysisResultsManager } from "../../../remote-queries/variant-analysis-results-manager";
+import { VariantAnalysisResultsManager } from "../../../../src/remote-queries/variant-analysis-results-manager";
-import { CodeQLCliServer } from "../../../cli";
+import { CodeQLCliServer } from "../../../../src/cli";
 import { storagePath } from "../global.helper";
 import { faker } from "@faker-js/faker";
-import * as ghApiClient from "../../../remote-queries/gh-api/gh-api-client";
+import * as ghApiClient from "../../../../src/remote-queries/gh-api/gh-api-client";
-import { createMockVariantAnalysisRepositoryTask } from "../../factories/remote-queries/shared/variant-analysis-repo-tasks";
+import { createMockVariantAnalysisRepositoryTask } from "../../../factories/remote-queries/shared/variant-analysis-repo-tasks";
 import {
   VariantAnalysisRepositoryTask,
   VariantAnalysisScannedRepositoryResult,
-} from "../../../remote-queries/shared/variant-analysis";
+} from "../../../../src/remote-queries/shared/variant-analysis";
 
 jest.setTimeout(10_000);
 
@@ -111,7 +111,7 @@ describe(VariantAnalysisResultsManager.name, () => {
       beforeEach(async () => {
         const sourceFilePath = join(
           __dirname,
-          "../../../../src/vscode-tests/cli-integration/data/variant-analysis-results.zip",
+          "../data/variant-analysis-results.zip",
         );
         arrayBuffer = fs.readFileSync(sourceFilePath).buffer;
 

extensions/ql-vscode/test/vscode-tests/cli-integration/remote-queries/variant-analysis-submission-integration.test.ts

@@ -12,9 +12,9 @@ import {
 import { Octokit } from "@octokit/rest";
 import { retry } from "@octokit/plugin-retry";
 
-import { CodeQLExtensionInterface } from "../../../extension";
+import { CodeQLExtensionInterface } from "../../../../src/extension";
-import { Credentials } from "../../../authentication";
+import { Credentials } from "../../../../src/authentication";
-import { MockGitHubApiServer } from "../../../mocks/mock-gh-api-server";
+import { MockGitHubApiServer } from "../../../../src/mocks/mock-gh-api-server";
 
 jest.setTimeout(10_000);
 

extensions/ql-vscode/test/vscode-tests/cli-integration/run-cli.test.ts

@@ -2,16 +2,16 @@ import { extensions, Uri } from "vscode";
 import { join } from "path";
 import { SemVer } from "semver";
 
-import { CodeQLCliServer, QueryInfoByLanguage } from "../../cli";
+import { CodeQLCliServer, QueryInfoByLanguage } from "../../../src/cli";
-import { CodeQLExtensionInterface } from "../../extension";
+import { CodeQLExtensionInterface } from "../../../src/extension";
 import { itWithCodeQL } from "../cli";
 import {
   getOnDiskWorkspaceFolders,
   getQlPackForDbscheme,
   languageToDbScheme,
-} from "../../helpers";
+} from "../../../src/helpers";
-import { resolveQueries } from "../../contextual/queryResolver";
+import { resolveQueries } from "../../../src/contextual/queryResolver";
-import { KeyType } from "../../contextual/keyType";
+import { KeyType } from "../../../src/contextual/keyType";
 
 jest.setTimeout(60_000);
 

extensions/ql-vscode/test/vscode-tests/cli-integration/sourcemap.test.ts

@@ -1,6 +1,6 @@
 import { commands, Selection, window, workspace } from "vscode";
 import { join, basename } from "path";
-import { tmpDir } from "../../helpers";
+import { tmpDir } from "../../../src/helpers";
 import { readFile, writeFile, ensureDir, copy } from "fs-extra";
 
 jest.setTimeout(20_000);

extensions/ql-vscode/test/vscode-tests/disposable-bucket.ts

@@ -1,5 +1,5 @@
 import { Disposable } from "vscode";
-import { DisposableObject } from "../pure/disposable-object";
+import { DisposableObject } from "../../src/pure/disposable-object";
 
 /**
  * A simple disposable object that does nothing other than contain a list of disposable objects.

extensions/ql-vscode/test/vscode-tests/ensureCli.ts

@@ -4,7 +4,7 @@ import {
   getRequiredAssetName,
   extractZipArchive,
   codeQlLauncherName,
-} from "../pure/distribution";
+} from "../../src/pure/distribution";
 import fetch from "node-fetch";
 
 /**

extensions/ql-vscode/test/vscode-tests/minimal-workspace/config.test.ts

@@ -5,7 +5,7 @@ import {
   ConfigListener,
   QueryHistoryConfigListener,
   QueryServerConfigListener,
-} from "../../config";
+} from "../../../src/config";
 
 describe("config listeners", () => {
   interface TestConfig<T> {

extensions/ql-vscode/test/vscode-tests/minimal-workspace/databases.test.ts

@@ -10,16 +10,16 @@ import {
   DatabaseContents,
   FullDatabaseOptions,
   findSourceArchive,
-} from "../../databases";
+} from "../../../src/databases";
-import { Logger } from "../../common";
+import { Logger } from "../../../src/common";
-import { ProgressCallback } from "../../commandRunner";
+import { ProgressCallback } from "../../../src/commandRunner";
-import { CodeQLCliServer, DbInfo } from "../../cli";
+import { CodeQLCliServer, DbInfo } from "../../../src/cli";
 import {
   encodeArchiveBasePath,
   encodeSourceArchiveUri,
-} from "../../archive-filesystem-provider";
+} from "../../../src/archive-filesystem-provider";
 import { testDisposeHandler } from "../test-dispose-handler";
-import { QueryRunner } from "../../queryRunner";
+import { QueryRunner } from "../../../src/queryRunner";
 
 describe("databases", () => {
   const MOCK_DB_OPTIONS: FullDatabaseOptions = {

extensions/ql-vscode/test/vscode-tests/minimal-workspace/databases/db-panel.test.ts

@@ -4,22 +4,22 @@ import { ensureDir, readJSON, remove, writeJson } from "fs-extra";
 import {
   DbConfig,
   SelectedDbItemKind,
-} from "../../../databases/config/db-config";
+} from "../../../../src/databases/config/db-config";
-import { DbManager } from "../../../databases/db-manager";
+import { DbManager } from "../../../../src/databases/db-manager";
-import { DbConfigStore } from "../../../databases/config/db-config-store";
+import { DbConfigStore } from "../../../../src/databases/config/db-config-store";
-import { DbTreeDataProvider } from "../../../databases/ui/db-tree-data-provider";
+import { DbTreeDataProvider } from "../../../../src/databases/ui/db-tree-data-provider";
 import {
   DbItemKind,
   DbListKind,
   LocalDatabaseDbItem,
-} from "../../../databases/db-item";
+} from "../../../../src/databases/db-item";
 import {
   DbTreeViewItem,
   SELECTED_DB_ITEM_RESOURCE_URI,
-} from "../../../databases/ui/db-tree-view-item";
+} from "../../../../src/databases/ui/db-tree-view-item";
-import { ExtensionApp } from "../../../common/vscode/vscode-app";
+import { ExtensionApp } from "../../../../src/common/vscode/vscode-app";
-import { createMockExtensionContext } from "../../factories/extension-context";
+import { createMockExtensionContext } from "../../../factories/extension-context";
-import { createDbConfig } from "../../factories/db-config-factories";
+import { createDbConfig } from "../../../factories/db-config-factories";
 
 describe("db panel", () => {
   const workspaceStoragePath = join(__dirname, "test-workspace-storage");

extensions/ql-vscode/test/vscode-tests/minimal-workspace/determining-selected-query-test.ts

@@ -1,7 +1,7 @@
 import { resolve, join } from "path";
 import * as vscode from "vscode";
 import { Uri } from "vscode";
-import { determineSelectedQuery } from "../../run-queries-shared";
+import { determineSelectedQuery } from "../../../src/run-queries-shared";
 
 async function showQlDocument(name: string): Promise<vscode.TextDocument> {
   const folderPath = vscode.workspace.workspaceFolders![0].uri.fsPath;

extensions/ql-vscode/test/vscode-tests/minimal-workspace/qltest-discovery.test.ts

@@ -1,7 +1,7 @@
 import { Uri, WorkspaceFolder } from "vscode";
 import * as fs from "fs-extra";
 
-import { QLTestDiscovery } from "../../qltest-discovery";
+import { QLTestDiscovery } from "../../../src/qltest-discovery";
 
 describe("qltest-discovery", () => {
   describe("discoverTests", () => {

extensions/ql-vscode/test/vscode-tests/no-workspace/archive-filesystem-provider.test.ts

@@ -7,7 +7,7 @@ import {
   decodeSourceArchiveUri,
   ZipFileReference,
   zipArchiveScheme,
-} from "../../archive-filesystem-provider";
+} from "../../../src/archive-filesystem-provider";
 import { FileType, FileSystemError, Uri } from "vscode";
 
 describe("archive-filesystem-provider", () => {

extensions/ql-vscode/test/vscode-tests/no-workspace/astViewer.test.ts

@@ -1,9 +1,9 @@
 import { readFile } from "fs-extra";
 import { load } from "js-yaml";
 
-import { AstViewer, AstItem } from "../../astViewer";
+import { AstViewer, AstItem } from "../../../src/astViewer";
 import { commands, Range, Uri } from "vscode";
-import { DatabaseItem } from "../../databases";
+import { DatabaseItem } from "../../../src/databases";
 import { testDisposeHandler } from "../test-dispose-handler";
 
 describe("AstViewer", () => {

extensions/ql-vscode/test/vscode-tests/no-workspace/contextual/astBuilder.test.ts

@@ -1,10 +1,10 @@
 import { readFileSync } from "fs-extra";
 
-import AstBuilder from "../../../contextual/astBuilder";
+import AstBuilder from "../../../../src/contextual/astBuilder";
-import { CodeQLCliServer } from "../../../cli";
+import { CodeQLCliServer } from "../../../../src/cli";
-import { DatabaseItem } from "../../../databases";
+import { DatabaseItem } from "../../../../src/databases";
 import { Uri } from "vscode";
-import { QueryWithResults } from "../../../run-queries-shared";
+import { QueryWithResults } from "../../../../src/run-queries-shared";
 
 /**
  *