From 4a752d27c49f30c6bea35d3980b54ff7dc82336f Mon Sep 17 00:00:00 2001 From: Charis Kyriakou Date: Mon, 21 Aug 2023 08:49:27 +0100 Subject: [PATCH] Moves mock GitHub API to /common (#2728) * Move mock GitHub API to /common * Rename MRVA mock scenarios * Update mock GitHub API docs --- docs/testing.md | 2 +- .../scripts/add-fields-to-scenarios.ts | 6 +++--- .../scripts/fix-scenario-file-numbering.ts | 2 +- extensions/ql-vscode/scripts/lint-scenarios.ts | 4 ++-- .../mock-gh-api}/gh-api-request.ts | 7 +++++-- .../mock-gh-api}/mock-gh-api-server.ts | 8 ++++---- .../mocks => common/mock-gh-api}/recorder.ts | 2 +- .../mock-gh-api}/request-handlers.ts | 0 .../auto-model-success/0-autoModel.json | 0 .../auto-model-success/1-autoModel.json | 0 .../scenarios/auto-model-success/README.md | 0 .../code-search-success/0-codeSearch.json | 0 .../code-search-success/1-codeSearch.json | 0 .../code-search-success/10-codeSearch.json | 0 .../code-search-success/11-codeSearch.json | 0 .../code-search-success/2-codeSearch.json | 0 .../code-search-success/3-codeSearch.json | 0 .../code-search-success/4-codeSearch.json | 0 .../code-search-success/5-codeSearch.json | 0 .../code-search-success/6-codeSearch.json | 0 .../code-search-success/7-codeSearch.json | 0 .../code-search-success/8-codeSearch.json | 0 .../code-search-success/9-codeSearch.json | 0 .../0-getRepo.json | 0 .../mrva-problem-query-success}/0-getRepo.json | 0 .../1-submitVariantAnalysis.json | 0 .../10-getVariantAnalysisRepoResult.json | 0 .../11-getVariantAnalysis.json | 0 .../12-getVariantAnalysisRepo.json | 0 .../13-getVariantAnalysisRepoResult.body.zip | Bin .../13-getVariantAnalysisRepoResult.json | 0 .../14-getVariantAnalysisRepo.json | 0 .../15-getVariantAnalysisRepoResult.body.zip | Bin .../15-getVariantAnalysisRepoResult.json | 0 .../16-getVariantAnalysis.json | 0 .../17-getVariantAnalysis.json | 0 .../17-getVariantAnalysisRepoResult.body.zip | Bin .../18-getVariantAnalysis.json | 0 .../19-getVariantAnalysisRepo.json | 0 .../2-getVariantAnalysis.json | 0 .../20-getVariantAnalysisRepoResult.body.zip | Bin .../20-getVariantAnalysisRepoResult.json | 0 .../21-getVariantAnalysis.json | 0 .../22-getVariantAnalysis.json | 0 .../23-getVariantAnalysis.json | 0 .../24-getVariantAnalysis.json | 0 .../25-getVariantAnalysisRepo.json | 0 .../26-getVariantAnalysisRepoResult.body.zip | Bin .../26-getVariantAnalysisRepoResult.json | 0 .../27-getVariantAnalysis.json | 0 .../3-getVariantAnalysis.json | 0 .../4-getVariantAnalysis.json | 0 .../5-getVariantAnalysis.json | 0 .../6-getVariantAnalysis.json | 0 .../7-getVariantAnalysis.json | 0 .../8-getVariantAnalysis.json | 0 .../9-getVariantAnalysisRepo.json | 0 .../mrva-problem-query-warnings}/0-getRepo.json | 0 .../1-submitVariantAnalysis.json | 0 .../10-getVariantAnalysisRepo.json | 0 .../11-getVariantAnalysisRepoResult.body.zip | Bin .../11-getVariantAnalysisRepoResult.json | 0 .../12-getVariantAnalysisRepoResult.body.zip | Bin .../12-getVariantAnalysisRepoResult.json | 0 .../13-getVariantAnalysis.json | 0 .../14-getVariantAnalysis.json | 0 .../15-getVariantAnalysis.json | 0 .../16-getVariantAnalysis.json | 0 .../17-getVariantAnalysis.json | 0 .../18-getVariantAnalysis.json | 0 .../19-getVariantAnalysis.json | 0 .../2-getVariantAnalysis.json | 0 .../20-getVariantAnalysis.json | 0 .../21-getVariantAnalysis.json | 0 .../22-getVariantAnalysis.json | 0 .../23-getVariantAnalysis.json | 0 .../24-getVariantAnalysisRepo.json | 0 .../25-getVariantAnalysisRepoResult.body.zip | Bin .../25-getVariantAnalysisRepoResult.json | 0 .../26-getVariantAnalysis.json | 0 .../27-getVariantAnalysis.json | 0 .../28-getVariantAnalysis.json | 0 .../29-getVariantAnalysis.json | 0 .../3-getVariantAnalysis.json | 0 .../30-getVariantAnalysis.json | 0 .../31-getVariantAnalysis.json | 0 .../32-getVariantAnalysis.json | 0 .../33-getVariantAnalysis.json | 0 .../34-getVariantAnalysis.json | 0 .../35-getVariantAnalysisRepo.json | 0 .../36-getVariantAnalysis.json | 0 .../37-getVariantAnalysisRepoResult.body.zip | Bin .../37-getVariantAnalysisRepoResult.json | 0 .../38-getVariantAnalysis.json | 0 .../39-getVariantAnalysis.json | 0 .../4-getVariantAnalysis.json | 0 .../40-getVariantAnalysis.json | 0 .../41-getVariantAnalysis.json | 0 .../42-getVariantAnalysis.json | 0 .../43-getVariantAnalysis.json | 0 .../44-getVariantAnalysis.json | 0 .../45-getVariantAnalysisRepo.json | 0 .../46-getVariantAnalysisRepoResult.body.zip | Bin .../46-getVariantAnalysisRepoResult.json | 0 .../47-getVariantAnalysis.json | 0 .../48-getVariantAnalysis.json | 0 .../49-getVariantAnalysis.json | 0 .../5-getVariantAnalysis.json | 0 .../50-getVariantAnalysis.json | 0 .../51-getVariantAnalysis.json | 0 .../6-getVariantAnalysis.json | 0 .../7-getVariantAnalysis.json | 0 .../8-getVariantAnalysis.json | 0 .../9-getVariantAnalysisRepo.json | 0 .../mrva-query-failure}/0-getRepo.json | 0 .../1-submitVariantAnalysis.json | 0 .../10-getVariantAnalysisRepo.json | 0 .../11-getVariantAnalysisRepoResult.body.zip | Bin .../11-getVariantAnalysisRepoResult.json | 0 .../12-getVariantAnalysis.json | 0 .../13-getVariantAnalysis.json | 0 .../14-getVariantAnalysis.json | 0 .../15-getVariantAnalysis.json | 0 .../2-getVariantAnalysis.json | 0 .../3-getVariantAnalysis.json | 0 .../4-getVariantAnalysis.json | 0 .../5-getVariantAnalysis.json | 0 .../6-getVariantAnalysis.json | 0 .../7-getVariantAnalysis.json | 0 .../8-getVariantAnalysis.json | 0 .../9-getVariantAnalysis.json | 0 .../mrva-submission-failure}/0-getRepo.json | 0 .../1-submitVariantAnalysis.json | 0 .../vscode}/vscode-mock-gh-api-server.ts | 10 +++++----- extensions/ql-vscode/src/extension.ts | 2 +- .../gh-api/gh-api-client.test.ts | 16 ++++++++-------- ...iant-analysis-submission-integration.test.ts | 8 ++++---- 137 files changed, 35 insertions(+), 32 deletions(-) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks => common/mock-gh-api}/gh-api-request.ts (94%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks => common/mock-gh-api}/mock-gh-api-server.ts (92%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks => common/mock-gh-api}/recorder.ts (99%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks => common/mock-gh-api}/request-handlers.ts (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks => common/mock-gh-api}/scenarios/auto-model-success/0-autoModel.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks => common/mock-gh-api}/scenarios/auto-model-success/1-autoModel.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks => common/mock-gh-api}/scenarios/auto-model-success/README.md (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks => common/mock-gh-api}/scenarios/code-search-success/0-codeSearch.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks => common/mock-gh-api}/scenarios/code-search-success/1-codeSearch.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks => common/mock-gh-api}/scenarios/code-search-success/10-codeSearch.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks => common/mock-gh-api}/scenarios/code-search-success/11-codeSearch.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks => common/mock-gh-api}/scenarios/code-search-success/2-codeSearch.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks => common/mock-gh-api}/scenarios/code-search-success/3-codeSearch.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks => common/mock-gh-api}/scenarios/code-search-success/4-codeSearch.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks => common/mock-gh-api}/scenarios/code-search-success/5-codeSearch.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks => common/mock-gh-api}/scenarios/code-search-success/6-codeSearch.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks => common/mock-gh-api}/scenarios/code-search-success/7-codeSearch.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks => common/mock-gh-api}/scenarios/code-search-success/8-codeSearch.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks => common/mock-gh-api}/scenarios/code-search-success/9-codeSearch.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/missing-controller-repo => common/mock-gh-api/scenarios/mrva-missing-controller-repo}/0-getRepo.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-success => common/mock-gh-api/scenarios/mrva-problem-query-success}/0-getRepo.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-success => common/mock-gh-api/scenarios/mrva-problem-query-success}/1-submitVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-success => common/mock-gh-api/scenarios/mrva-problem-query-success}/10-getVariantAnalysisRepoResult.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-success => common/mock-gh-api/scenarios/mrva-problem-query-success}/11-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-success => common/mock-gh-api/scenarios/mrva-problem-query-success}/12-getVariantAnalysisRepo.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-success => common/mock-gh-api/scenarios/mrva-problem-query-success}/13-getVariantAnalysisRepoResult.body.zip (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-success => common/mock-gh-api/scenarios/mrva-problem-query-success}/13-getVariantAnalysisRepoResult.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-success => common/mock-gh-api/scenarios/mrva-problem-query-success}/14-getVariantAnalysisRepo.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-success => common/mock-gh-api/scenarios/mrva-problem-query-success}/15-getVariantAnalysisRepoResult.body.zip (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-success => common/mock-gh-api/scenarios/mrva-problem-query-success}/15-getVariantAnalysisRepoResult.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-success => common/mock-gh-api/scenarios/mrva-problem-query-success}/16-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-success => common/mock-gh-api/scenarios/mrva-problem-query-success}/17-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-success => common/mock-gh-api/scenarios/mrva-problem-query-success}/17-getVariantAnalysisRepoResult.body.zip (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-success => common/mock-gh-api/scenarios/mrva-problem-query-success}/18-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-success => common/mock-gh-api/scenarios/mrva-problem-query-success}/19-getVariantAnalysisRepo.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-success => common/mock-gh-api/scenarios/mrva-problem-query-success}/2-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-success => common/mock-gh-api/scenarios/mrva-problem-query-success}/20-getVariantAnalysisRepoResult.body.zip (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-success => common/mock-gh-api/scenarios/mrva-problem-query-success}/20-getVariantAnalysisRepoResult.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-success => common/mock-gh-api/scenarios/mrva-problem-query-success}/21-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-success => common/mock-gh-api/scenarios/mrva-problem-query-success}/22-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-success => common/mock-gh-api/scenarios/mrva-problem-query-success}/23-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-success => common/mock-gh-api/scenarios/mrva-problem-query-success}/24-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-success => common/mock-gh-api/scenarios/mrva-problem-query-success}/25-getVariantAnalysisRepo.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-success => common/mock-gh-api/scenarios/mrva-problem-query-success}/26-getVariantAnalysisRepoResult.body.zip (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-success => common/mock-gh-api/scenarios/mrva-problem-query-success}/26-getVariantAnalysisRepoResult.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-success => common/mock-gh-api/scenarios/mrva-problem-query-success}/27-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-success => common/mock-gh-api/scenarios/mrva-problem-query-success}/3-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-success => common/mock-gh-api/scenarios/mrva-problem-query-success}/4-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-success => common/mock-gh-api/scenarios/mrva-problem-query-success}/5-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-success => common/mock-gh-api/scenarios/mrva-problem-query-success}/6-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-success => common/mock-gh-api/scenarios/mrva-problem-query-success}/7-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-success => common/mock-gh-api/scenarios/mrva-problem-query-success}/8-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-success => common/mock-gh-api/scenarios/mrva-problem-query-success}/9-getVariantAnalysisRepo.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/0-getRepo.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/1-submitVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/10-getVariantAnalysisRepo.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/11-getVariantAnalysisRepoResult.body.zip (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/11-getVariantAnalysisRepoResult.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/12-getVariantAnalysisRepoResult.body.zip (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/12-getVariantAnalysisRepoResult.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/13-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/14-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/15-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/16-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/17-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/18-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/19-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/2-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/20-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/21-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/22-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/23-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/24-getVariantAnalysisRepo.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/25-getVariantAnalysisRepoResult.body.zip (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/25-getVariantAnalysisRepoResult.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/26-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/27-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/28-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/29-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/3-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/30-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/31-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/32-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/33-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/34-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/35-getVariantAnalysisRepo.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/36-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/37-getVariantAnalysisRepoResult.body.zip (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/37-getVariantAnalysisRepoResult.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/38-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/39-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/4-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/40-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/41-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/42-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/43-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/44-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/45-getVariantAnalysisRepo.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/46-getVariantAnalysisRepoResult.body.zip (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/46-getVariantAnalysisRepoResult.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/47-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/48-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/49-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/5-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/50-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/51-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/6-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/7-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/8-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/problem-query-warnings => common/mock-gh-api/scenarios/mrva-problem-query-warnings}/9-getVariantAnalysisRepo.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/query-failure => common/mock-gh-api/scenarios/mrva-query-failure}/0-getRepo.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/query-failure => common/mock-gh-api/scenarios/mrva-query-failure}/1-submitVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/query-failure => common/mock-gh-api/scenarios/mrva-query-failure}/10-getVariantAnalysisRepo.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/query-failure => common/mock-gh-api/scenarios/mrva-query-failure}/11-getVariantAnalysisRepoResult.body.zip (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/query-failure => common/mock-gh-api/scenarios/mrva-query-failure}/11-getVariantAnalysisRepoResult.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/query-failure => common/mock-gh-api/scenarios/mrva-query-failure}/12-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/query-failure => common/mock-gh-api/scenarios/mrva-query-failure}/13-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/query-failure => common/mock-gh-api/scenarios/mrva-query-failure}/14-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/query-failure => common/mock-gh-api/scenarios/mrva-query-failure}/15-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/query-failure => common/mock-gh-api/scenarios/mrva-query-failure}/2-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/query-failure => common/mock-gh-api/scenarios/mrva-query-failure}/3-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/query-failure => common/mock-gh-api/scenarios/mrva-query-failure}/4-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/query-failure => common/mock-gh-api/scenarios/mrva-query-failure}/5-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/query-failure => common/mock-gh-api/scenarios/mrva-query-failure}/6-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/query-failure => common/mock-gh-api/scenarios/mrva-query-failure}/7-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/query-failure => common/mock-gh-api/scenarios/mrva-query-failure}/8-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/query-failure => common/mock-gh-api/scenarios/mrva-query-failure}/9-getVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/submission-failure => common/mock-gh-api/scenarios/mrva-submission-failure}/0-getRepo.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks/scenarios/submission-failure => common/mock-gh-api/scenarios/mrva-submission-failure}/1-submitVariantAnalysis.json (100%) rename extensions/ql-vscode/src/{variant-analysis/gh-api/mocks => common/mock-gh-api/vscode}/vscode-mock-gh-api-server.ts (96%) diff --git a/docs/testing.md b/docs/testing.md index 01b7b61be..dfc2d0c4a 100644 --- a/docs/testing.md +++ b/docs/testing.md @@ -133,4 +133,4 @@ Once the scenario has been recorded, it's often useful to remove some of the req ### Scenario data location -Pre-recorded scenarios are stored in `./src/variant-analysis/github-api/mocks/scenarios`. However, it's possible to configure the location, by setting the `codeQL.mockGitHubApiServer.scenariosPath` configuration property in the VS Code user settings. +Pre-recorded scenarios are stored in `./src/common/mock-gh-api/scenarios`. However, it's possible to configure the location, by setting the `codeQL.mockGitHubApiServer.scenariosPath` configuration property in the VS Code user settings. diff --git a/extensions/ql-vscode/scripts/add-fields-to-scenarios.ts b/extensions/ql-vscode/scripts/add-fields-to-scenarios.ts index 4f1c14298..11b4afc64 100644 --- a/extensions/ql-vscode/scripts/add-fields-to-scenarios.ts +++ b/extensions/ql-vscode/scripts/add-fields-to-scenarios.ts @@ -18,15 +18,15 @@ import { Octokit, type RestEndpointMethodTypes } from "@octokit/rest"; import { throttling } from "@octokit/plugin-throttling"; import { getFiles } from "./util/files"; -import type { GitHubApiRequest } from "../src/variant-analysis/gh-api/mocks/gh-api-request"; -import { isGetVariantAnalysisRequest } from "../src/variant-analysis/gh-api/mocks/gh-api-request"; +import type { GitHubApiRequest } from "../src/common/mock-gh-api/gh-api-request"; +import { isGetVariantAnalysisRequest } from "../src/common/mock-gh-api/gh-api-request"; import { VariantAnalysis } from "../src/variant-analysis/gh-api/variant-analysis"; import { RepositoryWithMetadata } from "../src/variant-analysis/gh-api/repository"; const extensionDirectory = resolve(__dirname, ".."); const scenariosDirectory = resolve( extensionDirectory, - "src/variant-analysis/gh-api/mocks/scenarios", + "src/common/mock-gh-api/scenarios", ); // Make sure we don't run into rate limits by automatically waiting until we can diff --git a/extensions/ql-vscode/scripts/fix-scenario-file-numbering.ts b/extensions/ql-vscode/scripts/fix-scenario-file-numbering.ts index d68a44eea..138fb28d6 100644 --- a/extensions/ql-vscode/scripts/fix-scenario-file-numbering.ts +++ b/extensions/ql-vscode/scripts/fix-scenario-file-numbering.ts @@ -22,7 +22,7 @@ const scenarioName = process.argv[2]; const extensionDirectory = resolve(__dirname, ".."); const scenariosDirectory = resolve( extensionDirectory, - "src/variant-analysis/gh-api/mocks/scenarios", + "src/common/mock-gh-api/scenarios", ); const scenarioDirectory = resolve(scenariosDirectory, scenarioName); diff --git a/extensions/ql-vscode/scripts/lint-scenarios.ts b/extensions/ql-vscode/scripts/lint-scenarios.ts index ce0ff6850..85b827368 100644 --- a/extensions/ql-vscode/scripts/lint-scenarios.ts +++ b/extensions/ql-vscode/scripts/lint-scenarios.ts @@ -10,7 +10,7 @@ const extensionDirectory = resolve(__dirname, ".."); const rootDirectory = resolve(extensionDirectory, "../.."); const scenariosDirectory = resolve( extensionDirectory, - "src/variant-analysis/gh-api/mocks/scenarios", + "src/common/mock-gh-api/scenarios", ); const debug = process.env.RUNNER_DEBUG || process.argv.includes("--debug"); @@ -19,7 +19,7 @@ async function lintScenarios() { const schema = createGenerator({ path: resolve( extensionDirectory, - "src/variant-analysis/gh-api/mocks/gh-api-request.ts", + "src/common/mock-gh-api/gh-api-request.ts", ), tsconfig: resolve(extensionDirectory, "tsconfig.json"), type: "GitHubApiRequest", diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/gh-api-request.ts b/extensions/ql-vscode/src/common/mock-gh-api/gh-api-request.ts similarity index 94% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/gh-api-request.ts rename to extensions/ql-vscode/src/common/mock-gh-api/gh-api-request.ts index 3808f9560..a14ac6423 100644 --- a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/gh-api-request.ts +++ b/extensions/ql-vscode/src/common/mock-gh-api/gh-api-request.ts @@ -1,5 +1,8 @@ -import { Repository } from "../repository"; -import { VariantAnalysis, VariantAnalysisRepoTask } from "../variant-analysis"; +import { Repository } from "../../variant-analysis/gh-api/repository"; +import { + VariantAnalysis, + VariantAnalysisRepoTask, +} from "../../variant-analysis/gh-api/variant-analysis"; // Types that represent requests/responses from the GitHub API // that we need to mock. diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/mock-gh-api-server.ts b/extensions/ql-vscode/src/common/mock-gh-api/mock-gh-api-server.ts similarity index 92% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/mock-gh-api-server.ts rename to extensions/ql-vscode/src/common/mock-gh-api/mock-gh-api-server.ts index 3b26707a8..9f32583ee 100644 --- a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/mock-gh-api-server.ts +++ b/extensions/ql-vscode/src/common/mock-gh-api/mock-gh-api-server.ts @@ -2,11 +2,11 @@ import { join, resolve } from "path"; import { pathExists } from "fs-extra"; import { setupServer, SetupServer } from "msw/node"; -import { DisposableObject } from "../../../common/disposable-object"; +import { DisposableObject } from "../disposable-object"; import { Recorder } from "./recorder"; import { createRequestHandlers } from "./request-handlers"; -import { getDirectoryNamesInsidePath } from "../../../common/files"; +import { getDirectoryNamesInsidePath } from "../files"; /** * Enables mocking of the GitHub API server via HTTP interception, using msw. @@ -129,11 +129,11 @@ export class MockGitHubApiServer extends DisposableObject { public async getDefaultScenariosPath(): Promise { // This should be the directory where package.json is located - const rootDirectory = resolve(__dirname, "../../../.."); + const rootDirectory = resolve(__dirname, "../../.."); const scenariosPath = resolve( rootDirectory, - "src/variant-analysis/gh-api/mocks/scenarios", + "src/common/mock-gh-api/scenarios", ); if (await pathExists(scenariosPath)) { return scenariosPath; diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/recorder.ts b/extensions/ql-vscode/src/common/mock-gh-api/recorder.ts similarity index 99% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/recorder.ts rename to extensions/ql-vscode/src/common/mock-gh-api/recorder.ts index 794e7059c..9cef474e7 100644 --- a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/recorder.ts +++ b/extensions/ql-vscode/src/common/mock-gh-api/recorder.ts @@ -8,7 +8,7 @@ import { IsomorphicResponse } from "@mswjs/interceptors"; import { Headers } from "headers-polyfill"; import fetch from "node-fetch"; -import { DisposableObject } from "../../../common/disposable-object"; +import { DisposableObject } from "../disposable-object"; import { GetVariantAnalysisRepoResultRequest, diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/request-handlers.ts b/extensions/ql-vscode/src/common/mock-gh-api/request-handlers.ts similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/request-handlers.ts rename to extensions/ql-vscode/src/common/mock-gh-api/request-handlers.ts diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/auto-model-success/0-autoModel.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/auto-model-success/0-autoModel.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/auto-model-success/0-autoModel.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/auto-model-success/0-autoModel.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/auto-model-success/1-autoModel.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/auto-model-success/1-autoModel.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/auto-model-success/1-autoModel.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/auto-model-success/1-autoModel.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/auto-model-success/README.md b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/auto-model-success/README.md similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/auto-model-success/README.md rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/auto-model-success/README.md diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/code-search-success/0-codeSearch.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/code-search-success/0-codeSearch.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/code-search-success/0-codeSearch.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/code-search-success/0-codeSearch.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/code-search-success/1-codeSearch.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/code-search-success/1-codeSearch.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/code-search-success/1-codeSearch.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/code-search-success/1-codeSearch.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/code-search-success/10-codeSearch.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/code-search-success/10-codeSearch.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/code-search-success/10-codeSearch.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/code-search-success/10-codeSearch.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/code-search-success/11-codeSearch.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/code-search-success/11-codeSearch.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/code-search-success/11-codeSearch.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/code-search-success/11-codeSearch.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/code-search-success/2-codeSearch.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/code-search-success/2-codeSearch.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/code-search-success/2-codeSearch.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/code-search-success/2-codeSearch.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/code-search-success/3-codeSearch.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/code-search-success/3-codeSearch.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/code-search-success/3-codeSearch.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/code-search-success/3-codeSearch.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/code-search-success/4-codeSearch.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/code-search-success/4-codeSearch.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/code-search-success/4-codeSearch.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/code-search-success/4-codeSearch.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/code-search-success/5-codeSearch.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/code-search-success/5-codeSearch.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/code-search-success/5-codeSearch.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/code-search-success/5-codeSearch.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/code-search-success/6-codeSearch.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/code-search-success/6-codeSearch.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/code-search-success/6-codeSearch.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/code-search-success/6-codeSearch.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/code-search-success/7-codeSearch.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/code-search-success/7-codeSearch.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/code-search-success/7-codeSearch.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/code-search-success/7-codeSearch.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/code-search-success/8-codeSearch.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/code-search-success/8-codeSearch.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/code-search-success/8-codeSearch.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/code-search-success/8-codeSearch.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/code-search-success/9-codeSearch.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/code-search-success/9-codeSearch.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/code-search-success/9-codeSearch.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/code-search-success/9-codeSearch.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/missing-controller-repo/0-getRepo.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-missing-controller-repo/0-getRepo.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/missing-controller-repo/0-getRepo.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-missing-controller-repo/0-getRepo.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/0-getRepo.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/0-getRepo.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/0-getRepo.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/0-getRepo.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/1-submitVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/1-submitVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/1-submitVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/1-submitVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/10-getVariantAnalysisRepoResult.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/10-getVariantAnalysisRepoResult.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/10-getVariantAnalysisRepoResult.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/10-getVariantAnalysisRepoResult.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/11-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/11-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/11-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/11-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/12-getVariantAnalysisRepo.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/12-getVariantAnalysisRepo.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/12-getVariantAnalysisRepo.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/12-getVariantAnalysisRepo.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/13-getVariantAnalysisRepoResult.body.zip b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/13-getVariantAnalysisRepoResult.body.zip similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/13-getVariantAnalysisRepoResult.body.zip rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/13-getVariantAnalysisRepoResult.body.zip diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/13-getVariantAnalysisRepoResult.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/13-getVariantAnalysisRepoResult.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/13-getVariantAnalysisRepoResult.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/13-getVariantAnalysisRepoResult.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/14-getVariantAnalysisRepo.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/14-getVariantAnalysisRepo.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/14-getVariantAnalysisRepo.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/14-getVariantAnalysisRepo.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/15-getVariantAnalysisRepoResult.body.zip b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/15-getVariantAnalysisRepoResult.body.zip similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/15-getVariantAnalysisRepoResult.body.zip rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/15-getVariantAnalysisRepoResult.body.zip diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/15-getVariantAnalysisRepoResult.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/15-getVariantAnalysisRepoResult.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/15-getVariantAnalysisRepoResult.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/15-getVariantAnalysisRepoResult.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/16-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/16-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/16-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/16-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/17-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/17-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/17-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/17-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/17-getVariantAnalysisRepoResult.body.zip b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/17-getVariantAnalysisRepoResult.body.zip similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/17-getVariantAnalysisRepoResult.body.zip rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/17-getVariantAnalysisRepoResult.body.zip diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/18-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/18-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/18-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/18-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/19-getVariantAnalysisRepo.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/19-getVariantAnalysisRepo.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/19-getVariantAnalysisRepo.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/19-getVariantAnalysisRepo.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/2-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/2-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/2-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/2-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/20-getVariantAnalysisRepoResult.body.zip b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/20-getVariantAnalysisRepoResult.body.zip similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/20-getVariantAnalysisRepoResult.body.zip rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/20-getVariantAnalysisRepoResult.body.zip diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/20-getVariantAnalysisRepoResult.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/20-getVariantAnalysisRepoResult.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/20-getVariantAnalysisRepoResult.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/20-getVariantAnalysisRepoResult.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/21-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/21-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/21-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/21-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/22-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/22-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/22-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/22-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/23-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/23-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/23-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/23-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/24-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/24-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/24-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/24-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/25-getVariantAnalysisRepo.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/25-getVariantAnalysisRepo.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/25-getVariantAnalysisRepo.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/25-getVariantAnalysisRepo.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/26-getVariantAnalysisRepoResult.body.zip b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/26-getVariantAnalysisRepoResult.body.zip similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/26-getVariantAnalysisRepoResult.body.zip rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/26-getVariantAnalysisRepoResult.body.zip diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/26-getVariantAnalysisRepoResult.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/26-getVariantAnalysisRepoResult.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/26-getVariantAnalysisRepoResult.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/26-getVariantAnalysisRepoResult.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/27-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/27-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/27-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/27-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/3-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/3-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/3-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/3-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/4-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/4-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/4-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/4-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/5-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/5-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/5-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/5-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/6-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/6-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/6-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/6-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/7-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/7-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/7-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/7-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/8-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/8-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/8-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/8-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/9-getVariantAnalysisRepo.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/9-getVariantAnalysisRepo.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/9-getVariantAnalysisRepo.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-success/9-getVariantAnalysisRepo.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/0-getRepo.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/0-getRepo.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/0-getRepo.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/0-getRepo.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/1-submitVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/1-submitVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/1-submitVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/1-submitVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/10-getVariantAnalysisRepo.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/10-getVariantAnalysisRepo.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/10-getVariantAnalysisRepo.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/10-getVariantAnalysisRepo.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/11-getVariantAnalysisRepoResult.body.zip b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/11-getVariantAnalysisRepoResult.body.zip similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/11-getVariantAnalysisRepoResult.body.zip rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/11-getVariantAnalysisRepoResult.body.zip diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/11-getVariantAnalysisRepoResult.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/11-getVariantAnalysisRepoResult.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/11-getVariantAnalysisRepoResult.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/11-getVariantAnalysisRepoResult.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/12-getVariantAnalysisRepoResult.body.zip b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/12-getVariantAnalysisRepoResult.body.zip similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/12-getVariantAnalysisRepoResult.body.zip rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/12-getVariantAnalysisRepoResult.body.zip diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/12-getVariantAnalysisRepoResult.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/12-getVariantAnalysisRepoResult.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/12-getVariantAnalysisRepoResult.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/12-getVariantAnalysisRepoResult.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/13-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/13-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/13-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/13-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/14-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/14-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/14-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/14-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/15-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/15-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/15-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/15-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/16-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/16-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/16-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/16-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/17-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/17-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/17-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/17-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/18-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/18-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/18-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/18-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/19-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/19-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/19-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/19-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/2-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/2-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/2-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/2-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/20-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/20-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/20-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/20-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/21-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/21-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/21-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/21-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/22-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/22-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/22-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/22-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/23-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/23-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/23-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/23-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/24-getVariantAnalysisRepo.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/24-getVariantAnalysisRepo.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/24-getVariantAnalysisRepo.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/24-getVariantAnalysisRepo.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/25-getVariantAnalysisRepoResult.body.zip b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/25-getVariantAnalysisRepoResult.body.zip similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/25-getVariantAnalysisRepoResult.body.zip rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/25-getVariantAnalysisRepoResult.body.zip diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/25-getVariantAnalysisRepoResult.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/25-getVariantAnalysisRepoResult.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/25-getVariantAnalysisRepoResult.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/25-getVariantAnalysisRepoResult.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/26-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/26-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/26-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/26-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/27-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/27-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/27-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/27-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/28-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/28-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/28-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/28-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/29-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/29-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/29-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/29-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/3-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/3-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/3-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/3-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/30-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/30-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/30-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/30-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/31-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/31-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/31-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/31-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/32-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/32-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/32-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/32-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/33-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/33-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/33-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/33-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/34-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/34-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/34-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/34-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/35-getVariantAnalysisRepo.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/35-getVariantAnalysisRepo.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/35-getVariantAnalysisRepo.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/35-getVariantAnalysisRepo.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/36-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/36-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/36-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/36-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/37-getVariantAnalysisRepoResult.body.zip b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/37-getVariantAnalysisRepoResult.body.zip similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/37-getVariantAnalysisRepoResult.body.zip rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/37-getVariantAnalysisRepoResult.body.zip diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/37-getVariantAnalysisRepoResult.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/37-getVariantAnalysisRepoResult.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/37-getVariantAnalysisRepoResult.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/37-getVariantAnalysisRepoResult.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/38-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/38-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/38-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/38-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/39-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/39-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/39-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/39-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/4-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/4-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/4-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/4-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/40-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/40-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/40-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/40-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/41-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/41-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/41-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/41-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/42-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/42-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/42-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/42-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/43-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/43-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/43-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/43-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/44-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/44-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/44-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/44-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/45-getVariantAnalysisRepo.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/45-getVariantAnalysisRepo.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/45-getVariantAnalysisRepo.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/45-getVariantAnalysisRepo.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/46-getVariantAnalysisRepoResult.body.zip b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/46-getVariantAnalysisRepoResult.body.zip similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/46-getVariantAnalysisRepoResult.body.zip rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/46-getVariantAnalysisRepoResult.body.zip diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/46-getVariantAnalysisRepoResult.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/46-getVariantAnalysisRepoResult.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/46-getVariantAnalysisRepoResult.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/46-getVariantAnalysisRepoResult.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/47-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/47-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/47-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/47-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/48-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/48-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/48-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/48-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/49-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/49-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/49-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/49-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/5-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/5-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/5-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/5-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/50-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/50-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/50-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/50-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/51-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/51-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/51-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/51-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/6-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/6-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/6-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/6-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/7-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/7-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/7-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/7-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/8-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/8-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/8-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/8-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/9-getVariantAnalysisRepo.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/9-getVariantAnalysisRepo.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/problem-query-warnings/9-getVariantAnalysisRepo.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-problem-query-warnings/9-getVariantAnalysisRepo.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/query-failure/0-getRepo.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-query-failure/0-getRepo.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/query-failure/0-getRepo.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-query-failure/0-getRepo.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/query-failure/1-submitVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-query-failure/1-submitVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/query-failure/1-submitVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-query-failure/1-submitVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/query-failure/10-getVariantAnalysisRepo.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-query-failure/10-getVariantAnalysisRepo.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/query-failure/10-getVariantAnalysisRepo.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-query-failure/10-getVariantAnalysisRepo.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/query-failure/11-getVariantAnalysisRepoResult.body.zip b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-query-failure/11-getVariantAnalysisRepoResult.body.zip similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/query-failure/11-getVariantAnalysisRepoResult.body.zip rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-query-failure/11-getVariantAnalysisRepoResult.body.zip diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/query-failure/11-getVariantAnalysisRepoResult.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-query-failure/11-getVariantAnalysisRepoResult.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/query-failure/11-getVariantAnalysisRepoResult.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-query-failure/11-getVariantAnalysisRepoResult.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/query-failure/12-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-query-failure/12-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/query-failure/12-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-query-failure/12-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/query-failure/13-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-query-failure/13-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/query-failure/13-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-query-failure/13-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/query-failure/14-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-query-failure/14-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/query-failure/14-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-query-failure/14-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/query-failure/15-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-query-failure/15-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/query-failure/15-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-query-failure/15-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/query-failure/2-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-query-failure/2-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/query-failure/2-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-query-failure/2-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/query-failure/3-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-query-failure/3-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/query-failure/3-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-query-failure/3-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/query-failure/4-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-query-failure/4-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/query-failure/4-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-query-failure/4-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/query-failure/5-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-query-failure/5-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/query-failure/5-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-query-failure/5-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/query-failure/6-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-query-failure/6-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/query-failure/6-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-query-failure/6-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/query-failure/7-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-query-failure/7-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/query-failure/7-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-query-failure/7-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/query-failure/8-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-query-failure/8-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/query-failure/8-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-query-failure/8-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/query-failure/9-getVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-query-failure/9-getVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/query-failure/9-getVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-query-failure/9-getVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/submission-failure/0-getRepo.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-submission-failure/0-getRepo.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/submission-failure/0-getRepo.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-submission-failure/0-getRepo.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/submission-failure/1-submitVariantAnalysis.json b/extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-submission-failure/1-submitVariantAnalysis.json similarity index 100% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/scenarios/submission-failure/1-submitVariantAnalysis.json rename to extensions/ql-vscode/src/common/mock-gh-api/scenarios/mrva-submission-failure/1-submitVariantAnalysis.json diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/vscode-mock-gh-api-server.ts b/extensions/ql-vscode/src/common/mock-gh-api/vscode/vscode-mock-gh-api-server.ts similarity index 96% rename from extensions/ql-vscode/src/variant-analysis/gh-api/mocks/vscode-mock-gh-api-server.ts rename to extensions/ql-vscode/src/common/mock-gh-api/vscode/vscode-mock-gh-api-server.ts index 655fd1225..aae2fa8ca 100644 --- a/extensions/ql-vscode/src/variant-analysis/gh-api/mocks/vscode-mock-gh-api-server.ts +++ b/extensions/ql-vscode/src/common/mock-gh-api/vscode/vscode-mock-gh-api-server.ts @@ -5,10 +5,10 @@ import { getMockGitHubApiServerScenariosPath, MockGitHubApiConfigListener, } from "../../../config"; -import { DisposableObject } from "../../../common/disposable-object"; -import { MockGitHubApiServer } from "./mock-gh-api-server"; -import { MockGitHubApiServerCommands } from "../../../common/commands"; -import { App, AppMode } from "../../../common/app"; +import { DisposableObject } from "../../disposable-object"; +import { MockGitHubApiServer } from "../mock-gh-api-server"; +import { MockGitHubApiServerCommands } from "../../commands"; +import { App, AppMode } from "../../app"; import path from "path"; /** @@ -222,7 +222,7 @@ export class VSCodeMockGitHubApiServer extends DisposableObject { if (this.app.mode === AppMode.Development) { const developmentScenariosPath = path.join( this.app.extensionPath, - "src/variant-analysis/gh-api/mocks/scenarios", + "src/common/mock-gh-api/scenarios", ); if (await pathExists(developmentScenariosPath)) { return developmentScenariosPath; diff --git a/extensions/ql-vscode/src/extension.ts b/extensions/ql-vscode/src/extension.ts index d5e51fcb7..b32b09bb6 100644 --- a/extensions/ql-vscode/src/extension.ts +++ b/extensions/ql-vscode/src/extension.ts @@ -111,7 +111,7 @@ import { VariantAnalysisView } from "./variant-analysis/variant-analysis-view"; import { VariantAnalysisViewSerializer } from "./variant-analysis/variant-analysis-view-serializer"; import { VariantAnalysisManager } from "./variant-analysis/variant-analysis-manager"; import { createVariantAnalysisContentProvider } from "./variant-analysis/variant-analysis-content-provider"; -import { VSCodeMockGitHubApiServer } from "./variant-analysis/gh-api/mocks/vscode-mock-gh-api-server"; +import { VSCodeMockGitHubApiServer } from "./common/mock-gh-api/vscode/vscode-mock-gh-api-server"; import { VariantAnalysisResultsManager } from "./variant-analysis/variant-analysis-results-manager"; import { ExtensionApp } from "./common/vscode/vscode-app"; import { DbModule } from "./databases/db-module"; diff --git a/extensions/ql-vscode/test/unit-tests/variant-analysis/gh-api/gh-api-client.test.ts b/extensions/ql-vscode/test/unit-tests/variant-analysis/gh-api/gh-api-client.test.ts index fce788cb0..b03b107cb 100644 --- a/extensions/ql-vscode/test/unit-tests/variant-analysis/gh-api/gh-api-client.test.ts +++ b/extensions/ql-vscode/test/unit-tests/variant-analysis/gh-api/gh-api-client.test.ts @@ -5,11 +5,11 @@ import { submitVariantAnalysis, } from "../../../../src/variant-analysis/gh-api/gh-api-client"; import { createMockSubmission } from "../../../factories/variant-analysis/shared/variant-analysis-submission"; -import { MockGitHubApiServer } from "../../../../src/variant-analysis/gh-api/mocks/mock-gh-api-server"; +import { MockGitHubApiServer } from "../../../../src/common/mock-gh-api/mock-gh-api-server"; -import { response } from "../../../../src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/0-getRepo.json"; -import { response as variantAnalysisJson_response } from "../../../../src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/1-submitVariantAnalysis.json"; -import { response as variantAnalysisRepoJson_response } from "../../../../src/variant-analysis/gh-api/mocks/scenarios/problem-query-success/9-getVariantAnalysisRepo.json"; +import { response } from "../../../../src/common/mock-gh-api/scenarios/mrva-problem-query-success/0-getRepo.json"; +import { response as variantAnalysisJson_response } from "../../../../src/common/mock-gh-api/scenarios/mrva-problem-query-success/1-submitVariantAnalysis.json"; +import { response as variantAnalysisRepoJson_response } from "../../../../src/common/mock-gh-api/scenarios/mrva-problem-query-success/9-getVariantAnalysisRepo.json"; import { testCredentialsWithRealOctokit } from "../../../factories/authentication"; const mockServer = new MockGitHubApiServer(); @@ -23,7 +23,7 @@ const repoTaskId = variantAnalysisRepoJson_response.body.repository.id; describe("submitVariantAnalysis", () => { it("returns the submitted variant analysis", async () => { - await mockServer.loadScenario("problem-query-success"); + await mockServer.loadScenario("mrva-problem-query-success"); const result = await submitVariantAnalysis( testCredentialsWithRealOctokit(), @@ -37,7 +37,7 @@ describe("submitVariantAnalysis", () => { describe("getVariantAnalysis", () => { it("returns the variant analysis", async () => { - await mockServer.loadScenario("problem-query-success"); + await mockServer.loadScenario("mrva-problem-query-success"); const result = await getVariantAnalysis( testCredentialsWithRealOctokit(), @@ -52,7 +52,7 @@ describe("getVariantAnalysis", () => { describe("getVariantAnalysisRepo", () => { it("returns the variant analysis repo task", async () => { - await mockServer.loadScenario("problem-query-success"); + await mockServer.loadScenario("mrva-problem-query-success"); const result = await getVariantAnalysisRepo( testCredentialsWithRealOctokit(), @@ -68,7 +68,7 @@ describe("getVariantAnalysisRepo", () => { describe("getRepositoryFromNwo", () => { it("returns the repository", async () => { - await mockServer.loadScenario("problem-query-success"); + await mockServer.loadScenario("mrva-problem-query-success"); const result = await getRepositoryFromNwo( testCredentialsWithRealOctokit(), diff --git a/extensions/ql-vscode/test/vscode-tests/cli-integration/variant-analysis/variant-analysis-submission-integration.test.ts b/extensions/ql-vscode/test/vscode-tests/cli-integration/variant-analysis/variant-analysis-submission-integration.test.ts index 3b3d8d749..458b3d7bd 100644 --- a/extensions/ql-vscode/test/vscode-tests/cli-integration/variant-analysis/variant-analysis-submission-integration.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/cli-integration/variant-analysis/variant-analysis-submission-integration.test.ts @@ -8,7 +8,7 @@ import { workspace, } from "vscode"; -import { MockGitHubApiServer } from "../../../../src/variant-analysis/gh-api/mocks/mock-gh-api-server"; +import { MockGitHubApiServer } from "../../../../src/common/mock-gh-api/mock-gh-api-server"; import { mockedQuickPickItem } from "../../utils/mocking.helpers"; import { setRemoteControllerRepo } from "../../../../src/config"; import { getActivatedExtension } from "../../global.helper"; @@ -60,7 +60,7 @@ describe("Variant Analysis Submission Integration", () => { describe("Successful scenario", () => { beforeEach(async () => { - await mockServer.loadScenario("problem-query-success"); + await mockServer.loadScenario("mrva-problem-query-success"); }); it("opens the variant analysis view", async () => { @@ -80,7 +80,7 @@ describe("Variant Analysis Submission Integration", () => { describe("Missing controller repo", () => { beforeEach(async () => { - await mockServer.loadScenario("missing-controller-repo"); + await mockServer.loadScenario("mrva-missing-controller-repo"); }); it("shows the error message", async () => { @@ -99,7 +99,7 @@ describe("Variant Analysis Submission Integration", () => { describe("Submission failure", () => { beforeEach(async () => { - await mockServer.loadScenario("submission-failure"); + await mockServer.loadScenario("mrva-submission-failure"); }); it("shows the error message", async () => {