errors,test: migrating error to internal/errors

PR-URL: #11505 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net>
nodejs · May 6, 2017 · 1c834e7 · 1c834e7
1 parent d74a545
commit 1c834e7
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 32 deletions.
diff --git a/lib/assert.js b/lib/assert.js
@@ -513,7 +513,9 @@ function _throws(shouldThrow, block, expected, message) {
   var actual;
 
   if (typeof block !== 'function') {
-    throw new TypeError('"block" argument must be a function');
+    const errors = lazyErrors();
+    throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'block', 'function',
+                               typeof block);
   }
 
   if (typeof expected === 'string') {

diff --git a/test/parallel/test-assert.js b/test/parallel/test-assert.js
@@ -655,40 +655,46 @@ try {
                      'Message incorrectly marked as generated');
 }
 
-// Verify that throws() and doesNotThrow() throw on non-function block
-function testBlockTypeError(method, block) {
-  let threw = true;
-
-  try {
-    method(block);
-    threw = false;
-  } catch (e) {
-    assert.strictEqual(e.toString(),
-                       'TypeError: "block" argument must be a function');
-  }
+{
+  // Verify that throws() and doesNotThrow() throw on non-function block
+  const validationFunction = common.expectsError({
+    code: 'ERR_INVALID_ARG_TYPE',
+    type: TypeError
+  });
+
+  const testBlockTypeError = (method, block) => {
+    let threw = true;
+
+    try {
+      method(block);
+      threw = false;
+    } catch (e) {
+      validationFunction(e);
+    }
+
+    assert.ok(threw);
+  };
 
-  assert.ok(threw);
+  testBlockTypeError(assert.throws, 'string');
+  testBlockTypeError(assert.doesNotThrow, 'string');
+  testBlockTypeError(assert.throws, 1);
+  testBlockTypeError(assert.doesNotThrow, 1);
+  testBlockTypeError(assert.throws, true);
+  testBlockTypeError(assert.doesNotThrow, true);
+  testBlockTypeError(assert.throws, false);
+  testBlockTypeError(assert.doesNotThrow, false);
+  testBlockTypeError(assert.throws, []);
+  testBlockTypeError(assert.doesNotThrow, []);
+  testBlockTypeError(assert.throws, {});
+  testBlockTypeError(assert.doesNotThrow, {});
+  testBlockTypeError(assert.throws, /foo/);
+  testBlockTypeError(assert.doesNotThrow, /foo/);
+  testBlockTypeError(assert.throws, null);
+  testBlockTypeError(assert.doesNotThrow, null);
+  testBlockTypeError(assert.throws, undefined);
+  testBlockTypeError(assert.doesNotThrow, undefined);
 }
 
-testBlockTypeError(assert.throws, 'string');
-testBlockTypeError(assert.doesNotThrow, 'string');
-testBlockTypeError(assert.throws, 1);
-testBlockTypeError(assert.doesNotThrow, 1);
-testBlockTypeError(assert.throws, true);
-testBlockTypeError(assert.doesNotThrow, true);
-testBlockTypeError(assert.throws, false);
-testBlockTypeError(assert.doesNotThrow, false);
-testBlockTypeError(assert.throws, []);
-testBlockTypeError(assert.doesNotThrow, []);
-testBlockTypeError(assert.throws, {});
-testBlockTypeError(assert.doesNotThrow, {});
-testBlockTypeError(assert.throws, /foo/);
-testBlockTypeError(assert.doesNotThrow, /foo/);
-testBlockTypeError(assert.throws, null);
-testBlockTypeError(assert.doesNotThrow, null);
-testBlockTypeError(assert.throws, undefined);
-testBlockTypeError(assert.doesNotThrow, undefined);
-
 // https://github.com/nodejs/node/issues/3275
 // eslint-disable-next-line no-throw-literal
 assert.throws(() => { throw 'error'; }, (err) => err === 'error');