test: replace assert.throws with expectsError

PR-URL: #17997 Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]>
nodejs · Feb 27, 2018 · 1be5e33 · 1be5e33
1 parent df0d78a
commit 1be5e33
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/test/parallel/test-http-response-statuscode.js b/test/parallel/test-http-response-statuscode.js
@@ -8,14 +8,13 @@ const MAX_REQUESTS = 13;
 let reqNum = 0;
 
 function test(res, header, code) {
-  const errRegExp = common.expectsError({
+  common.expectsError(() => {
+    res.writeHead(header);
+  }, {
     code: 'ERR_HTTP_INVALID_STATUS_CODE',
     type: RangeError,
     message: `Invalid status code: ${code}`
   });
-  assert.throws(() => {
-    res.writeHead(header);
-  }, errRegExp);
 }
 
 const server = http.Server(common.mustCall(function(req, res) {

diff --git a/test/parallel/test-url-format-invalid-input.js b/test/parallel/test-url-format-invalid-input.js
@@ -14,13 +14,14 @@ const throwsObjsAndReportTypes = new Map([
 ]);
 
 for (const [urlObject, type] of throwsObjsAndReportTypes) {
-  const error = common.expectsError({
+  common.expectsError(function() {
+    url.format(urlObject);
+  }, {
     code: 'ERR_INVALID_ARG_TYPE',
     type: TypeError,
     message: 'The "urlObject" argument must be one of type Object or string. ' +
              `Received type ${type}`
   });
-  assert.throws(function() { url.format(urlObject); }, error);
 }
 assert.strictEqual(url.format(''), '');
 assert.strictEqual(url.format({}), '');
diff --git a/test/parallel/test-url-parse-invalid-input.js b/test/parallel/test-url-parse-invalid-input.js
@@ -16,12 +16,13 @@ const url = require('url');
   [() => {}, 'function'],
   [Symbol('foo'), 'symbol']
 ].forEach(([val, type]) => {
-  const error = common.expectsError({
+  common.expectsError(() => {
+    url.parse(val);
+  }, {
     code: 'ERR_INVALID_ARG_TYPE',
     type: TypeError,
     message: `The "url" argument must be of type string. Received type ${type}`
   });
-  assert.throws(() => { url.parse(val); }, error);
 });
 
 assert.throws(() => { url.parse('http://%E0%A4%A@fail'); },

diff --git a/test/parallel/test-util-inherits.js b/test/parallel/test-util-inherits.js
@@ -3,11 +3,6 @@
 const common = require('../common');
 const assert = require('assert');
 const inherits = require('util').inherits;
-const errCheck = common.expectsError({
-  code: 'ERR_INVALID_ARG_TYPE',
-  type: TypeError,
-  message: 'The "superCtor" argument must be of type Function'
-});
 
 // super constructor
 function A() {
@@ -86,16 +81,20 @@ common.expectsError(function() {
   code: 'ERR_INVALID_ARG_TYPE',
   type: TypeError,
   message: 'The "superCtor.prototype" property must be of type Function'
-}
-);
-assert.throws(function() {
+});
+
+common.expectsError(function() {
   inherits(A, null);
-}, errCheck);
+}, {
+  code: 'ERR_INVALID_ARG_TYPE',
+  type: TypeError,
+  message: 'The "superCtor" argument must be of type Function'
+});
+
 common.expectsError(function() {
   inherits(null, A);
 }, {
   code: 'ERR_INVALID_ARG_TYPE',
   type: TypeError,
   message: 'The "ctor" argument must be of type Function'
-}
-);
+});