Skip to content

Commit fed110f

Browse files
norascheuchnorascheuch
committed
Replace toBeCalled
1 parent 5948008 commit fed110f

10 files changed

Lines changed: 55 additions & 55 deletions

File tree

‎extensions/ql-vscode/test/unit-tests/common/disposable-object.test.ts‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ describe("DisposableObject and DisposeHandler", () => {
3434

3535
disposableObject.dispose();
3636

37-
expect(disposable1.dispose).toBeCalled();
38-
expect(disposable2.dispose).toBeCalled();
39-
expect(disposable3.dispose).toBeCalled();
37+
expect(disposable1.dispose).toHaveBeenCalled();
38+
expect(disposable2.dispose).toHaveBeenCalled();
39+
expect(disposable3.dispose).toHaveBeenCalled();
4040

4141
// pushed items must be called in reverse order
4242
expect(disposable2.dispose.mock.invocationCallOrder[0]).toBeLessThan(
@@ -51,30 +51,30 @@ describe("DisposableObject and DisposeHandler", () => {
5151

5252
disposableObject.dispose();
5353

54-
expect(disposable1.dispose).not.toBeCalled();
55-
expect(disposable2.dispose).not.toBeCalled();
56-
expect(disposable3.dispose).not.toBeCalled();
54+
expect(disposable1.dispose).not.toHaveBeenCalled();
55+
expect(disposable2.dispose).not.toHaveBeenCalled();
56+
expect(disposable3.dispose).not.toHaveBeenCalled();
5757
});
5858

5959
it("should dispose and stop tracking objects", () => {
6060
disposableObject.track(disposable1);
6161
disposableObject.disposeAndStopTracking(disposable1);
6262

63-
expect(disposable1.dispose).toBeCalled();
63+
expect(disposable1.dispose).toHaveBeenCalled();
6464
disposable1.dispose.mockClear();
6565

6666
disposableObject.dispose();
67-
expect(disposable1.dispose).not.toBeCalled();
67+
expect(disposable1.dispose).not.toHaveBeenCalled();
6868
});
6969

7070
it("should avoid disposing an object that is not tracked", () => {
7171
disposableObject.push(disposable1);
7272
disposableObject.disposeAndStopTracking(disposable1);
7373

74-
expect(disposable1.dispose).not.toBeCalled();
74+
expect(disposable1.dispose).not.toHaveBeenCalled();
7575

7676
disposableObject.dispose();
77-
expect(disposable1.dispose).toBeCalled();
77+
expect(disposable1.dispose).toHaveBeenCalled();
7878
});
7979

8080
it("ahould use a dispose handler", () => {
@@ -91,10 +91,10 @@ describe("DisposableObject and DisposeHandler", () => {
9191

9292
disposableObject.dispose(handler);
9393

94-
expect(disposable1.dispose).toBeCalled();
95-
expect(disposable2.dispose).not.toBeCalled();
96-
expect(disposable3.dispose).toBeCalled();
97-
expect(disposable4.dispose).not.toBeCalled();
94+
expect(disposable1.dispose).toHaveBeenCalled();
95+
expect(disposable2.dispose).not.toHaveBeenCalled();
96+
expect(disposable3.dispose).toHaveBeenCalled();
97+
expect(disposable4.dispose).not.toHaveBeenCalled();
9898

9999
// now that disposableObject has been disposed, subsequent disposals are
100100
// no-ops
@@ -105,10 +105,10 @@ describe("DisposableObject and DisposeHandler", () => {
105105

106106
disposableObject.dispose();
107107

108-
expect(disposable1.dispose).not.toBeCalled();
109-
expect(disposable2.dispose).not.toBeCalled();
110-
expect(disposable3.dispose).not.toBeCalled();
111-
expect(disposable4.dispose).not.toBeCalled();
108+
expect(disposable1.dispose).not.toHaveBeenCalled();
109+
expect(disposable2.dispose).not.toHaveBeenCalled();
110+
expect(disposable3.dispose).not.toHaveBeenCalled();
111+
expect(disposable4.dispose).not.toHaveBeenCalled();
112112
});
113113

114114
class MyDisposableObject extends DisposableObject {

‎extensions/ql-vscode/test/vscode-tests/activated-extension/variant-analysis/variant-analysis-manager.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -656,7 +656,7 @@ describe("Variant Analysis Manager", () => {
656656
variantAnalysis.id,
657657
);
658658

659-
expect(writeTextStub).not.toBeCalled();
659+
expect(writeTextStub).not.toHaveBeenCalled();
660660
});
661661
});
662662

@@ -682,7 +682,7 @@ describe("Variant Analysis Manager", () => {
682682
variantAnalysis.id,
683683
);
684684

685-
expect(writeTextStub).not.toBeCalled();
685+
expect(writeTextStub).not.toHaveBeenCalled();
686686
});
687687
});
688688

‎extensions/ql-vscode/test/vscode-tests/activated-extension/variant-analysis/variant-analysis-monitor.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ describe("Variant Analysis Monitor", () => {
291291
it("should not try to download any repos", async () => {
292292
await variantAnalysisMonitor.monitorVariantAnalysis(variantAnalysis);
293293

294-
expect(mockEecuteCommand).not.toBeCalled();
294+
expect(mockEecuteCommand).not.toHaveBeenCalled();
295295
});
296296
});
297297

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -628,7 +628,7 @@ describe("local databases", () => {
628628

629629
await (databaseManager as any).createSkeletonPacks(mockDbItem);
630630

631-
expect(generateSpy).not.toBeCalled();
631+
expect(generateSpy).not.toHaveBeenCalled();
632632
});
633633

634634
it("should return early if the user escapes out of the dialog", async () => {
@@ -638,7 +638,7 @@ describe("local databases", () => {
638638

639639
await (databaseManager as any).createSkeletonPacks(mockDbItem);
640640

641-
expect(generateSpy).not.toBeCalled();
641+
expect(generateSpy).not.toHaveBeenCalled();
642642
});
643643

644644
it("should return early and write choice to settings if user wants to never be asked again", async () => {
@@ -652,14 +652,14 @@ describe("local databases", () => {
652652

653653
await (databaseManager as any).createSkeletonPacks(mockDbItem);
654654

655-
expect(generateSpy).not.toBeCalled();
655+
expect(generateSpy).not.toHaveBeenCalled();
656656
expect(setAutogenerateQlPacksSpy).toHaveBeenCalledWith("never");
657657
});
658658

659659
it("should create the skeleton QL pack for the user", async () => {
660660
await (databaseManager as any).createSkeletonPacks(mockDbItem);
661661

662-
expect(generateSpy).toBeCalled();
662+
expect(generateSpy).toHaveBeenCalled();
663663
});
664664
});
665665

@@ -694,7 +694,7 @@ describe("local databases", () => {
694694

695695
await (databaseManager as any).createSkeletonPacks(mockDbItem);
696696

697-
expect(generateSpy).not.toBeCalled();
697+
expect(generateSpy).not.toHaveBeenCalled();
698698
});
699699
});
700700
});

‎extensions/ql-vscode/test/vscode-tests/no-workspace/common/vscode/external-files.test.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ describe("tryOpenExternalFile", () => {
2929
Uri.file("xxx"),
3030
expect.anything(),
3131
);
32-
expect(executeCommand).not.toBeCalled();
32+
expect(executeCommand).not.toHaveBeenCalled();
3333
});
3434

3535
[
@@ -61,8 +61,8 @@ describe("tryOpenExternalFile", () => {
6161
const uri = Uri.file("xxx");
6262
expect(showTextDocumentSpy).toHaveBeenCalledTimes(1);
6363
expect(showTextDocumentSpy).toHaveBeenCalledWith(uri, expect.anything());
64-
expect(showInformationMessageSpy).toBeCalled();
65-
expect(executeCommand).not.toBeCalled();
64+
expect(showInformationMessageSpy).toHaveBeenCalled();
65+
expect(executeCommand).not.toHaveBeenCalled();
6666
});
6767
});
6868
});

‎extensions/ql-vscode/test/vscode-tests/no-workspace/common/vscode/progress.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ describe("helpers", () => {
4848
);
4949

5050
// There are no listeners registered to this readable
51-
expect(mockReadable.on).not.toBeCalled();
51+
expect(mockReadable.on).not.toHaveBeenCalled();
5252

5353
expect(progressSpy).toBeCalledTimes(1);
5454
expect(progressSpy).toBeCalledWith({

‎extensions/ql-vscode/test/vscode-tests/no-workspace/language-support/ast-viewer/ast-viewer.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ describe("AstViewer", () => {
8888
if (expectedSelection) {
8989
expect(revealMock).toBeCalledWith(expectedSelection);
9090
} else {
91-
expect(revealMock).not.toBeCalled();
91+
expect(revealMock).not.toHaveBeenCalled();
9292
}
9393
}
9494

‎extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/query-history-manager.test.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -608,8 +608,8 @@ describe("QueryHistoryManager", () => {
608608
const cancelSpy2 = jest.spyOn(inProgress2, "cancel");
609609

610610
await queryHistoryManager.handleCancel([inProgress1, inProgress2]);
611-
expect(cancelSpy1).toBeCalled();
612-
expect(cancelSpy2).toBeCalled();
611+
expect(cancelSpy1).toHaveBeenCalled();
612+
expect(cancelSpy2).toHaveBeenCalled();
613613
});
614614

615615
it("should cancel a single variant analysis", async () => {
@@ -708,7 +708,7 @@ describe("QueryHistoryManager", () => {
708708
const item = localQueryHistory[4];
709709
await queryHistoryManager.handleCopyRepoList(item);
710710

711-
expect(executeCommand).not.toBeCalled();
711+
expect(executeCommand).not.toHaveBeenCalled();
712712
});
713713

714714
it("should copy repo list for a single variant analysis", async () => {
@@ -731,7 +731,7 @@ describe("QueryHistoryManager", () => {
731731
const item = localQueryHistory[4];
732732
await queryHistoryManager.handleExportResults(item);
733733

734-
expect(variantAnalysisManagerStub.exportResults).not.toBeCalled();
734+
expect(variantAnalysisManagerStub.exportResults).not.toHaveBeenCalled();
735735
});
736736

737737
it("should export results for a single variant analysis", async () => {
@@ -801,7 +801,7 @@ describe("QueryHistoryManager", () => {
801801
queryHistoryManager as any
802802
).findOtherQueryToCompare(thisQuery, [thisQuery, localQueryHistory[0]]);
803803
expect(otherQuery).toBe(localQueryHistory[0]);
804-
expect(showQuickPickSpy).not.toBeCalled();
804+
expect(showQuickPickSpy).not.toHaveBeenCalled();
805805
});
806806

807807
it("should throw an error when a databases are not the same", async () => {
@@ -850,7 +850,7 @@ describe("QueryHistoryManager", () => {
850850
await queryHistoryManager.handleCompareWith(localQueryHistory[0], [
851851
localQueryHistory[0],
852852
]);
853-
expect(doCompareCallback).not.toBeCalled();
853+
expect(doCompareCallback).not.toHaveBeenCalled();
854854
});
855855

856856
it("should throw an error when a query is not successful", async () => {

‎extensions/ql-vscode/test/vscode-tests/no-workspace/query-results.test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ describe("query-results", () => {
245245
sourceInfo as SourceInfo,
246246
);
247247
// We do not re-interpret if we are reading from a SARIF file.
248-
expect(spy).not.toBeCalled();
248+
expect(spy).not.toHaveBeenCalled();
249249

250250
expect(results).toHaveProperty("t", "SarifInterpretationData");
251251
expect(results).toHaveProperty("runs[0].results");
@@ -279,7 +279,7 @@ describe("query-results", () => {
279279
);
280280

281281
// We do not attempt to re-interpret if we are reading from a SARIF file.
282-
expect(spy).not.toBeCalled();
282+
expect(spy).not.toHaveBeenCalled();
283283
},
284284
2 * 60 * 1000, // up to 2 minutes per test
285285
);
@@ -336,7 +336,7 @@ describe("query-results", () => {
336336
sourceInfo as SourceInfo,
337337
);
338338
// We do not re-interpret if we are reading from a SARIF file.
339-
expect(spy).not.toBeCalled();
339+
expect(spy).not.toHaveBeenCalled();
340340

341341
expect(results).toHaveProperty("t", "SarifInterpretationData");
342342
expect(results).toHaveProperty("runs[0].results");
@@ -400,7 +400,7 @@ describe("query-results", () => {
400400
);
401401

402402
// We do not attempt to re-interpret if we are reading from a SARIF file.
403-
expect(spy).not.toBeCalled();
403+
expect(spy).not.toHaveBeenCalled();
404404
},
405405
2 * 60 * 1000, // up to 2 minutes per test
406406
);

‎extensions/ql-vscode/test/vscode-tests/no-workspace/telemetry.test.ts‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ describe("telemetry reporting", () => {
162162
it("should reinitialize reporter when extension setting changes", async () => {
163163
await telemetryListener.initialize();
164164

165-
expect(disposeSpy).not.toBeCalled();
165+
expect(disposeSpy).not.toHaveBeenCalled();
166166
expect(telemetryListener._reporter).toBeDefined();
167167

168168
// this disables the reporter
@@ -205,7 +205,7 @@ describe("telemetry reporting", () => {
205205
},
206206
{ executionTime: 1234 },
207207
);
208-
expect(sendTelemetryErrorEventSpy).not.toBeCalled();
208+
expect(sendTelemetryErrorEventSpy).not.toHaveBeenCalled();
209209
});
210210

211211
it("should send a command usage event with an error", async () => {
@@ -227,7 +227,7 @@ describe("telemetry reporting", () => {
227227
},
228228
{ executionTime: 1234 },
229229
);
230-
expect(sendTelemetryErrorEventSpy).not.toBeCalled();
230+
expect(sendTelemetryErrorEventSpy).not.toHaveBeenCalled();
231231
});
232232

233233
it("should send a command usage event with a cli version", async () => {
@@ -250,7 +250,7 @@ describe("telemetry reporting", () => {
250250
},
251251
{ executionTime: 1234 },
252252
);
253-
expect(sendTelemetryErrorEventSpy).not.toBeCalled();
253+
expect(sendTelemetryErrorEventSpy).not.toHaveBeenCalled();
254254

255255
// Verify that if the cli version is not set, then the telemetry falls back to "not-set"
256256
sendTelemetryEventSpy.mockClear();
@@ -272,7 +272,7 @@ describe("telemetry reporting", () => {
272272
},
273273
{ executionTime: 5678 },
274274
);
275-
expect(sendTelemetryErrorEventSpy).not.toBeCalled();
275+
expect(sendTelemetryErrorEventSpy).not.toHaveBeenCalled();
276276
});
277277

278278
it("should avoid sending an event when telemetry is disabled", async () => {
@@ -282,8 +282,8 @@ describe("telemetry reporting", () => {
282282
telemetryListener.sendCommandUsage("command-id", 1234, undefined);
283283
telemetryListener.sendCommandUsage("command-id", 1234, new Error());
284284

285-
expect(sendTelemetryEventSpy).not.toBeCalled();
286-
expect(sendTelemetryErrorEventSpy).not.toBeCalled();
285+
expect(sendTelemetryEventSpy).not.toHaveBeenCalled();
286+
expect(sendTelemetryErrorEventSpy).not.toHaveBeenCalled();
287287
});
288288

289289
it("should send an event when telemetry is re-enabled", async () => {
@@ -303,7 +303,7 @@ describe("telemetry reporting", () => {
303303
},
304304
{ executionTime: 1234 },
305305
);
306-
expect(sendTelemetryErrorEventSpy).not.toBeCalled();
306+
expect(sendTelemetryErrorEventSpy).not.toHaveBeenCalled();
307307
});
308308

309309
it("should filter undesired properties from telemetry payload", async () => {
@@ -426,7 +426,7 @@ describe("telemetry reporting", () => {
426426
await telemetryListener.initialize();
427427

428428
// popup should not be shown even though we have initialized telemetry
429-
expect(showInformationMessageSpy).not.toBeCalled();
429+
expect(showInformationMessageSpy).not.toHaveBeenCalled();
430430
});
431431

432432
// This test is failing because codeQL.canary is not a registered configuration.
@@ -464,7 +464,7 @@ describe("telemetry reporting", () => {
464464
},
465465
{},
466466
);
467-
expect(sendTelemetryErrorEventSpy).not.toBeCalled();
467+
expect(sendTelemetryErrorEventSpy).not.toHaveBeenCalled();
468468
});
469469

470470
it("should send a ui-interaction telementry event with a cli version", async () => {
@@ -482,15 +482,15 @@ describe("telemetry reporting", () => {
482482
},
483483
{},
484484
);
485-
expect(sendTelemetryErrorEventSpy).not.toBeCalled();
485+
expect(sendTelemetryErrorEventSpy).not.toHaveBeenCalled();
486486
});
487487

488488
it("should send an error telementry event", async () => {
489489
await telemetryListener.initialize();
490490

491491
telemetryListener.sendError(redactableError`test`);
492492

493-
expect(sendTelemetryEventSpy).not.toBeCalled();
493+
expect(sendTelemetryEventSpy).not.toHaveBeenCalled();
494494
expect(sendTelemetryErrorEventSpy).toHaveBeenCalledWith(
495495
"error",
496496
{
@@ -509,7 +509,7 @@ describe("telemetry reporting", () => {
509509

510510
telemetryListener.sendError(redactableError`test`);
511511

512-
expect(sendTelemetryEventSpy).not.toBeCalled();
512+
expect(sendTelemetryEventSpy).not.toHaveBeenCalled();
513513
expect(sendTelemetryErrorEventSpy).toHaveBeenCalledWith(
514514
"error",
515515
{
@@ -529,7 +529,7 @@ describe("telemetry reporting", () => {
529529
redactableError`test message with secret information: ${42} and more ${"secret"} parts`,
530530
);
531531

532-
expect(sendTelemetryEventSpy).not.toBeCalled();
532+
expect(sendTelemetryEventSpy).not.toHaveBeenCalled();
533533
expect(sendTelemetryErrorEventSpy).toHaveBeenCalledWith(
534534
"error",
535535
{

0 commit comments

Comments
 (0)