From 054216c99bd59755376f977d53969a74848e11c9 Mon Sep 17 00:00:00 2001 From: Nancy Truong Date: Fri, 12 Oct 2018 10:23:36 -0700 Subject: [PATCH 1/2] test: check codes of thrown errors --- test/parallel/test-buffer-alloc.js | 12 ++++++++++-- test/parallel/test-buffer-arraybuffer.js | 7 ++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/test/parallel/test-buffer-alloc.js b/test/parallel/test-buffer-alloc.js index ca790c933d2242..1abf3d4866568a 100644 --- a/test/parallel/test-buffer-alloc.js +++ b/test/parallel/test-buffer-alloc.js @@ -971,8 +971,16 @@ const regErrorMsg = new RegExp('The first argument must be one of type string, Buffer, ' + 'ArrayBuffer, Array, or Array-like Object\\.'); -assert.throws(() => Buffer.from(), regErrorMsg); -assert.throws(() => Buffer.from(null), regErrorMsg); +assert.throws(() => Buffer.from(), { + name: 'TypeError [ERR_INVALID_ARG_TYPE]', + message: 'The first argument must be one of type string, Buffer, ' + + 'ArrayBuffer, Array, or Array-like Object. Received type undefined' +}); +assert.throws(() => Buffer.from(null), { + name: 'TypeError [ERR_INVALID_ARG_TYPE]', + message: 'The first argument must be one of type string, Buffer, ' + + 'ArrayBuffer, Array, or Array-like Object. Received type object' +}); // Test prototype getters don't throw assert.strictEqual(Buffer.prototype.parent, undefined); diff --git a/test/parallel/test-buffer-arraybuffer.js b/test/parallel/test-buffer-arraybuffer.js index 8d26f983f2b4dd..78fe86ce93a9c5 100644 --- a/test/parallel/test-buffer-arraybuffer.js +++ b/test/parallel/test-buffer-arraybuffer.js @@ -40,7 +40,12 @@ assert.throws(function() { Object.setPrototypeOf(AB, ArrayBuffer); Object.setPrototypeOf(AB.prototype, ArrayBuffer.prototype); Buffer.from(new AB()); -}, TypeError); +}, { + code: 'ERR_INVALID_ARG_TYPE', + name: 'TypeError [ERR_INVALID_ARG_TYPE]', + message: 'The first argument must be one of type string, Buffer,' + + ' ArrayBuffer, Array, or Array-like Object. Received type object' +}); // Test the byteOffset and length arguments { From f1e416038e692b467f99cb1b7228427069809dcf Mon Sep 17 00:00:00 2001 From: Nancy Truong Date: Fri, 12 Oct 2018 10:28:42 -0700 Subject: [PATCH 2/2] test: fixing linting for modified tests --- test/parallel/test-buffer-alloc.js | 8 ++------ test/parallel/test-buffer-arraybuffer.js | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/test/parallel/test-buffer-alloc.js b/test/parallel/test-buffer-alloc.js index 1abf3d4866568a..313a13cb1e41ad 100644 --- a/test/parallel/test-buffer-alloc.js +++ b/test/parallel/test-buffer-alloc.js @@ -967,18 +967,14 @@ common.expectsError( message: 'argument must be a buffer' }); -const regErrorMsg = - new RegExp('The first argument must be one of type string, Buffer, ' + - 'ArrayBuffer, Array, or Array-like Object\\.'); - assert.throws(() => Buffer.from(), { name: 'TypeError [ERR_INVALID_ARG_TYPE]', - message: 'The first argument must be one of type string, Buffer, ' + + message: 'The first argument must be one of type string, Buffer, ' + 'ArrayBuffer, Array, or Array-like Object. Received type undefined' }); assert.throws(() => Buffer.from(null), { name: 'TypeError [ERR_INVALID_ARG_TYPE]', - message: 'The first argument must be one of type string, Buffer, ' + + message: 'The first argument must be one of type string, Buffer, ' + 'ArrayBuffer, Array, or Array-like Object. Received type object' }); diff --git a/test/parallel/test-buffer-arraybuffer.js b/test/parallel/test-buffer-arraybuffer.js index 78fe86ce93a9c5..2a1ce141079279 100644 --- a/test/parallel/test-buffer-arraybuffer.js +++ b/test/parallel/test-buffer-arraybuffer.js @@ -43,7 +43,7 @@ assert.throws(function() { }, { code: 'ERR_INVALID_ARG_TYPE', name: 'TypeError [ERR_INVALID_ARG_TYPE]', - message: 'The first argument must be one of type string, Buffer,' + + message: 'The first argument must be one of type string, Buffer,' + ' ArrayBuffer, Array, or Array-like Object. Received type object' });