Skip to content

test: validate arguments to mustCall(), fix incorrect tests #10692

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

test: validate arguments to mustCall(), fix incorrect tests #10692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6ff3d8
fix misplaced ) in http response statuscode test
nfriedly Jan 8, 2017
cd7ce11
validate 'expected' argument to mustCall()
nfriedly Oct 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion test/common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,10 @@ function runCallChecks(exitCode) {


exports.mustCall = function(fn, expected) {
if (typeof expected !== 'number') expected = 1;
if (expected === undefined)
expected = 1;
else if (typeof expected !== 'number')
throw new TypeError(`Invalid expected value: ${expected}`);

const context = {
expected: expected,
Expand Down
8 changes: 8 additions & 0 deletions test/parallel/test-common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,11 @@ const assert = require('assert');
common.globalCheck = false;
global.gc = 42; // Not a valid global unless --expose_gc is set.
assert.deepStrictEqual(common.leakedGlobals(), ['gc']);

assert.throws(function() {
common.mustCall(function() {}, 'foo');
}, /^TypeError: Invalid expected value: foo$/);

assert.throws(function() {
common.mustCall(function() {}, /foo/);
}, /^TypeError: Invalid expected value: \/foo\/$/);
24 changes: 12 additions & 12 deletions test/parallel/test-http-response-statuscode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,62 +11,62 @@ const server = http.Server(common.mustCall(function(req, res) {
case 0:
assert.throws(common.mustCall(() => {
res.writeHead(-1);
}, /invalid status code/i));
}), /invalid status code/i);
break;
case 1:
assert.throws(common.mustCall(() => {
res.writeHead(Infinity);
}, /invalid status code/i));
}), /invalid status code/i);
break;
case 2:
assert.throws(common.mustCall(() => {
res.writeHead(NaN);
}, /invalid status code/i));
}), /invalid status code/i);
break;
case 3:
assert.throws(common.mustCall(() => {
res.writeHead({});
}, /invalid status code/i));
}), /invalid status code/i);
break;
case 4:
assert.throws(common.mustCall(() => {
res.writeHead(99);
}, /invalid status code/i));
}), /invalid status code/i);
break;
case 5:
assert.throws(common.mustCall(() => {
res.writeHead(1000);
}, /invalid status code/i));
}), /invalid status code/i);
break;
case 6:
assert.throws(common.mustCall(() => {
res.writeHead('1000');
}, /invalid status code/i));
}), /invalid status code/i);
break;
case 7:
assert.throws(common.mustCall(() => {
res.writeHead(null);
}, /invalid status code/i));
}), /invalid status code/i);
break;
case 8:
assert.throws(common.mustCall(() => {
res.writeHead(true);
}, /invalid status code/i));
}), /invalid status code/i);
break;
case 9:
assert.throws(common.mustCall(() => {
res.writeHead([]);
}, /invalid status code/i));
}), /invalid status code/i);
break;
case 10:
assert.throws(common.mustCall(() => {
res.writeHead('this is not valid');
}, /invalid status code/i));
}), /invalid status code/i);
break;
case 11:
assert.throws(common.mustCall(() => {
res.writeHead('404 this is not valid either');
}, /invalid status code/i));
}), /invalid status code/i);
this.close();
break;
default:
Expand Down