Skip to content

Commit 66dad41

Browse files
jeremymengjeremymeng
authored
[test][keyvault] replace assert.ok with specific assertions (#36396)
1 parent d5fd6fd commit 66dad41

File tree

13 files changed

+64
-63
lines changed

13 files changed

+64
-63
lines changed

‎sdk/keyvault/arm-keyvault/test/keyvault.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ describe("Keyvault test", () => {
6464
for await (const item of client.operations.list()) {
6565
resArray.push(item);
6666
}
67-
assert.ok(resArray.length);
67+
assert.isAbove(resArray.length, 0);
6868
});
6969

7070
// skip other cases as create operation needs TenantId.

‎sdk/keyvault/keyvault-certificates/test/internal/lroUnexpectedErrors.spec.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { RestError } from "@azure/core-rest-pipeline";
44
import { DeleteCertificatePoller } from "../../src/lro/delete/poller.js";
55
import { RecoverDeletedCertificatePoller } from "../../src/lro/recover/poller.js";
66
import type { KeyVaultClient } from "../../src/keyVaultClient.js";
7-
import { describe, it, assert } from "vitest";
7+
import { describe, it, assert, expect } from "vitest";
88

99
describe("The LROs properly throw on unexpected errors", () => {
1010
const vaultUrl = `https://keyvaultname.vault.azure.net`;
@@ -56,7 +56,7 @@ describe("The LROs properly throw on unexpected errors", () => {
5656
await poller.poll();
5757
await poller.poll();
5858

59-
assert.isUndefined(poller.getOperationState().isCompleted);
59+
expect(poller.getOperationState().isCompleted).toBeFalsy();
6060
});
6161

6262
it("Errors other than 403 and 404 throw", async () => {
@@ -142,7 +142,7 @@ describe("The LROs properly throw on unexpected errors", () => {
142142
await poller.poll();
143143
await poller.poll();
144144

145-
assert.isUndefined(poller.getOperationState().isCompleted);
145+
expect(poller.getOperationState().isCompleted).toBeFalsy();
146146
});
147147

148148
it("Errors other than 403 and 404 throw", async () => {

‎sdk/keyvault/keyvault-keys/test/internal/lroUnexpectedErrors.spec.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import { RestError } from "@azure/core-rest-pipeline";
44
import { DeleteKeyPoller } from "../../src/lro/delete/poller.js";
55
import { RecoverDeletedKeyPoller } from "../../src/lro/recover/poller.js";
6-
import { describe, it, assert } from "vitest";
6+
import { describe, it, assert, expect } from "vitest";
77

88
describe("The LROs properly throw on unexpected errors", () => {
99
describe("delete LRO", () => {
@@ -55,7 +55,7 @@ describe("The LROs properly throw on unexpected errors", () => {
5555
await poller.poll();
5656
await poller.poll();
5757

58-
assert.isUndefined(poller.getOperationState().isCompleted);
58+
expect(poller.getOperationState().isCompleted).toBeFalsy();
5959
});
6060

6161
it("Errors other than 403 and 404 throw", async () => {
@@ -140,7 +140,7 @@ describe("The LROs properly throw on unexpected errors", () => {
140140
await poller.poll();
141141
await poller.poll();
142142

143-
assert.isUndefined(poller.getOperationState().isCompleted);
143+
expect(poller.getOperationState().isCompleted).toBeFalsy();
144144
});
145145

146146
it("Errors other than 403 and 404 throw", async () => {

‎sdk/keyvault/keyvault-keys/test/internal/recoverBackupRestore.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ describe("Keys client - restore keys and recover backups", () => {
7171
await client.createKey(keyName, "RSA");
7272
const result = await client.backupKey(keyName);
7373
assert.equal(Buffer.isBuffer(result), true, "Unexpected return value from backupKey()");
74-
assert.ok(result!.length > 0, "Unexpected length of buffer from backupKey()");
74+
assert.isAbove(result!.length, 0, "Unexpected length of buffer from backupKey()");
7575
await testClient.flushKey(keyName);
7676
});
7777

‎sdk/keyvault/keyvault-keys/test/public/lro.delete.spec.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import type { DeletedKey, KeyClient } from "../../src/index.js";
66
import { testPollerProperties } from "./utils/recorderUtils.js";
77
import { authenticate, envSetupForPlayback } from "./utils/testAuthentication.js";
88
import type TestClient from "./utils/testClient.js";
9-
import { describe, it, assert, beforeEach, afterEach } from "vitest";
9+
import { describe, it, assert, beforeEach, afterEach, expect } from "vitest";
1010

1111
describe("Keys client - Long Running Operations - delete", () => {
1212
const keyPrefix = `lroDelete${env.CERTIFICATE_NAME || "KeyName"}`;
@@ -35,14 +35,14 @@ describe("Keys client - Long Running Operations - delete", () => {
3535
const keyName = testClient.formatName(`${keyPrefix}-${ctx.task.name}-${keySuffix}`);
3636
await client.createKey(keyName, "RSA");
3737
const poller = await client.beginDeleteKey(keyName, testPollerProperties);
38-
assert.ok(poller.getOperationState().isStarted);
38+
assert.isTrue(poller.getOperationState().isStarted);
3939

4040
// The pending deleted can be obtained this way:
4141
assert.equal(poller.getOperationState().result!.name, keyName);
4242

4343
const deletedKey: DeletedKey = await poller.pollUntilDone();
4444
assert.equal(deletedKey.name, keyName);
45-
assert.ok(poller.getOperationState().isCompleted);
45+
assert.isTrue(poller.getOperationState().isCompleted);
4646

4747
// The final key can also be obtained this way:
4848
assert.equal(poller.getOperationState().result!.name, keyName);
@@ -54,19 +54,19 @@ describe("Keys client - Long Running Operations - delete", () => {
5454
const keyName = testClient.formatName(`${keyPrefix}-${ctx.task.name}-${keySuffix}`);
5555
await client.createKey(keyName, "RSA");
5656
const poller = await client.beginDeleteKey(keyName, testPollerProperties);
57-
assert.ok(poller.getOperationState().isStarted);
57+
assert.isTrue(poller.getOperationState().isStarted);
5858

5959
poller.pollUntilDone().catch((e) => {
60-
assert.ok(e.name === "PollerStoppedError");
60+
assert.equal(e.name, "PollerStoppedError");
6161
assert.equal(e.name, "PollerStoppedError");
6262
assert.equal(e.message, "This poller is already stopped");
6363
});
6464

6565
await poller.poll(); // Making sure it has some data
6666

6767
poller.stopPolling();
68-
assert.ok(poller.isStopped());
69-
assert.ok(!poller.getOperationState().isCompleted);
68+
assert.isTrue(poller.isStopped());
69+
expect(poller.getOperationState().isCompleted).toBeFalsy();
7070

7171
const serialized = poller.toString();
7272

@@ -75,10 +75,10 @@ describe("Keys client - Long Running Operations - delete", () => {
7575
...testPollerProperties,
7676
});
7777

78-
assert.ok(resumePoller.getOperationState().isStarted);
78+
assert.isTrue(resumePoller.getOperationState().isStarted);
7979
const deletedKey: DeletedKey = await resumePoller.pollUntilDone();
8080
assert.equal(deletedKey.name, keyName);
81-
assert.ok(resumePoller.getOperationState().isCompleted);
81+
assert.isTrue(resumePoller.getOperationState().isCompleted);
8282

8383
await testClient.purgeKey(keyName);
8484
});

‎sdk/keyvault/keyvault-keys/test/public/lro.recoverDelete.spec.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import type { DeletedKey, KeyClient } from "../../src/index.js";
66
import { testPollerProperties } from "./utils/recorderUtils.js";
77
import { authenticate, envSetupForPlayback } from "./utils/testAuthentication.js";
88
import type TestClient from "./utils/testClient.js";
9-
import { describe, it, assert, beforeEach, afterEach } from "vitest";
9+
import { describe, it, assert, beforeEach, afterEach, expect } from "vitest";
1010

1111
describe("Keys client - Long Running Operations - recoverDelete", () => {
1212
const keyPrefix = `lroRecoverDelete${env.CERTIFICATE_NAME || "KeyName"}`;
@@ -39,14 +39,14 @@ describe("Keys client - Long Running Operations - recoverDelete", () => {
3939
await deletePoller.pollUntilDone();
4040

4141
const poller = await client.beginRecoverDeletedKey(keyName, testPollerProperties);
42-
assert.ok(poller.getOperationState().isStarted);
42+
assert.isTrue(poller.getOperationState().isStarted);
4343

4444
// The pending key can be obtained this way:
4545
assert.equal(poller.getOperationState().result!.name, keyName);
4646

4747
const deletedKey: DeletedKey = await poller.pollUntilDone();
4848
assert.equal(deletedKey.name, keyName);
49-
assert.ok(poller.getOperationState().isCompleted);
49+
assert.isTrue(poller.getOperationState().isCompleted);
5050

5151
// The final key can also be obtained this way:
5252
assert.equal(poller.getOperationState().result!.name, keyName);
@@ -61,19 +61,19 @@ describe("Keys client - Long Running Operations - recoverDelete", () => {
6161
await deletePoller.pollUntilDone();
6262

6363
const poller = await client.beginRecoverDeletedKey(keyName, testPollerProperties);
64-
assert.ok(poller.getOperationState().isStarted);
64+
assert.isTrue(poller.getOperationState().isStarted);
6565

6666
poller.pollUntilDone().catch((e) => {
67-
assert.ok(e.name === "PollerStoppedError");
67+
assert.equal(e.name, "PollerStoppedError");
6868
assert.equal(e.name, "PollerStoppedError");
6969
assert.equal(e.message, "This poller is already stopped");
7070
});
7171

7272
await poller.poll(); // Making sure it has some data
7373

7474
poller.stopPolling();
75-
assert.ok(poller.isStopped());
76-
assert.ok(!poller.getOperationState().isCompleted);
75+
assert.isTrue(poller.isStopped());
76+
expect(poller.getOperationState().isCompleted).toBeFalsy();
7777

7878
const serialized = poller.toString();
7979

@@ -82,10 +82,10 @@ describe("Keys client - Long Running Operations - recoverDelete", () => {
8282
...testPollerProperties,
8383
});
8484

85-
assert.ok(poller.getOperationState().isStarted);
85+
assert.isTrue(poller.getOperationState().isStarted);
8686
const deletedKey: DeletedKey = await resumePoller.pollUntilDone();
8787
assert.equal(deletedKey.name, keyName);
88-
assert.ok(resumePoller.getOperationState().isCompleted);
88+
assert.isTrue(resumePoller.getOperationState().isCompleted);
8989

9090
await testClient.flushKey(keyName);
9191
});

‎sdk/keyvault/keyvault-keys/test/public/node/crypto.spec.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -176,14 +176,14 @@ describe("CryptographyClient (all decrypts happen remotely)", () => {
176176
const signature = await cryptoClient.sign("RS256", signatureValue);
177177
const verifyResult = await cryptoClient.verify("RS256", signatureValue, signature.result);
178178

179-
assert.ok(verifyResult.result);
179+
assert.isTrue(verifyResult.result);
180180
});
181181

182182
it("sign and verify data with RS256 (local verification)", async () => {
183183
const signatureValue = Buffer.from("32 byte signature in ascii chars");
184184
const signature = await cryptoClient.signData("RS256", signatureValue);
185185
const verifyResult = await cryptoClient.verifyData("RS256", signatureValue, signature.result);
186-
assert.ok(verifyResult.result);
186+
assert.isTrue(verifyResult.result);
187187
});
188188

189189
describe("tracing", () => {
@@ -311,14 +311,14 @@ describe("CryptographyClient (all decrypts happen remotely)", () => {
311311
const digest = hash.digest();
312312
const signature = await cryptoClient.sign("RS256", digest);
313313
const verifyResult = await cryptoClient.verify("RS256", digest, signature.result);
314-
assert.ok(verifyResult.result);
314+
assert.isTrue(verifyResult.result);
315315
});
316316

317317
it("sign and verify data with RS256 through an RSA-HSM key (local verification)", async function (): Promise<void> {
318318
const signatureValue = Buffer.from("My Message");
319319
const signature = await cryptoClient.signData("RS256", signatureValue);
320320
const verifyResult = await cryptoClient.verifyData("RS256", signatureValue, signature.result);
321-
assert.ok(verifyResult.result);
321+
assert.isTrue(verifyResult.result);
322322
});
323323

324324
it("sign and verify with RS384 through an RSA-HSM key", async function (): Promise<void> {
@@ -328,7 +328,7 @@ describe("CryptographyClient (all decrypts happen remotely)", () => {
328328
const digest = hash.digest();
329329
const signature = await cryptoClient.sign("RS384", digest);
330330
const verifyResult = await cryptoClient.verify("RS384", digest, signature.result);
331-
assert.ok(verifyResult.result);
331+
assert.isTrue(verifyResult.result);
332332
});
333333
});
334334

‎sdk/keyvault/keyvault-keys/test/public/node/localCryptography.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ describe("Local cryptography public tests", () => {
213213
digest,
214214
signature.result,
215215
);
216-
assert.ok(verifyResult);
216+
assert.isDefined(verifyResult);
217217

218218
await testClient.flushKey(keyName);
219219
});

‎sdk/keyvault/keyvault-secrets/test/internal/lroUnexpectedErrors.spec.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import { RestError } from "@azure/core-rest-pipeline";
44
import { DeleteSecretPoller } from "../../src/lro/delete/poller.js";
55
import { RecoverDeletedSecretPoller } from "../../src/lro/recover/poller.js";
6-
import { describe, it, assert } from "vitest";
6+
import { describe, it, assert, expect } from "vitest";
77

88
describe("The LROs properly throw on unexpected errors", () => {
99
describe("delete LRO", () => {
@@ -51,7 +51,7 @@ describe("The LROs properly throw on unexpected errors", () => {
5151
await poller.poll();
5252
await poller.poll();
5353

54-
assert.isUndefined(poller.getOperationState().isCompleted);
54+
expect(poller.getOperationState().isCompleted).toBeFalsy();
5555
});
5656

5757
it("Errors other than 403 and 404 throw", async () => {
@@ -130,7 +130,7 @@ describe("The LROs properly throw on unexpected errors", () => {
130130
await poller.poll();
131131
await poller.poll();
132132

133-
assert.isUndefined(poller.getOperationState().isCompleted);
133+
expect(poller.getOperationState().isCompleted).toBeFalsy();
134134
});
135135

136136
it("Errors other than 403 and 404 throw", async () => {

‎sdk/keyvault/keyvault-secrets/test/public/CRUD.spec.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -165,21 +165,21 @@ describe("Secret client - create, read, update and delete operations", () => {
165165

166166
let deletedSecret = deletePoller.getResult();
167167
assert.equal(typeof deletedSecret!.properties.recoveryId, "string");
168-
assert.ok(deletedSecret!.properties.deletedOn instanceof Date);
169-
assert.ok(deletedSecret!.properties.scheduledPurgeDate instanceof Date);
168+
assert.instanceOf(deletedSecret!.properties.deletedOn, Date);
169+
assert.instanceOf(deletedSecret!.properties.scheduledPurgeDate, Date);
170170

171171
assert.equal(typeof deletedSecret!.recoveryId, "string");
172-
assert.ok(deletedSecret!.deletedOn instanceof Date);
173-
assert.ok(deletedSecret!.scheduledPurgeDate instanceof Date);
172+
assert.instanceOf(deletedSecret!.deletedOn, Date);
173+
assert.instanceOf(deletedSecret!.scheduledPurgeDate, Date);
174174

175175
deletedSecret = await deletePoller.pollUntilDone();
176176
assert.equal(typeof deletedSecret.properties.recoveryId, "string");
177-
assert.ok(deletedSecret.properties.deletedOn instanceof Date);
178-
assert.ok(deletedSecret.properties.scheduledPurgeDate instanceof Date);
177+
assert.instanceOf(deletedSecret.properties.deletedOn, Date);
178+
assert.instanceOf(deletedSecret.properties.scheduledPurgeDate, Date);
179179

180180
assert.equal(typeof deletedSecret!.recoveryId, "string");
181-
assert.ok(deletedSecret!.deletedOn instanceof Date);
182-
assert.ok(deletedSecret!.scheduledPurgeDate instanceof Date);
181+
assert.instanceOf(deletedSecret!.deletedOn, Date);
182+
assert.instanceOf(deletedSecret!.scheduledPurgeDate, Date);
183183

184184
try {
185185
await client.getSecret(secretName);

0 commit comments

Comments
 (0)