1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test: refactor common.expectsError

Browse Source 
A combination of try catch and common.expectsError is not necessary
as the latter already does everything on its own.

PR-URL: https://github.com/nodejs/node/pull/17703
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
Ruben Bridgewater 2017-12-15 21:10:35 -02:00
parent d9171fef3f
commit dc2e266647
No known key found for this signature in database
GPG Key ID: F07496B3EB3C1762
1 changed files with 18 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
test/parallel/test-assert.js
View File

@ -476,33 +476,21 @@ common.expectsError(
}
);
{
let threw = false;
try {
assert.doesNotThrow(makeBlock(thrower, Error), 'user message');
} catch (e) {
threw = true;
common.expectsError({
code: 'ERR_ASSERTION',
message: /Got unwanted exception: user message\n\[object Object\]/
})(e);
common.expectsError(
() => assert.doesNotThrow(makeBlock(thrower, Error), 'user message'),
{
code: 'ERR_ASSERTION',
message: /Got unwanted exception: user message\n\[object Object\]/
}
assert.ok(threw);
}
);
{
let threw = false;
try {
assert.doesNotThrow(makeBlock(thrower, Error));
} catch (e) {
threw = true;
common.expectsError({
code: 'ERR_ASSERTION',
message: /Got unwanted exception\.\n\[object Object\]/
})(e);
common.expectsError(
() => assert.doesNotThrow(makeBlock(thrower, Error)),
{
code: 'ERR_ASSERTION',
message: /Got unwanted exception\.\n\[object Object\]/
}
assert.ok(threw);
}
);
// make sure that validating using constructor really works
{
@ -691,21 +679,15 @@ try {
}
const testBlockTypeError = (method, block) => {
let threw = true;
try {
method(block);
threw = false;
} catch (e) {
common.expectsError({
common.expectsError(
() => method(block),
{
code: 'ERR_INVALID_ARG_TYPE',
type: TypeError,
message: 'The "block" argument must be of type Function. Received ' +
`type ${typeName(block)}`
})(e);
}
assert.ok(threw);
`type ${typeName(block)}`
}
);
};
testBlockTypeError(assert.throws, 'string');