Skip to content
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

lib: improve the coverage of the validator #42443

Merged
merged 3 commits into from
Apr 2, 2022
Merged

lib: improve the coverage of the validator #42443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
35814f4
lib: improve the coverage of the validator
mawaregetsuka Mar 23, 2022
82888c0
add some tests
mawaregetsuka Mar 23, 2022
796a748
add test case
mawaregetsuka Mar 25, 2022
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
12 changes: 6 additions & 6 deletions lib/internal/validators.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,10 @@ const validateInteger = hideStackFrames(
const validateInt32 = hideStackFrames(
(value, name, min = -2147483648, max = 2147483647) => {
// The defaults for min and max correspond to the limits of 32-bit integers.
if (typeof value !== 'number') {
throw new ERR_INVALID_ARG_TYPE(name, 'number', value);
}
if (!isInt32(value)) {
if (typeof value !== 'number') {
throw new ERR_INVALID_ARG_TYPE(name, 'number', value);
}
if (!NumberIsInteger(value)) {
throw new ERR_OUT_OF_RANGE(name, 'an integer', value);
}
Expand All @@ -98,10 +98,10 @@ const validateInt32 = hideStackFrames(
);

const validateUint32 = hideStackFrames((value, name, positive) => {
if (typeof value !== 'number') {
throw new ERR_INVALID_ARG_TYPE(name, 'number', value);
}
if (!isUint32(value)) {
if (typeof value !== 'number') {
throw new ERR_INVALID_ARG_TYPE(name, 'number', value);
}
if (!NumberIsInteger(value)) {
throw new ERR_OUT_OF_RANGE(name, 'an integer', value);
}
Expand Down
30 changes: 30 additions & 0 deletions test/parallel/test-validators.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ const {
validateNumber,
validateObject,
validateString,
validateInt32,
validateUint32,
} = require('internal/validators');
const { MAX_SAFE_INTEGER, MIN_SAFE_INTEGER } = Number;
const outOfRangeError = {
Expand Down Expand Up @@ -41,6 +43,34 @@ const invalidArgValueError = {
// validateInteger() works with unsafe integers.
validateInteger(MAX_SAFE_INTEGER + 1, 'foo', 0, MAX_SAFE_INTEGER + 1);
validateInteger(MIN_SAFE_INTEGER - 1, 'foo', MIN_SAFE_INTEGER - 1);

// validateInt32() and validateUint32()
[
Symbol(), 1n, {}, [], false, true, undefined, null, () => {}, '', '1',
].forEach((val) => assert.throws(() => validateInt32(val, 'name'), {
code: 'ERR_INVALID_ARG_TYPE'
}));
[
2147483647 + 1, -2147483648 - 1, NaN,
].forEach((val) => assert.throws(() => validateInt32(val, 'name'), {
code: 'ERR_OUT_OF_RANGE'
}));
[
0, 1, -1,
].forEach((val) => validateInt32(val, 'name'));
[
Symbol(), 1n, {}, [], false, true, undefined, null, () => {}, '', '1',
].forEach((val) => assert.throws(() => validateUint32(val, 'name'), {
code: 'ERR_INVALID_ARG_TYPE'
}));
[
4294967296, -1, NaN,
].forEach((val) => assert.throws(() => validateUint32(val, 'name'), {
code: 'ERR_OUT_OF_RANGE'
}));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
}));
}));
// Ensure it doesn't throw on acceptable values:
validateInt32(0, 'name');
validateUint32(0, 'name');
validateInt32(1, 'name');
validateUint32(1, 'name');
validateInt32(-1, 'name');

[
0, 1,
].forEach((val) => validateUint32(val, 'name'));
}

{
Expand Down