mrva/vscode-codeql
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Minor renames in variant analysis monitor tests (#3411)

Browse Source 
* Rename mockGetVariantAnalysis -> mockGetVariantAnalysisFromApi

* Rename mockEecuteCommand -> mockExecuteCommand
This commit is contained in:
Charis Kyriakou
2024-02-28 09:12:26 +00:00
committed by GitHub
parent e86127672a
commit ab36153511
1 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
extensions/ql-vscode/test/vscode-tests/activated-extension/variant-analysis/variant-analysis-monitor.test.ts
View File

@@ -27,7 +27,7 @@ import { createMockLogger } from "../../../__mocks__/loggerMock";
jest.setTimeout(60_000);
describe("Variant Analysis Monitor", () => {
let mockGetVariantAnalysis: jest.SpiedFunction<
let mockGetVariantAnalysisFromApi: jest.SpiedFunction<
typeof ghApiClient.getVariantAnalysis
>;
let variantAnalysisMonitor: VariantAnalysisMonitor;
@@ -36,7 +36,7 @@ describe("Variant Analysis Monitor", () => {
let variantAnalysis: VariantAnalysis;
const onVariantAnalysisChangeSpy = jest.fn();
const mockEecuteCommand = jest.fn();
const mockExecuteCommand = jest.fn();
let logger: NotificationLogger;
@@ -51,7 +51,7 @@ describe("Variant Analysis Monitor", () => {
variantAnalysisMonitor = new VariantAnalysisMonitor(
createMockApp({
commands: createMockCommandManager({
executeCommand: mockEecuteCommand,
executeCommand: mockExecuteCommand,
}),
logger,
}),
@@ -60,7 +60,7 @@ describe("Variant Analysis Monitor", () => {
);
variantAnalysisMonitor.onVariantAnalysisChange(onVariantAnalysisChangeSpy);
mockGetVariantAnalysis = jest
mockGetVariantAnalysisFromApi = jest
.spyOn(ghApiClient, "getVariantAnalysis")
.mockRejectedValue(new Error("Not mocked"));
@@ -80,13 +80,13 @@ describe("Variant Analysis Monitor", () => {
beforeEach(async () => {
mockFailedApiResponse = createFailedMockApiResponse();
mockGetVariantAnalysis.mockResolvedValue(mockFailedApiResponse);
mockGetVariantAnalysisFromApi.mockResolvedValue(mockFailedApiResponse);
});
it("should mark as failed and stop monitoring", async () => {
await variantAnalysisMonitor.monitorVariantAnalysis(variantAnalysis);
expect(mockGetVariantAnalysis).toHaveBeenCalledTimes(1);
expect(mockGetVariantAnalysisFromApi).toHaveBeenCalledTimes(1);
expect(onVariantAnalysisChangeSpy).toHaveBeenCalledWith(
expect.objectContaining({
@@ -115,7 +115,7 @@ describe("Variant Analysis Monitor", () => {
"succeeded",
]);
mockApiResponse = createMockApiResponse("succeeded", scannedRepos);
mockGetVariantAnalysis.mockResolvedValue(mockApiResponse);
mockGetVariantAnalysisFromApi.mockResolvedValue(mockApiResponse);
});
it("should trigger a download extension command for each repo", async () => {
@@ -124,10 +124,10 @@ describe("Variant Analysis Monitor", () => {
);
await variantAnalysisMonitor.monitorVariantAnalysis(variantAnalysis);
expect(mockEecuteCommand).toHaveBeenCalledTimes(succeededRepos.length);
expect(mockExecuteCommand).toHaveBeenCalledTimes(succeededRepos.length);
succeededRepos.forEach((succeededRepo, index) => {
expect(mockEecuteCommand).toHaveBeenNthCalledWith(
expect(mockExecuteCommand).toHaveBeenNthCalledWith(
index + 1,
"codeQL.autoDownloadVariantAnalysisResult",
mapScannedRepository(succeededRepo),
@@ -147,13 +147,13 @@ describe("Variant Analysis Monitor", () => {
beforeEach(async () => {
scannedRepos = createMockScannedRepos(["pending", "in_progress"]);
mockApiResponse = createMockApiResponse("in_progress", scannedRepos);
mockGetVariantAnalysis.mockResolvedValue(mockApiResponse);
mockGetVariantAnalysisFromApi.mockResolvedValue(mockApiResponse);
});
it("should succeed and not download any repos via a command", async () => {
await variantAnalysisMonitor.monitorVariantAnalysis(variantAnalysis);
expect(mockEecuteCommand).not.toHaveBeenCalled();
expect(mockExecuteCommand).not.toHaveBeenCalled();
});
});
@@ -170,7 +170,7 @@ describe("Variant Analysis Monitor", () => {
"pending",
]);
mockApiResponse = createMockApiResponse("in_progress", scannedRepos);
mockGetVariantAnalysis.mockResolvedValueOnce(mockApiResponse);
mockGetVariantAnalysisFromApi.mockResolvedValueOnce(mockApiResponse);
let nextApiResponse = {
...mockApiResponse,
@@ -178,7 +178,7 @@ describe("Variant Analysis Monitor", () => {
};
nextApiResponse.scanned_repositories[0].analysis_status = "succeeded";
nextApiResponse.scanned_repositories[1].analysis_status = "succeeded";
mockGetVariantAnalysis.mockResolvedValueOnce(nextApiResponse);
mockGetVariantAnalysisFromApi.mockResolvedValueOnce(nextApiResponse);
nextApiResponse = {
...mockApiResponse,
@@ -188,7 +188,7 @@ describe("Variant Analysis Monitor", () => {
};
nextApiResponse.scanned_repositories[2].analysis_status = "succeeded";
nextApiResponse.scanned_repositories[5].analysis_status = "succeeded";
mockGetVariantAnalysis.mockResolvedValueOnce(nextApiResponse);
mockGetVariantAnalysisFromApi.mockResolvedValueOnce(nextApiResponse);
nextApiResponse = {
...mockApiResponse,
@@ -198,14 +198,14 @@ describe("Variant Analysis Monitor", () => {
};
nextApiResponse.scanned_repositories[3].analysis_status = "succeeded";
nextApiResponse.scanned_repositories[4].analysis_status = "failed";
mockGetVariantAnalysis.mockResolvedValueOnce(nextApiResponse);
mockGetVariantAnalysisFromApi.mockResolvedValueOnce(nextApiResponse);
});
it("should trigger a download extension command for each repo", async () => {
await variantAnalysisMonitor.monitorVariantAnalysis(variantAnalysis);
expect(mockGetVariantAnalysis).toHaveBeenCalledTimes(4);
expect(mockEecuteCommand).toHaveBeenCalledTimes(5);
expect(mockGetVariantAnalysisFromApi).toHaveBeenCalledTimes(4);
expect(mockExecuteCommand).toHaveBeenCalledTimes(5);
});
});
@@ -222,15 +222,15 @@ describe("Variant Analysis Monitor", () => {
"pending",
]);
mockApiResponse = createMockApiResponse("in_progress", scannedRepos);
mockGetVariantAnalysis.mockResolvedValueOnce(mockApiResponse);
mockGetVariantAnalysisFromApi.mockResolvedValueOnce(mockApiResponse);
mockGetVariantAnalysis.mockRejectedValueOnce(
mockGetVariantAnalysisFromApi.mockRejectedValueOnce(
new Error("No internet connection"),
);
mockGetVariantAnalysis.mockRejectedValueOnce(
mockGetVariantAnalysisFromApi.mockRejectedValueOnce(
new Error("No internet connection"),
);
mockGetVariantAnalysis.mockRejectedValueOnce(
mockGetVariantAnalysisFromApi.mockRejectedValueOnce(
new Error("My different error"),
);
@@ -241,15 +241,15 @@ describe("Variant Analysis Monitor", () => {
nextApiResponse.scanned_repositories[0].analysis_status = "succeeded";
nextApiResponse.scanned_repositories[1].analysis_status = "succeeded";
mockGetVariantAnalysis.mockResolvedValueOnce(nextApiResponse);
mockGetVariantAnalysisFromApi.mockResolvedValueOnce(nextApiResponse);
mockGetVariantAnalysis.mockRejectedValueOnce(
mockGetVariantAnalysisFromApi.mockRejectedValueOnce(
new Error("My different error"),
);
mockGetVariantAnalysis.mockRejectedValueOnce(
mockGetVariantAnalysisFromApi.mockRejectedValueOnce(
new Error("My different error"),
);
mockGetVariantAnalysis.mockRejectedValueOnce(
mockGetVariantAnalysisFromApi.mockRejectedValueOnce(
new Error("Another different error"),
);
@@ -262,7 +262,7 @@ describe("Variant Analysis Monitor", () => {
nextApiResponse.scanned_repositories[4].analysis_status = "failed";
nextApiResponse.scanned_repositories[5].analysis_status = "succeeded";
nextApiResponse.status = "succeeded";
mockGetVariantAnalysis.mockResolvedValueOnce(nextApiResponse);
mockGetVariantAnalysisFromApi.mockResolvedValueOnce(nextApiResponse);
});
it("should only trigger the warning once per error", async () => {
@@ -292,13 +292,13 @@ describe("Variant Analysis Monitor", () => {
beforeEach(async () => {
scannedRepos = [];
mockApiResponse = createMockApiResponse("succeeded", scannedRepos);
mockGetVariantAnalysis.mockResolvedValue(mockApiResponse);
mockGetVariantAnalysisFromApi.mockResolvedValue(mockApiResponse);
});
it("should not try to download any repos", async () => {
await variantAnalysisMonitor.monitorVariantAnalysis(variantAnalysis);
expect(mockEecuteCommand).not.toHaveBeenCalled();
expect(mockExecuteCommand).not.toHaveBeenCalled();
});
});
@@ -313,9 +313,9 @@ describe("Variant Analysis Monitor", () => {
"pending",
]);
mockApiResponse = createMockApiResponse("in_progress", scannedRepos);
mockGetVariantAnalysis.mockResolvedValueOnce(mockApiResponse);
mockGetVariantAnalysisFromApi.mockResolvedValueOnce(mockApiResponse);
mockGetVariantAnalysis.mockRejectedValueOnce(
mockGetVariantAnalysisFromApi.mockRejectedValueOnce(
new RequestError("Not Found", 404, {
request: {
method: "GET",
@@ -336,7 +336,7 @@ describe("Variant Analysis Monitor", () => {
it("should stop requesting the variant analysis", async () => {
await variantAnalysisMonitor.monitorVariantAnalysis(variantAnalysis);
expect(mockGetVariantAnalysis).toHaveBeenCalledTimes(2);
expect(mockGetVariantAnalysisFromApi).toHaveBeenCalledTimes(2);
expect(logger.showWarningMessage).toHaveBeenCalledTimes(1);
expect(logger.showWarningMessage).toHaveBeenCalledWith(
expect.stringMatching(/not found/i),
@@ -350,7 +350,7 @@ describe("Variant Analysis Monitor", () => {
VariantAnalysisStatus.Canceling,
);
mockApiResponse = createMockApiResponse("in_progress");
mockGetVariantAnalysis.mockResolvedValue(mockApiResponse);
mockGetVariantAnalysisFromApi.mockResolvedValue(mockApiResponse);
await variantAnalysisMonitor.monitorVariantAnalysis(variantAnalysis);