lib: improve the coverage of the validator

PR-URL: #42443 Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Mohammed Keyvanzadeh <[email protected]> Reviewed-By: Antoine du Hamel <[email protected]> Reviewed-By: James M Snell <[email protected]>
nodejs · Apr 6, 2022 · 3bac969 · 3bac969
1 parent f41a478
commit 3bac969
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 6 deletions.
diff --git a/lib/internal/validators.js b/lib/internal/validators.js
@@ -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);
       }
@@ -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);
     }

diff --git a/test/parallel/test-validators.js b/test/parallel/test-validators.js
@@ -10,6 +10,8 @@ const {
   validateNumber,
   validateObject,
   validateString,
+  validateInt32,
+  validateUint32,
 } = require('internal/validators');
 const { MAX_SAFE_INTEGER, MIN_SAFE_INTEGER } = Number;
 const outOfRangeError = {
@@ -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'));
 }
 
 {