Skip to content

Commit d5fd6fd

Browse files
authored
[test][core] replace assert.ok/notOk with more specific assertions (#36393)
1 parent a4a8dcc commit d5fd6fd

File tree

20 files changed

+100
-100
lines changed

20 files changed

+100
-100
lines changed

sdk/core/core-amqp/test/cbs.spec.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ describe("CbsClient", function () {
2323
await cbsClient.init({ abortSignal: signal });
2424
throw new Error(TEST_FAILURE);
2525
} catch (err) {
26-
assert.ok(isError(err));
26+
assert.isTrue(isError(err));
2727
assert.equal((err as Error).name, "AbortError");
2828
}
2929
});
@@ -55,7 +55,7 @@ describe("CbsClient", function () {
5555
await cbsClient.init({ abortSignal: signal });
5656
throw new Error(TEST_FAILURE);
5757
} catch (err) {
58-
assert.ok(isError(err));
58+
assert.isTrue(isError(err));
5959
assert.equal((err as Error).name, "AbortError");
6060
}
6161
});
@@ -76,7 +76,7 @@ describe("CbsClient", function () {
7676
await cbsClient.init({ abortSignal: signal });
7777
throw new Error(TEST_FAILURE);
7878
} catch (err) {
79-
assert.ok(isError(err));
79+
assert.isTrue(isError(err));
8080
assert.equal((err as Error).name, "AbortError");
8181
}
8282
});
@@ -91,7 +91,7 @@ describe("CbsClient", function () {
9191
await cbsClient.negotiateClaim("audience", "token", TokenType.CbsTokenTypeSas);
9292
throw new Error(TEST_FAILURE);
9393
} catch (err) {
94-
assert.ok(isError(err));
94+
assert.isTrue(isError(err));
9595
assert.equal(
9696
(err as Error).message,
9797
"Attempted to negotiate a claim but the CBS link does not exist.",
@@ -116,7 +116,7 @@ describe("CbsClient", function () {
116116
});
117117
throw new Error(TEST_FAILURE);
118118
} catch (err) {
119-
assert.ok(isError(err));
119+
assert.isTrue(isError(err));
120120
assert.equal((err as Error).name, "AbortError");
121121
}
122122
});
@@ -139,7 +139,7 @@ describe("CbsClient", function () {
139139
});
140140
throw new Error(TEST_FAILURE);
141141
} catch (err) {
142-
assert.ok(isError(err));
142+
assert.isTrue(isError(err));
143143
assert.equal((err as Error).name, "AbortError");
144144
}
145145
});

sdk/core/core-amqp/test/message.spec.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ describe("message", function () {
2727
const annotatedMessage = AmqpAnnotatedMessage.fromRheaMessage(rhMsg);
2828

2929
const expectedTtl = rhMsg.absolute_expiry_time!.getTime() - rhMsg.creation_time!.getTime();
30-
assert.ok(
30+
assert.isDefined(
3131
annotatedMessage.header?.timeToLive,
3232
"Expecting valid annotatedMsg.header.timeToLive",
3333
);
@@ -43,7 +43,7 @@ describe("message", function () {
4343
const annotatedMessage = AmqpAnnotatedMessage.fromRheaMessage(rhMsg);
4444

4545
const expectedTtl = 49 * 24 * 60 * 60 * 1000;
46-
assert.ok(
46+
assert.isDefined(
4747
annotatedMessage.header?.timeToLive,
4848
"Expecting valid annotatedMsg.header.timeToLive",
4949
);
@@ -61,8 +61,8 @@ describe("message", function () {
6161
const rhMsg = AmqpAnnotatedMessage.toRheaMessage(input);
6262

6363
assert.equal(Constants.maxUint32Value, rhMsg.ttl);
64-
assert.ok(rhMsg.creation_time);
65-
assert.ok(rhMsg.absolute_expiry_time);
64+
assert.isDefined(rhMsg.creation_time);
65+
assert.isDefined(rhMsg.absolute_expiry_time);
6666
assert.equal(
6767
rhMsg.creation_time!.getTime() + oneHundredDaysInMs,
6868
rhMsg.absolute_expiry_time!.getTime(),
@@ -121,8 +121,8 @@ describe("message", function () {
121121
const rhMsg = AmqpAnnotatedMessage.toRheaMessage(input);
122122

123123
assert.equal(rhMsg.ttl, sevenDayInMs);
124-
assert.ok(rhMsg.creation_time);
125-
assert.ok(rhMsg.absolute_expiry_time);
124+
assert.isDefined(rhMsg.creation_time);
125+
assert.isDefined(rhMsg.absolute_expiry_time);
126126
assert.equal(
127127
rhMsg.absolute_expiry_time!.getTime(),
128128
rhMsg.creation_time!.getTime() + sevenDayInMs,

sdk/core/core-amqp/test/requestResponse.spec.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ describe.skipIf(isBrowser)("RequestResponseLink", function () {
5555
await RequestResponseLink.create(connection, {}, {}, { abortSignal: signal });
5656
throw new Error(TEST_FAILURE);
5757
} catch (err) {
58-
assert.ok(isError(err));
58+
assert.isTrue(isError(err));
5959
assert.equal((err as Error).name, "AbortError");
6060
}
6161
});
@@ -73,7 +73,7 @@ describe.skipIf(isBrowser)("RequestResponseLink", function () {
7373
await RequestResponseLink.create(connection, {}, {}, { abortSignal: signal });
7474
throw new Error(TEST_FAILURE);
7575
} catch (err) {
76-
assert.ok(isError(err));
76+
assert.isTrue(isError(err));
7777
assert.equal((err as Error).name, "AbortError");
7878
}
7979
});
@@ -321,7 +321,7 @@ describe.skipIf(isBrowser)("RequestResponseLink", function () {
321321
await failedRequest;
322322
throw new Error("Test failure");
323323
} catch (err) {
324-
assert.ok(isError(err));
324+
assert.isTrue(isError(err));
325325
assert.notEqual((err as Error).message, "Test failure");
326326
}
327327

@@ -467,7 +467,7 @@ describe.skipIf(isBrowser)("RequestResponseLink", function () {
467467
await link.sendRequest(request, { abortSignal: signal, requestName: "foo" });
468468
throw new Error(`Test failure`);
469469
} catch (err) {
470-
assert.ok(isError(err));
470+
assert.isTrue(isError(err));
471471
const error = err as Error;
472472
assert.equal(error.name, "AbortError", `Error name ${error.name} is not as expected`);
473473
assert.equal(
@@ -541,7 +541,7 @@ describe.skipIf(isBrowser)("RequestResponseLink", function () {
541541
});
542542
throw new Error(`Test failure`);
543543
} catch (err) {
544-
assert.ok(isError(err));
544+
assert.isTrue(isError(err));
545545
const error = err as Error;
546546
assert.equal(error.name, "AbortError", `Error name ${error.name} is not as expected`);
547547
assert.equal(
@@ -606,7 +606,7 @@ describe.skipIf(isBrowser)("RequestResponseLink", function () {
606606
await link.sendRequest(request, { abortSignal: signal, requestName: "foo" });
607607
throw new Error(`Test failure`);
608608
} catch (err) {
609-
assert.ok(isError(err));
609+
assert.isTrue(isError(err));
610610
const error = err as Error;
611611
assert.equal(error.name, "AbortError", `Error name ${error.name} is not as expected`);
612612
assert.equal(
@@ -684,7 +684,7 @@ describe.skipIf(isBrowser)("RequestResponseLink", function () {
684684
await link.sendRequest(request, { timeoutInMs: 120000, requestName: "foo" });
685685
throw new Error(testFailureMessage);
686686
} catch (err) {
687-
assert.ok(isError(err));
687+
assert.isTrue(isError(err));
688688
const error = err as Error;
689689
assert.notEqual(error.message, testFailureMessage);
690690
}

sdk/core/core-auth/test/index.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ describe("AzureSASCredential", () => {
144144

145145
describe("isTokenCredential", function () {
146146
it("should return true for an object that resembles a TokenCredential", () => {
147-
assert.ok(
147+
assert.isTrue(
148148
isTokenCredential({
149149
getToken() {
150150
return Promise.resolve({
@@ -207,7 +207,7 @@ describe("isTokenCredential", function () {
207207

208208
describe("isNamedKeyCredential", function () {
209209
it("should return true for an object that resembles a NamedKeyCredential", () => {
210-
assert.ok(isNamedKeyCredential({ name: "foo", key: "bar" }));
210+
assert.isTrue(isNamedKeyCredential({ name: "foo", key: "bar" }));
211211
});
212212

213213
it("should return false for an object that does not resemble a NamedKeyCredential", () => {
@@ -217,7 +217,7 @@ describe("isNamedKeyCredential", function () {
217217

218218
describe("isSASCredential", function () {
219219
it("should return true for an object that resembles a isSASCredential", () => {
220-
assert.ok(isSASCredential({ signature: "sig" }));
220+
assert.isTrue(isSASCredential({ signature: "sig" }));
221221
});
222222

223223
it("should return false for an object that does not resemble a isSASCredential", () => {
@@ -227,7 +227,7 @@ describe("isSASCredential", function () {
227227

228228
describe("isKeyCredential", function () {
229229
it("should return true for an object that resembles a KeyCredential", () => {
230-
assert.ok(isKeyCredential({ key: "bar" }));
230+
assert.isTrue(isKeyCredential({ key: "bar" }));
231231
});
232232

233233
it("should return false for an object that does not resemble a KeyCredential", () => {

sdk/core/core-client/test/serviceClient.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1264,7 +1264,7 @@ describe("ServiceClient", function () {
12641264
},
12651265
});
12661266
const response = await client.sendOperationRequest<{ body: Date }>({}, operationSpec);
1267-
assert.ok(response.body);
1267+
assert.isDefined(response.body);
12681268
});
12691269

12701270
it("should catch the mandatory parameter missing error", async function () {

sdk/core/core-lro/test/public/lro.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2546,7 +2546,7 @@ matrix(
25462546
(state as any).x = 1;
25472547
setState = true;
25482548
} else {
2549-
assert.ok((state as any).x);
2549+
assert.isDefined((state as any).x);
25502550
check = true;
25512551
}
25522552
},
@@ -2591,7 +2591,7 @@ matrix(
25912591
(state as any).x = 1;
25922592
setState = true;
25932593
} else {
2594-
assert.ok((state as any).x);
2594+
assert.isDefined((state as any).x);
25952595
check = true;
25962596
}
25972597
},

sdk/core/core-rest-pipeline/test/browser/userAgentPlatform.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ describe("userAgentPlatform", () => {
1111
await setPlatformSpecificData(map);
1212

1313
// Switch if we're using a different browser runner
14-
assert.ok(map.has("Chromium"));
14+
assert.isTrue(map.has("Chromium"));
1515
});
1616
});

sdk/core/core-rest-pipeline/test/formDataPolicy.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ describe("formDataPolicy", function () {
4141
});
4242

4343
const parts = (result.request.multipartBody as MultipartRequestBody).parts;
44-
assert.ok(parts.length === 1, "expected 1 part");
44+
assert.equal(parts.length, 1, "expected 1 part");
4545
assert.deepEqual(
4646
parts[0].headers,
4747
createHttpHeaders({

sdk/core/core-rest-pipeline/test/multipartPolicy.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ describe("multipartPolicy", function () {
7777
},
7878
});
7979

80-
assert.ok(request.headers.has("content-type"), "content-type header expected");
80+
assert.isTrue(request.headers.has("content-type"), "content-type header expected");
8181
assert.match(
8282
request.headers.get("content-type")!,
8383
/multipart\/mixed; boundary=[0-9a-zA-Z'()+,-./:=?]+/,
@@ -134,7 +134,7 @@ describe("multipartPolicy", function () {
134134
},
135135
});
136136

137-
assert.ok(request.headers.has("content-type"), "content-type header expected");
137+
assert.isTrue(request.headers.has("content-type"), "content-type header expected");
138138
assert.match(
139139
request.headers.get("content-type")!,
140140
/multipart\/alternative; boundary=[0-9a-zA-Z'()+,-./:=?]+/,

sdk/core/core-rest-pipeline/test/node/bearerTokenAuthenticationPolicyChallenge.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ describe("bearerTokenAuthenticationPolicy with challenge", function () {
496496
error = e;
497497
}
498498

499-
assert.ok(error);
499+
assert.isDefined(error);
500500
assert.equal(error?.message, "Failed sendRequest error");
501501
});
502502
});

0 commit comments

Comments
 (0)