From 42968374684f7c4c1abe8e11b5379db8862c2678 Mon Sep 17 00:00:00 2001 From: Andrew Eisenberg Date: Fri, 12 Oct 2018 09:33:37 -0700 Subject: [PATCH] test: replace assert.throws w/ common.expectsError Converts RangeError assertions to use common.expectsError and includes an assertion for the error code. PR-URL: https://github.com/nodejs/node/pull/23454 Reviewed-By: Gireesh Punathil Reviewed-By: Colin Ihrig Reviewed-By: Anna Henningsen Reviewed-By: James M Snell Reviewed-By: Trivikram Kamat Reviewed-By: Sakthipriyan Vairamani --- test/parallel/test-buffer-alloc.js | 76 +++++++++++++----------------- 1 file changed, 34 insertions(+), 42 deletions(-) diff --git a/test/parallel/test-buffer-alloc.js b/test/parallel/test-buffer-alloc.js index 5088e3c06ff471..61bb3a8c57767b 100644 --- a/test/parallel/test-buffer-alloc.js +++ b/test/parallel/test-buffer-alloc.js @@ -74,41 +74,22 @@ new Buffer('', 'latin1'); new Buffer('', 'binary'); Buffer(0); +const outOfBoundsError = { + code: 'ERR_BUFFER_OUT_OF_BOUNDS', + type: RangeError +}; + // try to write a 0-length string beyond the end of b -common.expectsError( - () => b.write('', 2048), - { - code: 'ERR_BUFFER_OUT_OF_BOUNDS', - type: RangeError - } -); +common.expectsError(() => b.write('', 2048), outOfBoundsError); // throw when writing to negative offset -common.expectsError( - () => b.write('a', -1), - { - code: 'ERR_BUFFER_OUT_OF_BOUNDS', - type: RangeError - } -); +common.expectsError(() => b.write('a', -1), outOfBoundsError); // throw when writing past bounds from the pool -common.expectsError( - () => b.write('a', 2048), - { - code: 'ERR_BUFFER_OUT_OF_BOUNDS', - type: RangeError - } -); +common.expectsError(() => b.write('a', 2048), outOfBoundsError); // throw when writing to negative offset -common.expectsError( - () => b.write('a', -1), - { - code: 'ERR_BUFFER_OUT_OF_BOUNDS', - type: RangeError - } -); +common.expectsError(() => b.write('a', -1), outOfBoundsError); // try to copy 0 bytes worth of data into an empty buffer b.copy(Buffer.alloc(0), 0, 0, 0); @@ -804,20 +785,34 @@ assert.strictEqual(Buffer.from('13.37').length, 5); Buffer.from(Buffer.allocUnsafe(0), 0, 0); // issue GH-5587 -assert.throws(() => Buffer.alloc(8).writeFloatLE(0, 5), RangeError); -assert.throws(() => Buffer.alloc(16).writeDoubleLE(0, 9), RangeError); +common.expectsError( + () => Buffer.alloc(8).writeFloatLE(0, 5), + outOfBoundsError +); +common.expectsError( + () => Buffer.alloc(16).writeDoubleLE(0, 9), + outOfBoundsError +); // attempt to overflow buffers, similar to previous bug in array buffers -assert.throws(() => Buffer.allocUnsafe(8).writeFloatLE(0.0, 0xffffffff), - RangeError); -assert.throws(() => Buffer.allocUnsafe(8).writeFloatLE(0.0, 0xffffffff), - RangeError); - +common.expectsError( + () => Buffer.allocUnsafe(8).writeFloatLE(0.0, 0xffffffff), + outOfBoundsError +); +common.expectsError( + () => Buffer.allocUnsafe(8).writeFloatLE(0.0, 0xffffffff), + outOfBoundsError +); // ensure negative values can't get past offset -assert.throws(() => Buffer.allocUnsafe(8).writeFloatLE(0.0, -1), RangeError); -assert.throws(() => Buffer.allocUnsafe(8).writeFloatLE(0.0, -1), RangeError); - +common.expectsError( + () => Buffer.allocUnsafe(8).writeFloatLE(0.0, -1), + outOfBoundsError +); +common.expectsError( + () => Buffer.allocUnsafe(8).writeFloatLE(0.0, -1), + outOfBoundsError +); // test for common write(U)IntLE/BE { @@ -1010,10 +1005,7 @@ common.expectsError(() => { const a = Buffer.alloc(1); const b = Buffer.alloc(1); a.copy(b, 0, 0x100000000, 0x100000001); -}, { - code: 'ERR_OUT_OF_RANGE', - type: RangeError -}); +}, outOfBoundsError); // Unpooled buffer (replaces SlowBuffer) {