From e9eb02904bd9a2f5a37decff22a247dc842c8b2a Mon Sep 17 00:00:00 2001 From: Mark Arranz Date: Tue, 6 Nov 2018 21:25:30 -0800 Subject: [PATCH 1/5] test: add Node.js TypeError test for undefined buffer argument --- test/parallel/test-dgram-send-bad-arguments.js | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/test/parallel/test-dgram-send-bad-arguments.js b/test/parallel/test-dgram-send-bad-arguments.js index 4eb7dca7a38e5d..faf4dfe014d9b5 100644 --- a/test/parallel/test-dgram-send-bad-arguments.js +++ b/test/parallel/test-dgram-send-bad-arguments.js @@ -20,7 +20,7 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); +const common = require('../common'); const assert = require('assert'); const dgram = require('dgram'); @@ -28,9 +28,17 @@ const buf = Buffer.from('test'); const host = '127.0.0.1'; const sock = dgram.createSocket('udp4'); -assert.throws(() => { - sock.send(); -}, TypeError); // First argument should be a buffer. +// First argument should be a buffer. +assert.throws(() => { sock.send(); }, TypeError); +common.expectsError( + () => { sock.send(); }, + { + code: 'ERR_INVALID_ARG_TYPE', + type: TypeError, + message: 'The "buffer" argument must be one of type ' + + 'Buffer, Uint8Array, or string. Received type undefined' + } +); // send(buf, offset, length, port, host) assert.throws(() => { sock.send(buf, 1, 1, -1, host); }, RangeError); From 97f33f32df9440e52383253fcece0f94539773e5 Mon Sep 17 00:00:00 2001 From: Mark Arranz Date: Tue, 6 Nov 2018 21:39:40 -0800 Subject: [PATCH 2/5] test: add Node.js TypeError test for number type buffer parameter --- test/parallel/test-dgram-send-bad-arguments.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/test/parallel/test-dgram-send-bad-arguments.js b/test/parallel/test-dgram-send-bad-arguments.js index faf4dfe014d9b5..39ed31cb4be3c0 100644 --- a/test/parallel/test-dgram-send-bad-arguments.js +++ b/test/parallel/test-dgram-send-bad-arguments.js @@ -47,6 +47,15 @@ assert.throws(() => { sock.send(buf, 1, 1, 65536, host); }, RangeError); // send(buf, port, host) assert.throws(() => { sock.send(23, 12345, host); }, TypeError); +common.expectsError( + () => { sock.send(23, 12345, host); }, + { + code: 'ERR_INVALID_ARG_TYPE', + type: TypeError, + message: 'The "buffer" argument must be one of type ' + + 'Buffer, Uint8Array, or string. Received type number' + } +); // send([buf1, ..], port, host) assert.throws(() => { sock.send([buf, 23], 12345, host); }, TypeError); From 8d70e8451fd280b3e17ffaebcfad9304f097337b Mon Sep 17 00:00:00 2001 From: Mark Arranz Date: Tue, 6 Nov 2018 21:43:52 -0800 Subject: [PATCH 3/5] test: add Node.js TypeError test for buffer argument as mixed array --- test/parallel/test-dgram-send-bad-arguments.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/test/parallel/test-dgram-send-bad-arguments.js b/test/parallel/test-dgram-send-bad-arguments.js index 39ed31cb4be3c0..a4ac878afa3d4a 100644 --- a/test/parallel/test-dgram-send-bad-arguments.js +++ b/test/parallel/test-dgram-send-bad-arguments.js @@ -59,3 +59,12 @@ common.expectsError( // send([buf1, ..], port, host) assert.throws(() => { sock.send([buf, 23], 12345, host); }, TypeError); +common.expectsError( + () => { sock.send([buf, 23], 12345, host); }, + { + code: 'ERR_INVALID_ARG_TYPE', + type: TypeError, + message: 'The "buffer list arguments" argument must be one of type ' + + 'Buffer or string. Received type object' + } +); From 9775048c62cd9cc9d2849f900f13eb63ef5a3415 Mon Sep 17 00:00:00 2001 From: Mark Arranz Date: Tue, 6 Nov 2018 22:47:06 -0800 Subject: [PATCH 4/5] test: remove unnecessary whitespace --- test/parallel/test-dgram-send-bad-arguments.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/parallel/test-dgram-send-bad-arguments.js b/test/parallel/test-dgram-send-bad-arguments.js index a4ac878afa3d4a..b0562652cdbcb1 100644 --- a/test/parallel/test-dgram-send-bad-arguments.js +++ b/test/parallel/test-dgram-send-bad-arguments.js @@ -31,7 +31,7 @@ const sock = dgram.createSocket('udp4'); // First argument should be a buffer. assert.throws(() => { sock.send(); }, TypeError); common.expectsError( - () => { sock.send(); }, + () => { sock.send(); }, { code: 'ERR_INVALID_ARG_TYPE', type: TypeError, @@ -48,7 +48,7 @@ assert.throws(() => { sock.send(buf, 1, 1, 65536, host); }, RangeError); // send(buf, port, host) assert.throws(() => { sock.send(23, 12345, host); }, TypeError); common.expectsError( - () => { sock.send(23, 12345, host); }, + () => { sock.send(23, 12345, host); }, { code: 'ERR_INVALID_ARG_TYPE', type: TypeError, @@ -60,7 +60,7 @@ common.expectsError( // send([buf1, ..], port, host) assert.throws(() => { sock.send([buf, 23], 12345, host); }, TypeError); common.expectsError( - () => { sock.send([buf, 23], 12345, host); }, + () => { sock.send([buf, 23], 12345, host); }, { code: 'ERR_INVALID_ARG_TYPE', type: TypeError, From 32f59b239b676b3056e3c6d75651fa7048803126 Mon Sep 17 00:00:00 2001 From: Mark Arranz Date: Wed, 7 Nov 2018 17:47:14 -0800 Subject: [PATCH 5/5] test: remove duplicated tests using assert --- test/parallel/test-dgram-send-bad-arguments.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/test/parallel/test-dgram-send-bad-arguments.js b/test/parallel/test-dgram-send-bad-arguments.js index b0562652cdbcb1..20356ba50c477a 100644 --- a/test/parallel/test-dgram-send-bad-arguments.js +++ b/test/parallel/test-dgram-send-bad-arguments.js @@ -29,7 +29,6 @@ const host = '127.0.0.1'; const sock = dgram.createSocket('udp4'); // First argument should be a buffer. -assert.throws(() => { sock.send(); }, TypeError); common.expectsError( () => { sock.send(); }, { @@ -46,7 +45,6 @@ assert.throws(() => { sock.send(buf, 1, 1, 0, host); }, RangeError); assert.throws(() => { sock.send(buf, 1, 1, 65536, host); }, RangeError); // send(buf, port, host) -assert.throws(() => { sock.send(23, 12345, host); }, TypeError); common.expectsError( () => { sock.send(23, 12345, host); }, { @@ -58,7 +56,6 @@ common.expectsError( ); // send([buf1, ..], port, host) -assert.throws(() => { sock.send([buf, 23], 12345, host); }, TypeError); common.expectsError( () => { sock.send([buf, 23], 12345, host); }, {