FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

test: remove assert.doesNotThrow() · nodejs/node@574d061 · GitHub

test: remove assert.doesNotThrow() · nodejs/node@574d061 · GitHub
Skip to content

Navigation Menu

Sign in
Sign in
Sign up

Commit 574d061

Browse files
BridgeAR
authored and
MylesBorins
committed
test: remove assert.doesNotThrow()
There is actually no reason to use `assert.doesNotThrow()` in the tests. If a test throws, just let the error bubble up right away instead of first catching it and then rethrowing it. Backport-PR-URL: #19244 PR-URL: #18669 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
1 parent 5478746 commit 574d061

123 files changed

Lines changed: 584 additions & 994 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎test/addons-napi/test_general/test.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ const y = {};
8181
test_general.wrap(y);
8282
test_general.removeWrap(y);
8383
// Wrapping twice succeeds if a remove_wrap() separates the instances
84-
assert.doesNotThrow(() => test_general.wrap(y));
84+
test_general.wrap(y);
8585

8686
// Ensure that removing a wrap and garbage collecting does not fire the
8787
// finalize callback.

‎test/addons/symlinked-module/test.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@ const sub = require('./submodule');
3030
const mod = require(path.join(i, 'binding.node'));
3131
assert.notStrictEqual(mod, null);
3232
assert.strictEqual(mod.hello(), 'world');
33-
assert.doesNotThrow(() => sub.test(i));
33+
sub.test(i);
3434
});

‎test/internet/test-dgram-membership.js‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const setup = dgram.createSocket.bind(dgram, { type: 'udp4', reuseAddr: true });
1010
// addMembership() with valid socket and multicast address should not throw
1111
{
1212
const socket = setup();
13-
assert.doesNotThrow(() => { socket.addMembership(multicastAddress); });
13+
socket.addMembership(multicastAddress);
1414
socket.close();
1515
}
1616

@@ -27,11 +27,7 @@ const setup = dgram.createSocket.bind(dgram, { type: 'udp4', reuseAddr: true });
2727
// dropMembership() after addMembership() should not throw
2828
{
2929
const socket = setup();
30-
assert.doesNotThrow(
31-
() => {
32-
socket.addMembership(multicastAddress);
33-
socket.dropMembership(multicastAddress);
34-
}
35-
);
30+
socket.addMembership(multicastAddress);
31+
socket.dropMembership(multicastAddress);
3632
socket.close();
3733
}

‎test/internet/test-dns.js‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -580,14 +580,10 @@ process.on('exit', function() {
580580
});
581581

582582

583-
assert.doesNotThrow(() =>
584-
dns.lookup(addresses.INET6_HOST, 6, common.mustCall()));
583+
dns.lookup(addresses.INET6_HOST, 6, common.mustCall());
585584

586-
assert.doesNotThrow(() =>
587-
dns.lookup(addresses.INET_HOST, {}, common.mustCall()));
585+
dns.lookup(addresses.INET_HOST, {}, common.mustCall());
588586

589-
assert.doesNotThrow(() =>
590-
dns.lookupService('0.0.0.0', '0', common.mustCall()));
587+
dns.lookupService('0.0.0.0', '0', common.mustCall());
591588

592-
assert.doesNotThrow(() =>
593-
dns.lookupService('0.0.0.0', 0, common.mustCall()));
589+
dns.lookupService('0.0.0.0', 0, common.mustCall());

‎test/parallel/test-assert-checktag.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ function re(literals, ...values) {
3030
FakeDate.prototype = Date.prototype;
3131
const fake = new FakeDate();
3232

33-
assert.doesNotThrow(() => assert.deepEqual(date, fake));
34-
assert.doesNotThrow(() => assert.deepEqual(fake, date));
33+
assert.deepEqual(date, fake);
34+
assert.deepEqual(fake, date);
3535

3636
// For deepStrictEqual we check the runtime type,
3737
// then reveal the fakeness of the fake date
@@ -47,7 +47,7 @@ function re(literals, ...values) {
4747
for (const prop of Object.keys(global)) {
4848
fakeGlobal[prop] = global[prop];
4949
}
50-
assert.doesNotThrow(() => assert.deepEqual(fakeGlobal, global));
50+
assert.deepEqual(fakeGlobal, global);
5151
// Message will be truncated anyway, don't validate
5252
assert.throws(() => assert.deepStrictEqual(fakeGlobal, global),
5353
assert.AssertionError);
@@ -59,7 +59,7 @@ function re(literals, ...values) {
5959
for (const prop of Object.keys(process)) {
6060
fakeProcess[prop] = process[prop];
6161
}
62-
assert.doesNotThrow(() => assert.deepEqual(fakeProcess, process));
62+
assert.deepEqual(fakeProcess, process);
6363
// Message will be truncated anyway, don't validate
6464
assert.throws(() => assert.deepStrictEqual(fakeProcess, process),
6565
assert.AssertionError);

‎test/parallel/test-assert-deep.js‎

Lines changed: 35 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -34,23 +34,23 @@ const buf = Buffer.from(arr);
3434
// They have different [[Prototype]]
3535
assert.throws(() => assert.deepStrictEqual(arr, buf),
3636
re`${arr} deepStrictEqual ${buf}`);
37-
assert.doesNotThrow(() => assert.deepEqual(arr, buf));
37+
assert.deepEqual(arr, buf);
3838

3939
{
4040
const buf2 = Buffer.from(arr);
4141
buf2.prop = 1;
4242

4343
assert.throws(() => assert.deepStrictEqual(buf2, buf),
4444
re`${buf2} deepStrictEqual ${buf}`);
45-
assert.doesNotThrow(() => assert.deepEqual(buf2, buf));
45+
assert.deepEqual(buf2, buf);
4646
}
4747

4848
{
4949
const arr2 = new Uint8Array([120, 121, 122, 10]);
5050
arr2.prop = 5;
5151
assert.throws(() => assert.deepStrictEqual(arr, arr2),
5252
re`${arr} deepStrictEqual ${arr2}`);
53-
assert.doesNotThrow(() => assert.deepEqual(arr, arr2));
53+
assert.deepEqual(arr, arr2);
5454
}
5555

5656
const date = new Date('2016');
@@ -66,8 +66,8 @@ const date2 = new MyDate('2016');
6666

6767
// deepEqual returns true as long as the time are the same,
6868
// but deepStrictEqual checks own properties
69-
assert.doesNotThrow(() => assert.deepEqual(date, date2));
70-
assert.doesNotThrow(() => assert.deepEqual(date2, date));
69+
assert.deepEqual(date, date2);
70+
assert.deepEqual(date2, date);
7171
assert.throws(() => assert.deepStrictEqual(date, date2),
7272
re`${date} deepStrictEqual ${date2}`);
7373
assert.throws(() => assert.deepStrictEqual(date2, date),
@@ -85,7 +85,7 @@ const re2 = new MyRegExp('test');
8585

8686
// deepEqual returns true as long as the regexp-specific properties
8787
// are the same, but deepStrictEqual checks all properties
88-
assert.doesNotThrow(() => assert.deepEqual(re1, re2));
88+
assert.deepEqual(re1, re2);
8989
assert.throws(() => assert.deepStrictEqual(re1, re2),
9090
re`${re1} deepStrictEqual ${re2}`);
9191

@@ -148,11 +148,11 @@ function assertNotDeepOrStrict(a, b, err) {
148148
}
149149

150150
function assertOnlyDeepEqual(a, b, err) {
151-
assert.doesNotThrow(() => assert.deepEqual(a, b));
151+
assert.deepEqual(a, b);
152152
assert.throws(() => assert.deepStrictEqual(a, b), err ||
153153
re`${a} deepStrictEqual ${b}`);
154154

155-
assert.doesNotThrow(() => assert.deepEqual(b, a));
155+
assert.deepEqual(b, a);
156156
assert.throws(() => assert.deepStrictEqual(b, a), err ||
157157
re`${b} deepStrictEqual ${a}`);
158158
}
@@ -492,10 +492,9 @@ assertOnlyDeepEqual([1, , , 3], [1, , , 3, , , ]);
492492

493493
// Handle NaN
494494
assert.throws(() => { assert.deepEqual(NaN, NaN); }, assert.AssertionError);
495-
assert.doesNotThrow(() => { assert.deepStrictEqual(NaN, NaN); });
496-
assert.doesNotThrow(() => { assert.deepStrictEqual({ a: NaN }, { a: NaN }); });
497-
assert.doesNotThrow(
498-
() => { assert.deepStrictEqual([ 1, 2, NaN, 4 ], [ 1, 2, NaN, 4 ]); });
495+
{ assert.deepStrictEqual(NaN, NaN); }
496+
{ assert.deepStrictEqual({ a: NaN }, { a: NaN }); }
497+
assert.deepStrictEqual([ 1, 2, NaN, 4 ], [ 1, 2, NaN, 4 ]);
499498

500499
// Handle boxed primitives
501500
{
@@ -547,9 +546,7 @@ assertDeepAndStrictEqual(-0, -0);
547546
assertDeepAndStrictEqual(a, b);
548547
}
549548

550-
assert.doesNotThrow(
551-
() => assert.deepEqual(new Date(2000, 3, 14), new Date(2000, 3, 14)),
552-
'deepEqual(new Date(2000, 3, 14), new Date(2000, 3, 14))');
549+
assert.deepEqual(new Date(2000, 3, 14), new Date(2000, 3, 14));
553550

554551
assert.throws(() => assert.deepEqual(new Date(), new Date(2000, 3, 14)),
555552
AssertionError,
@@ -561,10 +558,7 @@ assert.throws(
561558
'notDeepEqual(new Date(2000, 3, 14), new Date(2000, 3, 14))'
562559
);
563560

564-
assert.doesNotThrow(
565-
() => assert.notDeepEqual(new Date(), new Date(2000, 3, 14)),
566-
'notDeepEqual(new Date(), new Date(2000, 3, 14))'
567-
);
561+
assert.notDeepEqual(new Date(), new Date(2000, 3, 14));
568562

569563
assert.deepEqual(/a/, /a/);
570564
assert.deepEqual(/a/g, /a/g);
@@ -605,23 +599,23 @@ common.expectsError(() => assert.deepEqual(/a/igm, /a/im),
605599
{
606600
const re1 = /a/g;
607601
re1.lastIndex = 3;
608-
assert.doesNotThrow(() => assert.deepEqual(re1, /a/g));
602+
assert.deepEqual(re1, /a/g);
609603
}
610604

611-
assert.doesNotThrow(() => assert.deepEqual(4, '4'), 'deepEqual(4, \'4\')');
612-
assert.doesNotThrow(() => assert.deepEqual(true, 1), 'deepEqual(true, 1)');
605+
assert.deepEqual(4, '4');
606+
assert.deepEqual(true, 1);
613607
assert.throws(() => assert.deepEqual(4, '5'),
614608
AssertionError,
615609
'deepEqual( 4, \'5\')');
616610

617611
// Having the same number of owned properties && the same set of keys.
618-
assert.doesNotThrow(() => assert.deepEqual({ a: 4 }, { a: 4 }));
619-
assert.doesNotThrow(() => assert.deepEqual({ a: 4, b: '2' }, { a: 4, b: '2' }));
620-
assert.doesNotThrow(() => assert.deepEqual([4], ['4']));
612+
assert.deepEqual({ a: 4 }, { a: 4 });
613+
assert.deepEqual({ a: 4, b: '2' }, { a: 4, b: '2' });
614+
assert.deepEqual([4], ['4']);
621615
assert.throws(
622616
() => assert.deepEqual({ a: 4 }, { a: 4, b: true }), AssertionError);
623-
assert.doesNotThrow(() => assert.deepEqual(['a'], { 0: 'a' }));
624-
assert.doesNotThrow(() => assert.deepEqual({ a: 4, b: '1' }, { b: '1', a: 4 }));
617+
assert.deepEqual(['a'], { 0: 'a' });
618+
assert.deepEqual({ a: 4, b: '1' }, { b: '1', a: 4 });
625619
const a1 = [1, 2, 3];
626620
const a2 = [1, 2, 3];
627621
a1.a = 'test';
@@ -630,7 +624,7 @@ a2.b = true;
630624
a2.a = 'test';
631625
assert.throws(() => assert.deepEqual(Object.keys(a1), Object.keys(a2)),
632626
AssertionError);
633-
assert.doesNotThrow(() => assert.deepEqual(a1, a2));
627+
assert.deepEqual(a1, a2);
634628

635629
// Having an identical prototype property.
636630
const nbRoot = {
@@ -654,11 +648,11 @@ nameBuilder2.prototype = nbRoot;
654648
const nb1 = new nameBuilder('Ryan', 'Dahl');
655649
let nb2 = new nameBuilder2('Ryan', 'Dahl');
656650

657-
assert.doesNotThrow(() => assert.deepEqual(nb1, nb2));
651+
assert.deepEqual(nb1, nb2);
658652

659653
nameBuilder2.prototype = Object;
660654
nb2 = new nameBuilder2('Ryan', 'Dahl');
661-
assert.doesNotThrow(() => assert.deepEqual(nb1, nb2));
655+
assert.deepEqual(nb1, nb2);
662656

663657
// Primitives and object.
664658
assert.throws(() => assert.deepEqual(null, {}), AssertionError);
@@ -670,21 +664,15 @@ assert.throws(() => assert.deepEqual(true, {}), AssertionError);
670664
assert.throws(() => assert.deepEqual(Symbol(), {}), AssertionError);
671665

672666
// Primitive wrappers and object.
673-
assert.doesNotThrow(() => assert.deepEqual(new String('a'), ['a']),
674-
AssertionError);
675-
assert.doesNotThrow(() => assert.deepEqual(new String('a'), { 0: 'a' }),
676-
AssertionError);
677-
assert.doesNotThrow(() => assert.deepEqual(new Number(1), {}), AssertionError);
678-
assert.doesNotThrow(() => assert.deepEqual(new Boolean(true), {}),
679-
AssertionError);
667+
assert.deepEqual(new String('a'), ['a']);
668+
assert.deepEqual(new String('a'), { 0: 'a' });
669+
assert.deepEqual(new Number(1), {});
670+
assert.deepEqual(new Boolean(true), {});
680671

681672
// Same number of keys but different key names.
682673
assert.throws(() => assert.deepEqual({ a: 1 }, { b: 1 }), AssertionError);
683674

684-
assert.doesNotThrow(
685-
() => assert.deepStrictEqual(new Date(2000, 3, 14), new Date(2000, 3, 14)),
686-
'deepStrictEqual(new Date(2000, 3, 14), new Date(2000, 3, 14))'
687-
);
675+
assert.deepStrictEqual(new Date(2000, 3, 14), new Date(2000, 3, 14));
688676

689677
assert.throws(
690678
() => assert.deepStrictEqual(new Date(), new Date(2000, 3, 14)),
@@ -698,10 +686,7 @@ assert.throws(
698686
'notDeepStrictEqual(new Date(2000, 3, 14), new Date(2000, 3, 14))'
699687
);
700688

701-
assert.doesNotThrow(
702-
() => assert.notDeepStrictEqual(new Date(), new Date(2000, 3, 14)),
703-
'notDeepStrictEqual(new Date(), new Date(2000, 3, 14))'
704-
);
689+
assert.notDeepStrictEqual(new Date(), new Date(2000, 3, 14));
705690

706691
assert.deepStrictEqual(/a/, /a/);
707692
assert.deepStrictEqual(/a/g, /a/g);
@@ -747,7 +732,7 @@ common.expectsError(
747732
{
748733
const re1 = /a/;
749734
re1.lastIndex = 3;
750-
assert.doesNotThrow(() => assert.deepStrictEqual(re1, /a/));
735+
assert.deepStrictEqual(re1, /a/);
751736
}
752737

753738
assert.throws(() => assert.deepStrictEqual(4, '4'),
@@ -786,14 +771,13 @@ common.expectsError(() => assert.deepStrictEqual(['a'], { 0: 'a' }),
786771

787772
/* eslint-enable */
788773

789-
assert.doesNotThrow(
790-
() => assert.deepStrictEqual({ a: 4, b: '1' }, { b: '1', a: 4 }));
774+
assert.deepStrictEqual({ a: 4, b: '1' }, { b: '1', a: 4 });
791775

792776
assert.throws(
793777
() => assert.deepStrictEqual([0, 1, 2, 'a', 'b'], [0, 1, 2, 'b', 'a']),
794778
AssertionError);
795779

796-
assert.doesNotThrow(() => assert.deepStrictEqual(a1, a2));
780+
assert.deepStrictEqual(a1, a2);
797781

798782
// Prototype check.
799783
function Constructor1(first, last) {
@@ -814,7 +798,7 @@ assert.throws(() => assert.deepStrictEqual(obj1, obj2), AssertionError);
814798
Constructor2.prototype = Constructor1.prototype;
815799
obj2 = new Constructor2('Ryan', 'Dahl');
816800

817-
assert.doesNotThrow(() => assert.deepStrictEqual(obj1, obj2));
801+
assert.deepStrictEqual(obj1, obj2);
818802

819803
// primitives
820804
assert.throws(() => assert.deepStrictEqual(4, '4'), AssertionError);
@@ -823,7 +807,7 @@ assert.throws(() => assert.deepStrictEqual(Symbol(), Symbol()),
823807
AssertionError);
824808

825809
const s = Symbol();
826-
assert.doesNotThrow(() => assert.deepStrictEqual(s, s));
810+
assert.deepStrictEqual(s, s);
827811

828812
// Primitives and object.
829813
assert.throws(() => assert.deepStrictEqual(null, {}), AssertionError);

‎test/parallel/test-assert.js‎

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -32,32 +32,22 @@ assert.ok(a.AssertionError.prototype instanceof Error,
3232
'a.AssertionError instanceof Error');
3333

3434
assert.throws(() => a(false), a.AssertionError, 'ok(false)');
35-
36-
assert.doesNotThrow(() => a(true), a.AssertionError, 'ok(true)');
37-
38-
assert.doesNotThrow(() => a('test', 'ok(\'test\')'));
39-
4035
assert.throws(() => a.ok(false), a.AssertionError, 'ok(false)');
4136

42-
assert.doesNotThrow(() => a.ok(true), a.AssertionError, 'ok(true)');
43-
44-
assert.doesNotThrow(() => a.ok('test'), 'ok(\'test\')');
37+
a(true);
38+
a('test', 'ok(\'test\')');
39+
a.ok(true);
40+
a.ok('test');
4541

4642
assert.throws(() => a.equal(true, false),
4743
a.AssertionError, 'equal(true, false)');
4844

49-
assert.doesNotThrow(() => a.equal(null, null), 'equal(null, null)');
50-
51-
assert.doesNotThrow(() => a.equal(undefined, undefined),
52-
'equal(undefined, undefined)');
53-
54-
assert.doesNotThrow(() => a.equal(null, undefined), 'equal(null, undefined)');
55-
56-
assert.doesNotThrow(() => a.equal(true, true), 'equal(true, true)');
57-
58-
assert.doesNotThrow(() => a.equal(2, '2'), 'equal(2, \'2\')');
59-
60-
assert.doesNotThrow(() => a.notEqual(true, false), 'notEqual(true, false)');
45+
a.equal(null, null);
46+
a.equal(undefined, undefined);
47+
a.equal(null, undefined);
48+
a.equal(true, true);
49+
a.equal(2, '2');
50+
a.notEqual(true, false);
6151

6252
assert.throws(() => a.notEqual(true, true),
6353
a.AssertionError, 'notEqual(true, true)');
@@ -71,7 +61,7 @@ assert.throws(() => a.strictEqual(null, undefined),
7161
assert.throws(() => a.notStrictEqual(2, 2),
7262
a.AssertionError, 'notStrictEqual(2, 2)');
7363

74-
assert.doesNotThrow(() => a.notStrictEqual(2, '2'), 'notStrictEqual(2, \'2\')');
64+
a.notStrictEqual(2, '2');
7565

7666
// Testing the throwing.
7767
function thrower(errorConstructor) {
@@ -126,8 +116,8 @@ assert.throws(() => thrower(TypeError));
126116

127117
assert.throws(() => { assert.ifError(new Error('test error')); },
128118
/^Error: test error$/);
129-
assert.doesNotThrow(() => { assert.ifError(null); });
130-
assert.doesNotThrow(() => { assert.ifError(); });
119+
assert.ifError(null);
120+
assert.ifError();
131121

132122
common.expectsError(
133123
() => assert.doesNotThrow(() => thrower(Error), 'user message'),

0 commit comments

Comments
 (0)

Footer

© 2026 GitHub, Inc.
Back | FazBrowse Home | New Git URL