Skip to content

Commit

Permalink
lib: improve the coverage of the validator
Browse files Browse the repository at this point in the history
PR-URL: #42443
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Mohammed Keyvanzadeh <mohammadkeyvanzade94@gmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
mawaregetsuka authored and juanarbol committed Apr 4, 2022
1 parent d71df7a commit 3ee5434
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 6 deletions.
12 changes: 6 additions & 6 deletions lib/internal/validators.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,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 @@ -99,10 +99,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
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'
}));
[
0, 1,
].forEach((val) => validateUint32(val, 'name'));
}

{
Expand Down

0 comments on commit 3ee5434

Please sign in to comment.