From dfc85f00c2060280ef326bc47a44b2c0afe9ec9f Mon Sep 17 00:00:00 2001 From: Charis Kyriakou Date: Fri, 23 Dec 2022 14:50:17 +0000 Subject: [PATCH] Move VS Code integration tests to /test directory --- .vscode/launch.json | 6 +- CONTRIBUTING.md | 14 ++--- extensions/ql-vscode/gulpfile.ts/tests.ts | 6 +- extensions/ql-vscode/jest.config.js | 6 +- extensions/ql-vscode/package.json | 6 +- .../ql-vscode/src/stories/tsconfig.json | 2 +- .../variant-analysis/RepoRow.stories.tsx | 2 +- .../VariantAnalysis.stories.tsx | 4 +- .../VariantAnalysisAnalyzedRepos.stories.tsx | 6 +- .../VariantAnalysisHeader.stories.tsx | 4 +- .../VariantAnalysisOutcomePanels.stories.tsx | 6 +- ...AnalysisSkippedRepositoriesTab.stories.tsx | 2 +- .../CodePaths/__tests__/CodePaths.spec.tsx | 4 +- extensions/ql-vscode/src/view/tsconfig.json | 2 +- .../__tests__/RepoRow.spec.tsx | 2 +- .../__tests__/VariantAnalysis.spec.tsx | 2 +- .../VariantAnalysisAnalyzedRepos.spec.tsx | 6 +- .../VariantAnalysisOutcomePanels.spec.tsx | 6 +- .../ql-vscode/test/__mocks__/appMock.ts | 2 +- .../factories/db-config-factories.ts | 2 +- .../factories/extension-context.ts | 0 .../local-queries/local-query-history-item.ts | 8 +-- .../remote-queries/gh-api/repository.ts | 2 +- .../gh-api/scanned-repositories.ts | 2 +- .../gh-api/skipped-repositories.ts | 2 +- .../gh-api/variant-analysis-api-response.ts | 4 +- .../gh-api/variant-analysis-repo-task.ts | 4 +- .../remote-query-history-item.ts | 4 +- .../remote-queries/shared/AnalysisMessage.ts | 2 +- .../remote-queries/shared/CodeFlow.ts | 2 +- .../remote-queries/shared/repository.ts | 2 +- .../shared/scanned-repositories.ts | 2 +- .../shared/skipped-repositories.ts | 2 +- .../shared/variant-analysis-repo-tasks.ts | 2 +- .../shared/variant-analysis-submission.ts | 2 +- .../remote-queries/shared/variant-analysis.ts | 2 +- .../variant-analysis-history-item.ts | 6 +- .../vscode-tests => test}/mock-memento.ts | 2 +- extensions/ql-vscode/test/tsconfig.json | 8 +-- .../config/db-config-validator.test.ts | 2 +- .../databases/db-tree-creator.test.ts | 2 +- .../gh-api/gh-api-client.test.ts | 2 +- .../variant-analysis-processor.test.ts | 10 ++-- .../test/unit-tests/variant-analysis.test.ts | 4 +- .../{src => test}/vscode-tests/.eslintrc.js | 0 .../data-invalid-pack/qlpack.yml | 0 .../data-remote-no-qlpack/in-pack.ql | 0 .../data-remote-no-qlpack/lib.qll | 0 .../data-remote-no-qlpack/not-in-pack.ql | 0 .../data-remote-qlpack-nested/not-in-pack.ql | 0 .../otherfolder/lib.qll | 0 .../data-remote-qlpack-nested/qlpack.yml | 0 .../subfolder/in-pack.ql | 0 .../data-remote-qlpack/in-pack.ql | 0 .../data-remote-qlpack/lib.qll | 0 .../data-remote-qlpack/not-in-pack.ql | 0 .../data-remote-qlpack/qlpack.yml | 0 .../cli-integration/data/codeql-pack.lock.yml | 0 .../cli-integration/data/qlpack.yml | 0 .../data/simple-javascript-query.ql | 0 .../cli-integration/data/simple-query.ql | 0 .../data/variant-analysis-results.zip | Bin .../cli-integration/databases.test.ts | 8 +-- .../databases/db-panel.test.ts | 8 +-- .../cli-integration/global.helper.ts | 6 +- .../cli-integration/helpers.test.ts | 8 +-- .../jest-runner-cli-integration.ts | 0 .../jest-runner-vscode.config.js | 0 .../cli-integration/jest.config.ts | 0 .../cli-integration/jest.setup.ts | 2 +- .../cli-integration/legacy-query.test.ts | 14 ++--- .../cli-integration/new-query.test.ts | 18 +++--- .../cli-integration/packaging.test.ts | 20 +++---- .../cli-integration/queries.test.ts | 14 ++--- .../remote-queries-manager.test.ts | 27 ++++----- .../variant-analysis-manager.test.ts | 51 ++++++++--------- .../variant-analysis-monitor.test.ts | 24 ++++---- .../variant-analysis-results-manager.test.ts | 18 +++--- ...nt-analysis-submission-integration.test.ts | 6 +- .../cli-integration/run-cli.test.ts | 10 ++-- .../cli-integration/sourcemap.test.ts | 2 +- .../{src => test}/vscode-tests/cli.ts | 0 .../vscode-tests/disposable-bucket.ts | 2 +- .../{src => test}/vscode-tests/ensureCli.ts | 2 +- .../jest-runner-vscode.config.base.js | 0 .../vscode-tests/jest.config.base.ts | 0 .../{src => test}/vscode-tests/jest.setup.ts | 0 .../minimal-workspace/activation.test.ts | 0 .../minimal-workspace/config.test.ts | 2 +- .../minimal-workspace/databases.test.ts | 12 ++-- .../minimal-workspace/databases/README.md | 0 .../databases/db-panel.test.ts | 18 +++--- .../determining-selected-query-test.ts | 2 +- .../jest-runner-vscode.config.js | 0 .../minimal-workspace/jest.config.ts | 0 .../qltest-discovery.test.ts | 2 +- .../activation/activation.test.ts | 0 .../archive-filesystem-provider.test.ts | 2 +- .../no-workspace/astViewer.test.ts | 4 +- .../contextual/astBuilder.test.ts | 8 +-- .../contextual/fileRangeFromURI.test.ts | 6 +- .../contextual/queryResolver.test.ts | 12 ++-- .../single_file.zip | Bin .../zip_with_folder.zip | Bin .../no-workspace/data/astBuilder.json | 0 .../no-workspace/data/astViewer.yml | 0 .../no-workspace/data/remote-queries/q0.ql | 0 .../no-workspace/data/remote-queries/q1.ql | 0 .../11111111/nwo.txt | 0 .../11111111/resultcount.txt | 0 .../11111111/results.bqrs | Bin .../11111111/results.csv | 0 .../11111111/results.md | 0 .../11111111/results.sarif | 0 .../171543249/nwo.txt | 0 .../171543249/resultcount.txt | 0 .../171543249/results.bqrs | Bin .../171543249/results.csv | 0 .../171543249/results.md | 0 .../171543249/results.sarif | 0 .../query-result.json | 0 .../query.json | 0 .../timestamp | 0 .../171544171/nwo.txt | 0 .../171544171/resultcount.txt | 0 .../171544171/results.bqrs | Bin .../171544171/results.csv | 0 .../171544171/results.md | 0 .../171544171/results.sarif | 0 .../query-result.json | 0 .../query.json | 0 .../timestamp | 0 .../query-with-results/analyses-results.json | 0 .../query-with-results/query.json | 0 .../workspace-query-history.json | 0 .../data/sarif/emptyResultsSarif.sarif | 0 .../data/sarif/invalidSarif.sarif | 0 .../no-workspace/data/sarif/validSarif.sarif | 0 .../no-workspace/data/variant-analysis/q0.ql | 0 .../no-workspace/data/variant-analysis/q1.ql | 0 .../workspace-query-history.json | 0 .../no-workspace/databaseFetcher.test.ts | 2 +- .../no-workspace/databases-ui.test.ts | 4 +- .../no-workspace/distribution.test.ts | 6 +- .../no-workspace/download-link.test.ts | 2 +- .../eval-log-tree-builder.test.ts | 4 +- .../no-workspace/eval-log-viewer.test.ts | 2 +- .../vscode-tests/no-workspace/helpers.test.ts | 4 +- .../history-item-label-provider.test.ts | 10 ++-- .../vscode-tests/no-workspace/index.ts | 0 .../no-workspace/interface-utils.test.ts | 9 ++- .../no-workspace/jest-runner-vscode.config.js | 0 .../vscode-tests/no-workspace/jest.config.ts | 0 .../no-workspace/query-history-info.test.ts | 16 +++--- .../no-workspace/query-history.test.ts | 53 +++++++++--------- .../no-workspace/query-results.test.ts | 21 ++++--- .../remote-queries/export-results.test.ts | 8 +-- .../gh-api/gh-actions-api-client.test.ts | 10 ++-- .../remote-queries/remote-queries-api.test.ts | 4 +- .../remote-query-history.test.ts | 26 ++++----- .../repository-selection.test.ts | 10 ++-- .../variant-analysis-history.test.ts | 20 +++---- .../no-workspace/run-queries.test.ts | 18 +++--- .../no-workspace/sarifParser.test.ts | 2 +- .../no-workspace/telemetry.test.ts | 6 +- .../no-workspace/test-adapter.test.ts | 6 +- .../vscode-tests/run-integration-tests.ts | 2 +- .../{src => test}/vscode-tests/test-config.ts | 2 +- .../vscode-tests/test-dispose-handler.ts | 2 +- .../utils/bundled-pack-helpers.ts | 0 .../utils/query-history-helpers.ts | 2 +- 171 files changed, 361 insertions(+), 366 deletions(-) rename extensions/ql-vscode/{src/vscode-tests => test}/factories/db-config-factories.ts (96%) rename extensions/ql-vscode/{src/vscode-tests => test}/factories/extension-context.ts (100%) rename extensions/ql-vscode/{src/vscode-tests => test}/factories/local-queries/local-query-history-item.ts (90%) rename extensions/ql-vscode/{src/vscode-tests => test}/factories/remote-queries/gh-api/repository.ts (89%) rename extensions/ql-vscode/{src/vscode-tests => test}/factories/remote-queries/gh-api/scanned-repositories.ts (93%) rename extensions/ql-vscode/{src/vscode-tests => test}/factories/remote-queries/gh-api/skipped-repositories.ts (94%) rename extensions/ql-vscode/{src/vscode-tests => test}/factories/remote-queries/gh-api/variant-analysis-api-response.ts (91%) rename extensions/ql-vscode/{src/vscode-tests => test}/factories/remote-queries/gh-api/variant-analysis-repo-task.ts (70%) rename extensions/ql-vscode/{src/vscode-tests => test}/factories/remote-queries/remote-query-history-item.ts (87%) rename extensions/ql-vscode/{src/vscode-tests => test}/factories/remote-queries/shared/AnalysisMessage.ts (65%) rename extensions/ql-vscode/{src/vscode-tests => test}/factories/remote-queries/shared/CodeFlow.ts (85%) rename extensions/ql-vscode/{src/vscode-tests => test}/factories/remote-queries/shared/repository.ts (89%) rename extensions/ql-vscode/{src/vscode-tests => test}/factories/remote-queries/shared/scanned-repositories.ts (94%) rename extensions/ql-vscode/{src/vscode-tests => test}/factories/remote-queries/shared/skipped-repositories.ts (94%) rename extensions/ql-vscode/{src/vscode-tests => test}/factories/remote-queries/shared/variant-analysis-repo-tasks.ts (91%) rename extensions/ql-vscode/{src/vscode-tests => test}/factories/remote-queries/shared/variant-analysis-submission.ts (89%) rename extensions/ql-vscode/{src/vscode-tests => test}/factories/remote-queries/shared/variant-analysis.ts (95%) rename extensions/ql-vscode/{src/vscode-tests => test}/factories/remote-queries/variant-analysis-history-item.ts (77%) rename extensions/ql-vscode/{src/vscode-tests => test}/mock-memento.ts (92%) rename extensions/ql-vscode/{src => test}/vscode-tests/.eslintrc.js (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/cli-integration/data-invalid-pack/qlpack.yml (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/cli-integration/data-remote-no-qlpack/in-pack.ql (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/cli-integration/data-remote-no-qlpack/lib.qll (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/cli-integration/data-remote-no-qlpack/not-in-pack.ql (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/cli-integration/data-remote-qlpack-nested/not-in-pack.ql (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/cli-integration/data-remote-qlpack-nested/otherfolder/lib.qll (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/cli-integration/data-remote-qlpack-nested/qlpack.yml (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/cli-integration/data-remote-qlpack-nested/subfolder/in-pack.ql (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/cli-integration/data-remote-qlpack/in-pack.ql (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/cli-integration/data-remote-qlpack/lib.qll (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/cli-integration/data-remote-qlpack/not-in-pack.ql (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/cli-integration/data-remote-qlpack/qlpack.yml (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/cli-integration/data/codeql-pack.lock.yml (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/cli-integration/data/qlpack.yml (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/cli-integration/data/simple-javascript-query.ql (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/cli-integration/data/simple-query.ql (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/cli-integration/data/variant-analysis-results.zip (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/cli-integration/databases.test.ts (91%) rename extensions/ql-vscode/{src => test}/vscode-tests/cli-integration/databases/db-panel.test.ts (92%) rename extensions/ql-vscode/{src => test}/vscode-tests/cli-integration/global.helper.ts (93%) rename extensions/ql-vscode/{src => test}/vscode-tests/cli-integration/helpers.test.ts (84%) rename extensions/ql-vscode/{src => test}/vscode-tests/cli-integration/jest-runner-cli-integration.ts (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/cli-integration/jest-runner-vscode.config.js (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/cli-integration/jest.config.ts (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/cli-integration/jest.setup.ts (97%) rename extensions/ql-vscode/{src => test}/vscode-tests/cli-integration/legacy-query.test.ts (93%) rename extensions/ql-vscode/{src => test}/vscode-tests/cli-integration/new-query.test.ts (91%) rename extensions/ql-vscode/{src => test}/vscode-tests/cli-integration/packaging.test.ts (89%) rename extensions/ql-vscode/{src => test}/vscode-tests/cli-integration/queries.test.ts (92%) rename extensions/ql-vscode/{src => test}/vscode-tests/cli-integration/remote-queries/remote-queries-manager.test.ts (93%) rename extensions/ql-vscode/{src => test}/vscode-tests/cli-integration/remote-queries/variant-analysis-manager.test.ts (95%) rename extensions/ql-vscode/{src => test}/vscode-tests/cli-integration/remote-queries/variant-analysis-monitor.test.ts (91%) rename extensions/ql-vscode/{src => test}/vscode-tests/cli-integration/remote-queries/variant-analysis-results-manager.test.ts (94%) rename extensions/ql-vscode/{src => test}/vscode-tests/cli-integration/remote-queries/variant-analysis-submission-integration.test.ts (96%) rename extensions/ql-vscode/{src => test}/vscode-tests/cli-integration/run-cli.test.ts (91%) rename extensions/ql-vscode/{src => test}/vscode-tests/cli-integration/sourcemap.test.ts (98%) rename extensions/ql-vscode/{src => test}/vscode-tests/cli.ts (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/disposable-bucket.ts (86%) rename extensions/ql-vscode/{src => test}/vscode-tests/ensureCli.ts (99%) rename extensions/ql-vscode/{src => test}/vscode-tests/jest-runner-vscode.config.base.js (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/jest.config.base.ts (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/jest.setup.ts (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/minimal-workspace/activation.test.ts (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/minimal-workspace/config.test.ts (99%) rename extensions/ql-vscode/{src => test}/vscode-tests/minimal-workspace/databases.test.ts (98%) rename extensions/ql-vscode/{src => test}/vscode-tests/minimal-workspace/databases/README.md (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/minimal-workspace/databases/db-panel.test.ts (97%) rename extensions/ql-vscode/{src => test}/vscode-tests/minimal-workspace/determining-selected-query-test.ts (96%) rename extensions/ql-vscode/{src => test}/vscode-tests/minimal-workspace/jest-runner-vscode.config.js (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/minimal-workspace/jest.config.ts (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/minimal-workspace/qltest-discovery.test.ts (97%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/activation/activation.test.ts (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/archive-filesystem-provider.test.ts (99%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/astViewer.test.ts (97%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/contextual/astBuilder.test.ts (95%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/contextual/fileRangeFromURI.test.ts (92%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/contextual/queryResolver.test.ts (92%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/data/archive-filesystem-provider-test/single_file.zip (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/data/archive-filesystem-provider-test/zip_with_folder.zip (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/data/astBuilder.json (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/data/astViewer.yml (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/data/remote-queries/q0.ql (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/data/remote-queries/q1.ql (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/11111111/nwo.txt (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/11111111/resultcount.txt (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/11111111/results.bqrs (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/11111111/results.csv (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/11111111/results.md (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/11111111/results.sarif (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/171543249/nwo.txt (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/171543249/resultcount.txt (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/171543249/results.bqrs (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/171543249/results.csv (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/171543249/results.md (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/171543249/results.sarif (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/query-result.json (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/query.json (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/timestamp (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 2-UL-vbKAjP8ffObxjsp7hN/171544171/nwo.txt (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 2-UL-vbKAjP8ffObxjsp7hN/171544171/resultcount.txt (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 2-UL-vbKAjP8ffObxjsp7hN/171544171/results.bqrs (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 2-UL-vbKAjP8ffObxjsp7hN/171544171/results.csv (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 2-UL-vbKAjP8ffObxjsp7hN/171544171/results.md (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 2-UL-vbKAjP8ffObxjsp7hN/171544171/results.sarif (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 2-UL-vbKAjP8ffObxjsp7hN/query-result.json (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 2-UL-vbKAjP8ffObxjsp7hN/query.json (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 2-UL-vbKAjP8ffObxjsp7hN/timestamp (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/data/remote-queries/query-with-results/analyses-results.json (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/data/remote-queries/query-with-results/query.json (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/data/remote-queries/workspace-query-history.json (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/data/sarif/emptyResultsSarif.sarif (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/data/sarif/invalidSarif.sarif (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/data/sarif/validSarif.sarif (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/data/variant-analysis/q0.ql (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/data/variant-analysis/q1.ql (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/data/variant-analysis/workspace-query-history.json (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/databaseFetcher.test.ts (99%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/databases-ui.test.ts (97%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/distribution.test.ts (98%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/download-link.test.ts (94%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/eval-log-tree-builder.test.ts (95%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/eval-log-viewer.test.ts (98%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/helpers.test.ts (99%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/history-item-label-provider.test.ts (95%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/index.ts (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/interface-utils.test.ts (96%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/jest-runner-vscode.config.js (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/jest.config.ts (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/query-history-info.test.ts (90%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/query-history.test.ts (97%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/query-results.test.ts (97%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/remote-queries/export-results.test.ts (80%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/remote-queries/gh-api/gh-actions-api-client.test.ts (90%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/remote-queries/remote-queries-api.test.ts (98%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/remote-queries/remote-query-history.test.ts (94%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/remote-queries/repository-selection.test.ts (98%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/remote-queries/variant-analysis-history.test.ts (90%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/run-queries.test.ts (95%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/sarifParser.test.ts (92%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/telemetry.test.ts (98%) rename extensions/ql-vscode/{src => test}/vscode-tests/no-workspace/test-adapter.test.ts (97%) rename extensions/ql-vscode/{src => test}/vscode-tests/run-integration-tests.ts (98%) rename extensions/ql-vscode/{src => test}/vscode-tests/test-config.ts (98%) rename extensions/ql-vscode/{src => test}/vscode-tests/test-dispose-handler.ts (85%) rename extensions/ql-vscode/{src => test}/vscode-tests/utils/bundled-pack-helpers.ts (100%) rename extensions/ql-vscode/{src => test}/vscode-tests/utils/query-history-helpers.ts (63%) diff --git a/.vscode/launch.json b/.vscode/launch.json index b16ae166e99..d2479f051c3 100644 --- a/.vscode/launch.json +++ b/.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. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7d1bd6b88fd..39c672c8d12 100644 --- a/CONTRIBUTING.md +++ b/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` -* CLI integration tests: these live in `src/vscode-tests/cli-integration` +* VSCode integration tests: these live in `test/vscode-tests/no-workspace` and `test/vscode-tests/minimal-workspace` +* 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 diff --git a/extensions/ql-vscode/gulpfile.ts/tests.ts b/extensions/ql-vscode/gulpfile.ts/tests.ts index 88d1e7473b4..41f7225267c 100644 --- a/extensions/ql-vscode/gulpfile.ts/tests.ts +++ b/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"), ); } diff --git a/extensions/ql-vscode/jest.config.js b/extensions/ql-vscode/jest.config.js index e386aaa33ca..68933e683e1 100644 --- a/extensions/ql-vscode/jest.config.js +++ b/extensions/ql-vscode/jest.config.js @@ -8,8 +8,8 @@ module.exports = { projects: [ "/src/view", "/test/unit-tests", - "/src/vscode-tests/cli-integration", - "/src/vscode-tests/no-workspace", - "/src/vscode-tests/minimal-workspace", + "/test/vscode-tests/cli-integration", + "/test/vscode-tests/no-workspace", + "/test/vscode-tests/minimal-workspace", ], }; diff --git a/extensions/ql-vscode/package.json b/extensions/ql-vscode/package.json index 2150c981966..eeed73428de 100644 --- a/extensions/ql-vscode/package.json +++ b/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:minimal-workspace": "jest --projects src/vscode-tests/minimal-workspace", - "cli-integration": "jest --projects src/vscode-tests/cli-integration", + "integration:no-workspace": "jest --projects test/vscode-tests/no-workspace", + "integration:minimal-workspace": "jest --projects test/vscode-tests/minimal-workspace", + "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", diff --git a/extensions/ql-vscode/src/stories/tsconfig.json b/extensions/ql-vscode/src/stories/tsconfig.json index a1ccc8cecc2..135aa8cd32e 100644 --- a/extensions/ql-vscode/src/stories/tsconfig.json +++ b/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, diff --git a/extensions/ql-vscode/src/stories/variant-analysis/RepoRow.stories.tsx b/extensions/ql-vscode/src/stories/variant-analysis/RepoRow.stories.tsx index bf1e0d99b77..26d4970466d 100644 --- a/extensions/ql-vscode/src/stories/variant-analysis/RepoRow.stories.tsx +++ b/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"; diff --git a/extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysis.stories.tsx b/extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysis.stories.tsx index 182e45c9496..3ca84c2eff1 100644 --- a/extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysis.stories.tsx +++ b/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 { createMockRepositoryWithMetadata } from "../../vscode-tests/factories/remote-queries/shared/repository"; +import { createMockVariantAnalysis } from "../../../test/factories/remote-queries/shared/variant-analysis"; +import { createMockRepositoryWithMetadata } from "../../../test/factories/remote-queries/shared/repository"; export default { title: "Variant Analysis/Variant Analysis", diff --git a/extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisAnalyzedRepos.stories.tsx b/extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisAnalyzedRepos.stories.tsx index 9b7c5f52f84..05d6ea5b575 100644 --- a/extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisAnalyzedRepos.stories.tsx +++ b/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 { createMockRepositoryWithMetadata } from "../../vscode-tests/factories/remote-queries/shared/repository"; -import { createMockScannedRepo } from "../../vscode-tests/factories/remote-queries/shared/scanned-repositories"; +import { createMockVariantAnalysis } from "../../../test/factories/remote-queries/shared/variant-analysis"; +import { createMockRepositoryWithMetadata } from "../../../test/factories/remote-queries/shared/repository"; +import { createMockScannedRepo } from "../../../test/factories/remote-queries/shared/scanned-repositories"; import * as analysesResults from "../remote-queries/data/analysesResultsMessage.json"; diff --git a/extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisHeader.stories.tsx b/extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisHeader.stories.tsx index a464b5e2390..30920a5f97c 100644 --- a/extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisHeader.stories.tsx +++ b/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 { createMockScannedRepo } from "../../vscode-tests/factories/remote-queries/shared/scanned-repositories"; +import { createMockVariantAnalysis } from "../../../test/factories/remote-queries/shared/variant-analysis"; +import { createMockScannedRepo } from "../../../test/factories/remote-queries/shared/scanned-repositories"; export default { title: "Variant Analysis/Variant Analysis Header", diff --git a/extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisOutcomePanels.stories.tsx b/extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisOutcomePanels.stories.tsx index 04c03d91009..9241bf1835e 100644 --- a/extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisOutcomePanels.stories.tsx +++ b/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 { createMockVariantAnalysis } from "../../vscode-tests/factories/remote-queries/shared/variant-analysis"; -import { createMockRepositoryWithMetadata } from "../../vscode-tests/factories/remote-queries/shared/repository"; +import { createMockScannedRepo } from "../../../test/factories/remote-queries/shared/scanned-repositories"; +import { createMockVariantAnalysis } from "../../../test/factories/remote-queries/shared/variant-analysis"; +import { createMockRepositoryWithMetadata } from "../../../test/factories/remote-queries/shared/repository"; import { defaultFilterSortState, RepositoriesFilterSortState, diff --git a/extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisSkippedRepositoriesTab.stories.tsx b/extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisSkippedRepositoriesTab.stories.tsx index fa90b1df150..26d5bb97063 100644 --- a/extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisSkippedRepositoriesTab.stories.tsx +++ b/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", diff --git a/extensions/ql-vscode/src/view/common/CodePaths/__tests__/CodePaths.spec.tsx b/extensions/ql-vscode/src/view/common/CodePaths/__tests__/CodePaths.spec.tsx index 50f1e60f854..c650dbb7d8f 100644 --- a/extensions/ql-vscode/src/view/common/CodePaths/__tests__/CodePaths.spec.tsx +++ b/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 { createMockAnalysisMessage } from "../../../../vscode-tests/factories/remote-queries/shared/AnalysisMessage"; +import { createMockCodeFlows } from "../../../../../test/factories/remote-queries/shared/CodeFlow"; +import { createMockAnalysisMessage } from "../../../../../test/factories/remote-queries/shared/AnalysisMessage"; describe(CodePaths.name, () => { const render = (props?: CodePathsProps) => diff --git a/extensions/ql-vscode/src/view/tsconfig.json b/extensions/ql-vscode/src/view/tsconfig.json index c3a8a6ce092..b158c1e92a3 100644 --- a/extensions/ql-vscode/src/view/tsconfig.json +++ b/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, diff --git a/extensions/ql-vscode/src/view/variant-analysis/__tests__/RepoRow.spec.tsx b/extensions/ql-vscode/src/view/variant-analysis/__tests__/RepoRow.spec.tsx index 111021c18ee..86820343c79 100644 --- a/extensions/ql-vscode/src/view/variant-analysis/__tests__/RepoRow.spec.tsx +++ b/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 = {}) => { diff --git a/extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysis.spec.tsx b/extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysis.spec.tsx index a073ef33108..2f1fb3dd44e 100644 --- a/extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysis.spec.tsx +++ b/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 = {}) => diff --git a/extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisAnalyzedRepos.spec.tsx b/extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisAnalyzedRepos.spec.tsx index bf026eed31a..da2b9096c8c 100644 --- a/extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisAnalyzedRepos.spec.tsx +++ b/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 { createMockRepositoryWithMetadata } from "../../../vscode-tests/factories/remote-queries/shared/repository"; -import { createMockScannedRepo } from "../../../vscode-tests/factories/remote-queries/shared/scanned-repositories"; +import { createMockVariantAnalysis } from "../../../../test/factories/remote-queries/shared/variant-analysis"; +import { createMockRepositoryWithMetadata } from "../../../../test/factories/remote-queries/shared/repository"; +import { createMockScannedRepo } from "../../../../test/factories/remote-queries/shared/scanned-repositories"; import { defaultFilterSortState, SortKey, diff --git a/extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisOutcomePanels.spec.tsx b/extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisOutcomePanels.spec.tsx index 0e76ff3c5a6..d52777d36fa 100644 --- a/extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisOutcomePanels.spec.tsx +++ b/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 { createMockRepositoryWithMetadata } from "../../../vscode-tests/factories/remote-queries/shared/repository"; +import { createMockVariantAnalysis } from "../../../../test/factories/remote-queries/shared/variant-analysis"; +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, () => { diff --git a/extensions/ql-vscode/test/__mocks__/appMock.ts b/extensions/ql-vscode/test/__mocks__/appMock.ts index aca45a550ad..cb8dd52d465 100644 --- a/extensions/ql-vscode/test/__mocks__/appMock.ts +++ b/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", diff --git a/extensions/ql-vscode/src/vscode-tests/factories/db-config-factories.ts b/extensions/ql-vscode/test/factories/db-config-factories.ts similarity index 96% rename from extensions/ql-vscode/src/vscode-tests/factories/db-config-factories.ts rename to extensions/ql-vscode/test/factories/db-config-factories.ts index 6c497c16f2b..89f81b6ecdb 100644 --- a/extensions/ql-vscode/src/vscode-tests/factories/db-config-factories.ts +++ b/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 = [], diff --git a/extensions/ql-vscode/src/vscode-tests/factories/extension-context.ts b/extensions/ql-vscode/test/factories/extension-context.ts similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/factories/extension-context.ts rename to extensions/ql-vscode/test/factories/extension-context.ts diff --git a/extensions/ql-vscode/src/vscode-tests/factories/local-queries/local-query-history-item.ts b/extensions/ql-vscode/test/factories/local-queries/local-query-history-item.ts similarity index 90% rename from extensions/ql-vscode/src/vscode-tests/factories/local-queries/local-query-history-item.ts rename to extensions/ql-vscode/test/factories/local-queries/local-query-history-item.ts index 8d4092c7371..157f60f3be3 100644 --- a/extensions/ql-vscode/src/vscode-tests/factories/local-queries/local-query-history-item.ts +++ b/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 { QueryMetadata } from "../../../pure/interface-types"; +import { QueryResultType } from "../../../src/pure/legacy-messages"; +import { QueryMetadata } from "../../../src/pure/interface-types"; export function createMockLocalQueryInfo({ startTime = new Date(), diff --git a/extensions/ql-vscode/src/vscode-tests/factories/remote-queries/gh-api/repository.ts b/extensions/ql-vscode/test/factories/remote-queries/gh-api/repository.ts similarity index 89% rename from extensions/ql-vscode/src/vscode-tests/factories/remote-queries/gh-api/repository.ts rename to extensions/ql-vscode/test/factories/remote-queries/gh-api/repository.ts index 44f4f9b8e1f..07cbfae509b 100644 --- a/extensions/ql-vscode/src/vscode-tests/factories/remote-queries/gh-api/repository.ts +++ b/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 { diff --git a/extensions/ql-vscode/src/vscode-tests/factories/remote-queries/gh-api/scanned-repositories.ts b/extensions/ql-vscode/test/factories/remote-queries/gh-api/scanned-repositories.ts similarity index 93% rename from extensions/ql-vscode/src/vscode-tests/factories/remote-queries/gh-api/scanned-repositories.ts rename to extensions/ql-vscode/test/factories/remote-queries/gh-api/scanned-repositories.ts index 14da8a06920..84e5819c5de 100644 --- a/extensions/ql-vscode/src/vscode-tests/factories/remote-queries/gh-api/scanned-repositories.ts +++ b/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( diff --git a/extensions/ql-vscode/src/vscode-tests/factories/remote-queries/gh-api/skipped-repositories.ts b/extensions/ql-vscode/test/factories/remote-queries/gh-api/skipped-repositories.ts similarity index 94% rename from extensions/ql-vscode/src/vscode-tests/factories/remote-queries/gh-api/skipped-repositories.ts rename to extensions/ql-vscode/test/factories/remote-queries/gh-api/skipped-repositories.ts index 36f06b1e6a3..4ec66e1804f 100644 --- a/extensions/ql-vscode/src/vscode-tests/factories/remote-queries/gh-api/skipped-repositories.ts +++ b/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 { diff --git a/extensions/ql-vscode/src/vscode-tests/factories/remote-queries/gh-api/variant-analysis-api-response.ts b/extensions/ql-vscode/test/factories/remote-queries/gh-api/variant-analysis-api-response.ts similarity index 91% rename from extensions/ql-vscode/src/vscode-tests/factories/remote-queries/gh-api/variant-analysis-api-response.ts rename to extensions/ql-vscode/test/factories/remote-queries/gh-api/variant-analysis-api-response.ts index cde28893a3a..9ae585ea6aa 100644 --- a/extensions/ql-vscode/src/vscode-tests/factories/remote-queries/gh-api/variant-analysis-api-response.ts +++ b/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"; -import { VariantAnalysisQueryLanguage } from "../../../../remote-queries/shared/variant-analysis"; +} from "../../../../src/remote-queries/gh-api/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"; diff --git a/extensions/ql-vscode/src/vscode-tests/factories/remote-queries/gh-api/variant-analysis-repo-task.ts b/extensions/ql-vscode/test/factories/remote-queries/gh-api/variant-analysis-repo-task.ts similarity index 70% rename from extensions/ql-vscode/src/vscode-tests/factories/remote-queries/gh-api/variant-analysis-repo-task.ts rename to extensions/ql-vscode/test/factories/remote-queries/gh-api/variant-analysis-repo-task.ts index 154da43f37d..c0666194131 100644 --- a/extensions/ql-vscode/src/vscode-tests/factories/remote-queries/gh-api/variant-analysis-repo-task.ts +++ b/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 { VariantAnalysisRepoStatus } from "../../../../remote-queries/shared/variant-analysis"; +import { VariantAnalysisRepoTask } from "../../../../src/remote-queries/gh-api/variant-analysis"; +import { VariantAnalysisRepoStatus } from "../../../../src/remote-queries/shared/variant-analysis"; import { createMockRepository } from "./repository"; export function createMockVariantAnalysisRepoTask(): VariantAnalysisRepoTask { diff --git a/extensions/ql-vscode/src/vscode-tests/factories/remote-queries/remote-query-history-item.ts b/extensions/ql-vscode/test/factories/remote-queries/remote-query-history-item.ts similarity index 87% rename from extensions/ql-vscode/src/vscode-tests/factories/remote-queries/remote-query-history-item.ts rename to extensions/ql-vscode/test/factories/remote-queries/remote-query-history-item.ts index 52d61edb015..985199047e9 100644 --- a/extensions/ql-vscode/src/vscode-tests/factories/remote-queries/remote-query-history-item.ts +++ b/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 { QueryStatus } from "../../../query-status"; +import { RemoteQueryHistoryItem } from "../../../src/remote-queries/remote-query-history-item"; +import { QueryStatus } from "../../../src/query-status"; export function createMockRemoteQueryHistoryItem({ date = new Date("2022-01-01T00:00:00.000Z"), diff --git a/extensions/ql-vscode/src/vscode-tests/factories/remote-queries/shared/AnalysisMessage.ts b/extensions/ql-vscode/test/factories/remote-queries/shared/AnalysisMessage.ts similarity index 65% rename from extensions/ql-vscode/src/vscode-tests/factories/remote-queries/shared/AnalysisMessage.ts rename to extensions/ql-vscode/test/factories/remote-queries/shared/AnalysisMessage.ts index 7fa63bf9680..cdd46290871 100644 --- a/extensions/ql-vscode/src/vscode-tests/factories/remote-queries/shared/AnalysisMessage.ts +++ b/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 { diff --git a/extensions/ql-vscode/src/vscode-tests/factories/remote-queries/shared/CodeFlow.ts b/extensions/ql-vscode/test/factories/remote-queries/shared/CodeFlow.ts similarity index 85% rename from extensions/ql-vscode/src/vscode-tests/factories/remote-queries/shared/CodeFlow.ts rename to extensions/ql-vscode/test/factories/remote-queries/shared/CodeFlow.ts index 1949ef14b26..eb1713d8ead 100644 --- a/extensions/ql-vscode/src/vscode-tests/factories/remote-queries/shared/CodeFlow.ts +++ b/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[] { diff --git a/extensions/ql-vscode/src/vscode-tests/factories/remote-queries/shared/repository.ts b/extensions/ql-vscode/test/factories/remote-queries/shared/repository.ts similarity index 89% rename from extensions/ql-vscode/src/vscode-tests/factories/remote-queries/shared/repository.ts rename to extensions/ql-vscode/test/factories/remote-queries/shared/repository.ts index bef5476deef..7220c99e372 100644 --- a/extensions/ql-vscode/src/vscode-tests/factories/remote-queries/shared/repository.ts +++ b/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 { diff --git a/extensions/ql-vscode/src/vscode-tests/factories/remote-queries/shared/scanned-repositories.ts b/extensions/ql-vscode/test/factories/remote-queries/shared/scanned-repositories.ts similarity index 94% rename from extensions/ql-vscode/src/vscode-tests/factories/remote-queries/shared/scanned-repositories.ts rename to extensions/ql-vscode/test/factories/remote-queries/shared/scanned-repositories.ts index edb8df1023a..f78506c5da6 100644 --- a/extensions/ql-vscode/src/vscode-tests/factories/remote-queries/shared/scanned-repositories.ts +++ b/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( diff --git a/extensions/ql-vscode/src/vscode-tests/factories/remote-queries/shared/skipped-repositories.ts b/extensions/ql-vscode/test/factories/remote-queries/shared/skipped-repositories.ts similarity index 94% rename from extensions/ql-vscode/src/vscode-tests/factories/remote-queries/shared/skipped-repositories.ts rename to extensions/ql-vscode/test/factories/remote-queries/shared/skipped-repositories.ts index 56f8e193cbd..090158f4464 100644 --- a/extensions/ql-vscode/src/vscode-tests/factories/remote-queries/shared/skipped-repositories.ts +++ b/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 { diff --git a/extensions/ql-vscode/src/vscode-tests/factories/remote-queries/shared/variant-analysis-repo-tasks.ts b/extensions/ql-vscode/test/factories/remote-queries/shared/variant-analysis-repo-tasks.ts similarity index 91% rename from extensions/ql-vscode/src/vscode-tests/factories/remote-queries/shared/variant-analysis-repo-tasks.ts rename to extensions/ql-vscode/test/factories/remote-queries/shared/variant-analysis-repo-tasks.ts index c2372228169..dc610313c80 100644 --- a/extensions/ql-vscode/src/vscode-tests/factories/remote-queries/shared/variant-analysis-repo-tasks.ts +++ b/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( diff --git a/extensions/ql-vscode/src/vscode-tests/factories/remote-queries/shared/variant-analysis-submission.ts b/extensions/ql-vscode/test/factories/remote-queries/shared/variant-analysis-submission.ts similarity index 89% rename from extensions/ql-vscode/src/vscode-tests/factories/remote-queries/shared/variant-analysis-submission.ts rename to extensions/ql-vscode/test/factories/remote-queries/shared/variant-analysis-submission.ts index f0dc8608af5..fd12aa27152 100644 --- a/extensions/ql-vscode/src/vscode-tests/factories/remote-queries/shared/variant-analysis-submission.ts +++ b/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 { diff --git a/extensions/ql-vscode/src/vscode-tests/factories/remote-queries/shared/variant-analysis.ts b/extensions/ql-vscode/test/factories/remote-queries/shared/variant-analysis.ts similarity index 95% rename from extensions/ql-vscode/src/vscode-tests/factories/remote-queries/shared/variant-analysis.ts rename to extensions/ql-vscode/test/factories/remote-queries/shared/variant-analysis.ts index 580aae5fa75..d2fed5dda0a 100644 --- a/extensions/ql-vscode/src/vscode-tests/factories/remote-queries/shared/variant-analysis.ts +++ b/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"; diff --git a/extensions/ql-vscode/src/vscode-tests/factories/remote-queries/variant-analysis-history-item.ts b/extensions/ql-vscode/test/factories/remote-queries/variant-analysis-history-item.ts similarity index 77% rename from extensions/ql-vscode/src/vscode-tests/factories/remote-queries/variant-analysis-history-item.ts rename to extensions/ql-vscode/test/factories/remote-queries/variant-analysis-history-item.ts index aadcad576cf..db8a0361a8e 100644 --- a/extensions/ql-vscode/src/vscode-tests/factories/remote-queries/variant-analysis-history-item.ts +++ b/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 { QueryStatus } from "../../../query-status"; -import { VariantAnalysisStatus } from "../../../remote-queries/shared/variant-analysis"; +import { VariantAnalysisHistoryItem } from "../../../src/remote-queries/variant-analysis-history-item"; +import { QueryStatus } from "../../../src/query-status"; +import { VariantAnalysisStatus } from "../../../src/remote-queries/shared/variant-analysis"; import { createMockVariantAnalysis } from "./shared/variant-analysis"; export function createMockVariantAnalysisHistoryItem({ diff --git a/extensions/ql-vscode/src/vscode-tests/mock-memento.ts b/extensions/ql-vscode/test/mock-memento.ts similarity index 92% rename from extensions/ql-vscode/src/vscode-tests/mock-memento.ts rename to extensions/ql-vscode/test/mock-memento.ts index 57e39789296..88cbef8d406 100644 --- a/extensions/ql-vscode/src/vscode-tests/mock-memento.ts +++ b/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(); diff --git a/extensions/ql-vscode/test/tsconfig.json b/extensions/ql-vscode/test/tsconfig.json index ead73b331eb..bbc52dca98b 100644 --- a/extensions/ql-vscode/test/tsconfig.json +++ b/extensions/ql-vscode/test/tsconfig.json @@ -1,13 +1,11 @@ { "extends": "../tsconfig.json", - "include": [ - "**/*.ts", - "../src/vscode-tests/factories/db-config-factories.ts" - ], + "include": ["**/*.ts", "../src/**/*.ts"], "exclude": [], "compilerOptions": { "noEmit": true, "resolveJsonModule": true, - "rootDir": ".." + "rootDir": "..", + "jsx": "react" } } diff --git a/extensions/ql-vscode/test/unit-tests/databases/config/db-config-validator.test.ts b/extensions/ql-vscode/test/unit-tests/databases/config/db-config-validator.test.ts index 724a75eea7c..ecf9352285b 100644 --- a/extensions/ql-vscode/test/unit-tests/databases/config/db-config-validator.test.ts +++ b/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, "../../../.."); diff --git a/extensions/ql-vscode/test/unit-tests/databases/db-tree-creator.test.ts b/extensions/ql-vscode/test/unit-tests/databases/db-tree-creator.test.ts index aaa08537f83..072f2ede6a3 100644 --- a/extensions/ql-vscode/test/unit-tests/databases/db-tree-creator.test.ts +++ b/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", () => { diff --git a/extensions/ql-vscode/test/unit-tests/remote-queries/gh-api/gh-api-client.test.ts b/extensions/ql-vscode/test/unit-tests/remote-queries/gh-api/gh-api-client.test.ts index 3bca3b3c588..930a12302c9 100644 --- a/extensions/ql-vscode/test/unit-tests/remote-queries/gh-api/gh-api-client.test.ts +++ b/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"; diff --git a/extensions/ql-vscode/test/unit-tests/remote-queries/variant-analysis-processor.test.ts b/extensions/ql-vscode/test/unit-tests/remote-queries/variant-analysis-processor.test.ts index 8204daa7a1c..cc5fcbf46bd 100644 --- a/extensions/ql-vscode/test/unit-tests/remote-queries/variant-analysis-processor.test.ts +++ b/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"; -import { createMockSkippedRepos } from "../../../src/vscode-tests/factories/remote-queries/gh-api/skipped-repositories"; -import { createMockApiResponse } from "../../../src/vscode-tests/factories/remote-queries/gh-api/variant-analysis-api-response"; -import { createMockSubmission } from "../../../src/vscode-tests/factories/remote-queries/shared/variant-analysis-submission"; -import { createMockVariantAnalysisRepoTask } from "../../../src/vscode-tests/factories/remote-queries/gh-api/variant-analysis-repo-task"; +} from "../../factories/remote-queries/gh-api/scanned-repositories"; +import { createMockSkippedRepos } from "../../factories/remote-queries/gh-api/skipped-repositories"; +import { createMockApiResponse } from "../../factories/remote-queries/gh-api/variant-analysis-api-response"; +import { createMockSubmission } from "../../factories/remote-queries/shared/variant-analysis-submission"; +import { createMockVariantAnalysisRepoTask } from "../../factories/remote-queries/gh-api/variant-analysis-repo-task"; describe(processVariantAnalysis.name, () => { const scannedRepos = createMockScannedRepos(); diff --git a/extensions/ql-vscode/test/unit-tests/variant-analysis.test.ts b/extensions/ql-vscode/test/unit-tests/variant-analysis.test.ts index 71b5bb04e4b..80297fc52ca 100644 --- a/extensions/ql-vscode/test/unit-tests/variant-analysis.test.ts +++ b/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 { createMockVariantAnalysis } from "../../src/vscode-tests/factories/remote-queries/shared/variant-analysis"; +import { createMockScannedRepo } from "../factories/remote-queries/shared/scanned-repositories"; +import { createMockVariantAnalysis } from "../factories/remote-queries/shared/variant-analysis"; describe("parseVariantAnalysisQueryLanguage", () => { it("parses a valid language", () => { diff --git a/extensions/ql-vscode/src/vscode-tests/.eslintrc.js b/extensions/ql-vscode/test/vscode-tests/.eslintrc.js similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/.eslintrc.js rename to extensions/ql-vscode/test/vscode-tests/.eslintrc.js diff --git a/extensions/ql-vscode/src/vscode-tests/cli-integration/data-invalid-pack/qlpack.yml b/extensions/ql-vscode/test/vscode-tests/cli-integration/data-invalid-pack/qlpack.yml similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/cli-integration/data-invalid-pack/qlpack.yml rename to extensions/ql-vscode/test/vscode-tests/cli-integration/data-invalid-pack/qlpack.yml diff --git a/extensions/ql-vscode/src/vscode-tests/cli-integration/data-remote-no-qlpack/in-pack.ql b/extensions/ql-vscode/test/vscode-tests/cli-integration/data-remote-no-qlpack/in-pack.ql similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/cli-integration/data-remote-no-qlpack/in-pack.ql rename to extensions/ql-vscode/test/vscode-tests/cli-integration/data-remote-no-qlpack/in-pack.ql diff --git a/extensions/ql-vscode/src/vscode-tests/cli-integration/data-remote-no-qlpack/lib.qll b/extensions/ql-vscode/test/vscode-tests/cli-integration/data-remote-no-qlpack/lib.qll similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/cli-integration/data-remote-no-qlpack/lib.qll rename to extensions/ql-vscode/test/vscode-tests/cli-integration/data-remote-no-qlpack/lib.qll diff --git a/extensions/ql-vscode/src/vscode-tests/cli-integration/data-remote-no-qlpack/not-in-pack.ql b/extensions/ql-vscode/test/vscode-tests/cli-integration/data-remote-no-qlpack/not-in-pack.ql similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/cli-integration/data-remote-no-qlpack/not-in-pack.ql rename to extensions/ql-vscode/test/vscode-tests/cli-integration/data-remote-no-qlpack/not-in-pack.ql diff --git a/extensions/ql-vscode/src/vscode-tests/cli-integration/data-remote-qlpack-nested/not-in-pack.ql b/extensions/ql-vscode/test/vscode-tests/cli-integration/data-remote-qlpack-nested/not-in-pack.ql similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/cli-integration/data-remote-qlpack-nested/not-in-pack.ql rename to extensions/ql-vscode/test/vscode-tests/cli-integration/data-remote-qlpack-nested/not-in-pack.ql diff --git a/extensions/ql-vscode/src/vscode-tests/cli-integration/data-remote-qlpack-nested/otherfolder/lib.qll b/extensions/ql-vscode/test/vscode-tests/cli-integration/data-remote-qlpack-nested/otherfolder/lib.qll similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/cli-integration/data-remote-qlpack-nested/otherfolder/lib.qll rename to extensions/ql-vscode/test/vscode-tests/cli-integration/data-remote-qlpack-nested/otherfolder/lib.qll diff --git a/extensions/ql-vscode/src/vscode-tests/cli-integration/data-remote-qlpack-nested/qlpack.yml b/extensions/ql-vscode/test/vscode-tests/cli-integration/data-remote-qlpack-nested/qlpack.yml similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/cli-integration/data-remote-qlpack-nested/qlpack.yml rename to extensions/ql-vscode/test/vscode-tests/cli-integration/data-remote-qlpack-nested/qlpack.yml diff --git a/extensions/ql-vscode/src/vscode-tests/cli-integration/data-remote-qlpack-nested/subfolder/in-pack.ql b/extensions/ql-vscode/test/vscode-tests/cli-integration/data-remote-qlpack-nested/subfolder/in-pack.ql similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/cli-integration/data-remote-qlpack-nested/subfolder/in-pack.ql rename to extensions/ql-vscode/test/vscode-tests/cli-integration/data-remote-qlpack-nested/subfolder/in-pack.ql diff --git a/extensions/ql-vscode/src/vscode-tests/cli-integration/data-remote-qlpack/in-pack.ql b/extensions/ql-vscode/test/vscode-tests/cli-integration/data-remote-qlpack/in-pack.ql similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/cli-integration/data-remote-qlpack/in-pack.ql rename to extensions/ql-vscode/test/vscode-tests/cli-integration/data-remote-qlpack/in-pack.ql diff --git a/extensions/ql-vscode/src/vscode-tests/cli-integration/data-remote-qlpack/lib.qll b/extensions/ql-vscode/test/vscode-tests/cli-integration/data-remote-qlpack/lib.qll similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/cli-integration/data-remote-qlpack/lib.qll rename to extensions/ql-vscode/test/vscode-tests/cli-integration/data-remote-qlpack/lib.qll diff --git a/extensions/ql-vscode/src/vscode-tests/cli-integration/data-remote-qlpack/not-in-pack.ql b/extensions/ql-vscode/test/vscode-tests/cli-integration/data-remote-qlpack/not-in-pack.ql similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/cli-integration/data-remote-qlpack/not-in-pack.ql rename to extensions/ql-vscode/test/vscode-tests/cli-integration/data-remote-qlpack/not-in-pack.ql diff --git a/extensions/ql-vscode/src/vscode-tests/cli-integration/data-remote-qlpack/qlpack.yml b/extensions/ql-vscode/test/vscode-tests/cli-integration/data-remote-qlpack/qlpack.yml similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/cli-integration/data-remote-qlpack/qlpack.yml rename to extensions/ql-vscode/test/vscode-tests/cli-integration/data-remote-qlpack/qlpack.yml diff --git a/extensions/ql-vscode/src/vscode-tests/cli-integration/data/codeql-pack.lock.yml b/extensions/ql-vscode/test/vscode-tests/cli-integration/data/codeql-pack.lock.yml similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/cli-integration/data/codeql-pack.lock.yml rename to extensions/ql-vscode/test/vscode-tests/cli-integration/data/codeql-pack.lock.yml diff --git a/extensions/ql-vscode/src/vscode-tests/cli-integration/data/qlpack.yml b/extensions/ql-vscode/test/vscode-tests/cli-integration/data/qlpack.yml similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/cli-integration/data/qlpack.yml rename to extensions/ql-vscode/test/vscode-tests/cli-integration/data/qlpack.yml diff --git a/extensions/ql-vscode/src/vscode-tests/cli-integration/data/simple-javascript-query.ql b/extensions/ql-vscode/test/vscode-tests/cli-integration/data/simple-javascript-query.ql similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/cli-integration/data/simple-javascript-query.ql rename to extensions/ql-vscode/test/vscode-tests/cli-integration/data/simple-javascript-query.ql diff --git a/extensions/ql-vscode/src/vscode-tests/cli-integration/data/simple-query.ql b/extensions/ql-vscode/test/vscode-tests/cli-integration/data/simple-query.ql similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/cli-integration/data/simple-query.ql rename to extensions/ql-vscode/test/vscode-tests/cli-integration/data/simple-query.ql diff --git a/extensions/ql-vscode/src/vscode-tests/cli-integration/data/variant-analysis-results.zip b/extensions/ql-vscode/test/vscode-tests/cli-integration/data/variant-analysis-results.zip similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/cli-integration/data/variant-analysis-results.zip rename to extensions/ql-vscode/test/vscode-tests/cli-integration/data/variant-analysis-results.zip diff --git a/extensions/ql-vscode/src/vscode-tests/cli-integration/databases.test.ts b/extensions/ql-vscode/test/vscode-tests/cli-integration/databases.test.ts similarity index 91% rename from extensions/ql-vscode/src/vscode-tests/cli-integration/databases.test.ts rename to extensions/ql-vscode/test/vscode-tests/cli-integration/databases.test.ts index 15fd96e01f1..d8c4a99bccf 100644 --- a/extensions/ql-vscode/src/vscode-tests/cli-integration/databases.test.ts +++ b/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 { CodeQLCliServer } from "../../cli"; -import { DatabaseManager } from "../../databases"; +import { CodeQLExtensionInterface } from "../../../src/extension"; +import { CodeQLCliServer } from "../../../src/cli"; +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); diff --git a/extensions/ql-vscode/src/vscode-tests/cli-integration/databases/db-panel.test.ts b/extensions/ql-vscode/test/vscode-tests/cli-integration/databases/db-panel.test.ts similarity index 92% rename from extensions/ql-vscode/src/vscode-tests/cli-integration/databases/db-panel.test.ts rename to extensions/ql-vscode/test/vscode-tests/cli-integration/databases/db-panel.test.ts index b541582e70d..bb658123184 100644 --- a/extensions/ql-vscode/src/vscode-tests/cli-integration/databases/db-panel.test.ts +++ b/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"; -import { DbListKind } from "../../../databases/db-item"; +} from "../../../../src/databases/ui/db-panel"; +import { DbListKind } from "../../../../src/databases/db-item"; jest.setTimeout(60_000); diff --git a/extensions/ql-vscode/src/vscode-tests/cli-integration/global.helper.ts b/extensions/ql-vscode/test/vscode-tests/cli-integration/global.helper.ts similarity index 93% rename from extensions/ql-vscode/src/vscode-tests/cli-integration/global.helper.ts rename to extensions/ql-vscode/test/vscode-tests/cli-integration/global.helper.ts index 7341b3f2bcb..73a7a69a840 100644 --- a/extensions/ql-vscode/src/vscode-tests/cli-integration/global.helper.ts +++ b/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 { CodeQLCliServer } from "../../cli"; -import { removeWorkspaceRefs } from "../../remote-queries/run-remote-query"; +import { DatabaseManager } from "../../../src/databases"; +import { CodeQLCliServer } from "../../../src/cli"; +import { removeWorkspaceRefs } from "../../../src/remote-queries/run-remote-query"; // This file contains helpers shared between actual tests. diff --git a/extensions/ql-vscode/src/vscode-tests/cli-integration/helpers.test.ts b/extensions/ql-vscode/test/vscode-tests/cli-integration/helpers.test.ts similarity index 84% rename from extensions/ql-vscode/src/vscode-tests/cli-integration/helpers.test.ts rename to extensions/ql-vscode/test/vscode-tests/cli-integration/helpers.test.ts index a9763ccc32f..954d053db9a 100644 --- a/extensions/ql-vscode/src/vscode-tests/cli-integration/helpers.test.ts +++ b/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 { CodeQLExtensionInterface } from "../../extension"; -import { tryGetQueryMetadata } from "../../helpers"; +import { CodeQLCliServer } from "../../../src/cli"; +import { CodeQLExtensionInterface } from "../../../src/extension"; +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; diff --git a/extensions/ql-vscode/src/vscode-tests/cli-integration/jest-runner-cli-integration.ts b/extensions/ql-vscode/test/vscode-tests/cli-integration/jest-runner-cli-integration.ts similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/cli-integration/jest-runner-cli-integration.ts rename to extensions/ql-vscode/test/vscode-tests/cli-integration/jest-runner-cli-integration.ts diff --git a/extensions/ql-vscode/src/vscode-tests/cli-integration/jest-runner-vscode.config.js b/extensions/ql-vscode/test/vscode-tests/cli-integration/jest-runner-vscode.config.js similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/cli-integration/jest-runner-vscode.config.js rename to extensions/ql-vscode/test/vscode-tests/cli-integration/jest-runner-vscode.config.js diff --git a/extensions/ql-vscode/src/vscode-tests/cli-integration/jest.config.ts b/extensions/ql-vscode/test/vscode-tests/cli-integration/jest.config.ts similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/cli-integration/jest.config.ts rename to extensions/ql-vscode/test/vscode-tests/cli-integration/jest.config.ts diff --git a/extensions/ql-vscode/src/vscode-tests/cli-integration/jest.setup.ts b/extensions/ql-vscode/test/vscode-tests/cli-integration/jest.setup.ts similarity index 97% rename from extensions/ql-vscode/src/vscode-tests/cli-integration/jest.setup.ts rename to extensions/ql-vscode/test/vscode-tests/cli-integration/jest.setup.ts index 2ac82cf0771..3e978ec6f43 100644 --- a/extensions/ql-vscode/src/vscode-tests/cli-integration/jest.setup.ts +++ b/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"; diff --git a/extensions/ql-vscode/src/vscode-tests/cli-integration/legacy-query.test.ts b/extensions/ql-vscode/test/vscode-tests/cli-integration/legacy-query.test.ts similarity index 93% rename from extensions/ql-vscode/src/vscode-tests/cli-integration/legacy-query.test.ts rename to extensions/ql-vscode/test/vscode-tests/cli-integration/legacy-query.test.ts index 586fd235bb3..fa7312ae2e8 100644 --- a/extensions/ql-vscode/src/vscode-tests/cli-integration/legacy-query.test.ts +++ b/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 qsClient from "../../legacy-query-server/queryserver-client"; -import * as cli from "../../cli"; -import { CellValue } from "../../pure/bqrs-cli-types"; +import * as messages from "../../../src/pure/legacy-messages"; +import * as qsClient from "../../../src/legacy-query-server/queryserver-client"; +import * as cli from "../../../src/cli"; +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 { extLogger, ProgressReporter } from "../../common"; +import { QueryServerClient } from "../../../src/legacy-query-server/queryserver-client"; +import { extLogger, ProgressReporter } from "../../../src/common"; const baseDir = join(__dirname, "../../../test/data"); diff --git a/extensions/ql-vscode/src/vscode-tests/cli-integration/new-query.test.ts b/extensions/ql-vscode/test/vscode-tests/cli-integration/new-query.test.ts similarity index 91% rename from extensions/ql-vscode/src/vscode-tests/cli-integration/new-query.test.ts rename to extensions/ql-vscode/test/vscode-tests/cli-integration/new-query.test.ts index 1f7a92cc85f..ea448f93175 100644 --- a/extensions/ql-vscode/src/vscode-tests/cli-integration/new-query.test.ts +++ b/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 qsClient from "../../query-server/queryserver-client"; -import * as cli from "../../cli"; -import { CellValue } from "../../pure/bqrs-cli-types"; +import * as messages from "../../../src/pure/new-messages"; +import * as qsClient from "../../../src/query-server/queryserver-client"; +import * as cli from "../../../src/cli"; +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 { extLogger, ProgressReporter } from "../../common"; -import { QueryResultType } from "../../pure/new-messages"; +import { QueryServerClient } from "../../../src/query-server/queryserver-client"; +import { extLogger, ProgressReporter } from "../../../src/common"; +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"); diff --git a/extensions/ql-vscode/src/vscode-tests/cli-integration/packaging.test.ts b/extensions/ql-vscode/test/vscode-tests/cli-integration/packaging.test.ts similarity index 89% rename from extensions/ql-vscode/src/vscode-tests/cli-integration/packaging.test.ts rename to extensions/ql-vscode/test/vscode-tests/cli-integration/packaging.test.ts index 6e16a17c30d..e368f81b64f 100644 --- a/extensions/ql-vscode/src/vscode-tests/cli-integration/packaging.test.ts +++ b/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 { CodeQLExtensionInterface } from "../../extension"; -import { getErrorMessage } from "../../pure/helpers-pure"; +import { CodeQLCliServer } from "../../../src/cli"; +import { CodeQLExtensionInterface } from "../../../src/extension"; +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( - __dirname, - "../../../src/vscode-tests/cli-integration/data", - ); + const rootDir = join(__dirname, "./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( - __dirname, - "../../../src/vscode-tests/cli-integration/data-invalid-pack", - ); + const rootDir = join(__dirname, "../data-invalid-pack"); quickPickSpy.mockResolvedValue([ { label: "foo/bar", diff --git a/extensions/ql-vscode/src/vscode-tests/cli-integration/queries.test.ts b/extensions/ql-vscode/test/vscode-tests/cli-integration/queries.test.ts similarity index 92% rename from extensions/ql-vscode/src/vscode-tests/cli-integration/queries.test.ts rename to extensions/ql-vscode/test/vscode-tests/cli-integration/queries.test.ts index 00a8578a62e..889f09b02b0 100644 --- a/extensions/ql-vscode/src/vscode-tests/cli-integration/queries.test.ts +++ b/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 { CodeQLExtensionInterface } from "../../extension"; +import { DatabaseItem, DatabaseManager } from "../../../src/databases"; +import { CodeQLExtensionInterface } from "../../../src/extension"; import { cleanDatabases, dbLoc, storagePath } from "./global.helper"; -import { importArchiveDatabase } from "../../databaseFetcher"; -import { CodeQLCliServer } from "../../cli"; +import { importArchiveDatabase } from "../../../src/databaseFetcher"; +import { CodeQLCliServer } from "../../../src/cli"; import { describeWithCodeQL } from "../cli"; -import { tmpDir } from "../../helpers"; -import { createInitialQueryInfo } from "../../run-queries-shared"; -import { QueryRunner } from "../../queryRunner"; +import { tmpDir } from "../../../src/helpers"; +import { createInitialQueryInfo } from "../../../src/run-queries-shared"; +import { QueryRunner } from "../../../src/queryRunner"; jest.setTimeout(20_000); diff --git a/extensions/ql-vscode/src/vscode-tests/cli-integration/remote-queries/remote-queries-manager.test.ts b/extensions/ql-vscode/test/vscode-tests/cli-integration/remote-queries/remote-queries-manager.test.ts similarity index 93% rename from extensions/ql-vscode/src/vscode-tests/cli-integration/remote-queries/remote-queries-manager.test.ts rename to extensions/ql-vscode/test/vscode-tests/cli-integration/remote-queries/remote-queries-manager.test.ts index 835a5de7ac9..97a6742beb8 100644 --- a/extensions/ql-vscode/src/vscode-tests/cli-integration/remote-queries/remote-queries-manager.test.ts +++ b/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 { CodeQLCliServer } from "../../../cli"; -import { CodeQLExtensionInterface } from "../../../extension"; +import { QlPack } from "../../../../src/remote-queries/run-remote-query"; +import { CodeQLCliServer } from "../../../../src/cli"; +import { CodeQLExtensionInterface } from "../../../../src/extension"; import { setRemoteControllerRepo, setRemoteRepositoryLists, -} from "../../../config"; -import { UserCancellationException } from "../../../commandRunner"; -import * as ghApiClient from "../../../remote-queries/gh-api/gh-api-client"; -import { Repository } from "../../../remote-queries/gh-api/repository"; +} from "../../../../src/config"; +import { UserCancellationException } from "../../../../src/commandRunner"; +import * as ghApiClient from "../../../../src/remote-queries/gh-api/gh-api-client"; +import { Repository } from "../../../../src/remote-queries/gh-api/repository"; import { createMockExtensionContext } from "../../no-workspace"; -import { OutputChannelLogger } from "../../../common"; -import { RemoteQueriesSubmission } from "../../../remote-queries/shared/remote-queries"; +import { OutputChannelLogger } from "../../../../src/common"; +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 { Credentials } from "../../../authentication"; +import { RemoteQueriesManager } from "../../../../src/remote-queries/remote-queries-manager"; +import { Credentials } from "../../../../src/authentication"; import { fixWorkspaceReferences, restoreWorkspaceReferences, @@ -35,10 +35,7 @@ import { jest.setTimeout(3 * 60 * 1000); describe("Remote queries", () => { - const baseDir = join( - __dirname, - "../../../../src/vscode-tests/cli-integration", - ); + const baseDir = join(__dirname, ".."); const qlpackFileWithWorkspaceRefs = getFile( "data-remote-qlpack/qlpack.yml", diff --git a/extensions/ql-vscode/src/vscode-tests/cli-integration/remote-queries/variant-analysis-manager.test.ts b/extensions/ql-vscode/test/vscode-tests/cli-integration/remote-queries/variant-analysis-manager.test.ts similarity index 95% rename from extensions/ql-vscode/src/vscode-tests/cli-integration/remote-queries/variant-analysis-manager.test.ts rename to extensions/ql-vscode/test/vscode-tests/cli-integration/remote-queries/variant-analysis-manager.test.ts index 052b2c0c91e..671bc41be9f 100644 --- a/extensions/ql-vscode/src/vscode-tests/cli-integration/remote-queries/variant-analysis-manager.test.ts +++ b/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 { extLogger } from "../../../common"; -import * as config from "../../../config"; +import { CodeQLExtensionInterface } from "../../../../src/extension"; +import { extLogger } from "../../../../src/common"; +import * as config from "../../../../src/config"; import { setRemoteControllerRepo, setRemoteRepositoryLists, -} from "../../../config"; -import * as ghApiClient from "../../../remote-queries/gh-api/gh-api-client"; -import * as ghActionsApiClient from "../../../remote-queries/gh-api/gh-actions-api-client"; -import { Credentials } from "../../../authentication"; +} from "../../../../src/config"; +import * as ghApiClient from "../../../../src/remote-queries/gh-api/gh-api-client"; +import * as ghActionsApiClient from "../../../../src/remote-queries/gh-api/gh-actions-api-client"; +import { Credentials } from "../../../../src/authentication"; import * as fs from "fs-extra"; import { join } from "path"; -import { VariantAnalysisManager } from "../../../remote-queries/variant-analysis-manager"; -import { CodeQLCliServer } from "../../../cli"; +import { VariantAnalysisManager } from "../../../../src/remote-queries/variant-analysis-manager"; +import { CodeQLCliServer } from "../../../../src/cli"; import { fixWorkspaceReferences, restoreWorkspaceReferences, storagePath, } from "../global.helper"; -import { VariantAnalysisResultsManager } from "../../../remote-queries/variant-analysis-results-manager"; -import { createMockVariantAnalysis } from "../../factories/remote-queries/shared/variant-analysis"; -import * as VariantAnalysisModule from "../../../remote-queries/shared/variant-analysis"; +import { VariantAnalysisResultsManager } from "../../../../src/remote-queries/variant-analysis-results-manager"; +import { createMockVariantAnalysis } from "../../../factories/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"; -import { createTimestampFile } from "../../../helpers"; -import { createMockVariantAnalysisRepoTask } from "../../factories/remote-queries/gh-api/variant-analysis-repo-task"; +} from "../../../../src/remote-queries/shared/variant-analysis"; +import { createTimestampFile } from "../../../../src/helpers"; +import { createMockVariantAnalysisRepoTask } from "../../../factories/remote-queries/gh-api/variant-analysis-repo-task"; import { VariantAnalysis as VariantAnalysisApiResponse, VariantAnalysisRepoTask, -} from "../../../remote-queries/gh-api/variant-analysis"; -import { createMockApiResponse } from "../../factories/remote-queries/gh-api/variant-analysis-api-response"; -import { UserCancellationException } from "../../../commandRunner"; -import { Repository } from "../../../remote-queries/gh-api/repository"; +} from "../../../../src/remote-queries/gh-api/variant-analysis"; +import { createMockApiResponse } from "../../../factories/remote-queries/gh-api/variant-analysis-api-response"; +import { UserCancellationException } from "../../../../src/commandRunner"; +import { Repository } from "../../../../src/remote-queries/gh-api/repository"; import { defaultFilterSortState, SortKey, -} from "../../../pure/variant-analysis-filter-sort"; -import { DbManager } from "../../../databases/db-manager"; +} from "../../../../src/pure/variant-analysis-filter-sort"; +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 | undefined; let executeCommandSpy: jest.SpiedFunction; - const baseDir = join( - __dirname, - "../../../../src/vscode-tests/cli-integration", - ); + const baseDir = join(__dirname, ".."); 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; diff --git a/extensions/ql-vscode/src/vscode-tests/cli-integration/remote-queries/variant-analysis-monitor.test.ts b/extensions/ql-vscode/test/vscode-tests/cli-integration/remote-queries/variant-analysis-monitor.test.ts similarity index 91% rename from extensions/ql-vscode/src/vscode-tests/cli-integration/remote-queries/variant-analysis-monitor.test.ts rename to extensions/ql-vscode/test/vscode-tests/cli-integration/remote-queries/variant-analysis-monitor.test.ts index a5b42897d8c..13b0bd83bf4 100644 --- a/extensions/ql-vscode/src/vscode-tests/cli-integration/remote-queries/variant-analysis-monitor.test.ts +++ b/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 * as config from "../../../config"; +import { CodeQLExtensionInterface } from "../../../../src/extension"; +import * as config from "../../../../src/config"; -import * as ghApiClient from "../../../remote-queries/gh-api/gh-api-client"; -import { VariantAnalysisMonitor } from "../../../remote-queries/variant-analysis-monitor"; +import * as ghApiClient from "../../../../src/remote-queries/gh-api/gh-api-client"; +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"; -import { createMockScannedRepos } from "../../factories/remote-queries/gh-api/scanned-repositories"; +} from "../../../../src/remote-queries/shared/variant-analysis"; +import { createMockScannedRepos } from "../../../factories/remote-queries/gh-api/scanned-repositories"; import { processFailureReason, processScannedRepository, processUpdatedVariantAnalysis, -} from "../../../remote-queries/variant-analysis-processor"; -import { Credentials } from "../../../authentication"; -import { createMockVariantAnalysis } from "../../factories/remote-queries/shared/variant-analysis"; -import { VariantAnalysisManager } from "../../../remote-queries/variant-analysis-manager"; +} from "../../../../src/remote-queries/variant-analysis-processor"; +import { Credentials } from "../../../../src/authentication"; +import { createMockVariantAnalysis } from "../../../factories/remote-queries/shared/variant-analysis"; +import { VariantAnalysisManager } from "../../../../src/remote-queries/variant-analysis-manager"; jest.setTimeout(60_000); diff --git a/extensions/ql-vscode/src/vscode-tests/cli-integration/remote-queries/variant-analysis-results-manager.test.ts b/extensions/ql-vscode/test/vscode-tests/cli-integration/remote-queries/variant-analysis-results-manager.test.ts similarity index 94% rename from extensions/ql-vscode/src/vscode-tests/cli-integration/remote-queries/variant-analysis-results-manager.test.ts rename to extensions/ql-vscode/test/vscode-tests/cli-integration/remote-queries/variant-analysis-results-manager.test.ts index 8c9b04a6b5f..cb86f02c6b5 100644 --- a/extensions/ql-vscode/src/vscode-tests/cli-integration/remote-queries/variant-analysis-results-manager.test.ts +++ b/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 { extLogger } from "../../../common"; -import { Credentials } from "../../../authentication"; +import { CodeQLExtensionInterface } from "../../../../src/extension"; +import { extLogger } from "../../../../src/common"; +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 { CodeQLCliServer } from "../../../cli"; +import { VariantAnalysisResultsManager } from "../../../../src/remote-queries/variant-analysis-results-manager"; +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 { createMockVariantAnalysisRepositoryTask } from "../../factories/remote-queries/shared/variant-analysis-repo-tasks"; +import * as ghApiClient from "../../../../src/remote-queries/gh-api/gh-api-client"; +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; diff --git a/extensions/ql-vscode/src/vscode-tests/cli-integration/remote-queries/variant-analysis-submission-integration.test.ts b/extensions/ql-vscode/test/vscode-tests/cli-integration/remote-queries/variant-analysis-submission-integration.test.ts similarity index 96% rename from extensions/ql-vscode/src/vscode-tests/cli-integration/remote-queries/variant-analysis-submission-integration.test.ts rename to extensions/ql-vscode/test/vscode-tests/cli-integration/remote-queries/variant-analysis-submission-integration.test.ts index 08a61095720..a7695a996dd 100644 --- a/extensions/ql-vscode/src/vscode-tests/cli-integration/remote-queries/variant-analysis-submission-integration.test.ts +++ b/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 { Credentials } from "../../../authentication"; -import { MockGitHubApiServer } from "../../../mocks/mock-gh-api-server"; +import { CodeQLExtensionInterface } from "../../../../src/extension"; +import { Credentials } from "../../../../src/authentication"; +import { MockGitHubApiServer } from "../../../../src/mocks/mock-gh-api-server"; jest.setTimeout(10_000); diff --git a/extensions/ql-vscode/src/vscode-tests/cli-integration/run-cli.test.ts b/extensions/ql-vscode/test/vscode-tests/cli-integration/run-cli.test.ts similarity index 91% rename from extensions/ql-vscode/src/vscode-tests/cli-integration/run-cli.test.ts rename to extensions/ql-vscode/test/vscode-tests/cli-integration/run-cli.test.ts index 6063b01a001..df1230e0694 100644 --- a/extensions/ql-vscode/src/vscode-tests/cli-integration/run-cli.test.ts +++ b/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 { CodeQLExtensionInterface } from "../../extension"; +import { CodeQLCliServer, QueryInfoByLanguage } from "../../../src/cli"; +import { CodeQLExtensionInterface } from "../../../src/extension"; import { itWithCodeQL } from "../cli"; import { getOnDiskWorkspaceFolders, getQlPackForDbscheme, languageToDbScheme, -} from "../../helpers"; -import { resolveQueries } from "../../contextual/queryResolver"; -import { KeyType } from "../../contextual/keyType"; +} from "../../../src/helpers"; +import { resolveQueries } from "../../../src/contextual/queryResolver"; +import { KeyType } from "../../../src/contextual/keyType"; jest.setTimeout(60_000); diff --git a/extensions/ql-vscode/src/vscode-tests/cli-integration/sourcemap.test.ts b/extensions/ql-vscode/test/vscode-tests/cli-integration/sourcemap.test.ts similarity index 98% rename from extensions/ql-vscode/src/vscode-tests/cli-integration/sourcemap.test.ts rename to extensions/ql-vscode/test/vscode-tests/cli-integration/sourcemap.test.ts index 199ea1108f8..e54d6b07111 100644 --- a/extensions/ql-vscode/src/vscode-tests/cli-integration/sourcemap.test.ts +++ b/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); diff --git a/extensions/ql-vscode/src/vscode-tests/cli.ts b/extensions/ql-vscode/test/vscode-tests/cli.ts similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/cli.ts rename to extensions/ql-vscode/test/vscode-tests/cli.ts diff --git a/extensions/ql-vscode/src/vscode-tests/disposable-bucket.ts b/extensions/ql-vscode/test/vscode-tests/disposable-bucket.ts similarity index 86% rename from extensions/ql-vscode/src/vscode-tests/disposable-bucket.ts rename to extensions/ql-vscode/test/vscode-tests/disposable-bucket.ts index 9839debbf3b..54854fec1ef 100644 --- a/extensions/ql-vscode/src/vscode-tests/disposable-bucket.ts +++ b/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. diff --git a/extensions/ql-vscode/src/vscode-tests/ensureCli.ts b/extensions/ql-vscode/test/vscode-tests/ensureCli.ts similarity index 99% rename from extensions/ql-vscode/src/vscode-tests/ensureCli.ts rename to extensions/ql-vscode/test/vscode-tests/ensureCli.ts index 53abc294031..bf5930690e0 100644 --- a/extensions/ql-vscode/src/vscode-tests/ensureCli.ts +++ b/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"; /** diff --git a/extensions/ql-vscode/src/vscode-tests/jest-runner-vscode.config.base.js b/extensions/ql-vscode/test/vscode-tests/jest-runner-vscode.config.base.js similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/jest-runner-vscode.config.base.js rename to extensions/ql-vscode/test/vscode-tests/jest-runner-vscode.config.base.js diff --git a/extensions/ql-vscode/src/vscode-tests/jest.config.base.ts b/extensions/ql-vscode/test/vscode-tests/jest.config.base.ts similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/jest.config.base.ts rename to extensions/ql-vscode/test/vscode-tests/jest.config.base.ts diff --git a/extensions/ql-vscode/src/vscode-tests/jest.setup.ts b/extensions/ql-vscode/test/vscode-tests/jest.setup.ts similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/jest.setup.ts rename to extensions/ql-vscode/test/vscode-tests/jest.setup.ts diff --git a/extensions/ql-vscode/src/vscode-tests/minimal-workspace/activation.test.ts b/extensions/ql-vscode/test/vscode-tests/minimal-workspace/activation.test.ts similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/minimal-workspace/activation.test.ts rename to extensions/ql-vscode/test/vscode-tests/minimal-workspace/activation.test.ts diff --git a/extensions/ql-vscode/src/vscode-tests/minimal-workspace/config.test.ts b/extensions/ql-vscode/test/vscode-tests/minimal-workspace/config.test.ts similarity index 99% rename from extensions/ql-vscode/src/vscode-tests/minimal-workspace/config.test.ts rename to extensions/ql-vscode/test/vscode-tests/minimal-workspace/config.test.ts index 39c562254c1..ec69b4c4ba4 100644 --- a/extensions/ql-vscode/src/vscode-tests/minimal-workspace/config.test.ts +++ b/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 { diff --git a/extensions/ql-vscode/src/vscode-tests/minimal-workspace/databases.test.ts b/extensions/ql-vscode/test/vscode-tests/minimal-workspace/databases.test.ts similarity index 98% rename from extensions/ql-vscode/src/vscode-tests/minimal-workspace/databases.test.ts rename to extensions/ql-vscode/test/vscode-tests/minimal-workspace/databases.test.ts index 9a50eabcc64..a76f14e1d9c 100644 --- a/extensions/ql-vscode/src/vscode-tests/minimal-workspace/databases.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/minimal-workspace/databases.test.ts @@ -10,16 +10,16 @@ import { DatabaseContents, FullDatabaseOptions, findSourceArchive, -} from "../../databases"; -import { Logger } from "../../common"; -import { ProgressCallback } from "../../commandRunner"; -import { CodeQLCliServer, DbInfo } from "../../cli"; +} from "../../../src/databases"; +import { Logger } from "../../../src/common"; +import { ProgressCallback } from "../../../src/commandRunner"; +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 = { diff --git a/extensions/ql-vscode/src/vscode-tests/minimal-workspace/databases/README.md b/extensions/ql-vscode/test/vscode-tests/minimal-workspace/databases/README.md similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/minimal-workspace/databases/README.md rename to extensions/ql-vscode/test/vscode-tests/minimal-workspace/databases/README.md diff --git a/extensions/ql-vscode/src/vscode-tests/minimal-workspace/databases/db-panel.test.ts b/extensions/ql-vscode/test/vscode-tests/minimal-workspace/databases/db-panel.test.ts similarity index 97% rename from extensions/ql-vscode/src/vscode-tests/minimal-workspace/databases/db-panel.test.ts rename to extensions/ql-vscode/test/vscode-tests/minimal-workspace/databases/db-panel.test.ts index 749f933c080..562be0cc77d 100644 --- a/extensions/ql-vscode/src/vscode-tests/minimal-workspace/databases/db-panel.test.ts +++ b/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"; -import { DbManager } from "../../../databases/db-manager"; -import { DbConfigStore } from "../../../databases/config/db-config-store"; -import { DbTreeDataProvider } from "../../../databases/ui/db-tree-data-provider"; +} from "../../../../src/databases/config/db-config"; +import { DbManager } from "../../../../src/databases/db-manager"; +import { DbConfigStore } from "../../../../src/databases/config/db-config-store"; +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"; -import { ExtensionApp } from "../../../common/vscode/vscode-app"; -import { createMockExtensionContext } from "../../factories/extension-context"; -import { createDbConfig } from "../../factories/db-config-factories"; +} from "../../../../src/databases/ui/db-tree-view-item"; +import { ExtensionApp } from "../../../../src/common/vscode/vscode-app"; +import { createMockExtensionContext } from "../../../factories/extension-context"; +import { createDbConfig } from "../../../factories/db-config-factories"; describe("db panel", () => { const workspaceStoragePath = join(__dirname, "test-workspace-storage"); diff --git a/extensions/ql-vscode/src/vscode-tests/minimal-workspace/determining-selected-query-test.ts b/extensions/ql-vscode/test/vscode-tests/minimal-workspace/determining-selected-query-test.ts similarity index 96% rename from extensions/ql-vscode/src/vscode-tests/minimal-workspace/determining-selected-query-test.ts rename to extensions/ql-vscode/test/vscode-tests/minimal-workspace/determining-selected-query-test.ts index f6f9dca4c25..fbfdde11aa6 100644 --- a/extensions/ql-vscode/src/vscode-tests/minimal-workspace/determining-selected-query-test.ts +++ b/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 { const folderPath = vscode.workspace.workspaceFolders![0].uri.fsPath; diff --git a/extensions/ql-vscode/src/vscode-tests/minimal-workspace/jest-runner-vscode.config.js b/extensions/ql-vscode/test/vscode-tests/minimal-workspace/jest-runner-vscode.config.js similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/minimal-workspace/jest-runner-vscode.config.js rename to extensions/ql-vscode/test/vscode-tests/minimal-workspace/jest-runner-vscode.config.js diff --git a/extensions/ql-vscode/src/vscode-tests/minimal-workspace/jest.config.ts b/extensions/ql-vscode/test/vscode-tests/minimal-workspace/jest.config.ts similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/minimal-workspace/jest.config.ts rename to extensions/ql-vscode/test/vscode-tests/minimal-workspace/jest.config.ts diff --git a/extensions/ql-vscode/src/vscode-tests/minimal-workspace/qltest-discovery.test.ts b/extensions/ql-vscode/test/vscode-tests/minimal-workspace/qltest-discovery.test.ts similarity index 97% rename from extensions/ql-vscode/src/vscode-tests/minimal-workspace/qltest-discovery.test.ts rename to extensions/ql-vscode/test/vscode-tests/minimal-workspace/qltest-discovery.test.ts index c0320337137..d1ef02bb379 100644 --- a/extensions/ql-vscode/src/vscode-tests/minimal-workspace/qltest-discovery.test.ts +++ b/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", () => { diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/activation/activation.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/activation/activation.test.ts similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/activation/activation.test.ts rename to extensions/ql-vscode/test/vscode-tests/no-workspace/activation/activation.test.ts diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/archive-filesystem-provider.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/archive-filesystem-provider.test.ts similarity index 99% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/archive-filesystem-provider.test.ts rename to extensions/ql-vscode/test/vscode-tests/no-workspace/archive-filesystem-provider.test.ts index 8f924ae3295..7ca3c6ef083 100644 --- a/extensions/ql-vscode/src/vscode-tests/no-workspace/archive-filesystem-provider.test.ts +++ b/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", () => { diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/astViewer.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/astViewer.test.ts similarity index 97% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/astViewer.test.ts rename to extensions/ql-vscode/test/vscode-tests/no-workspace/astViewer.test.ts index dd152a7e892..12c4f86063b 100644 --- a/extensions/ql-vscode/src/vscode-tests/no-workspace/astViewer.test.ts +++ b/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", () => { diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/contextual/astBuilder.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/contextual/astBuilder.test.ts similarity index 95% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/contextual/astBuilder.test.ts rename to extensions/ql-vscode/test/vscode-tests/no-workspace/contextual/astBuilder.test.ts index 143e11b195f..669bf611fad 100644 --- a/extensions/ql-vscode/src/vscode-tests/no-workspace/contextual/astBuilder.test.ts +++ b/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 { CodeQLCliServer } from "../../../cli"; -import { DatabaseItem } from "../../../databases"; +import AstBuilder from "../../../../src/contextual/astBuilder"; +import { CodeQLCliServer } from "../../../../src/cli"; +import { DatabaseItem } from "../../../../src/databases"; import { Uri } from "vscode"; -import { QueryWithResults } from "../../../run-queries-shared"; +import { QueryWithResults } from "../../../../src/run-queries-shared"; /** * diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/contextual/fileRangeFromURI.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/contextual/fileRangeFromURI.test.ts similarity index 92% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/contextual/fileRangeFromURI.test.ts rename to extensions/ql-vscode/test/vscode-tests/no-workspace/contextual/fileRangeFromURI.test.ts index 5a4607fdaf3..d6a5d1148dc 100644 --- a/extensions/ql-vscode/src/vscode-tests/no-workspace/contextual/fileRangeFromURI.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/contextual/fileRangeFromURI.test.ts @@ -1,11 +1,11 @@ import { Uri, Range } from "vscode"; -import fileRangeFromURI from "../../../contextual/fileRangeFromURI"; -import { DatabaseItem } from "../../../databases"; +import fileRangeFromURI from "../../../../src/contextual/fileRangeFromURI"; +import { DatabaseItem } from "../../../../src/databases"; import { WholeFileLocation, LineColumnLocation, -} from "../../../pure/bqrs-cli-types"; +} from "../../../../src/pure/bqrs-cli-types"; describe("fileRangeFromURI", () => { it("should return undefined when value is not a file URI", () => { diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/contextual/queryResolver.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/contextual/queryResolver.test.ts similarity index 92% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/contextual/queryResolver.test.ts rename to extensions/ql-vscode/test/vscode-tests/no-workspace/contextual/queryResolver.test.ts index db07a865d0e..57aadd9d4d9 100644 --- a/extensions/ql-vscode/src/vscode-tests/no-workspace/contextual/queryResolver.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/contextual/queryResolver.test.ts @@ -1,16 +1,16 @@ import { load } from "js-yaml"; import * as fs from "fs-extra"; -import { KeyType } from "../../../contextual/keyType"; -import { getErrorMessage } from "../../../pure/helpers-pure"; +import { KeyType } from "../../../../src/contextual/keyType"; +import { getErrorMessage } from "../../../../src/pure/helpers-pure"; -import * as helpers from "../../../helpers"; +import * as helpers from "../../../../src/helpers"; import { qlpackOfDatabase, resolveQueries, -} from "../../../contextual/queryResolver"; -import { CodeQLCliServer } from "../../../cli"; -import { DatabaseItem } from "../../../databases"; +} from "../../../../src/contextual/queryResolver"; +import { CodeQLCliServer } from "../../../../src/cli"; +import { DatabaseItem } from "../../../../src/databases"; describe("queryResolver", () => { let writeFileSpy: jest.SpiedFunction; diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/data/archive-filesystem-provider-test/single_file.zip b/extensions/ql-vscode/test/vscode-tests/no-workspace/data/archive-filesystem-provider-test/single_file.zip similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/data/archive-filesystem-provider-test/single_file.zip rename to extensions/ql-vscode/test/vscode-tests/no-workspace/data/archive-filesystem-provider-test/single_file.zip diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/data/archive-filesystem-provider-test/zip_with_folder.zip b/extensions/ql-vscode/test/vscode-tests/no-workspace/data/archive-filesystem-provider-test/zip_with_folder.zip similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/data/archive-filesystem-provider-test/zip_with_folder.zip rename to extensions/ql-vscode/test/vscode-tests/no-workspace/data/archive-filesystem-provider-test/zip_with_folder.zip diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/data/astBuilder.json b/extensions/ql-vscode/test/vscode-tests/no-workspace/data/astBuilder.json similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/data/astBuilder.json rename to extensions/ql-vscode/test/vscode-tests/no-workspace/data/astBuilder.json diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/data/astViewer.yml b/extensions/ql-vscode/test/vscode-tests/no-workspace/data/astViewer.yml similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/data/astViewer.yml rename to extensions/ql-vscode/test/vscode-tests/no-workspace/data/astViewer.yml diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/q0.ql b/extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/q0.ql similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/q0.ql rename to extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/q0.ql diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/q1.ql b/extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/q1.ql similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/q1.ql rename to extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/q1.ql diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/11111111/nwo.txt b/extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/11111111/nwo.txt similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/11111111/nwo.txt rename to extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/11111111/nwo.txt diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/11111111/resultcount.txt b/extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/11111111/resultcount.txt similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/11111111/resultcount.txt rename to extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/11111111/resultcount.txt diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/11111111/results.bqrs b/extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/11111111/results.bqrs similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/11111111/results.bqrs rename to extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/11111111/results.bqrs diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/11111111/results.csv b/extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/11111111/results.csv similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/11111111/results.csv rename to extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/11111111/results.csv diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/11111111/results.md b/extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/11111111/results.md similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/11111111/results.md rename to extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/11111111/results.md diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/11111111/results.sarif b/extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/11111111/results.sarif similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/11111111/results.sarif rename to extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/11111111/results.sarif diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/171543249/nwo.txt b/extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/171543249/nwo.txt similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/171543249/nwo.txt rename to extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/171543249/nwo.txt diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/171543249/resultcount.txt b/extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/171543249/resultcount.txt similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/171543249/resultcount.txt rename to extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/171543249/resultcount.txt diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/171543249/results.bqrs b/extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/171543249/results.bqrs similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/171543249/results.bqrs rename to extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/171543249/results.bqrs diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/171543249/results.csv b/extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/171543249/results.csv similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/171543249/results.csv rename to extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/171543249/results.csv diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/171543249/results.md b/extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/171543249/results.md similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/171543249/results.md rename to extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/171543249/results.md diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/171543249/results.sarif b/extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/171543249/results.sarif similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/171543249/results.sarif rename to extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/171543249/results.sarif diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/query-result.json b/extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/query-result.json similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/query-result.json rename to extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/query-result.json diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/query.json b/extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/query.json similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/query.json rename to extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/query.json diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/timestamp b/extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/timestamp similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/timestamp rename to extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 1-6sBi6oaky_fxqXW2NA4bx/timestamp diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 2-UL-vbKAjP8ffObxjsp7hN/171544171/nwo.txt b/extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 2-UL-vbKAjP8ffObxjsp7hN/171544171/nwo.txt similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 2-UL-vbKAjP8ffObxjsp7hN/171544171/nwo.txt rename to extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 2-UL-vbKAjP8ffObxjsp7hN/171544171/nwo.txt diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 2-UL-vbKAjP8ffObxjsp7hN/171544171/resultcount.txt b/extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 2-UL-vbKAjP8ffObxjsp7hN/171544171/resultcount.txt similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 2-UL-vbKAjP8ffObxjsp7hN/171544171/resultcount.txt rename to extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 2-UL-vbKAjP8ffObxjsp7hN/171544171/resultcount.txt diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 2-UL-vbKAjP8ffObxjsp7hN/171544171/results.bqrs b/extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 2-UL-vbKAjP8ffObxjsp7hN/171544171/results.bqrs similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 2-UL-vbKAjP8ffObxjsp7hN/171544171/results.bqrs rename to extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 2-UL-vbKAjP8ffObxjsp7hN/171544171/results.bqrs diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 2-UL-vbKAjP8ffObxjsp7hN/171544171/results.csv b/extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 2-UL-vbKAjP8ffObxjsp7hN/171544171/results.csv similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 2-UL-vbKAjP8ffObxjsp7hN/171544171/results.csv rename to extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 2-UL-vbKAjP8ffObxjsp7hN/171544171/results.csv diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 2-UL-vbKAjP8ffObxjsp7hN/171544171/results.md b/extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 2-UL-vbKAjP8ffObxjsp7hN/171544171/results.md similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 2-UL-vbKAjP8ffObxjsp7hN/171544171/results.md rename to extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 2-UL-vbKAjP8ffObxjsp7hN/171544171/results.md diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 2-UL-vbKAjP8ffObxjsp7hN/171544171/results.sarif b/extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 2-UL-vbKAjP8ffObxjsp7hN/171544171/results.sarif similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 2-UL-vbKAjP8ffObxjsp7hN/171544171/results.sarif rename to extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 2-UL-vbKAjP8ffObxjsp7hN/171544171/results.sarif diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 2-UL-vbKAjP8ffObxjsp7hN/query-result.json b/extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 2-UL-vbKAjP8ffObxjsp7hN/query-result.json similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 2-UL-vbKAjP8ffObxjsp7hN/query-result.json rename to extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 2-UL-vbKAjP8ffObxjsp7hN/query-result.json diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 2-UL-vbKAjP8ffObxjsp7hN/query.json b/extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 2-UL-vbKAjP8ffObxjsp7hN/query.json similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 2-UL-vbKAjP8ffObxjsp7hN/query.json rename to extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 2-UL-vbKAjP8ffObxjsp7hN/query.json diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 2-UL-vbKAjP8ffObxjsp7hN/timestamp b/extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 2-UL-vbKAjP8ffObxjsp7hN/timestamp similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 2-UL-vbKAjP8ffObxjsp7hN/timestamp rename to extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/queries/MRVA Integration test 2-UL-vbKAjP8ffObxjsp7hN/timestamp diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/query-with-results/analyses-results.json b/extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/query-with-results/analyses-results.json similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/query-with-results/analyses-results.json rename to extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/query-with-results/analyses-results.json diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/query-with-results/query.json b/extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/query-with-results/query.json similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/query-with-results/query.json rename to extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/query-with-results/query.json diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/workspace-query-history.json b/extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/workspace-query-history.json similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/data/remote-queries/workspace-query-history.json rename to extensions/ql-vscode/test/vscode-tests/no-workspace/data/remote-queries/workspace-query-history.json diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/data/sarif/emptyResultsSarif.sarif b/extensions/ql-vscode/test/vscode-tests/no-workspace/data/sarif/emptyResultsSarif.sarif similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/data/sarif/emptyResultsSarif.sarif rename to extensions/ql-vscode/test/vscode-tests/no-workspace/data/sarif/emptyResultsSarif.sarif diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/data/sarif/invalidSarif.sarif b/extensions/ql-vscode/test/vscode-tests/no-workspace/data/sarif/invalidSarif.sarif similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/data/sarif/invalidSarif.sarif rename to extensions/ql-vscode/test/vscode-tests/no-workspace/data/sarif/invalidSarif.sarif diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/data/sarif/validSarif.sarif b/extensions/ql-vscode/test/vscode-tests/no-workspace/data/sarif/validSarif.sarif similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/data/sarif/validSarif.sarif rename to extensions/ql-vscode/test/vscode-tests/no-workspace/data/sarif/validSarif.sarif diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/data/variant-analysis/q0.ql b/extensions/ql-vscode/test/vscode-tests/no-workspace/data/variant-analysis/q0.ql similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/data/variant-analysis/q0.ql rename to extensions/ql-vscode/test/vscode-tests/no-workspace/data/variant-analysis/q0.ql diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/data/variant-analysis/q1.ql b/extensions/ql-vscode/test/vscode-tests/no-workspace/data/variant-analysis/q1.ql similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/data/variant-analysis/q1.ql rename to extensions/ql-vscode/test/vscode-tests/no-workspace/data/variant-analysis/q1.ql diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/data/variant-analysis/workspace-query-history.json b/extensions/ql-vscode/test/vscode-tests/no-workspace/data/variant-analysis/workspace-query-history.json similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/data/variant-analysis/workspace-query-history.json rename to extensions/ql-vscode/test/vscode-tests/no-workspace/data/variant-analysis/workspace-query-history.json diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/databaseFetcher.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/databaseFetcher.test.ts similarity index 99% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/databaseFetcher.test.ts rename to extensions/ql-vscode/test/vscode-tests/no-workspace/databaseFetcher.test.ts index 88c4a2b8431..a032b10c1f1 100644 --- a/extensions/ql-vscode/src/vscode-tests/no-workspace/databaseFetcher.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/databaseFetcher.test.ts @@ -6,7 +6,7 @@ import { QuickPickItem, window } from "vscode"; import { convertGithubNwoToDatabaseUrl, findDirWithFile, -} from "../../databaseFetcher"; +} from "../../../src/databaseFetcher"; import * as Octokit from "@octokit/rest"; // These tests make API calls and may need extra time to complete. diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/databases-ui.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/databases-ui.test.ts similarity index 97% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/databases-ui.test.ts rename to extensions/ql-vscode/test/vscode-tests/no-workspace/databases-ui.test.ts index 0b916ace152..84970df470b 100644 --- a/extensions/ql-vscode/src/vscode-tests/no-workspace/databases-ui.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/databases-ui.test.ts @@ -9,9 +9,9 @@ import { } from "fs-extra"; import { Uri } from "vscode"; -import { DatabaseUI } from "../../databases-ui"; +import { DatabaseUI } from "../../../src/databases-ui"; import { testDisposeHandler } from "../test-dispose-handler"; -import { Credentials } from "../../authentication"; +import { Credentials } from "../../../src/authentication"; describe("databases-ui", () => { describe("fixDbUri", () => { diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/distribution.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/distribution.test.ts similarity index 98% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/distribution.test.ts rename to extensions/ql-vscode/test/vscode-tests/no-workspace/distribution.test.ts index 6c29f7e31d5..ba053231594 100644 --- a/extensions/ql-vscode/src/vscode-tests/no-workspace/distribution.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/distribution.test.ts @@ -2,8 +2,8 @@ import { sep } from "path"; import * as fetch from "node-fetch"; import { Range } from "semver"; -import * as helpers from "../../helpers"; -import { extLogger } from "../../common"; +import * as helpers from "../../../src/helpers"; +import { extLogger } from "../../../src/common"; import * as fs from "fs-extra"; import * as os from "os"; import { @@ -12,7 +12,7 @@ import { ReleasesApiConsumer, getExecutableFromDirectory, DistributionManager, -} from "../../distribution"; +} from "../../../src/distribution"; describe("Releases API consumer", () => { const owner = "someowner"; diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/download-link.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/download-link.test.ts similarity index 94% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/download-link.test.ts rename to extensions/ql-vscode/test/vscode-tests/no-workspace/download-link.test.ts index 2dd8f0e9db9..7cf3de7257e 100644 --- a/extensions/ql-vscode/src/vscode-tests/no-workspace/download-link.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/download-link.test.ts @@ -3,7 +3,7 @@ import { join } from "path"; import { DownloadLink, createDownloadPath, -} from "../../remote-queries/download-link"; +} from "../../../src/remote-queries/download-link"; describe("createDownloadPath", () => { it("should return the correct path", () => { diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/eval-log-tree-builder.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/eval-log-tree-builder.test.ts similarity index 95% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/eval-log-tree-builder.test.ts rename to extensions/ql-vscode/test/vscode-tests/no-workspace/eval-log-tree-builder.test.ts index 9fe38eacd6e..67d2d0c5db8 100644 --- a/extensions/ql-vscode/src/vscode-tests/no-workspace/eval-log-tree-builder.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/eval-log-tree-builder.test.ts @@ -1,5 +1,5 @@ -import EvalLogTreeBuilder from "../../eval-log-tree-builder"; -import { EvalLogData } from "../../pure/log-summary-parser"; +import EvalLogTreeBuilder from "../../../src/eval-log-tree-builder"; +import { EvalLogData } from "../../../src/pure/log-summary-parser"; describe("EvalLogTreeBuilder", () => { it("should build the log tree roots", async () => { diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/eval-log-viewer.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/eval-log-viewer.test.ts similarity index 98% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/eval-log-viewer.test.ts rename to extensions/ql-vscode/test/vscode-tests/no-workspace/eval-log-viewer.test.ts index c1f0825d64e..b4480ddc450 100644 --- a/extensions/ql-vscode/src/vscode-tests/no-workspace/eval-log-viewer.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/eval-log-viewer.test.ts @@ -3,7 +3,7 @@ import { ChildEvalLogTreeItem, EvalLogTreeItem, EvalLogViewer, -} from "../../eval-log-viewer"; +} from "../../../src/eval-log-viewer"; import { testDisposeHandler } from "../test-dispose-handler"; describe("EvalLogViewer", () => { diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/helpers.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/helpers.test.ts similarity index 99% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/helpers.test.ts rename to extensions/ql-vscode/test/vscode-tests/no-workspace/helpers.test.ts index c08a2ac25d1..fe464c1c068 100644 --- a/extensions/ql-vscode/src/vscode-tests/no-workspace/helpers.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/helpers.test.ts @@ -25,8 +25,8 @@ import { showBinaryChoiceWithUrlDialog, showInformationMessageWithAction, walkDirectory, -} from "../../helpers"; -import { reportStreamProgress } from "../../commandRunner"; +} from "../../../src/helpers"; +import { reportStreamProgress } from "../../../src/commandRunner"; describe("helpers", () => { describe("Invocation rate limiter", () => { diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/history-item-label-provider.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/history-item-label-provider.test.ts similarity index 95% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/history-item-label-provider.test.ts rename to extensions/ql-vscode/test/vscode-tests/no-workspace/history-item-label-provider.test.ts index 57947be0944..5f2f4964ea5 100644 --- a/extensions/ql-vscode/src/vscode-tests/no-workspace/history-item-label-provider.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/history-item-label-provider.test.ts @@ -1,9 +1,9 @@ import { env } from "vscode"; -import { QueryHistoryConfig } from "../../config"; -import { HistoryItemLabelProvider } from "../../history-item-label-provider"; -import { createMockLocalQueryInfo } from "../factories/local-queries/local-query-history-item"; -import { createMockRemoteQueryHistoryItem } from "../factories/remote-queries/remote-query-history-item"; -import { QueryStatus } from "../../query-status"; +import { QueryHistoryConfig } from "../../../src/config"; +import { HistoryItemLabelProvider } from "../../../src/history-item-label-provider"; +import { createMockLocalQueryInfo } from "../../factories/local-queries/local-query-history-item"; +import { createMockRemoteQueryHistoryItem } from "../../factories/remote-queries/remote-query-history-item"; +import { QueryStatus } from "../../../src/query-status"; describe("HistoryItemLabelProvider", () => { let labelProvider: HistoryItemLabelProvider; diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/index.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/index.ts similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/index.ts rename to extensions/ql-vscode/test/vscode-tests/no-workspace/index.ts diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/interface-utils.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/interface-utils.test.ts similarity index 96% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/interface-utils.test.ts rename to extensions/ql-vscode/test/vscode-tests/no-workspace/interface-utils.test.ts index 5e781f47cb4..753e71845de 100644 --- a/extensions/ql-vscode/src/vscode-tests/no-workspace/interface-utils.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/interface-utils.test.ts @@ -9,9 +9,12 @@ import { } from "vscode"; import { basename } from "path"; import { fileSync, FileResult } from "tmp"; -import { fileUriToWebviewUri, tryResolveLocation } from "../../interface-utils"; -import { getDefaultResultSetName } from "../../pure/interface-types"; -import { DatabaseItem } from "../../databases"; +import { + fileUriToWebviewUri, + tryResolveLocation, +} from "../../../src/interface-utils"; +import { getDefaultResultSetName } from "../../../src/pure/interface-types"; +import { DatabaseItem } from "../../../src/databases"; describe("interface-utils", () => { describe("webview uri conversion", () => { diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/jest-runner-vscode.config.js b/extensions/ql-vscode/test/vscode-tests/no-workspace/jest-runner-vscode.config.js similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/jest-runner-vscode.config.js rename to extensions/ql-vscode/test/vscode-tests/no-workspace/jest-runner-vscode.config.js diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/jest.config.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/jest.config.ts similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/jest.config.ts rename to extensions/ql-vscode/test/vscode-tests/no-workspace/jest.config.ts diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/query-history-info.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history-info.test.ts similarity index 90% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/query-history-info.test.ts rename to extensions/ql-vscode/test/vscode-tests/no-workspace/query-history-info.test.ts index 212873501b8..c8fe45fe6fa 100644 --- a/extensions/ql-vscode/src/vscode-tests/no-workspace/query-history-info.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history-info.test.ts @@ -1,20 +1,20 @@ -import { QueryStatus } from "../../query-status"; +import { QueryStatus } from "../../../src/query-status"; import { buildRepoLabel, getActionsWorkflowRunUrl, getQueryId, getQueryText, getRawQueryName, -} from "../../query-history-info"; -import { VariantAnalysisHistoryItem } from "../../remote-queries/variant-analysis-history-item"; -import { createMockVariantAnalysis } from "../factories/remote-queries/shared/variant-analysis"; -import { createMockScannedRepos } from "../factories/remote-queries/shared/scanned-repositories"; -import { createMockLocalQueryInfo } from "../factories/local-queries/local-query-history-item"; -import { createMockRemoteQueryHistoryItem } from "../factories/remote-queries/remote-query-history-item"; +} from "../../../src/query-history-info"; +import { VariantAnalysisHistoryItem } from "../../../src/remote-queries/variant-analysis-history-item"; +import { createMockVariantAnalysis } from "../../factories/remote-queries/shared/variant-analysis"; +import { createMockScannedRepos } from "../../factories/remote-queries/shared/scanned-repositories"; +import { createMockLocalQueryInfo } from "../../factories/local-queries/local-query-history-item"; +import { createMockRemoteQueryHistoryItem } from "../../factories/remote-queries/remote-query-history-item"; import { VariantAnalysisRepoStatus, VariantAnalysisStatus, -} from "../../remote-queries/shared/variant-analysis"; +} from "../../../src/remote-queries/shared/variant-analysis"; describe("Query history info", () => { const date = new Date("2022-01-01T00:00:00.000Z"); diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/query-history.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history.test.ts similarity index 97% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/query-history.test.ts rename to extensions/ql-vscode/test/vscode-tests/no-workspace/query-history.test.ts index 848a4d02af5..747b311c4d3 100644 --- a/extensions/ql-vscode/src/vscode-tests/no-workspace/query-history.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/query-history.test.ts @@ -2,46 +2,49 @@ import { readdirSync, mkdirSync, writeFileSync } from "fs-extra"; import { join } from "path"; import * as vscode from "vscode"; -import { extLogger } from "../../common"; -import { registerQueryHistoryScrubber } from "../../query-history-scrubber"; +import { extLogger } from "../../../src/common"; +import { registerQueryHistoryScrubber } from "../../../src/query-history-scrubber"; import { HistoryTreeDataProvider, QueryHistoryManager, SortOrder, -} from "../../query-history"; -import { QueryHistoryConfig, QueryHistoryConfigListener } from "../../config"; -import { LocalQueryInfo } from "../../query-results"; -import { DatabaseManager } from "../../databases"; +} from "../../../src/query-history"; +import { + QueryHistoryConfig, + QueryHistoryConfigListener, +} from "../../../src/config"; +import { LocalQueryInfo } from "../../../src/query-results"; +import { DatabaseManager } from "../../../src/databases"; import { dirSync } from "tmp-promise"; import { ONE_DAY_IN_MS, ONE_HOUR_IN_MS, THREE_HOURS_IN_MS, TWO_HOURS_IN_MS, -} from "../../pure/time"; -import { tmpDir } from "../../helpers"; -import { HistoryItemLabelProvider } from "../../history-item-label-provider"; -import { RemoteQueriesManager } from "../../remote-queries/remote-queries-manager"; -import { ResultsView } from "../../interface"; -import { EvalLogViewer } from "../../eval-log-viewer"; -import { QueryRunner } from "../../queryRunner"; -import { VariantAnalysisManager } from "../../remote-queries/variant-analysis-manager"; -import { QueryHistoryInfo } from "../../query-history-info"; +} from "../../../src/pure/time"; +import { tmpDir } from "../../../src/helpers"; +import { HistoryItemLabelProvider } from "../../../src/history-item-label-provider"; +import { RemoteQueriesManager } from "../../../src/remote-queries/remote-queries-manager"; +import { ResultsView } from "../../../src/interface"; +import { EvalLogViewer } from "../../../src/eval-log-viewer"; +import { QueryRunner } from "../../../src/queryRunner"; +import { VariantAnalysisManager } from "../../../src/remote-queries/variant-analysis-manager"; +import { QueryHistoryInfo } from "../../../src/query-history-info"; import { createMockLocalQueryInfo, createMockQueryWithResults, -} from "../factories/local-queries/local-query-history-item"; -import { createMockRemoteQueryHistoryItem } from "../factories/remote-queries/remote-query-history-item"; -import { RemoteQueryHistoryItem } from "../../remote-queries/remote-query-history-item"; +} from "../../factories/local-queries/local-query-history-item"; +import { createMockRemoteQueryHistoryItem } from "../../factories/remote-queries/remote-query-history-item"; +import { RemoteQueryHistoryItem } from "../../../src/remote-queries/remote-query-history-item"; import { shuffleHistoryItems } from "../utils/query-history-helpers"; -import { createMockVariantAnalysisHistoryItem } from "../factories/remote-queries/variant-analysis-history-item"; -import { VariantAnalysisHistoryItem } from "../../remote-queries/variant-analysis-history-item"; -import { QueryStatus } from "../../query-status"; -import { VariantAnalysisStatus } from "../../remote-queries/shared/variant-analysis"; -import * as ghActionsApiClient from "../../remote-queries/gh-api/gh-actions-api-client"; -import { Credentials } from "../../authentication"; +import { createMockVariantAnalysisHistoryItem } from "../../factories/remote-queries/variant-analysis-history-item"; +import { VariantAnalysisHistoryItem } from "../../../src/remote-queries/variant-analysis-history-item"; +import { QueryStatus } from "../../../src/query-status"; +import { VariantAnalysisStatus } from "../../../src/remote-queries/shared/variant-analysis"; +import * as ghActionsApiClient from "../../../src/remote-queries/gh-api/gh-actions-api-client"; +import { Credentials } from "../../../src/authentication"; import { QuickPickItem, TextEditor } from "vscode"; -import { WebviewReveal } from "../../interface-utils"; +import { WebviewReveal } from "../../../src/interface-utils"; describe("query-history", () => { const mockExtensionLocation = join(tmpDir.name, "mock-extension-location"); diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/query-results.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/query-results.test.ts similarity index 97% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/query-results.test.ts rename to extensions/ql-vscode/test/vscode-tests/no-workspace/query-results.test.ts index 56f7b2f921e..c5000a68b0f 100644 --- a/extensions/ql-vscode/src/vscode-tests/no-workspace/query-results.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/query-results.test.ts @@ -11,26 +11,29 @@ import { LocalQueryInfo, InitialQueryInfo, interpretResultsSarif, -} from "../../query-results"; -import { QueryWithResults } from "../../run-queries-shared"; +} from "../../../src/query-results"; +import { QueryWithResults } from "../../../src/run-queries-shared"; import { DatabaseInfo, SortDirection, SortedResultSetInfo, -} from "../../pure/interface-types"; -import { CodeQLCliServer, SourceInfo } from "../../cli"; +} from "../../../src/pure/interface-types"; +import { CodeQLCliServer, SourceInfo } from "../../../src/cli"; import { CancellationTokenSource, Uri } from "vscode"; -import { tmpDir } from "../../helpers"; +import { tmpDir } from "../../../src/helpers"; import { slurpQueryHistory, splatQueryHistory, -} from "../../query-serialization"; +} from "../../../src/query-serialization"; import { formatLegacyMessage, QueryInProgress, -} from "../../legacy-query-server/run-queries"; -import { EvaluationResult, QueryResultType } from "../../pure/legacy-messages"; -import { sleep } from "../../pure/time"; +} from "../../../src/legacy-query-server/run-queries"; +import { + EvaluationResult, + QueryResultType, +} from "../../../src/pure/legacy-messages"; +import { sleep } from "../../../src/pure/time"; describe("query-results", () => { let queryPath: string; diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/remote-queries/export-results.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/remote-queries/export-results.test.ts similarity index 80% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/remote-queries/export-results.test.ts rename to extensions/ql-vscode/test/vscode-tests/no-workspace/remote-queries/export-results.test.ts index d11c41230ed..28aad971efb 100644 --- a/extensions/ql-vscode/src/vscode-tests/no-workspace/remote-queries/export-results.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/remote-queries/export-results.test.ts @@ -1,9 +1,9 @@ import { join } from "path"; import { readFile } from "fs-extra"; -import { Credentials } from "../../../authentication"; -import * as markdownGenerator from "../../../remote-queries/remote-queries-markdown-generation"; -import * as ghApiClient from "../../../remote-queries/gh-api/gh-api-client"; -import { exportRemoteQueryAnalysisResults } from "../../../remote-queries/export-results"; +import { Credentials } from "../../../../src/authentication"; +import * as markdownGenerator from "../../../../src/remote-queries/remote-queries-markdown-generation"; +import * as ghApiClient from "../../../../src/remote-queries/gh-api/gh-api-client"; +import { exportRemoteQueryAnalysisResults } from "../../../../src/remote-queries/export-results"; describe("export results", () => { describe("exportRemoteQueryAnalysisResults", () => { diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/remote-queries/gh-api/gh-actions-api-client.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/remote-queries/gh-api/gh-actions-api-client.test.ts similarity index 90% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/remote-queries/gh-api/gh-actions-api-client.test.ts rename to extensions/ql-vscode/test/vscode-tests/no-workspace/remote-queries/gh-api/gh-actions-api-client.test.ts index 22b8f78aefb..d2de53e6851 100644 --- a/extensions/ql-vscode/src/vscode-tests/no-workspace/remote-queries/gh-api/gh-actions-api-client.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/remote-queries/gh-api/gh-actions-api-client.test.ts @@ -1,12 +1,12 @@ -import { Credentials } from "../../../../authentication"; +import { Credentials } from "../../../../../src/authentication"; import { cancelRemoteQuery, cancelVariantAnalysis, getRepositoriesMetadata, -} from "../../../../remote-queries/gh-api/gh-actions-api-client"; -import { RemoteQuery } from "../../../../remote-queries/remote-query"; -import { createMockVariantAnalysis } from "../../../factories/remote-queries/shared/variant-analysis"; -import { VariantAnalysis } from "../../../../remote-queries/shared/variant-analysis"; +} from "../../../../../src/remote-queries/gh-api/gh-actions-api-client"; +import { RemoteQuery } from "../../../../../src/remote-queries/remote-query"; +import { createMockVariantAnalysis } from "../../../../factories/remote-queries/shared/variant-analysis"; +import { VariantAnalysis } from "../../../../../src/remote-queries/shared/variant-analysis"; jest.setTimeout(10000); diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/remote-queries/remote-queries-api.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/remote-queries/remote-queries-api.test.ts similarity index 98% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/remote-queries/remote-queries-api.test.ts rename to extensions/ql-vscode/test/vscode-tests/no-workspace/remote-queries/remote-queries-api.test.ts index c9c9e517f8a..fe96be07c55 100644 --- a/extensions/ql-vscode/src/vscode-tests/no-workspace/remote-queries/remote-queries-api.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/remote-queries/remote-queries-api.test.ts @@ -1,6 +1,6 @@ import { EOL } from "os"; -import { parseResponse } from "../../../remote-queries/remote-queries-api"; -import { Repository } from "../../../remote-queries/shared/repository"; +import { parseResponse } from "../../../../src/remote-queries/remote-queries-api"; +import { Repository } from "../../../../src/remote-queries/shared/repository"; describe("parseResponse", () => { const controllerRepository: Repository = { diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/remote-queries/remote-query-history.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/remote-queries/remote-query-history.test.ts similarity index 94% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/remote-queries/remote-query-history.test.ts rename to extensions/ql-vscode/test/vscode-tests/no-workspace/remote-queries/remote-query-history.test.ts index e6bb15eb7e9..38921ccf9d9 100644 --- a/extensions/ql-vscode/src/vscode-tests/no-workspace/remote-queries/remote-query-history.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/remote-queries/remote-query-history.test.ts @@ -17,21 +17,21 @@ import { window, workspace, } from "vscode"; -import { QueryHistoryConfig } from "../../../config"; -import { DatabaseManager } from "../../../databases"; -import { tmpDir, walkDirectory } from "../../../helpers"; -import { QueryHistoryManager } from "../../../query-history"; -import { Credentials } from "../../../authentication"; -import { AnalysesResultsManager } from "../../../remote-queries/analyses-results-manager"; -import { RemoteQueryResult } from "../../../remote-queries/shared/remote-query-result"; +import { QueryHistoryConfig } from "../../../../src/config"; +import { DatabaseManager } from "../../../../src/databases"; +import { tmpDir, walkDirectory } from "../../../../src/helpers"; +import { QueryHistoryManager } from "../../../../src/query-history"; +import { Credentials } from "../../../../src/authentication"; +import { AnalysesResultsManager } from "../../../../src/remote-queries/analyses-results-manager"; +import { RemoteQueryResult } from "../../../../src/remote-queries/shared/remote-query-result"; import { DisposableBucket } from "../../disposable-bucket"; import { testDisposeHandler } from "../../test-dispose-handler"; -import { HistoryItemLabelProvider } from "../../../history-item-label-provider"; -import { RemoteQueriesManager } from "../../../remote-queries/remote-queries-manager"; -import { ResultsView } from "../../../interface"; -import { EvalLogViewer } from "../../../eval-log-viewer"; -import { QueryRunner } from "../../../queryRunner"; -import { VariantAnalysisManager } from "../../../remote-queries/variant-analysis-manager"; +import { HistoryItemLabelProvider } from "../../../../src/history-item-label-provider"; +import { RemoteQueriesManager } from "../../../../src/remote-queries/remote-queries-manager"; +import { ResultsView } from "../../../../src/interface"; +import { EvalLogViewer } from "../../../../src/eval-log-viewer"; +import { QueryRunner } from "../../../../src/queryRunner"; +import { VariantAnalysisManager } from "../../../../src/remote-queries/variant-analysis-manager"; // set a higher timeout since recursive delete may take a while, expecially on Windows. jest.setTimeout(120000); diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/remote-queries/repository-selection.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/remote-queries/repository-selection.test.ts similarity index 98% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/remote-queries/repository-selection.test.ts rename to extensions/ql-vscode/test/vscode-tests/no-workspace/remote-queries/repository-selection.test.ts index d2e29a7ad5a..f2d9dda3edd 100644 --- a/extensions/ql-vscode/src/vscode-tests/no-workspace/remote-queries/repository-selection.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/remote-queries/repository-selection.test.ts @@ -1,15 +1,15 @@ import { QuickPickItem, window } from "vscode"; import * as fs from "fs-extra"; -import { UserCancellationException } from "../../../commandRunner"; +import { UserCancellationException } from "../../../../src/commandRunner"; -import * as config from "../../../config"; -import { getRepositorySelection } from "../../../remote-queries/repository-selection"; -import { DbManager } from "../../../databases/db-manager"; +import * as config from "../../../../src/config"; +import { getRepositorySelection } from "../../../../src/remote-queries/repository-selection"; +import { DbManager } from "../../../../src/databases/db-manager"; import { DbItem, DbItemKind, RemoteRepoDbItem, -} from "../../../databases/db-item"; +} from "../../../../src/databases/db-item"; describe("repository selection", () => { describe("newQueryRunExperience true", () => { diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/remote-queries/variant-analysis-history.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/remote-queries/variant-analysis-history.test.ts similarity index 90% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/remote-queries/variant-analysis-history.test.ts rename to extensions/ql-vscode/test/vscode-tests/no-workspace/remote-queries/variant-analysis-history.test.ts index 1a369e0612f..9d8f1bfcd62 100644 --- a/extensions/ql-vscode/src/vscode-tests/no-workspace/remote-queries/variant-analysis-history.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/remote-queries/variant-analysis-history.test.ts @@ -9,18 +9,18 @@ import { import { join } from "path"; import { commands, ExtensionContext, Uri } from "vscode"; -import { QueryHistoryConfig } from "../../../config"; -import { DatabaseManager } from "../../../databases"; -import { tmpDir, walkDirectory } from "../../../helpers"; -import { QueryHistoryManager } from "../../../query-history"; +import { QueryHistoryConfig } from "../../../../src/config"; +import { DatabaseManager } from "../../../../src/databases"; +import { tmpDir, walkDirectory } from "../../../../src/helpers"; +import { QueryHistoryManager } from "../../../../src/query-history"; import { DisposableBucket } from "../../disposable-bucket"; import { testDisposeHandler } from "../../test-dispose-handler"; -import { HistoryItemLabelProvider } from "../../../history-item-label-provider"; -import { RemoteQueriesManager } from "../../../remote-queries/remote-queries-manager"; -import { ResultsView } from "../../../interface"; -import { EvalLogViewer } from "../../../eval-log-viewer"; -import { QueryRunner } from "../../../queryRunner"; -import { VariantAnalysisManager } from "../../../remote-queries/variant-analysis-manager"; +import { HistoryItemLabelProvider } from "../../../../src/history-item-label-provider"; +import { RemoteQueriesManager } from "../../../../src/remote-queries/remote-queries-manager"; +import { ResultsView } from "../../../../src/interface"; +import { EvalLogViewer } from "../../../../src/eval-log-viewer"; +import { QueryRunner } from "../../../../src/queryRunner"; +import { VariantAnalysisManager } from "../../../../src/remote-queries/variant-analysis-manager"; // set a higher timeout since recursive delete may take a while, expecially on Windows. jest.setTimeout(120000); diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/run-queries.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/run-queries.test.ts similarity index 95% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/run-queries.test.ts rename to extensions/ql-vscode/test/vscode-tests/no-workspace/run-queries.test.ts index fb5708d5336..0d0b705c4ac 100644 --- a/extensions/ql-vscode/src/vscode-tests/no-workspace/run-queries.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/run-queries.test.ts @@ -7,15 +7,15 @@ import { compileQuery, registerDatabases, deregisterDatabases, -} from "../../pure/legacy-messages"; -import * as config from "../../config"; -import { tmpDir } from "../../helpers"; -import { QueryServerClient } from "../../legacy-query-server/queryserver-client"; -import { CodeQLCliServer } from "../../cli"; -import { SELECT_QUERY_NAME } from "../../contextual/locationFinder"; -import { QueryInProgress } from "../../legacy-query-server/run-queries"; -import { LegacyQueryRunner } from "../../legacy-query-server/legacyRunner"; -import { DatabaseItem } from "../../databases"; +} from "../../../src/pure/legacy-messages"; +import * as config from "../../../src/config"; +import { tmpDir } from "../../../src/helpers"; +import { QueryServerClient } from "../../../src/legacy-query-server/queryserver-client"; +import { CodeQLCliServer } from "../../../src/cli"; +import { SELECT_QUERY_NAME } from "../../../src/contextual/locationFinder"; +import { QueryInProgress } from "../../../src/legacy-query-server/run-queries"; +import { LegacyQueryRunner } from "../../../src/legacy-query-server/legacyRunner"; +import { DatabaseItem } from "../../../src/databases"; describe("run-queries", () => { let isCanarySpy: jest.SpiedFunction; diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/sarifParser.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/sarifParser.test.ts similarity index 92% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/sarifParser.test.ts rename to extensions/ql-vscode/test/vscode-tests/no-workspace/sarifParser.test.ts index 35910b8a874..1c4fa67658f 100644 --- a/extensions/ql-vscode/src/vscode-tests/no-workspace/sarifParser.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/sarifParser.test.ts @@ -1,6 +1,6 @@ import { join } from "path"; -import { sarifParser } from "../../sarif-parser"; +import { sarifParser } from "../../../src/sarif-parser"; describe("sarif parser", () => { const sarifDir = join(__dirname, "data/sarif"); diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/telemetry.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/telemetry.test.ts similarity index 98% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/telemetry.test.ts rename to extensions/ql-vscode/test/vscode-tests/no-workspace/telemetry.test.ts index a8b887fa91d..7be66b2ee78 100644 --- a/extensions/ql-vscode/src/vscode-tests/no-workspace/telemetry.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/telemetry.test.ts @@ -8,9 +8,9 @@ import { import { TelemetryListener, telemetryListener as globalTelemetryListener, -} from "../../telemetry"; -import { UserCancellationException } from "../../commandRunner"; -import { ENABLE_TELEMETRY } from "../../config"; +} from "../../../src/telemetry"; +import { UserCancellationException } from "../../../src/commandRunner"; +import { ENABLE_TELEMETRY } from "../../../src/config"; import { createMockExtensionContext } from "./index"; // setting preferences can trigger lots of background activity diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/test-adapter.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/test-adapter.test.ts similarity index 97% rename from extensions/ql-vscode/src/vscode-tests/no-workspace/test-adapter.test.ts rename to extensions/ql-vscode/test/vscode-tests/no-workspace/test-adapter.test.ts index 4af6e989235..423224f15cb 100644 --- a/extensions/ql-vscode/src/vscode-tests/no-workspace/test-adapter.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/test-adapter.test.ts @@ -1,14 +1,14 @@ import * as fs from "fs-extra"; import { Uri, WorkspaceFolder } from "vscode"; -import { QLTestAdapter } from "../../test-adapter"; -import { CodeQLCliServer } from "../../cli"; +import { QLTestAdapter } from "../../../src/test-adapter"; +import { CodeQLCliServer } from "../../../src/cli"; import { DatabaseItem, DatabaseItemImpl, DatabaseManager, FullDatabaseOptions, -} from "../../databases"; +} from "../../../src/databases"; describe("test-adapter", () => { let adapter: QLTestAdapter; diff --git a/extensions/ql-vscode/src/vscode-tests/run-integration-tests.ts b/extensions/ql-vscode/test/vscode-tests/run-integration-tests.ts similarity index 98% rename from extensions/ql-vscode/src/vscode-tests/run-integration-tests.ts rename to extensions/ql-vscode/test/vscode-tests/run-integration-tests.ts index b8ac58f11ce..01657d21fda 100644 --- a/extensions/ql-vscode/src/vscode-tests/run-integration-tests.ts +++ b/extensions/ql-vscode/test/vscode-tests/run-integration-tests.ts @@ -6,7 +6,7 @@ import { downloadAndUnzipVSCode, resolveCliArgsFromVSCodeExecutablePath, } from "@vscode/test-electron"; -import { assertNever } from "../pure/helpers-pure"; +import { assertNever } from "../../src/pure/helpers-pure"; import { dirSync } from "tmp-promise"; // For some reason, the following are not exported directly from `vscode-test`, diff --git a/extensions/ql-vscode/src/vscode-tests/test-config.ts b/extensions/ql-vscode/test/vscode-tests/test-config.ts similarity index 98% rename from extensions/ql-vscode/src/vscode-tests/test-config.ts rename to extensions/ql-vscode/test/vscode-tests/test-config.ts index e91b5799fbd..29386e7d533 100644 --- a/extensions/ql-vscode/src/vscode-tests/test-config.ts +++ b/extensions/ql-vscode/test/vscode-tests/test-config.ts @@ -1,7 +1,7 @@ import { readFileSync } from "fs-extra"; import { join } from "path"; import { ConfigurationTarget } from "vscode"; -import { ALL_SETTINGS, InspectionResult, Setting } from "../config"; +import { ALL_SETTINGS, InspectionResult, Setting } from "../../src/config"; class TestSetting { private initialSettingState: InspectionResult | undefined; diff --git a/extensions/ql-vscode/src/vscode-tests/test-dispose-handler.ts b/extensions/ql-vscode/test/vscode-tests/test-dispose-handler.ts similarity index 85% rename from extensions/ql-vscode/src/vscode-tests/test-dispose-handler.ts rename to extensions/ql-vscode/test/vscode-tests/test-dispose-handler.ts index b395f3ea007..ff10fa2d403 100644 --- a/extensions/ql-vscode/src/vscode-tests/test-dispose-handler.ts +++ b/extensions/ql-vscode/test/vscode-tests/test-dispose-handler.ts @@ -1,5 +1,5 @@ import { Disposable } from "vscode"; -import { DisposableObject } from "../pure/disposable-object"; +import { DisposableObject } from "../../src/pure/disposable-object"; export function testDisposeHandler(disposable: any & Disposable) { if ( diff --git a/extensions/ql-vscode/src/vscode-tests/utils/bundled-pack-helpers.ts b/extensions/ql-vscode/test/vscode-tests/utils/bundled-pack-helpers.ts similarity index 100% rename from extensions/ql-vscode/src/vscode-tests/utils/bundled-pack-helpers.ts rename to extensions/ql-vscode/test/vscode-tests/utils/bundled-pack-helpers.ts diff --git a/extensions/ql-vscode/src/vscode-tests/utils/query-history-helpers.ts b/extensions/ql-vscode/test/vscode-tests/utils/query-history-helpers.ts similarity index 63% rename from extensions/ql-vscode/src/vscode-tests/utils/query-history-helpers.ts rename to extensions/ql-vscode/test/vscode-tests/utils/query-history-helpers.ts index b55c8d1baac..0f4c8931ae5 100644 --- a/extensions/ql-vscode/src/vscode-tests/utils/query-history-helpers.ts +++ b/extensions/ql-vscode/test/vscode-tests/utils/query-history-helpers.ts @@ -1,4 +1,4 @@ -import { QueryHistoryInfo } from "../../query-history-info"; +import { QueryHistoryInfo } from "../../../src/query-history-info"; export function shuffleHistoryItems(history: QueryHistoryInfo[]) { return history.sort(() => Math.random() - 0.5);