From afe56a2216dff8e7cdbaa8e7b2c88935414f741b Mon Sep 17 00:00:00 2001 From: James M Snell Date: Tue, 23 Aug 2016 14:16:45 -0700 Subject: [PATCH 01/12] test: separate negative buffer length tests --- test/parallel/test-buffer-alloc.js | 13 ---------- .../test-buffer-no-negative-allocation.js | 24 +++++++++++++++++++ test/parallel/test-buffer.js | 8 ------- 3 files changed, 24 insertions(+), 21 deletions(-) create mode 100644 test/parallel/test-buffer-no-negative-allocation.js diff --git a/test/parallel/test-buffer-alloc.js b/test/parallel/test-buffer-alloc.js index 57bc8715974032..4716ae4e9e530f 100644 --- a/test/parallel/test-buffer-alloc.js +++ b/test/parallel/test-buffer-alloc.js @@ -1485,19 +1485,6 @@ assert.doesNotThrow(() => { Buffer.from(new ArrayBuffer()); }); -assert.throws(() => Buffer.alloc(-Buffer.poolSize), - '"size" argument must not be negative'); -assert.throws(() => Buffer.alloc(-100), - '"size" argument must not be negative'); -assert.throws(() => Buffer.allocUnsafe(-Buffer.poolSize), - '"size" argument must not be negative'); -assert.throws(() => Buffer.allocUnsafe(-100), - '"size" argument must not be negative'); -assert.throws(() => Buffer.allocUnsafeSlow(-Buffer.poolSize), - '"size" argument must not be negative'); -assert.throws(() => Buffer.allocUnsafeSlow(-100), - '"size" argument must not be negative'); - assert.throws(() => Buffer.alloc({ valueOf: () => 1 }), /"size" argument must be a number/); assert.throws(() => Buffer.alloc({ valueOf: () => -1 }), diff --git a/test/parallel/test-buffer-no-negative-allocation.js b/test/parallel/test-buffer-no-negative-allocation.js new file mode 100644 index 00000000000000..588a7d49f7ea8a --- /dev/null +++ b/test/parallel/test-buffer-no-negative-allocation.js @@ -0,0 +1,24 @@ +'use strict'; + +require('../common'); +const assert = require('assert'); + +const msg = /"size" argument must not be negative/; + +// Test that negative Buffer length inputs throw errors. + +assert.throws(() => Buffer(-Buffer.poolSize), msg); +assert.throws(() => Buffer(-100), msg); +assert.throws(() => Buffer(-1), msg); + +assert.throws(() => Buffer.alloc(-Buffer.poolSize), msg); +assert.throws(() => Buffer.alloc(-100), msg); +assert.throws(() => Buffer.alloc(-1), msg); + +assert.throws(() => Buffer.allocUnsafe(-Buffer.poolSize), msg); +assert.throws(() => Buffer.allocUnsafe(-100), msg); +assert.throws(() => Buffer.allocUnsafe(-1), msg); + +assert.throws(() => Buffer.allocUnsafeSlow(-Buffer.poolSize), msg); +assert.throws(() => Buffer.allocUnsafeSlow(-100), msg); +assert.throws(() => Buffer.allocUnsafeSlow(-1), msg); diff --git a/test/parallel/test-buffer.js b/test/parallel/test-buffer.js index 3fe1edbde0c585..5b10e5e6df1ccb 100644 --- a/test/parallel/test-buffer.js +++ b/test/parallel/test-buffer.js @@ -1521,11 +1521,3 @@ assert.equal(SlowBuffer.prototype.offset, undefined); } } } - -// Test that large negative Buffer length inputs throw errors. -assert.throws(() => Buffer(-Buffer.poolSize), - '"size" argument must not be negative'); -assert.throws(() => Buffer(-100), - '"size" argument must not be negative'); -assert.throws(() => Buffer(-1), - '"size" argument must not be negative'); From 7e9e884a03d9c5f738a76e3c4dd374ba7b248906 Mon Sep 17 00:00:00 2001 From: James M Snell Date: Tue, 23 Aug 2016 14:33:10 -0700 Subject: [PATCH 02/12] test: separate failed buffer allocation uint32array check --- .../test-buffer-failed-alloc-typed-arrays.js | 33 +++++++++++++++++++ test/parallel/test-buffer.js | 23 ------------- 2 files changed, 33 insertions(+), 23 deletions(-) create mode 100644 test/parallel/test-buffer-failed-alloc-typed-arrays.js diff --git a/test/parallel/test-buffer-failed-alloc-typed-arrays.js b/test/parallel/test-buffer-failed-alloc-typed-arrays.js new file mode 100644 index 00000000000000..fd9c2744e55f69 --- /dev/null +++ b/test/parallel/test-buffer-failed-alloc-typed-arrays.js @@ -0,0 +1,33 @@ +'use strict'; + +require('../common'); +const assert = require('assert'); +const SlowBuffer = require('buffer').SlowBuffer; + +// Test failed or zero-sized Buffer allocations not affecting typed arrays. +// This test exists because of a regression that occurred. Because Buffer +// instances are allocated with the same underlying allocator as TypedArrays, +// but Buffer's can optional be non-zero filled, there was a regression that +// occurred when a Buffer allocated failed, the internal flag specifying +// whether or not to zero-fill was not being reset, causing TypedArrays to +// allocate incorrectly. +const zeroArray = new Uint32Array(10).fill(0); +const sizes = [1e10, 0, 0.1, -1, 'a', undefined, null, NaN]; +const allocators = [ + Buffer, + SlowBuffer, + Buffer.alloc, + Buffer.allocUnsafe, + Buffer.allocUnsafeSlow +]; +for (const allocator of allocators) { + for (const size of sizes) { + try { + // These allocations are known to fail. If they do, + // Uint32Array should still produce a zeroed out result. + allocator(size); + } catch (e) { + assert.deepStrictEqual(new Uint32Array(10), zeroArray); + } + } +} diff --git a/test/parallel/test-buffer.js b/test/parallel/test-buffer.js index 5b10e5e6df1ccb..0535a089b0de2c 100644 --- a/test/parallel/test-buffer.js +++ b/test/parallel/test-buffer.js @@ -1498,26 +1498,3 @@ assert.equal(SlowBuffer.prototype.offset, undefined); // Check pool offset after that by trying to write string into the pool. assert.doesNotThrow(() => Buffer.from('abc')); } - - -// Test failed or zero-sized Buffer allocations not affecting typed arrays -{ - const zeroArray = new Uint32Array(10).fill(0); - const sizes = [1e10, 0, 0.1, -1, 'a', undefined, null, NaN]; - const allocators = [ - Buffer, - SlowBuffer, - Buffer.alloc, - Buffer.allocUnsafe, - Buffer.allocUnsafeSlow - ]; - for (const allocator of allocators) { - for (const size of sizes) { - try { - allocator(size); - } catch (e) { - assert.deepStrictEqual(new Uint32Array(10), zeroArray); - } - } - } -} From f58f6ecd1f28d54889184f4d9aa3bdd7872f91f7 Mon Sep 17 00:00:00 2001 From: James M Snell Date: Tue, 23 Aug 2016 14:42:41 -0700 Subject: [PATCH 03/12] test: separate out buffer regression 649 test --- test/parallel/test-buffer-alloc.js | 3 --- test/parallel/test-buffer-regression-649.js | 13 +++++++++++++ test/parallel/test-buffer.js | 3 --- 3 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 test/parallel/test-buffer-regression-649.js diff --git a/test/parallel/test-buffer-alloc.js b/test/parallel/test-buffer-alloc.js index 4716ae4e9e530f..4be53ff3847ccb 100644 --- a/test/parallel/test-buffer-alloc.js +++ b/test/parallel/test-buffer-alloc.js @@ -1437,9 +1437,6 @@ assert.throws(function() { b.equals('abc'); }); -// Regression test for https://github.com/nodejs/node/issues/649. -assert.throws(() => { Buffer.allocUnsafe(1422561062959).toString('utf8');}); - var ps = Buffer.poolSize; Buffer.poolSize = 0; assert.equal(Buffer.allocUnsafe(1).parent, undefined); diff --git a/test/parallel/test-buffer-regression-649.js b/test/parallel/test-buffer-regression-649.js new file mode 100644 index 00000000000000..b11e4a50e5d447 --- /dev/null +++ b/test/parallel/test-buffer-regression-649.js @@ -0,0 +1,13 @@ +'use strict'; + +require('../common'); +const assert = require('assert'); +const SlowBuffer = require('buffer').SlowBuffer; + +// Regression test for https://github.com/nodejs/node/issues/649. +const len = 1422561062959; +assert.throws(() => Buffer(len).toString('utf8')); +assert.throws(() => SlowBuffer(len).toString('utf8')); +assert.throws(() => Buffer.alloc(len).toString('utf8')); +assert.throws(() => Buffer.allocUnsafe(len).toString('utf8')); +assert.throws(() => Buffer.allocUnsafeSlow(len).toString('utf8')); diff --git a/test/parallel/test-buffer.js b/test/parallel/test-buffer.js index 0535a089b0de2c..4b5a2738989f5a 100644 --- a/test/parallel/test-buffer.js +++ b/test/parallel/test-buffer.js @@ -1457,9 +1457,6 @@ assert.throws(function() { b.equals('abc'); }); -// Regression test for https://github.com/nodejs/node/issues/649. -assert.throws(function() { Buffer(1422561062959).toString('utf8'); }); - var ps = Buffer.poolSize; Buffer.poolSize = 0; assert.equal(Buffer(1).parent, undefined); From 435b7c72a2cae644bdc3541cc0bba2b7a4c13f59 Mon Sep 17 00:00:00 2001 From: James M Snell Date: Tue, 23 Aug 2016 15:27:08 -0700 Subject: [PATCH 04/12] test: separate buffer compare tests --- test/parallel/test-buffer-alloc.js | 38 ---------------------------- test/parallel/test-buffer-compare.js | 30 ++++++++++++++++++++++ test/parallel/test-buffer.js | 38 ---------------------------- 3 files changed, 30 insertions(+), 76 deletions(-) create mode 100644 test/parallel/test-buffer-compare.js diff --git a/test/parallel/test-buffer-alloc.js b/test/parallel/test-buffer-alloc.js index 4be53ff3847ccb..28657c586cdd95 100644 --- a/test/parallel/test-buffer-alloc.js +++ b/test/parallel/test-buffer-alloc.js @@ -1381,44 +1381,6 @@ if (common.hasCrypto) { common.skip('missing crypto'); } -// Test Compare -{ - const b = Buffer.alloc(1, 'a'); - const c = Buffer.alloc(1, 'c'); - const d = Buffer.alloc(2, 'aa'); - - assert.equal(b.compare(c), -1); - assert.equal(c.compare(d), 1); - assert.equal(d.compare(b), 1); - assert.equal(b.compare(d), -1); - assert.equal(b.compare(b), 0); - - assert.equal(Buffer.compare(b, c), -1); - assert.equal(Buffer.compare(c, d), 1); - assert.equal(Buffer.compare(d, b), 1); - assert.equal(Buffer.compare(b, d), -1); - assert.equal(Buffer.compare(c, c), 0); - - assert.equal(Buffer.compare(Buffer.alloc(0), Buffer.alloc(0)), 0); - assert.equal(Buffer.compare(Buffer.alloc(0), Buffer.alloc(1)), -1); - assert.equal(Buffer.compare(Buffer.alloc(1), Buffer.alloc(0)), 1); -} - -assert.throws(function() { - var b = Buffer.allocUnsafe(1); - Buffer.compare(b, 'abc'); -}); - -assert.throws(function() { - var b = Buffer.allocUnsafe(1); - Buffer.compare('abc', b); -}); - -assert.throws(function() { - var b = Buffer.allocUnsafe(1); - b.compare('abc'); -}); - // Test Equals { const b = Buffer.alloc(5, 'abcdf'); diff --git a/test/parallel/test-buffer-compare.js b/test/parallel/test-buffer-compare.js new file mode 100644 index 00000000000000..c0db39a6e3c8bc --- /dev/null +++ b/test/parallel/test-buffer-compare.js @@ -0,0 +1,30 @@ +'use strict'; + +require('../common'); +const assert = require('assert'); + +const b = Buffer.alloc(1, 'a'); +const c = Buffer.alloc(1, 'c'); +const d = Buffer.alloc(2, 'aa'); + +assert.strictEqual(b.compare(c), -1); +assert.strictEqual(c.compare(d), 1); +assert.strictEqual(d.compare(b), 1); +assert.strictEqual(b.compare(d), -1); +assert.strictEqual(b.compare(b), 0); + +assert.strictEqual(Buffer.compare(b, c), -1); +assert.strictEqual(Buffer.compare(c, d), 1); +assert.strictEqual(Buffer.compare(d, b), 1); +assert.strictEqual(Buffer.compare(b, d), -1); +assert.strictEqual(Buffer.compare(c, c), 0); + +assert.strictEqual(Buffer.compare(Buffer.alloc(0), Buffer.alloc(0)), 0); +assert.strictEqual(Buffer.compare(Buffer.alloc(0), Buffer.alloc(1)), -1); +assert.strictEqual(Buffer.compare(Buffer.alloc(1), Buffer.alloc(0)), 1); + +assert.throws(() => Buffer.compare(Buffer.alloc(1), 'abc')); + +assert.throws(() => Buffer.compare('abc', Buffer.alloc(1))); + +assert.throws(() => Buffer.alloc(1).compare('abc')); diff --git a/test/parallel/test-buffer.js b/test/parallel/test-buffer.js index 4b5a2738989f5a..04c0c7ee04bf59 100644 --- a/test/parallel/test-buffer.js +++ b/test/parallel/test-buffer.js @@ -1401,44 +1401,6 @@ if (common.hasCrypto) { common.skip('missing crypto'); } -// Test Compare -{ - const b = new Buffer(1).fill('a'); - const c = new Buffer(1).fill('c'); - const d = new Buffer(2).fill('aa'); - - assert.equal(b.compare(c), -1); - assert.equal(c.compare(d), 1); - assert.equal(d.compare(b), 1); - assert.equal(b.compare(d), -1); - assert.equal(b.compare(b), 0); - - assert.equal(Buffer.compare(b, c), -1); - assert.equal(Buffer.compare(c, d), 1); - assert.equal(Buffer.compare(d, b), 1); - assert.equal(Buffer.compare(b, d), -1); - assert.equal(Buffer.compare(c, c), 0); - - assert.equal(Buffer.compare(Buffer(0), Buffer(0)), 0); - assert.equal(Buffer.compare(Buffer(0), Buffer(1)), -1); - assert.equal(Buffer.compare(Buffer(1), Buffer(0)), 1); -} - -assert.throws(function() { - var b = Buffer(1); - Buffer.compare(b, 'abc'); -}); - -assert.throws(function() { - var b = Buffer(1); - Buffer.compare('abc', b); -}); - -assert.throws(function() { - var b = Buffer(1); - b.compare('abc'); -}); - // Test Equals { const b = new Buffer(5).fill('abcdf'); From c82a8be2c81ee7fd71b55dc58354af3189fddaae Mon Sep 17 00:00:00 2001 From: James M Snell Date: Tue, 23 Aug 2016 15:34:54 -0700 Subject: [PATCH 05/12] test: separate buffer equal tests --- test/parallel/test-buffer-alloc.js | 18 ------------------ test/parallel/test-buffer-equals.js | 16 ++++++++++++++++ test/parallel/test-buffer.js | 18 ------------------ 3 files changed, 16 insertions(+), 36 deletions(-) create mode 100644 test/parallel/test-buffer-equals.js diff --git a/test/parallel/test-buffer-alloc.js b/test/parallel/test-buffer-alloc.js index 28657c586cdd95..dc97e68c1278ee 100644 --- a/test/parallel/test-buffer-alloc.js +++ b/test/parallel/test-buffer-alloc.js @@ -1381,24 +1381,6 @@ if (common.hasCrypto) { common.skip('missing crypto'); } -// Test Equals -{ - const b = Buffer.alloc(5, 'abcdf'); - const c = Buffer.alloc(5, 'abcdf'); - const d = Buffer.alloc(5, 'abcde'); - const e = Buffer.alloc(6, 'abcdef'); - - assert.ok(b.equals(c)); - assert.ok(!c.equals(d)); - assert.ok(!d.equals(e)); - assert.ok(d.equals(d)); -} - -assert.throws(function() { - var b = Buffer.allocUnsafe(1); - b.equals('abc'); -}); - var ps = Buffer.poolSize; Buffer.poolSize = 0; assert.equal(Buffer.allocUnsafe(1).parent, undefined); diff --git a/test/parallel/test-buffer-equals.js b/test/parallel/test-buffer-equals.js new file mode 100644 index 00000000000000..2b460c5c6aea1b --- /dev/null +++ b/test/parallel/test-buffer-equals.js @@ -0,0 +1,16 @@ +'use strict'; + +require('../common'); +const assert = require('assert'); + +const b = Buffer.from('abcdf'); +const c = Buffer.from('abcdf'); +const d = Buffer.from('abcde'); +const e = Buffer.from('abcdef'); + +assert.ok(b.equals(c)); +assert.ok(!c.equals(d)); +assert.ok(!d.equals(e)); +assert.ok(d.equals(d)); + +assert.throws(() => Buffer.alloc(1).equals('abc')); diff --git a/test/parallel/test-buffer.js b/test/parallel/test-buffer.js index 04c0c7ee04bf59..91caac14d46e2b 100644 --- a/test/parallel/test-buffer.js +++ b/test/parallel/test-buffer.js @@ -1401,24 +1401,6 @@ if (common.hasCrypto) { common.skip('missing crypto'); } -// Test Equals -{ - const b = new Buffer(5).fill('abcdf'); - const c = new Buffer(5).fill('abcdf'); - const d = new Buffer(5).fill('abcde'); - const e = new Buffer(6).fill('abcdef'); - - assert.ok(b.equals(c)); - assert.ok(!c.equals(d)); - assert.ok(!d.equals(e)); - assert.ok(d.equals(d)); -} - -assert.throws(function() { - var b = Buffer(1); - b.equals('abc'); -}); - var ps = Buffer.poolSize; Buffer.poolSize = 0; assert.equal(Buffer(1).parent, undefined); From 1930c73df9c3f430ccaec4d700a51c71ff22dbd0 Mon Sep 17 00:00:00 2001 From: James M Snell Date: Tue, 23 Aug 2016 15:40:02 -0700 Subject: [PATCH 06/12] test: separate buffer toString range tests --- test/parallel/test-buffer-alloc.js | 80 -------------------- test/parallel/test-buffer-tostring-range.js | 84 +++++++++++++++++++++ test/parallel/test-buffer.js | 80 -------------------- 3 files changed, 84 insertions(+), 160 deletions(-) create mode 100644 test/parallel/test-buffer-tostring-range.js diff --git a/test/parallel/test-buffer-alloc.js b/test/parallel/test-buffer-alloc.js index dc97e68c1278ee..3334d51b8a474c 100644 --- a/test/parallel/test-buffer-alloc.js +++ b/test/parallel/test-buffer-alloc.js @@ -269,86 +269,6 @@ b.copy(Buffer.alloc(1), 1, 1, 1); // try to copy 0 bytes from past the end of the source buffer b.copy(Buffer.alloc(1), 0, 2048, 2048); -const rangeBuffer = Buffer.from('abc'); - -// if start >= buffer's length, empty string will be returned -assert.equal(rangeBuffer.toString('ascii', 3), ''); -assert.equal(rangeBuffer.toString('ascii', +Infinity), ''); -assert.equal(rangeBuffer.toString('ascii', 3.14, 3), ''); -assert.equal(rangeBuffer.toString('ascii', 'Infinity', 3), ''); - -// if end <= 0, empty string will be returned -assert.equal(rangeBuffer.toString('ascii', 1, 0), ''); -assert.equal(rangeBuffer.toString('ascii', 1, -1.2), ''); -assert.equal(rangeBuffer.toString('ascii', 1, -100), ''); -assert.equal(rangeBuffer.toString('ascii', 1, -Infinity), ''); - -// if start < 0, start will be taken as zero -assert.equal(rangeBuffer.toString('ascii', -1, 3), 'abc'); -assert.equal(rangeBuffer.toString('ascii', -1.99, 3), 'abc'); -assert.equal(rangeBuffer.toString('ascii', -Infinity, 3), 'abc'); -assert.equal(rangeBuffer.toString('ascii', '-1', 3), 'abc'); -assert.equal(rangeBuffer.toString('ascii', '-1.99', 3), 'abc'); -assert.equal(rangeBuffer.toString('ascii', '-Infinity', 3), 'abc'); - -// if start is an invalid integer, start will be taken as zero -assert.equal(rangeBuffer.toString('ascii', 'node.js', 3), 'abc'); -assert.equal(rangeBuffer.toString('ascii', {}, 3), 'abc'); -assert.equal(rangeBuffer.toString('ascii', [], 3), 'abc'); -assert.equal(rangeBuffer.toString('ascii', NaN, 3), 'abc'); -assert.equal(rangeBuffer.toString('ascii', null, 3), 'abc'); -assert.equal(rangeBuffer.toString('ascii', undefined, 3), 'abc'); -assert.equal(rangeBuffer.toString('ascii', false, 3), 'abc'); -assert.equal(rangeBuffer.toString('ascii', '', 3), 'abc'); - -// but, if start is an integer when coerced, then it will be coerced and used. -assert.equal(rangeBuffer.toString('ascii', '-1', 3), 'abc'); -assert.equal(rangeBuffer.toString('ascii', '1', 3), 'bc'); -assert.equal(rangeBuffer.toString('ascii', '-Infinity', 3), 'abc'); -assert.equal(rangeBuffer.toString('ascii', '3', 3), ''); -assert.equal(rangeBuffer.toString('ascii', Number(3), 3), ''); -assert.equal(rangeBuffer.toString('ascii', '3.14', 3), ''); -assert.equal(rangeBuffer.toString('ascii', '1.99', 3), 'bc'); -assert.equal(rangeBuffer.toString('ascii', '-1.99', 3), 'abc'); -assert.equal(rangeBuffer.toString('ascii', 1.99, 3), 'bc'); -assert.equal(rangeBuffer.toString('ascii', true, 3), 'bc'); - -// if end > buffer's length, end will be taken as buffer's length -assert.equal(rangeBuffer.toString('ascii', 0, 5), 'abc'); -assert.equal(rangeBuffer.toString('ascii', 0, 6.99), 'abc'); -assert.equal(rangeBuffer.toString('ascii', 0, Infinity), 'abc'); -assert.equal(rangeBuffer.toString('ascii', 0, '5'), 'abc'); -assert.equal(rangeBuffer.toString('ascii', 0, '6.99'), 'abc'); -assert.equal(rangeBuffer.toString('ascii', 0, 'Infinity'), 'abc'); - -// if end is an invalid integer, end will be taken as buffer's length -assert.equal(rangeBuffer.toString('ascii', 0, 'node.js'), ''); -assert.equal(rangeBuffer.toString('ascii', 0, {}), ''); -assert.equal(rangeBuffer.toString('ascii', 0, NaN), ''); -assert.equal(rangeBuffer.toString('ascii', 0, undefined), 'abc'); -assert.equal(rangeBuffer.toString('ascii', 0), 'abc'); -assert.equal(rangeBuffer.toString('ascii', 0, null), ''); -assert.equal(rangeBuffer.toString('ascii', 0, []), ''); -assert.equal(rangeBuffer.toString('ascii', 0, false), ''); -assert.equal(rangeBuffer.toString('ascii', 0, ''), ''); - -// but, if end is an integer when coerced, then it will be coerced and used. -assert.equal(rangeBuffer.toString('ascii', 0, '-1'), ''); -assert.equal(rangeBuffer.toString('ascii', 0, '1'), 'a'); -assert.equal(rangeBuffer.toString('ascii', 0, '-Infinity'), ''); -assert.equal(rangeBuffer.toString('ascii', 0, '3'), 'abc'); -assert.equal(rangeBuffer.toString('ascii', 0, Number(3)), 'abc'); -assert.equal(rangeBuffer.toString('ascii', 0, '3.14'), 'abc'); -assert.equal(rangeBuffer.toString('ascii', 0, '1.99'), 'a'); -assert.equal(rangeBuffer.toString('ascii', 0, '-1.99'), ''); -assert.equal(rangeBuffer.toString('ascii', 0, 1.99), 'a'); -assert.equal(rangeBuffer.toString('ascii', 0, true), 'a'); - -// try toString() with a object as a encoding -assert.equal(rangeBuffer.toString({toString: function() { - return 'ascii'; -}}), 'abc'); - // testing for smart defaults and ability to pass string values as offset var writeTest = Buffer.from('abcdes'); writeTest.write('n', 'ascii'); diff --git a/test/parallel/test-buffer-tostring-range.js b/test/parallel/test-buffer-tostring-range.js new file mode 100644 index 00000000000000..c7ab356e4661ff --- /dev/null +++ b/test/parallel/test-buffer-tostring-range.js @@ -0,0 +1,84 @@ +'use strict'; + +require('../common'); +const assert = require('assert'); + +const rangeBuffer = Buffer.from('abc'); + +// if start >= buffer's length, empty string will be returned +assert.strictEqual(rangeBuffer.toString('ascii', 3), ''); +assert.strictEqual(rangeBuffer.toString('ascii', +Infinity), ''); +assert.strictEqual(rangeBuffer.toString('ascii', 3.14, 3), ''); +assert.strictEqual(rangeBuffer.toString('ascii', 'Infinity', 3), ''); + +// if end <= 0, empty string will be returned +assert.strictEqual(rangeBuffer.toString('ascii', 1, 0), ''); +assert.strictEqual(rangeBuffer.toString('ascii', 1, -1.2), ''); +assert.strictEqual(rangeBuffer.toString('ascii', 1, -100), ''); +assert.strictEqual(rangeBuffer.toString('ascii', 1, -Infinity), ''); + +// if start < 0, start will be taken as zero +assert.strictEqual(rangeBuffer.toString('ascii', -1, 3), 'abc'); +assert.strictEqual(rangeBuffer.toString('ascii', -1.99, 3), 'abc'); +assert.strictEqual(rangeBuffer.toString('ascii', -Infinity, 3), 'abc'); +assert.strictEqual(rangeBuffer.toString('ascii', '-1', 3), 'abc'); +assert.strictEqual(rangeBuffer.toString('ascii', '-1.99', 3), 'abc'); +assert.strictEqual(rangeBuffer.toString('ascii', '-Infinity', 3), 'abc'); + +// if start is an invalid integer, start will be taken as zero +assert.strictEqual(rangeBuffer.toString('ascii', 'node.js', 3), 'abc'); +assert.strictEqual(rangeBuffer.toString('ascii', {}, 3), 'abc'); +assert.strictEqual(rangeBuffer.toString('ascii', [], 3), 'abc'); +assert.strictEqual(rangeBuffer.toString('ascii', NaN, 3), 'abc'); +assert.strictEqual(rangeBuffer.toString('ascii', null, 3), 'abc'); +assert.strictEqual(rangeBuffer.toString('ascii', undefined, 3), 'abc'); +assert.strictEqual(rangeBuffer.toString('ascii', false, 3), 'abc'); +assert.strictEqual(rangeBuffer.toString('ascii', '', 3), 'abc'); + +// but, if start is an integer when coerced, then it will be coerced and used. +assert.strictEqual(rangeBuffer.toString('ascii', '-1', 3), 'abc'); +assert.strictEqual(rangeBuffer.toString('ascii', '1', 3), 'bc'); +assert.strictEqual(rangeBuffer.toString('ascii', '-Infinity', 3), 'abc'); +assert.strictEqual(rangeBuffer.toString('ascii', '3', 3), ''); +assert.strictEqual(rangeBuffer.toString('ascii', Number(3), 3), ''); +assert.strictEqual(rangeBuffer.toString('ascii', '3.14', 3), ''); +assert.strictEqual(rangeBuffer.toString('ascii', '1.99', 3), 'bc'); +assert.strictEqual(rangeBuffer.toString('ascii', '-1.99', 3), 'abc'); +assert.strictEqual(rangeBuffer.toString('ascii', 1.99, 3), 'bc'); +assert.strictEqual(rangeBuffer.toString('ascii', true, 3), 'bc'); + +// if end > buffer's length, end will be taken as buffer's length +assert.strictEqual(rangeBuffer.toString('ascii', 0, 5), 'abc'); +assert.strictEqual(rangeBuffer.toString('ascii', 0, 6.99), 'abc'); +assert.strictEqual(rangeBuffer.toString('ascii', 0, Infinity), 'abc'); +assert.strictEqual(rangeBuffer.toString('ascii', 0, '5'), 'abc'); +assert.strictEqual(rangeBuffer.toString('ascii', 0, '6.99'), 'abc'); +assert.strictEqual(rangeBuffer.toString('ascii', 0, 'Infinity'), 'abc'); + +// if end is an invalid integer, end will be taken as buffer's length +assert.strictEqual(rangeBuffer.toString('ascii', 0, 'node.js'), ''); +assert.strictEqual(rangeBuffer.toString('ascii', 0, {}), ''); +assert.strictEqual(rangeBuffer.toString('ascii', 0, NaN), ''); +assert.strictEqual(rangeBuffer.toString('ascii', 0, undefined), 'abc'); +assert.strictEqual(rangeBuffer.toString('ascii', 0), 'abc'); +assert.strictEqual(rangeBuffer.toString('ascii', 0, null), ''); +assert.strictEqual(rangeBuffer.toString('ascii', 0, []), ''); +assert.strictEqual(rangeBuffer.toString('ascii', 0, false), ''); +assert.strictEqual(rangeBuffer.toString('ascii', 0, ''), ''); + +// but, if end is an integer when coerced, then it will be coerced and used. +assert.strictEqual(rangeBuffer.toString('ascii', 0, '-1'), ''); +assert.strictEqual(rangeBuffer.toString('ascii', 0, '1'), 'a'); +assert.strictEqual(rangeBuffer.toString('ascii', 0, '-Infinity'), ''); +assert.strictEqual(rangeBuffer.toString('ascii', 0, '3'), 'abc'); +assert.strictEqual(rangeBuffer.toString('ascii', 0, Number(3)), 'abc'); +assert.strictEqual(rangeBuffer.toString('ascii', 0, '3.14'), 'abc'); +assert.strictEqual(rangeBuffer.toString('ascii', 0, '1.99'), 'a'); +assert.strictEqual(rangeBuffer.toString('ascii', 0, '-1.99'), ''); +assert.strictEqual(rangeBuffer.toString('ascii', 0, 1.99), 'a'); +assert.strictEqual(rangeBuffer.toString('ascii', 0, true), 'a'); + +// try toString() with a object as a encoding +assert.strictEqual(rangeBuffer.toString({toString: function() { + return 'ascii'; +}}), 'abc'); diff --git a/test/parallel/test-buffer.js b/test/parallel/test-buffer.js index 91caac14d46e2b..89d87cc2df0b01 100644 --- a/test/parallel/test-buffer.js +++ b/test/parallel/test-buffer.js @@ -271,86 +271,6 @@ b.copy(Buffer(1), 1, 1, 1); // try to copy 0 bytes from past the end of the source buffer b.copy(Buffer(1), 0, 2048, 2048); -const rangeBuffer = new Buffer('abc'); - -// if start >= buffer's length, empty string will be returned -assert.equal(rangeBuffer.toString('ascii', 3), ''); -assert.equal(rangeBuffer.toString('ascii', +Infinity), ''); -assert.equal(rangeBuffer.toString('ascii', 3.14, 3), ''); -assert.equal(rangeBuffer.toString('ascii', 'Infinity', 3), ''); - -// if end <= 0, empty string will be returned -assert.equal(rangeBuffer.toString('ascii', 1, 0), ''); -assert.equal(rangeBuffer.toString('ascii', 1, -1.2), ''); -assert.equal(rangeBuffer.toString('ascii', 1, -100), ''); -assert.equal(rangeBuffer.toString('ascii', 1, -Infinity), ''); - -// if start < 0, start will be taken as zero -assert.equal(rangeBuffer.toString('ascii', -1, 3), 'abc'); -assert.equal(rangeBuffer.toString('ascii', -1.99, 3), 'abc'); -assert.equal(rangeBuffer.toString('ascii', -Infinity, 3), 'abc'); -assert.equal(rangeBuffer.toString('ascii', '-1', 3), 'abc'); -assert.equal(rangeBuffer.toString('ascii', '-1.99', 3), 'abc'); -assert.equal(rangeBuffer.toString('ascii', '-Infinity', 3), 'abc'); - -// if start is an invalid integer, start will be taken as zero -assert.equal(rangeBuffer.toString('ascii', 'node.js', 3), 'abc'); -assert.equal(rangeBuffer.toString('ascii', {}, 3), 'abc'); -assert.equal(rangeBuffer.toString('ascii', [], 3), 'abc'); -assert.equal(rangeBuffer.toString('ascii', NaN, 3), 'abc'); -assert.equal(rangeBuffer.toString('ascii', null, 3), 'abc'); -assert.equal(rangeBuffer.toString('ascii', undefined, 3), 'abc'); -assert.equal(rangeBuffer.toString('ascii', false, 3), 'abc'); -assert.equal(rangeBuffer.toString('ascii', '', 3), 'abc'); - -// but, if start is an integer when coerced, then it will be coerced and used. -assert.equal(rangeBuffer.toString('ascii', '-1', 3), 'abc'); -assert.equal(rangeBuffer.toString('ascii', '1', 3), 'bc'); -assert.equal(rangeBuffer.toString('ascii', '-Infinity', 3), 'abc'); -assert.equal(rangeBuffer.toString('ascii', '3', 3), ''); -assert.equal(rangeBuffer.toString('ascii', Number(3), 3), ''); -assert.equal(rangeBuffer.toString('ascii', '3.14', 3), ''); -assert.equal(rangeBuffer.toString('ascii', '1.99', 3), 'bc'); -assert.equal(rangeBuffer.toString('ascii', '-1.99', 3), 'abc'); -assert.equal(rangeBuffer.toString('ascii', 1.99, 3), 'bc'); -assert.equal(rangeBuffer.toString('ascii', true, 3), 'bc'); - -// if end > buffer's length, end will be taken as buffer's length -assert.equal(rangeBuffer.toString('ascii', 0, 5), 'abc'); -assert.equal(rangeBuffer.toString('ascii', 0, 6.99), 'abc'); -assert.equal(rangeBuffer.toString('ascii', 0, Infinity), 'abc'); -assert.equal(rangeBuffer.toString('ascii', 0, '5'), 'abc'); -assert.equal(rangeBuffer.toString('ascii', 0, '6.99'), 'abc'); -assert.equal(rangeBuffer.toString('ascii', 0, 'Infinity'), 'abc'); - -// if end is an invalid integer, end will be taken as buffer's length -assert.equal(rangeBuffer.toString('ascii', 0, 'node.js'), ''); -assert.equal(rangeBuffer.toString('ascii', 0, {}), ''); -assert.equal(rangeBuffer.toString('ascii', 0, NaN), ''); -assert.equal(rangeBuffer.toString('ascii', 0, undefined), 'abc'); -assert.equal(rangeBuffer.toString('ascii', 0), 'abc'); -assert.equal(rangeBuffer.toString('ascii', 0, null), ''); -assert.equal(rangeBuffer.toString('ascii', 0, []), ''); -assert.equal(rangeBuffer.toString('ascii', 0, false), ''); -assert.equal(rangeBuffer.toString('ascii', 0, ''), ''); - -// but, if end is an integer when coerced, then it will be coerced and used. -assert.equal(rangeBuffer.toString('ascii', 0, '-1'), ''); -assert.equal(rangeBuffer.toString('ascii', 0, '1'), 'a'); -assert.equal(rangeBuffer.toString('ascii', 0, '-Infinity'), ''); -assert.equal(rangeBuffer.toString('ascii', 0, '3'), 'abc'); -assert.equal(rangeBuffer.toString('ascii', 0, Number(3)), 'abc'); -assert.equal(rangeBuffer.toString('ascii', 0, '3.14'), 'abc'); -assert.equal(rangeBuffer.toString('ascii', 0, '1.99'), 'a'); -assert.equal(rangeBuffer.toString('ascii', 0, '-1.99'), ''); -assert.equal(rangeBuffer.toString('ascii', 0, 1.99), 'a'); -assert.equal(rangeBuffer.toString('ascii', 0, true), 'a'); - -// try toString() with a object as a encoding -assert.equal(rangeBuffer.toString({toString: function() { - return 'ascii'; -}}), 'abc'); - // testing for smart defaults and ability to pass string values as offset var writeTest = new Buffer('abcdes'); writeTest.write('n', 'ascii'); From 89d8e87ca8b01be07186aef177d63d3026420b0a Mon Sep 17 00:00:00 2001 From: James M Snell Date: Tue, 23 Aug 2016 15:46:40 -0700 Subject: [PATCH 07/12] test: separate buffer fill tests --- test/parallel/test-buffer-alloc.js | 53 ----------------------------- test/parallel/test-buffer-fill.js | 47 ++++++++++++++++++++++++++ test/parallel/test-buffer.js | 54 ------------------------------ 3 files changed, 47 insertions(+), 107 deletions(-) diff --git a/test/parallel/test-buffer-alloc.js b/test/parallel/test-buffer-alloc.js index 3334d51b8a474c..b844cf62688a7f 100644 --- a/test/parallel/test-buffer-alloc.js +++ b/test/parallel/test-buffer-alloc.js @@ -36,59 +36,6 @@ for (const [index, value] of e.entries()) { assert.strictEqual(value, ui32[index]); } -// First check Buffer#fill() works as expected. - -assert.throws(function() { - Buffer.allocUnsafe(8).fill('a', -1); -}); - -assert.throws(function() { - Buffer.allocUnsafe(8).fill('a', 0, 9); -}); - -// Make sure this doesn't hang indefinitely. -Buffer.allocUnsafe(8).fill(''); -Buffer.alloc(8, ''); - -{ - const buf = Buffer.alloc(64, 10); - for (let i = 0; i < buf.length; i++) - assert.equal(buf[i], 10); - - buf.fill(11, 0, buf.length >> 1); - for (let i = 0; i < buf.length >> 1; i++) - assert.equal(buf[i], 11); - for (let i = (buf.length >> 1) + 1; i < buf.length; i++) - assert.equal(buf[i], 10); - - buf.fill('h'); - for (let i = 0; i < buf.length; i++) - assert.equal('h'.charCodeAt(0), buf[i]); - - buf.fill(0); - for (let i = 0; i < buf.length; i++) - assert.equal(0, buf[i]); - - buf.fill(null); - for (let i = 0; i < buf.length; i++) - assert.equal(0, buf[i]); - - buf.fill(1, 16, 32); - for (let i = 0; i < 16; i++) - assert.equal(0, buf[i]); - for (let i = 16; i < 32; i++) - assert.equal(1, buf[i]); - for (let i = 32; i < buf.length; i++) - assert.equal(0, buf[i]); -} - -{ - const buf = Buffer.alloc(10, 'abc'); - assert.equal(buf.toString(), 'abcabcabca'); - buf.fill('է'); - assert.equal(buf.toString(), 'էէէէէ'); -} - { // copy 512 bytes, from 0 to 512. b.fill(++cntr); diff --git a/test/parallel/test-buffer-fill.js b/test/parallel/test-buffer-fill.js index 638fda819d4c0b..e5581b2d83d041 100644 --- a/test/parallel/test-buffer-fill.js +++ b/test/parallel/test-buffer-fill.js @@ -267,3 +267,50 @@ function testBufs(string, offset, length, encoding) { assert.deepStrictEqual(buf1.fill.apply(buf1, arguments), writeToFill.apply(null, arguments)); } + +// Make sure these throw. +assert.throws(() => Buffer.allocUnsafe(8).fill('a', -1)); +assert.throws(() => Buffer.allocUnsafe(8).fill('a', 0, 9)); + +// Make sure this doesn't hang indefinitely. +Buffer.allocUnsafe(8).fill(''); +Buffer.alloc(8, ''); + +{ + const buf = Buffer.alloc(64, 10); + for (let i = 0; i < buf.length; i++) + assert.strictEqual(buf[i], 10); + + buf.fill(11, 0, buf.length >> 1); + for (let i = 0; i < buf.length >> 1; i++) + assert.strictEqual(buf[i], 11); + for (let i = (buf.length >> 1) + 1; i < buf.length; i++) + assert.strictEqual(buf[i], 10); + + buf.fill('h'); + for (let i = 0; i < buf.length; i++) + assert.strictEqual('h'.charCodeAt(0), buf[i]); + + buf.fill(0); + for (let i = 0; i < buf.length; i++) + assert.strictEqual(0, buf[i]); + + buf.fill(null); + for (let i = 0; i < buf.length; i++) + assert.strictEqual(0, buf[i]); + + buf.fill(1, 16, 32); + for (let i = 0; i < 16; i++) + assert.strictEqual(0, buf[i]); + for (let i = 16; i < 32; i++) + assert.strictEqual(1, buf[i]); + for (let i = 32; i < buf.length; i++) + assert.strictEqual(0, buf[i]); +} + +{ + const buf = Buffer.alloc(10, 'abc'); + assert.strictEqual(buf.toString(), 'abcabcabca'); + buf.fill('է'); + assert.strictEqual(buf.toString(), 'էէէէէ'); +} diff --git a/test/parallel/test-buffer.js b/test/parallel/test-buffer.js index 89d87cc2df0b01..94daae255da165 100644 --- a/test/parallel/test-buffer.js +++ b/test/parallel/test-buffer.js @@ -37,60 +37,6 @@ for (const [key, value] of e.entries()) { assert.deepStrictEqual(value, ui32[key]); } -// First check Buffer#fill() works as expected. - -assert.throws(function() { - Buffer(8).fill('a', -1); -}); - -assert.throws(function() { - Buffer(8).fill('a', 0, 9); -}); - -// Make sure this doesn't hang indefinitely. -Buffer(8).fill(''); - -{ - const buf = new Buffer(64); - buf.fill(10); - for (let i = 0; i < buf.length; i++) - assert.equal(buf[i], 10); - - buf.fill(11, 0, buf.length >> 1); - for (let i = 0; i < buf.length >> 1; i++) - assert.equal(buf[i], 11); - for (let i = (buf.length >> 1) + 1; i < buf.length; i++) - assert.equal(buf[i], 10); - - buf.fill('h'); - for (let i = 0; i < buf.length; i++) - assert.equal('h'.charCodeAt(0), buf[i]); - - buf.fill(0); - for (let i = 0; i < buf.length; i++) - assert.equal(0, buf[i]); - - buf.fill(null); - for (let i = 0; i < buf.length; i++) - assert.equal(0, buf[i]); - - buf.fill(1, 16, 32); - for (let i = 0; i < 16; i++) - assert.equal(0, buf[i]); - for (let i = 16; i < 32; i++) - assert.equal(1, buf[i]); - for (let i = 32; i < buf.length; i++) - assert.equal(0, buf[i]); -} - -{ - const buf = new Buffer(10); - buf.fill('abc'); - assert.equal(buf.toString(), 'abcabcabca'); - buf.fill('է'); - assert.equal(buf.toString(), 'էէէէէ'); -} - { // copy 512 bytes, from 0 to 512. b.fill(++cntr); From 253e77c660c20674f57db30fb901ba09b46809fb Mon Sep 17 00:00:00 2001 From: James M Snell Date: Tue, 23 Aug 2016 15:56:43 -0700 Subject: [PATCH 08/12] test: separate out buffer copy tests --- test/parallel/test-buffer-alloc.js | 126 ----------------------------- test/parallel/test-buffer-copy.js | 120 +++++++++++++++++++++++++++ test/parallel/test-buffer.js | 126 ----------------------------- 3 files changed, 120 insertions(+), 252 deletions(-) create mode 100644 test/parallel/test-buffer-copy.js diff --git a/test/parallel/test-buffer-alloc.js b/test/parallel/test-buffer-alloc.js index b844cf62688a7f..0954c1744c2d7e 100644 --- a/test/parallel/test-buffer-alloc.js +++ b/test/parallel/test-buffer-alloc.js @@ -4,9 +4,6 @@ var assert = require('assert'); var Buffer = require('buffer').Buffer; -// counter to ensure unique value is always copied -var cntr = 0; - var b = Buffer.allocUnsafe(1024); console.log('b.length == %d', b.length); @@ -36,129 +33,6 @@ for (const [index, value] of e.entries()) { assert.strictEqual(value, ui32[index]); } -{ - // copy 512 bytes, from 0 to 512. - b.fill(++cntr); - c.fill(++cntr); - const copied = b.copy(c, 0, 0, 512); - console.log('copied %d bytes from b into c', copied); - assert.strictEqual(512, copied); - for (let i = 0; i < c.length; i++) { - assert.strictEqual(b[i], c[i]); - } -} - -{ - // copy c into b, without specifying sourceEnd - b.fill(++cntr); - c.fill(++cntr); - const copied = c.copy(b, 0, 0); - console.log('copied %d bytes from c into b w/o sourceEnd', copied); - assert.strictEqual(c.length, copied); - for (let i = 0; i < c.length; i++) { - assert.strictEqual(c[i], b[i]); - } -} - -{ - // copy c into b, without specifying sourceStart - b.fill(++cntr); - c.fill(++cntr); - const copied = c.copy(b, 0); - console.log('copied %d bytes from c into b w/o sourceStart', copied); - assert.strictEqual(c.length, copied); - for (let i = 0; i < c.length; i++) { - assert.strictEqual(c[i], b[i]); - } -} - -{ - // copy longer buffer b to shorter c without targetStart - b.fill(++cntr); - c.fill(++cntr); - const copied = b.copy(c); - console.log('copied %d bytes from b into c w/o targetStart', copied); - assert.strictEqual(c.length, copied); - for (let i = 0; i < c.length; i++) { - assert.strictEqual(b[i], c[i]); - } -} - -{ - // copy starting near end of b to c - b.fill(++cntr); - c.fill(++cntr); - const copied = b.copy(c, 0, b.length - Math.floor(c.length / 2)); - console.log('copied %d bytes from end of b into beginning of c', copied); - assert.strictEqual(Math.floor(c.length / 2), copied); - for (let i = 0; i < Math.floor(c.length / 2); i++) { - assert.strictEqual(b[b.length - Math.floor(c.length / 2) + i], c[i]); - } - for (let i = Math.floor(c.length / 2) + 1; i < c.length; i++) { - assert.strictEqual(c[c.length - 1], c[i]); - } -} - -{ - // try to copy 513 bytes, and check we don't overrun c - b.fill(++cntr); - c.fill(++cntr); - const copied = b.copy(c, 0, 0, 513); - console.log('copied %d bytes from b trying to overrun c', copied); - assert.strictEqual(c.length, copied); - for (let i = 0; i < c.length; i++) { - assert.strictEqual(b[i], c[i]); - } -} - -{ - // copy 768 bytes from b into b - b.fill(++cntr); - b.fill(++cntr, 256); - const copied = b.copy(b, 0, 256, 1024); - console.log('copied %d bytes from b into b', copied); - assert.strictEqual(768, copied); - for (let i = 0; i < b.length; i++) { - assert.strictEqual(cntr, b[i]); - } -} - -// copy string longer than buffer length (failure will segfault) -var bb = Buffer.allocUnsafe(10); -bb.fill('hello crazy world'); - - -// try to copy from before the beginning of b -assert.doesNotThrow(() => { b.copy(c, 0, 100, 10); }); - -// copy throws at negative sourceStart -assert.throws(function() { - Buffer.allocUnsafe(5).copy(Buffer.allocUnsafe(5), 0, -1); -}, RangeError); - -{ - // check sourceEnd resets to targetEnd if former is greater than the latter - b.fill(++cntr); - c.fill(++cntr); - const copied = b.copy(c, 0, 0, 1025); - console.log('copied %d bytes from b into c', copied); - for (let i = 0; i < c.length; i++) { - assert.strictEqual(b[i], c[i]); - } -} - -// throw with negative sourceEnd -console.log('test copy at negative sourceEnd'); -assert.throws(function() { - b.copy(c, 0, 0, -1); -}, RangeError); - -// when sourceStart is greater than sourceEnd, zero copied -assert.equal(b.copy(c, 0, 100, 10), 0); - -// when targetStart > targetLength, zero copied -assert.equal(b.copy(c, 512, 0, 10), 0); - var caught_error; // invalid encoding for Buffer.toString diff --git a/test/parallel/test-buffer-copy.js b/test/parallel/test-buffer-copy.js new file mode 100644 index 00000000000000..e5721db0fb17ac --- /dev/null +++ b/test/parallel/test-buffer-copy.js @@ -0,0 +1,120 @@ +'use strict'; + +require('../common'); +const assert = require('assert'); + +var b = Buffer.allocUnsafe(1024); +var c = Buffer.allocUnsafe(512); +var cntr = 0; + +{ + // copy 512 bytes, from 0 to 512. + b.fill(++cntr); + c.fill(++cntr); + const copied = b.copy(c, 0, 0, 512); + assert.strictEqual(512, copied); + for (let i = 0; i < c.length; i++) { + assert.strictEqual(b[i], c[i]); + } +} + +{ + // copy c into b, without specifying sourceEnd + b.fill(++cntr); + c.fill(++cntr); + const copied = c.copy(b, 0, 0); + assert.strictEqual(c.length, copied); + for (let i = 0; i < c.length; i++) { + assert.strictEqual(c[i], b[i]); + } +} + +{ + // copy c into b, without specifying sourceStart + b.fill(++cntr); + c.fill(++cntr); + const copied = c.copy(b, 0); + assert.strictEqual(c.length, copied); + for (let i = 0; i < c.length; i++) { + assert.strictEqual(c[i], b[i]); + } +} + +{ + // copy longer buffer b to shorter c without targetStart + b.fill(++cntr); + c.fill(++cntr); + const copied = b.copy(c); + assert.strictEqual(c.length, copied); + for (let i = 0; i < c.length; i++) { + assert.strictEqual(b[i], c[i]); + } +} + +{ + // copy starting near end of b to c + b.fill(++cntr); + c.fill(++cntr); + const copied = b.copy(c, 0, b.length - Math.floor(c.length / 2)); + assert.strictEqual(Math.floor(c.length / 2), copied); + for (let i = 0; i < Math.floor(c.length / 2); i++) { + assert.strictEqual(b[b.length - Math.floor(c.length / 2) + i], c[i]); + } + for (let i = Math.floor(c.length / 2) + 1; i < c.length; i++) { + assert.strictEqual(c[c.length - 1], c[i]); + } +} + +{ + // try to copy 513 bytes, and check we don't overrun c + b.fill(++cntr); + c.fill(++cntr); + const copied = b.copy(c, 0, 0, 513); + assert.strictEqual(c.length, copied); + for (let i = 0; i < c.length; i++) { + assert.strictEqual(b[i], c[i]); + } +} + +{ + // copy 768 bytes from b into b + b.fill(++cntr); + b.fill(++cntr, 256); + const copied = b.copy(b, 0, 256, 1024); + assert.strictEqual(768, copied); + for (let i = 0; i < b.length; i++) { + assert.strictEqual(cntr, b[i]); + } +} + +// copy string longer than buffer length (failure will segfault) +var bb = Buffer.allocUnsafe(10); +bb.fill('hello crazy world'); + + +// try to copy from before the beginning of b +assert.doesNotThrow(() => { b.copy(c, 0, 100, 10); }); + +// copy throws at negative sourceStart +assert.throws(function() { + Buffer.allocUnsafe(5).copy(Buffer.allocUnsafe(5), 0, -1); +}, RangeError); + +{ + // check sourceEnd resets to targetEnd if former is greater than the latter + b.fill(++cntr); + c.fill(++cntr); + b.copy(c, 0, 0, 1025); + for (let i = 0; i < c.length; i++) { + assert.strictEqual(b[i], c[i]); + } +} + +// throw with negative sourceEnd +assert.throws(() => b.copy(c, 0, 0, -1), RangeError); + +// when sourceStart is greater than sourceEnd, zero copied +assert.strictEqual(b.copy(c, 0, 100, 10), 0); + +// when targetStart > targetLength, zero copied +assert.strictEqual(b.copy(c, 512, 0, 10), 0); diff --git a/test/parallel/test-buffer.js b/test/parallel/test-buffer.js index 94daae255da165..f368731a8b9f35 100644 --- a/test/parallel/test-buffer.js +++ b/test/parallel/test-buffer.js @@ -5,9 +5,6 @@ var assert = require('assert'); var Buffer = require('buffer').Buffer; var SlowBuffer = require('buffer').SlowBuffer; -// counter to ensure unique value is always copied -var cntr = 0; - var b = Buffer(1024); // safe constructor console.log('b.length == %d', b.length); @@ -37,129 +34,6 @@ for (const [key, value] of e.entries()) { assert.deepStrictEqual(value, ui32[key]); } -{ - // copy 512 bytes, from 0 to 512. - b.fill(++cntr); - c.fill(++cntr); - const copied = b.copy(c, 0, 0, 512); - console.log('copied %d bytes from b into c', copied); - assert.strictEqual(512, copied); - for (let i = 0; i < c.length; i++) { - assert.strictEqual(b[i], c[i]); - } -} - -{ - // copy c into b, without specifying sourceEnd - b.fill(++cntr); - c.fill(++cntr); - const copied = c.copy(b, 0, 0); - console.log('copied %d bytes from c into b w/o sourceEnd', copied); - assert.strictEqual(c.length, copied); - for (let i = 0; i < c.length; i++) { - assert.strictEqual(c[i], b[i]); - } -} - -{ - // copy c into b, without specifying sourceStart - b.fill(++cntr); - c.fill(++cntr); - const copied = c.copy(b, 0); - console.log('copied %d bytes from c into b w/o sourceStart', copied); - assert.strictEqual(c.length, copied); - for (let i = 0; i < c.length; i++) { - assert.strictEqual(c[i], b[i]); - } -} - -{ - // copy longer buffer b to shorter c without targetStart - b.fill(++cntr); - c.fill(++cntr); - const copied = b.copy(c); - console.log('copied %d bytes from b into c w/o targetStart', copied); - assert.strictEqual(c.length, copied); - for (let i = 0; i < c.length; i++) { - assert.strictEqual(b[i], c[i]); - } -} - -{ - // copy starting near end of b to c - b.fill(++cntr); - c.fill(++cntr); - const copied = b.copy(c, 0, b.length - Math.floor(c.length / 2)); - console.log('copied %d bytes from end of b into beginning of c', copied); - assert.strictEqual(Math.floor(c.length / 2), copied); - for (let i = 0; i < Math.floor(c.length / 2); i++) { - assert.strictEqual(b[b.length - Math.floor(c.length / 2) + i], c[i]); - } - for (let i = Math.floor(c.length / 2) + 1; i < c.length; i++) { - assert.strictEqual(c[c.length - 1], c[i]); - } -} - -{ - // try to copy 513 bytes, and check we don't overrun c - b.fill(++cntr); - c.fill(++cntr); - const copied = b.copy(c, 0, 0, 513); - console.log('copied %d bytes from b trying to overrun c', copied); - assert.strictEqual(c.length, copied); - for (let i = 0; i < c.length; i++) { - assert.strictEqual(b[i], c[i]); - } -} - -{ - // copy 768 bytes from b into b - b.fill(++cntr); - b.fill(++cntr, 256); - const copied = b.copy(b, 0, 256, 1024); - console.log('copied %d bytes from b into b', copied); - assert.strictEqual(768, copied); - for (let i = 0; i < b.length; i++) { - assert.strictEqual(cntr, b[i]); - } -} - -// copy string longer than buffer length (failure will segfault) -var bb = Buffer(10); -bb.fill('hello crazy world'); - - -// try to copy from before the beginning of b -assert.doesNotThrow(() => { b.copy(c, 0, 100, 10); }); - -// copy throws at negative sourceStart -assert.throws(function() { - Buffer(5).copy(Buffer(5), 0, -1); -}, RangeError); - -{ - // check sourceEnd resets to targetEnd if former is greater than the latter - b.fill(++cntr); - c.fill(++cntr); - const copied = b.copy(c, 0, 0, 1025); - console.log('copied %d bytes from b into c', copied); - for (let i = 0; i < c.length; i++) { - assert.strictEqual(b[i], c[i]); - } -} - -// throw with negative sourceEnd -console.log('test copy at negative sourceEnd'); -assert.throws(function() { - b.copy(c, 0, 0, -1); -}, RangeError); - -// when sourceStart is greater than sourceEnd, zero copied -assert.equal(b.copy(c, 0, 100, 10), 0); - -// when targetStart > targetLength, zero copied -assert.equal(b.copy(c, 512, 0, 10), 0); - var caught_error; // invalid encoding for Buffer.toString From a5d4501340f21aaaeb77dd6b91b02d801335d7ac Mon Sep 17 00:00:00 2001 From: James M Snell Date: Wed, 24 Aug 2016 07:17:07 -0700 Subject: [PATCH 09/12] test: favor use of strictEqual where possible in buffer test --- test/parallel/test-buffer-alloc.js | 503 +++++++++++++++-------------- 1 file changed, 257 insertions(+), 246 deletions(-) diff --git a/test/parallel/test-buffer-alloc.js b/test/parallel/test-buffer-alloc.js index 0954c1744c2d7e..9247d88d34ce45 100644 --- a/test/parallel/test-buffer-alloc.js +++ b/test/parallel/test-buffer-alloc.js @@ -97,7 +97,7 @@ writeTest.write('o', '1', 'ascii'); writeTest.write('d', '2', 'ascii'); writeTest.write('e', 3, 'ascii'); writeTest.write('j', 4, 'ascii'); -assert.equal(writeTest.toString(), 'nodejs'); +assert.strictEqual(writeTest.toString(), 'nodejs'); // Offset points to the end of the buffer // (see https://github.com/nodejs/node/issues/8127). @@ -113,7 +113,7 @@ assert.doesNotThrow(() => { b[i] = asciiString.charCodeAt(i); } const asciiSlice = b.toString('ascii', 0, asciiString.length); - assert.equal(asciiString, asciiSlice); + assert.strictEqual(asciiString, asciiSlice); } { @@ -121,9 +121,9 @@ assert.doesNotThrow(() => { const offset = 100; const written = b.write(asciiString, offset, 'ascii'); - assert.equal(asciiString.length, written); + assert.strictEqual(asciiString.length, written); const asciiSlice = b.toString('ascii', offset, offset + asciiString.length); - assert.equal(asciiString, asciiSlice); + assert.strictEqual(asciiString, asciiSlice); } { @@ -147,21 +147,21 @@ var utf8Slice = b.toString('utf8', 0, Buffer.byteLength(utf8String)); assert.equal(utf8String, utf8Slice); var written = b.write(utf8String, offset, 'utf8'); -assert.equal(Buffer.byteLength(utf8String), written); +assert.strictEqual(Buffer.byteLength(utf8String), written); utf8Slice = b.toString('utf8', offset, offset + Buffer.byteLength(utf8String)); -assert.equal(utf8String, utf8Slice); +assert.strictEqual(utf8String, utf8Slice); var sliceA = b.slice(offset, offset + Buffer.byteLength(utf8String)); var sliceB = b.slice(offset, offset + Buffer.byteLength(utf8String)); for (let i = 0; i < Buffer.byteLength(utf8String); i++) { - assert.equal(sliceA[i], sliceB[i]); + assert.strictEqual(sliceA[i], sliceB[i]); } { const slice = b.slice(100, 150); - assert.equal(50, slice.length); + assert.strictEqual(50, slice.length); for (let i = 0; i < 50; i++) { - assert.equal(b[100 + i], slice[i]); + assert.strictEqual(b[100 + i], slice[i]); } } @@ -170,8 +170,8 @@ for (let i = 0; i < Buffer.byteLength(utf8String); i++) { const b = Buffer.allocUnsafe(5); const c = b.slice(0, 4); const d = c.slice(0, 2); - assert.equal(b.parent, c.parent); - assert.equal(b.parent, d.parent); + assert.strictEqual(b.parent, c.parent); + assert.strictEqual(b.parent, d.parent); } { @@ -179,7 +179,7 @@ for (let i = 0; i < Buffer.byteLength(utf8String); i++) { const b = Buffer.allocUnsafeSlow(5); const c = b.slice(0, 4); const d = c.slice(0, 2); - assert.equal(c.parent, d.parent); + assert.strictEqual(c.parent, d.parent); } { @@ -189,7 +189,7 @@ for (let i = 0; i < Buffer.byteLength(utf8String); i++) { const size = buffer.write(testValue, 0, 'utf8'); console.log('bytes written to buffer: ' + size); const slice = buffer.toString('utf8', 0, size); - assert.equal(slice, testValue); + assert.strictEqual(slice, testValue); } { @@ -197,21 +197,21 @@ for (let i = 0; i < Buffer.byteLength(utf8String); i++) { const a = Buffer.allocUnsafe(8); for (let i = 0; i < 8; i++) a[i] = i; const b = a.slice(4, 8); - assert.equal(4, b[0]); - assert.equal(5, b[1]); - assert.equal(6, b[2]); - assert.equal(7, b[3]); + assert.strictEqual(4, b[0]); + assert.strictEqual(5, b[1]); + assert.strictEqual(6, b[2]); + assert.strictEqual(7, b[3]); const c = b.slice(2, 4); - assert.equal(6, c[0]); - assert.equal(7, c[1]); + assert.strictEqual(6, c[0]); + assert.strictEqual(7, c[1]); } { const d = Buffer.from([23, 42, 255]); - assert.equal(d.length, 3); - assert.equal(d[0], 23); - assert.equal(d[1], 42); - assert.equal(d[2], 255); + assert.strictEqual(d.length, 3); + assert.strictEqual(d[0], 23); + assert.strictEqual(d[1], 42); + assert.strictEqual(d[2], 255); assert.deepStrictEqual(d, Buffer.from(d)); } @@ -239,22 +239,22 @@ for (let i = 0; i < Buffer.byteLength(utf8String); i++) { console.error('f.length: %d (should be 12)', f.length); assert.deepStrictEqual(f, Buffer.from([63, 4, 64, 4, 56, 4, 50, 4, 53, 4, 66, 4])); - assert.equal(f.toString(encoding), 'привет'); + assert.strictEqual(f.toString(encoding), 'привет'); } { const f = Buffer.from([0, 0, 0, 0, 0]); - assert.equal(f.length, 5); + assert.strictEqual(f.length, 5); const size = f.write('あいうえお', encoding); console.error('bytes written to buffer: %d (should be 4)', size); - assert.equal(size, 4); + assert.strictEqual(size, 4); assert.deepStrictEqual(f, Buffer.from([0x42, 0x30, 0x44, 0x30, 0x00])); } }); { const f = Buffer.from('\uD83D\uDC4D', 'utf-16le'); // THUMBS UP SIGN (U+1F44D) - assert.equal(f.length, 4); + assert.strictEqual(f.length, 4); assert.deepStrictEqual(f, Buffer.from('3DD84DDC', 'hex')); } @@ -270,7 +270,7 @@ assert.deepStrictEqual(g, Buffer.from([0, 1, 2, 3])); // // Test toString('base64') // -assert.equal('TWFu', (Buffer.from('Man')).toString('base64')); +assert.strictEqual('TWFu', (Buffer.from('Man')).toString('base64')); { // test that regular and URL-safe base64 both work @@ -295,12 +295,12 @@ assert.equal('TWFu', (Buffer.from('Man')).toString('base64')); 'dWVkIGFuZCBpbmRlZmF0aWdhYmxlIGdlbmVyYXRpb24gb2Yga25vd2xlZ' + 'GdlLCBleGNlZWRzIHRoZSBzaG9ydCB2ZWhlbWVuY2Ugb2YgYW55IGNhcm' + '5hbCBwbGVhc3VyZS4='; - assert.equal(expected, (Buffer.from(quote)).toString('base64')); + assert.strictEqual(expected, (Buffer.from(quote)).toString('base64')); let b = Buffer.allocUnsafe(1024); let bytesWritten = b.write(expected, 0, 'base64'); - assert.equal(quote.length, bytesWritten); - assert.equal(quote, b.toString('ascii', 0, quote.length)); + assert.strictEqual(quote.length, bytesWritten); + assert.strictEqual(quote, b.toString('ascii', 0, quote.length)); // check that the base64 decoder ignores whitespace const expectedWhite = expected.slice(0, 60) + ' \n' + @@ -311,14 +311,14 @@ assert.equal('TWFu', (Buffer.from('Man')).toString('base64')); expected.slice(300, 360) + '\n'; b = Buffer.allocUnsafe(1024); bytesWritten = b.write(expectedWhite, 0, 'base64'); - assert.equal(quote.length, bytesWritten); - assert.equal(quote, b.toString('ascii', 0, quote.length)); + assert.strictEqual(quote.length, bytesWritten); + assert.strictEqual(quote, b.toString('ascii', 0, quote.length)); // check that the base64 decoder on the constructor works // even in the presence of whitespace. b = Buffer.from(expectedWhite, 'base64'); - assert.equal(quote.length, b.length); - assert.equal(quote, b.toString('ascii', 0, quote.length)); + assert.strictEqual(quote.length, b.length); + assert.strictEqual(quote, b.toString('ascii', 0, quote.length)); // check that the base64 decoder ignores illegal chars const expectedIllegal = expected.slice(0, 60) + ' \x80' + @@ -328,102 +328,112 @@ assert.equal('TWFu', (Buffer.from('Man')).toString('base64')); expected.slice(240, 300) + '\x03' + expected.slice(300, 360); b = Buffer.from(expectedIllegal, 'base64'); - assert.equal(quote.length, b.length); - assert.equal(quote, b.toString('ascii', 0, quote.length)); + assert.strictEqual(quote.length, b.length); + assert.strictEqual(quote, b.toString('ascii', 0, quote.length)); } -assert.equal(Buffer.from('', 'base64').toString(), ''); -assert.equal(Buffer.from('K', 'base64').toString(), ''); +assert.strictEqual(Buffer.from('', 'base64').toString(), ''); +assert.strictEqual(Buffer.from('K', 'base64').toString(), ''); // multiple-of-4 with padding -assert.equal(Buffer.from('Kg==', 'base64').toString(), '*'); -assert.equal(Buffer.from('Kio=', 'base64').toString(), '**'); -assert.equal(Buffer.from('Kioq', 'base64').toString(), '***'); -assert.equal(Buffer.from('KioqKg==', 'base64').toString(), '****'); -assert.equal(Buffer.from('KioqKio=', 'base64').toString(), '*****'); -assert.equal(Buffer.from('KioqKioq', 'base64').toString(), '******'); -assert.equal(Buffer.from('KioqKioqKg==', 'base64').toString(), '*******'); -assert.equal(Buffer.from('KioqKioqKio=', 'base64').toString(), '********'); -assert.equal(Buffer.from('KioqKioqKioq', 'base64').toString(), '*********'); -assert.equal(Buffer.from('KioqKioqKioqKg==', 'base64').toString(), - '**********'); -assert.equal(Buffer.from('KioqKioqKioqKio=', 'base64').toString(), - '***********'); -assert.equal(Buffer.from('KioqKioqKioqKioq', 'base64').toString(), - '************'); -assert.equal(Buffer.from('KioqKioqKioqKioqKg==', 'base64').toString(), - '*************'); -assert.equal(Buffer.from('KioqKioqKioqKioqKio=', 'base64').toString(), - '**************'); -assert.equal(Buffer.from('KioqKioqKioqKioqKioq', 'base64').toString(), - '***************'); -assert.equal(Buffer.from('KioqKioqKioqKioqKioqKg==', 'base64').toString(), - '****************'); -assert.equal(Buffer.from('KioqKioqKioqKioqKioqKio=', 'base64').toString(), - '*****************'); -assert.equal(Buffer.from('KioqKioqKioqKioqKioqKioq', 'base64').toString(), - '******************'); -assert.equal(Buffer.from('KioqKioqKioqKioqKioqKioqKg==', 'base64').toString(), - '*******************'); -assert.equal(Buffer.from('KioqKioqKioqKioqKioqKioqKio=', 'base64').toString(), - '********************'); +assert.strictEqual(Buffer.from('Kg==', 'base64').toString(), '*'); +assert.strictEqual(Buffer.from('Kio=', 'base64').toString(), '*'.repeat(2)); +assert.strictEqual(Buffer.from('Kioq', 'base64').toString(), '*'.repeat(3)); +assert.strictEqual(Buffer.from('KioqKg==', 'base64').toString(), '*'.repeat(4)); +assert.strictEqual(Buffer.from('KioqKio=', 'base64').toString(), '*'.repeat(5)); +assert.strictEqual(Buffer.from('KioqKioq', 'base64').toString(), '*'.repeat(6)); +assert.strictEqual(Buffer.from('KioqKioqKg==', 'base64').toString(), + '*'.repeat(7)); +assert.strictEqual(Buffer.from('KioqKioqKio=', 'base64').toString(), + '*'.repeat(8)); +assert.strictEqual(Buffer.from('KioqKioqKioq', 'base64').toString(), + '*'.repeat(9)); +assert.strictEqual(Buffer.from('KioqKioqKioqKg==', 'base64').toString(), + '*'.repeat(10)); +assert.strictEqual(Buffer.from('KioqKioqKioqKio=', 'base64').toString(), + '*'.repeat(11)); +assert.strictEqual(Buffer.from('KioqKioqKioqKioq', 'base64').toString(), + '*'.repeat(12)); +assert.strictEqual(Buffer.from('KioqKioqKioqKioqKg==', 'base64').toString(), + '*'.repeat(13)); +assert.strictEqual(Buffer.from('KioqKioqKioqKioqKio=', 'base64').toString(), + '*'.repeat(14)); +assert.strictEqual(Buffer.from('KioqKioqKioqKioqKioq', 'base64').toString(), + '*'.repeat(15)); +assert.strictEqual(Buffer.from('KioqKioqKioqKioqKioqKg==', 'base64').toString(), + '*'.repeat(16)); +assert.strictEqual(Buffer.from('KioqKioqKioqKioqKioqKio=', 'base64').toString(), + '*'.repeat(17)); +assert.strictEqual(Buffer.from('KioqKioqKioqKioqKioqKioq', 'base64').toString(), + '*'.repeat(18)); +assert.strictEqual(Buffer.from('KioqKioqKioqKioqKioqKioqKg==', + 'base64').toString(), + '*'.repeat(19)); +assert.strictEqual(Buffer.from('KioqKioqKioqKioqKioqKioqKio=', + 'base64').toString(), + '*'.repeat(20)); // no padding, not a multiple of 4 -assert.equal(Buffer.from('Kg', 'base64').toString(), '*'); -assert.equal(Buffer.from('Kio', 'base64').toString(), '**'); -assert.equal(Buffer.from('KioqKg', 'base64').toString(), '****'); -assert.equal(Buffer.from('KioqKio', 'base64').toString(), '*****'); -assert.equal(Buffer.from('KioqKioqKg', 'base64').toString(), '*******'); -assert.equal(Buffer.from('KioqKioqKio', 'base64').toString(), '********'); -assert.equal(Buffer.from('KioqKioqKioqKg', 'base64').toString(), '**********'); -assert.equal(Buffer.from('KioqKioqKioqKio', 'base64').toString(), - '***********'); -assert.equal(Buffer.from('KioqKioqKioqKioqKg', 'base64').toString(), - '*************'); -assert.equal(Buffer.from('KioqKioqKioqKioqKio', 'base64').toString(), - '**************'); -assert.equal(Buffer.from('KioqKioqKioqKioqKioqKg', 'base64').toString(), - '****************'); -assert.equal(Buffer.from('KioqKioqKioqKioqKioqKio', 'base64').toString(), - '*****************'); -assert.equal(Buffer.from('KioqKioqKioqKioqKioqKioqKg', 'base64').toString(), - '*******************'); -assert.equal(Buffer.from('KioqKioqKioqKioqKioqKioqKio', 'base64').toString(), - '********************'); +assert.strictEqual(Buffer.from('Kg', 'base64').toString(), '*'); +assert.strictEqual(Buffer.from('Kio', 'base64').toString(), '*'.repeat(2)); +assert.strictEqual(Buffer.from('KioqKg', 'base64').toString(), '*'.repeat(4)); +assert.strictEqual(Buffer.from('KioqKio', 'base64').toString(), '*'.repeat(5)); +assert.strictEqual(Buffer.from('KioqKioqKg', 'base64').toString(), + '*'.repeat(7)); +assert.strictEqual(Buffer.from('KioqKioqKio', 'base64').toString(), + '*'.repeat(8)); +assert.strictEqual(Buffer.from('KioqKioqKioqKg', 'base64').toString(), + '*'.repeat(10)); +assert.strictEqual(Buffer.from('KioqKioqKioqKio', 'base64').toString(), + '*'.repeat(11)); +assert.strictEqual(Buffer.from('KioqKioqKioqKioqKg', 'base64').toString(), + '*'.repeat(13)); +assert.strictEqual(Buffer.from('KioqKioqKioqKioqKio', 'base64').toString(), + '*'.repeat(14)); +assert.strictEqual(Buffer.from('KioqKioqKioqKioqKioqKg', 'base64').toString(), + '*'.repeat(16)); +assert.strictEqual(Buffer.from('KioqKioqKioqKioqKioqKio', 'base64').toString(), + '*'.repeat(17)); +assert.strictEqual(Buffer.from('KioqKioqKioqKioqKioqKioqKg', + 'base64').toString(), + '*'.repeat(19)); +assert.strictEqual(Buffer.from('KioqKioqKioqKioqKioqKioqKio', + 'base64').toString(), + '*'.repeat(20)); // handle padding graciously, multiple-of-4 or not -assert.equal( +assert.strictEqual( Buffer.from('72INjkR5fchcxk9+VgdGPFJDxUBFR5/rMFsghgxADiw==', 'base64').length, 32 ); -assert.equal( +assert.strictEqual( Buffer.from('72INjkR5fchcxk9+VgdGPFJDxUBFR5/rMFsghgxADiw=', 'base64').length, 32 ); -assert.equal( +assert.strictEqual( Buffer.from('72INjkR5fchcxk9+VgdGPFJDxUBFR5/rMFsghgxADiw', 'base64').length, 32 ); -assert.equal( +assert.strictEqual( Buffer.from('w69jACy6BgZmaFvv96HG6MYksWytuZu3T1FvGnulPg==', 'base64').length, 31 ); -assert.equal( +assert.strictEqual( Buffer.from('w69jACy6BgZmaFvv96HG6MYksWytuZu3T1FvGnulPg=', 'base64').length, 31 ); -assert.equal( +assert.strictEqual( Buffer.from('w69jACy6BgZmaFvv96HG6MYksWytuZu3T1FvGnulPg', 'base64').length, 31 ); // This string encodes single '.' character in UTF-16 var dot = Buffer.from('//4uAA==', 'base64'); -assert.equal(dot[0], 0xff); -assert.equal(dot[1], 0xfe); -assert.equal(dot[2], 0x2e); -assert.equal(dot[3], 0x00); -assert.equal(dot.toString('base64'), '//4uAA=='); +assert.strictEqual(dot[0], 0xff); +assert.strictEqual(dot[1], 0xfe); +assert.strictEqual(dot[2], 0x2e); +assert.strictEqual(dot[3], 0x00); +assert.strictEqual(dot.toString('base64'), '//4uAA=='); { // Writing base64 at a position > 0 should not mangle the result. @@ -436,11 +446,12 @@ assert.equal(dot.toString('base64'), '//4uAA=='); for (let i = 0; i < segments.length; ++i) { pos += b.write(segments[i], pos, 'base64'); } - assert.equal(b.toString('latin1', 0, pos), 'Madness?! This is node.js!'); + assert.strictEqual(b.toString('latin1', 0, pos), + 'Madness?! This is node.js!'); } // Regression test for https://github.com/nodejs/node/issues/3496. -assert.equal(Buffer.from('=bad'.repeat(1e4), 'base64').length, 0); +assert.strictEqual(Buffer.from('=bad'.repeat(1e4), 'base64').length, 0); { // Creating buffers larger than pool size. @@ -453,22 +464,22 @@ assert.equal(Buffer.from('=bad'.repeat(1e4), 'base64').length, 0); const b = Buffer.from(s); for (let i = 0; i < l; i++) { - assert.equal('h'.charCodeAt(0), b[i]); + assert.strictEqual('h'.charCodeAt(0), b[i]); } const sb = b.toString(); - assert.equal(sb.length, s.length); - assert.equal(sb, s); + assert.strictEqual(sb.length, s.length); + assert.strictEqual(sb, s); } { // Single argument slice const b = Buffer.from('abcde'); - assert.equal('bcde', b.slice(1).toString()); + assert.strictEqual('bcde', b.slice(1).toString()); } // slice(0,0).length === 0 -assert.equal(0, Buffer.from('hello').slice(0, 0).length); +assert.strictEqual(0, Buffer.from('hello').slice(0, 0).length); // test hex toString console.log('Create hex string from buffer'); @@ -477,28 +488,28 @@ for (let i = 0; i < 256; i++) { hexb[i] = i; } var hexStr = hexb.toString('hex'); -assert.equal(hexStr, - '000102030405060708090a0b0c0d0e0f' + - '101112131415161718191a1b1c1d1e1f' + - '202122232425262728292a2b2c2d2e2f' + - '303132333435363738393a3b3c3d3e3f' + - '404142434445464748494a4b4c4d4e4f' + - '505152535455565758595a5b5c5d5e5f' + - '606162636465666768696a6b6c6d6e6f' + - '707172737475767778797a7b7c7d7e7f' + - '808182838485868788898a8b8c8d8e8f' + - '909192939495969798999a9b9c9d9e9f' + - 'a0a1a2a3a4a5a6a7a8a9aaabacadaeaf' + - 'b0b1b2b3b4b5b6b7b8b9babbbcbdbebf' + - 'c0c1c2c3c4c5c6c7c8c9cacbcccdcecf' + - 'd0d1d2d3d4d5d6d7d8d9dadbdcdddedf' + - 'e0e1e2e3e4e5e6e7e8e9eaebecedeeef' + - 'f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff'); +assert.strictEqual(hexStr, + '000102030405060708090a0b0c0d0e0f' + + '101112131415161718191a1b1c1d1e1f' + + '202122232425262728292a2b2c2d2e2f' + + '303132333435363738393a3b3c3d3e3f' + + '404142434445464748494a4b4c4d4e4f' + + '505152535455565758595a5b5c5d5e5f' + + '606162636465666768696a6b6c6d6e6f' + + '707172737475767778797a7b7c7d7e7f' + + '808182838485868788898a8b8c8d8e8f' + + '909192939495969798999a9b9c9d9e9f' + + 'a0a1a2a3a4a5a6a7a8a9aaabacadaeaf' + + 'b0b1b2b3b4b5b6b7b8b9babbbcbdbebf' + + 'c0c1c2c3c4c5c6c7c8c9cacbcccdcecf' + + 'd0d1d2d3d4d5d6d7d8d9dadbdcdddedf' + + 'e0e1e2e3e4e5e6e7e8e9eaebecedeeef' + + 'f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff'); console.log('Create buffer from hex string'); var hexb2 = Buffer.from(hexStr, 'hex'); for (let i = 0; i < 256; i++) { - assert.equal(hexb2[i], hexb[i]); + assert.strictEqual(hexb2[i], hexb[i]); } { @@ -508,8 +519,8 @@ for (let i = 0; i < 256; i++) { const b2 = b.toString('hex', 1, 10000); const b3 = b.toString('hex', 1, 5); const b4 = b.toString('hex', 1); - assert.equal(b2, b3); - assert.equal(b2, b4); + assert.strictEqual(b2, b3); + assert.strictEqual(b2, b4); } function buildBuffer(data) { @@ -526,66 +537,66 @@ function buildBuffer(data) { var x = buildBuffer([0x81, 0xa3, 0x66, 0x6f, 0x6f, 0xa3, 0x62, 0x61, 0x72]); console.log(x.inspect()); -assert.equal('', x.inspect()); +assert.strictEqual('', x.inspect()); { const z = x.slice(4); console.log(z.inspect()); console.log(z.length); - assert.equal(5, z.length); - assert.equal(0x6f, z[0]); - assert.equal(0xa3, z[1]); - assert.equal(0x62, z[2]); - assert.equal(0x61, z[3]); - assert.equal(0x72, z[4]); + assert.strictEqual(5, z.length); + assert.strictEqual(0x6f, z[0]); + assert.strictEqual(0xa3, z[1]); + assert.strictEqual(0x62, z[2]); + assert.strictEqual(0x61, z[3]); + assert.strictEqual(0x72, z[4]); } { const z = x.slice(0); console.log(z.inspect()); console.log(z.length); - assert.equal(z.length, x.length); + assert.strictEqual(z.length, x.length); } { const z = x.slice(0, 4); console.log(z.inspect()); console.log(z.length); - assert.equal(4, z.length); - assert.equal(0x81, z[0]); - assert.equal(0xa3, z[1]); + assert.strictEqual(4, z.length); + assert.strictEqual(0x81, z[0]); + assert.strictEqual(0xa3, z[1]); } { const z = x.slice(0, 9); console.log(z.inspect()); console.log(z.length); - assert.equal(9, z.length); + assert.strictEqual(9, z.length); } { const z = x.slice(1, 4); console.log(z.inspect()); console.log(z.length); - assert.equal(3, z.length); - assert.equal(0xa3, z[0]); + assert.strictEqual(3, z.length); + assert.strictEqual(0xa3, z[0]); } { const z = x.slice(2, 4); console.log(z.inspect()); console.log(z.length); - assert.equal(2, z.length); - assert.equal(0x66, z[0]); - assert.equal(0x6f, z[1]); + assert.strictEqual(2, z.length); + assert.strictEqual(0x66, z[0]); + assert.strictEqual(0x6f, z[1]); } -assert.equal(0, Buffer.from('hello').slice(0, 0).length); +assert.strictEqual(0, Buffer.from('hello').slice(0, 0).length); ['ucs2', 'ucs-2', 'utf16le', 'utf-16le'].forEach(function(encoding) { const b = Buffer.allocUnsafe(10); b.write('あいうえお', encoding); - assert.equal(b.toString(encoding), 'あいうえお'); + assert.strictEqual(b.toString(encoding), 'あいうえお'); }); { @@ -593,48 +604,48 @@ assert.equal(0, Buffer.from('hello').slice(0, 0).length); const b = Buffer.from([0xde, 0xad, 0xbe, 0xef]); let s = String.fromCharCode(0xffff); b.write(s, 0, 'latin1'); - assert.equal(0xff, b[0]); - assert.equal(0xad, b[1]); - assert.equal(0xbe, b[2]); - assert.equal(0xef, b[3]); + assert.strictEqual(0xff, b[0]); + assert.strictEqual(0xad, b[1]); + assert.strictEqual(0xbe, b[2]); + assert.strictEqual(0xef, b[3]); s = String.fromCharCode(0xaaee); b.write(s, 0, 'latin1'); - assert.equal(0xee, b[0]); - assert.equal(0xad, b[1]); - assert.equal(0xbe, b[2]); - assert.equal(0xef, b[3]); + assert.strictEqual(0xee, b[0]); + assert.strictEqual(0xad, b[1]); + assert.strictEqual(0xbe, b[2]); + assert.strictEqual(0xef, b[3]); } { // #1210 Test UTF-8 string includes null character let buf = Buffer.from('\0'); - assert.equal(buf.length, 1); + assert.strictEqual(buf.length, 1); buf = Buffer.from('\0\0'); - assert.equal(buf.length, 2); + assert.strictEqual(buf.length, 2); } { const buf = Buffer.allocUnsafe(2); let written = buf.write(''); // 0byte - assert.equal(written, 0); + assert.strictEqual(written, 0); written = buf.write('\0'); // 1byte (v8 adds null terminator) - assert.equal(written, 1); + assert.strictEqual(written, 1); written = buf.write('a\0'); // 1byte * 2 - assert.equal(written, 2); + assert.strictEqual(written, 2); written = buf.write('あ'); // 3bytes - assert.equal(written, 0); + assert.strictEqual(written, 0); written = buf.write('\0あ'); // 1byte + 3bytes - assert.equal(written, 1); + assert.strictEqual(written, 1); written = buf.write('\0\0あ'); // 1byte * 2 + 3bytes - assert.equal(written, 2); + assert.strictEqual(written, 2); } { const buf = Buffer.allocUnsafe(10); written = buf.write('あいう'); // 3bytes * 3 (v8 adds null terminator) - assert.equal(written, 9); + assert.strictEqual(written, 9); written = buf.write('あいう\0'); // 3bytes * 3 + 1byte - assert.equal(written, 10); + assert.strictEqual(written, 10); } { @@ -643,59 +654,59 @@ assert.equal(0, Buffer.from('hello').slice(0, 0).length); buf.fill(0xFF); let written = buf.write('abcd', 1, 2, 'utf8'); console.log(buf); - assert.equal(written, 2); - assert.equal(buf[0], 0xFF); - assert.equal(buf[1], 0x61); - assert.equal(buf[2], 0x62); - assert.equal(buf[3], 0xFF); + assert.strictEqual(written, 2); + assert.strictEqual(buf[0], 0xFF); + assert.strictEqual(buf[1], 0x61); + assert.strictEqual(buf[2], 0x62); + assert.strictEqual(buf[3], 0xFF); buf.fill(0xFF); written = buf.write('abcd', 1, 4); console.log(buf); - assert.equal(written, 3); - assert.equal(buf[0], 0xFF); - assert.equal(buf[1], 0x61); - assert.equal(buf[2], 0x62); - assert.equal(buf[3], 0x63); + assert.strictEqual(written, 3); + assert.strictEqual(buf[0], 0xFF); + assert.strictEqual(buf[1], 0x61); + assert.strictEqual(buf[2], 0x62); + assert.strictEqual(buf[3], 0x63); buf.fill(0xFF); written = buf.write('abcd', 1, 2, 'utf8'); console.log(buf); - assert.equal(written, 2); - assert.equal(buf[0], 0xFF); - assert.equal(buf[1], 0x61); - assert.equal(buf[2], 0x62); - assert.equal(buf[3], 0xFF); + assert.strictEqual(written, 2); + assert.strictEqual(buf[0], 0xFF); + assert.strictEqual(buf[1], 0x61); + assert.strictEqual(buf[2], 0x62); + assert.strictEqual(buf[3], 0xFF); buf.fill(0xFF); written = buf.write('abcdef', 1, 2, 'hex'); console.log(buf); - assert.equal(written, 2); - assert.equal(buf[0], 0xFF); - assert.equal(buf[1], 0xAB); - assert.equal(buf[2], 0xCD); - assert.equal(buf[3], 0xFF); + assert.strictEqual(written, 2); + assert.strictEqual(buf[0], 0xFF); + assert.strictEqual(buf[1], 0xAB); + assert.strictEqual(buf[2], 0xCD); + assert.strictEqual(buf[3], 0xFF); ['ucs2', 'ucs-2', 'utf16le', 'utf-16le'].forEach(function(encoding) { buf.fill(0xFF); written = buf.write('abcd', 0, 2, encoding); console.log(buf); - assert.equal(written, 2); - assert.equal(buf[0], 0x61); - assert.equal(buf[1], 0x00); - assert.equal(buf[2], 0xFF); - assert.equal(buf[3], 0xFF); + assert.strictEqual(written, 2); + assert.strictEqual(buf[0], 0x61); + assert.strictEqual(buf[1], 0x00); + assert.strictEqual(buf[2], 0xFF); + assert.strictEqual(buf[3], 0xFF); }); } { // test offset returns are correct const b = Buffer.allocUnsafe(16); - assert.equal(4, b.writeUInt32LE(0, 0)); - assert.equal(6, b.writeUInt16LE(0, 4)); - assert.equal(7, b.writeUInt8(0, 6)); - assert.equal(8, b.writeInt8(0, 7)); - assert.equal(16, b.writeDoubleLE(0, 8)); + assert.strictEqual(4, b.writeUInt32LE(0, 0)); + assert.strictEqual(6, b.writeUInt16LE(0, 4)); + assert.strictEqual(7, b.writeUInt8(0, 6)); + assert.strictEqual(8, b.writeInt8(0, 7)); + assert.strictEqual(16, b.writeDoubleLE(0, 8)); } { @@ -703,13 +714,13 @@ assert.equal(0, Buffer.from('hello').slice(0, 0).length); // ef bf bd = utf-8 representation of unicode replacement character // see https://codereview.chromium.org/121173009/ const buf = Buffer.from('ab\ud800cd', 'utf8'); - assert.equal(buf[0], 0x61); - assert.equal(buf[1], 0x62); - assert.equal(buf[2], 0xef); - assert.equal(buf[3], 0xbf); - assert.equal(buf[4], 0xbd); - assert.equal(buf[5], 0x63); - assert.equal(buf[6], 0x64); + assert.strictEqual(buf[0], 0x61); + assert.strictEqual(buf[1], 0x62); + assert.strictEqual(buf[2], 0xef); + assert.strictEqual(buf[3], 0xbf); + assert.strictEqual(buf[4], 0xbd); + assert.strictEqual(buf[5], 0x63); + assert.strictEqual(buf[6], 0x64); } { @@ -717,8 +728,8 @@ assert.equal(0, Buffer.from('hello').slice(0, 0).length); const buf = Buffer.from([0, 0, 0, 0, 0]); // length: 5 var sub = buf.slice(0, 4); // length: 4 written = sub.write('12345', 'latin1'); - assert.equal(written, 4); - assert.equal(buf[4], 0); + assert.strictEqual(written, 4); + assert.strictEqual(buf[4], 0); } // Check for fractional length args, junk length args, etc. @@ -728,18 +739,18 @@ assert.equal(0, Buffer.from('hello').slice(0, 0).length); Buffer.allocUnsafe(3.3).fill().toString(); // throws bad argument error in commit 43cb4ec Buffer.alloc(3.3).fill().toString(); -assert.equal(Buffer.allocUnsafe(NaN).length, 0); -assert.equal(Buffer.allocUnsafe(3.3).length, 3); -assert.equal(Buffer.from({length: 3.3}).length, 3); -assert.equal(Buffer.from({length: 'BAM'}).length, 0); +assert.strictEqual(Buffer.allocUnsafe(NaN).length, 0); +assert.strictEqual(Buffer.allocUnsafe(3.3).length, 3); +assert.strictEqual(Buffer.from({length: 3.3}).length, 3); +assert.strictEqual(Buffer.from({length: 'BAM'}).length, 0); // Make sure that strings are not coerced to numbers. -assert.equal(Buffer.from('99').length, 2); -assert.equal(Buffer.from('13.37').length, 5); +assert.strictEqual(Buffer.from('99').length, 2); +assert.strictEqual(Buffer.from('13.37').length, 5); // Ensure that the length argument is respected. 'ascii utf8 hex base64 latin1'.split(' ').forEach(function(enc) { - assert.equal(Buffer.allocUnsafe(1).write('aaaaaa', 0, 1, enc), 1); + assert.strictEqual(Buffer.allocUnsafe(1).write('aaaaaa', 0, 1, enc), 1); }); { @@ -747,7 +758,7 @@ assert.equal(Buffer.from('13.37').length, 5); const a = Buffer.allocUnsafe(3); const b = Buffer.from('xxx'); a.write('aaaaaaaa', 'base64'); - assert.equal(b.toString(), 'xxx'); + assert.strictEqual(b.toString(), 'xxx'); } // issue GH-3416 @@ -764,7 +775,7 @@ Buffer.from(Buffer.allocUnsafe(0), 0, 0); 'ucs-2', 'utf16le', 'utf-16le' ].forEach(function(enc) { - assert.equal(Buffer.isEncoding(enc), true); + assert.strictEqual(Buffer.isEncoding(enc), true); }); [ 'utf9', @@ -779,7 +790,7 @@ Buffer.from(Buffer.allocUnsafe(0), 0, 0); 1, 0, -1 ].forEach(function(enc) { - assert.equal(Buffer.isEncoding(enc), false); + assert.strictEqual(Buffer.isEncoding(enc), false); }); @@ -870,8 +881,8 @@ assert.throws(function() { { const buf = Buffer.from([0xFF]); - assert.equal(buf.readUInt8(0), 255); - assert.equal(buf.readInt8(0), -1); + assert.strictEqual(buf.readUInt8(0), 255); + assert.strictEqual(buf.readInt8(0), -1); } [16, 32].forEach(function(bits) { @@ -897,17 +908,17 @@ assert.throws(function() { [16, 32].forEach(function(bits) { var buf = Buffer.from([0xFF, 0xFF, 0xFF, 0xFF]); - assert.equal(buf['readUInt' + bits + 'BE'](0), - (0xFFFFFFFF >>> (32 - bits))); + assert.strictEqual(buf['readUInt' + bits + 'BE'](0), + (0xFFFFFFFF >>> (32 - bits))); - assert.equal(buf['readUInt' + bits + 'LE'](0), - (0xFFFFFFFF >>> (32 - bits))); + assert.strictEqual(buf['readUInt' + bits + 'LE'](0), + (0xFFFFFFFF >>> (32 - bits))); - assert.equal(buf['readInt' + bits + 'BE'](0), - (0xFFFFFFFF >> (32 - bits))); + assert.strictEqual(buf['readInt' + bits + 'BE'](0), + (0xFFFFFFFF >> (32 - bits))); - assert.equal(buf['readInt' + bits + 'LE'](0), - (0xFFFFFFFF >> (32 - bits))); + assert.strictEqual(buf['readInt' + bits + 'LE'](0), + (0xFFFFFFFF >> (32 - bits))); }); // test for common read(U)IntLE/BE @@ -937,92 +948,92 @@ assert.throws(function() { let buf = Buffer.allocUnsafe(3); buf.writeUIntLE(0x123456, 0, 3); assert.deepStrictEqual(buf.toJSON().data, [0x56, 0x34, 0x12]); - assert.equal(buf.readUIntLE(0, 3), 0x123456); + assert.strictEqual(buf.readUIntLE(0, 3), 0x123456); buf = Buffer.allocUnsafe(3); buf.writeUIntBE(0x123456, 0, 3); assert.deepStrictEqual(buf.toJSON().data, [0x12, 0x34, 0x56]); - assert.equal(buf.readUIntBE(0, 3), 0x123456); + assert.strictEqual(buf.readUIntBE(0, 3), 0x123456); buf = Buffer.allocUnsafe(3); buf.writeIntLE(0x123456, 0, 3); assert.deepStrictEqual(buf.toJSON().data, [0x56, 0x34, 0x12]); - assert.equal(buf.readIntLE(0, 3), 0x123456); + assert.strictEqual(buf.readIntLE(0, 3), 0x123456); buf = Buffer.allocUnsafe(3); buf.writeIntBE(0x123456, 0, 3); assert.deepStrictEqual(buf.toJSON().data, [0x12, 0x34, 0x56]); - assert.equal(buf.readIntBE(0, 3), 0x123456); + assert.strictEqual(buf.readIntBE(0, 3), 0x123456); buf = Buffer.allocUnsafe(3); buf.writeIntLE(-0x123456, 0, 3); assert.deepStrictEqual(buf.toJSON().data, [0xaa, 0xcb, 0xed]); - assert.equal(buf.readIntLE(0, 3), -0x123456); + assert.strictEqual(buf.readIntLE(0, 3), -0x123456); buf = Buffer.allocUnsafe(3); buf.writeIntBE(-0x123456, 0, 3); assert.deepStrictEqual(buf.toJSON().data, [0xed, 0xcb, 0xaa]); - assert.equal(buf.readIntBE(0, 3), -0x123456); + assert.strictEqual(buf.readIntBE(0, 3), -0x123456); buf = Buffer.allocUnsafe(3); buf.writeIntLE(-0x123400, 0, 3); assert.deepStrictEqual(buf.toJSON().data, [0x00, 0xcc, 0xed]); - assert.equal(buf.readIntLE(0, 3), -0x123400); + assert.strictEqual(buf.readIntLE(0, 3), -0x123400); buf = Buffer.allocUnsafe(3); buf.writeIntBE(-0x123400, 0, 3); assert.deepStrictEqual(buf.toJSON().data, [0xed, 0xcc, 0x00]); - assert.equal(buf.readIntBE(0, 3), -0x123400); + assert.strictEqual(buf.readIntBE(0, 3), -0x123400); buf = Buffer.allocUnsafe(3); buf.writeIntLE(-0x120000, 0, 3); assert.deepStrictEqual(buf.toJSON().data, [0x00, 0x00, 0xee]); - assert.equal(buf.readIntLE(0, 3), -0x120000); + assert.strictEqual(buf.readIntLE(0, 3), -0x120000); buf = Buffer.allocUnsafe(3); buf.writeIntBE(-0x120000, 0, 3); assert.deepStrictEqual(buf.toJSON().data, [0xee, 0x00, 0x00]); - assert.equal(buf.readIntBE(0, 3), -0x120000); + assert.strictEqual(buf.readIntBE(0, 3), -0x120000); buf = Buffer.allocUnsafe(5); buf.writeUIntLE(0x1234567890, 0, 5); assert.deepStrictEqual(buf.toJSON().data, [0x90, 0x78, 0x56, 0x34, 0x12]); - assert.equal(buf.readUIntLE(0, 5), 0x1234567890); + assert.strictEqual(buf.readUIntLE(0, 5), 0x1234567890); buf = Buffer.allocUnsafe(5); buf.writeUIntBE(0x1234567890, 0, 5); assert.deepStrictEqual(buf.toJSON().data, [0x12, 0x34, 0x56, 0x78, 0x90]); - assert.equal(buf.readUIntBE(0, 5), 0x1234567890); + assert.strictEqual(buf.readUIntBE(0, 5), 0x1234567890); buf = Buffer.allocUnsafe(5); buf.writeIntLE(0x1234567890, 0, 5); assert.deepStrictEqual(buf.toJSON().data, [0x90, 0x78, 0x56, 0x34, 0x12]); - assert.equal(buf.readIntLE(0, 5), 0x1234567890); + assert.strictEqual(buf.readIntLE(0, 5), 0x1234567890); buf = Buffer.allocUnsafe(5); buf.writeIntBE(0x1234567890, 0, 5); assert.deepStrictEqual(buf.toJSON().data, [0x12, 0x34, 0x56, 0x78, 0x90]); - assert.equal(buf.readIntBE(0, 5), 0x1234567890); + assert.strictEqual(buf.readIntBE(0, 5), 0x1234567890); buf = Buffer.allocUnsafe(5); buf.writeIntLE(-0x1234567890, 0, 5); assert.deepStrictEqual(buf.toJSON().data, [0x70, 0x87, 0xa9, 0xcb, 0xed]); - assert.equal(buf.readIntLE(0, 5), -0x1234567890); + assert.strictEqual(buf.readIntLE(0, 5), -0x1234567890); buf = Buffer.allocUnsafe(5); buf.writeIntBE(-0x1234567890, 0, 5); assert.deepStrictEqual(buf.toJSON().data, [0xed, 0xcb, 0xa9, 0x87, 0x70]); - assert.equal(buf.readIntBE(0, 5), -0x1234567890); + assert.strictEqual(buf.readIntBE(0, 5), -0x1234567890); buf = Buffer.allocUnsafe(5); buf.writeIntLE(-0x0012000000, 0, 5); assert.deepStrictEqual(buf.toJSON().data, [0x00, 0x00, 0x00, 0xee, 0xff]); - assert.equal(buf.readIntLE(0, 5), -0x0012000000); + assert.strictEqual(buf.readIntLE(0, 5), -0x0012000000); buf = Buffer.allocUnsafe(5); buf.writeIntBE(-0x0012000000, 0, 5); assert.deepStrictEqual(buf.toJSON().data, [0xff, 0xee, 0x00, 0x00, 0x00]); - assert.equal(buf.readIntBE(0, 5), -0x0012000000); + assert.strictEqual(buf.readIntBE(0, 5), -0x0012000000); } // test Buffer slice @@ -1114,7 +1125,7 @@ if (common.hasCrypto) { var b1 = Buffer.from('YW55=======', 'base64'); var b2 = Buffer.from('YW55', 'base64'); - assert.equal( + assert.strictEqual( crypto.createHash('sha1').update(b1).digest('hex'), crypto.createHash('sha1').update(b2).digest('hex') ); @@ -1124,7 +1135,7 @@ if (common.hasCrypto) { var ps = Buffer.poolSize; Buffer.poolSize = 0; -assert.equal(Buffer.allocUnsafe(1).parent, undefined); +assert.strictEqual(Buffer.allocUnsafe(1).parent, undefined); Buffer.poolSize = ps; // Test Buffer.copy() segfault @@ -1160,7 +1171,7 @@ assert.throws(() => { const ubuf = Buffer.allocUnsafeSlow(10); assert(ubuf); assert(ubuf.buffer); -assert.equal(ubuf.buffer.byteLength, 10); +assert.strictEqual(ubuf.buffer.byteLength, 10); // Regression test assert.doesNotThrow(() => { From 0f76db67071fc7916b5c61644b010af7b7fc92c8 Mon Sep 17 00:00:00 2001 From: James M Snell Date: Wed, 24 Aug 2016 07:21:01 -0700 Subject: [PATCH 10/12] test: separate out buffer slice tests --- test/parallel/test-buffer-alloc.js | 51 ----------------------------- test/parallel/test-buffer-slice.js | 52 ++++++++++++++++++++++++++++++ test/parallel/test-buffer.js | 51 ----------------------------- 3 files changed, 52 insertions(+), 102 deletions(-) create mode 100644 test/parallel/test-buffer-slice.js diff --git a/test/parallel/test-buffer-alloc.js b/test/parallel/test-buffer-alloc.js index 9247d88d34ce45..bc8b921a2be75f 100644 --- a/test/parallel/test-buffer-alloc.js +++ b/test/parallel/test-buffer-alloc.js @@ -1036,57 +1036,6 @@ assert.throws(function() { assert.strictEqual(buf.readIntBE(0, 5), -0x0012000000); } -// test Buffer slice -{ - const buf = Buffer.from('0123456789'); - assert.equal(buf.slice(-10, 10), '0123456789'); - assert.equal(buf.slice(-20, 10), '0123456789'); - assert.equal(buf.slice(-20, -10), ''); - assert.equal(buf.slice(), '0123456789'); - assert.equal(buf.slice(0), '0123456789'); - assert.equal(buf.slice(0, 0), ''); - assert.equal(buf.slice(undefined), '0123456789'); - assert.equal(buf.slice('foobar'), '0123456789'); - assert.equal(buf.slice(undefined, undefined), '0123456789'); - - assert.equal(buf.slice(2), '23456789'); - assert.equal(buf.slice(5), '56789'); - assert.equal(buf.slice(10), ''); - assert.equal(buf.slice(5, 8), '567'); - assert.equal(buf.slice(8, -1), '8'); - assert.equal(buf.slice(-10), '0123456789'); - assert.equal(buf.slice(0, -9), '0'); - assert.equal(buf.slice(0, -10), ''); - assert.equal(buf.slice(0, -1), '012345678'); - assert.equal(buf.slice(2, -2), '234567'); - assert.equal(buf.slice(0, 65536), '0123456789'); - assert.equal(buf.slice(65536, 0), ''); - assert.equal(buf.slice(-5, -8), ''); - assert.equal(buf.slice(-5, -3), '56'); - assert.equal(buf.slice(-10, 10), '0123456789'); - for (let i = 0, s = buf.toString(); i < buf.length; ++i) { - assert.equal(buf.slice(i), s.slice(i)); - assert.equal(buf.slice(0, i), s.slice(0, i)); - assert.equal(buf.slice(-i), s.slice(-i)); - assert.equal(buf.slice(0, -i), s.slice(0, -i)); - } - - const utf16Buf = Buffer.from('0123456789', 'utf16le'); - assert.deepStrictEqual(utf16Buf.slice(0, 6), Buffer.from('012', 'utf16le')); - - assert.equal(buf.slice('0', '1'), '0'); - assert.equal(buf.slice('-5', '10'), '56789'); - assert.equal(buf.slice('-10', '10'), '0123456789'); - assert.equal(buf.slice('-10', '-5'), '01234'); - assert.equal(buf.slice('-10', '-0'), ''); - assert.equal(buf.slice('111'), ''); - assert.equal(buf.slice('0', '-111'), ''); - - // try to slice a zero length Buffer - // see https://github.com/joyent/node/issues/5881 - Buffer.alloc(0).slice(0, 1); -} - // Regression test for #5482: should throw but not assert in C++ land. assert.throws(function() { Buffer.from('', 'buffer'); diff --git a/test/parallel/test-buffer-slice.js b/test/parallel/test-buffer-slice.js new file mode 100644 index 00000000000000..311acaebfae37f --- /dev/null +++ b/test/parallel/test-buffer-slice.js @@ -0,0 +1,52 @@ +'use strict'; + +require('../common'); +const assert = require('assert'); + +const buf = Buffer.from('0123456789'); +assert.equal(buf.slice(-10, 10), '0123456789'); +assert.equal(buf.slice(-20, 10), '0123456789'); +assert.equal(buf.slice(-20, -10), ''); +assert.equal(buf.slice(), '0123456789'); +assert.equal(buf.slice(0), '0123456789'); +assert.equal(buf.slice(0, 0), ''); +assert.equal(buf.slice(undefined), '0123456789'); +assert.equal(buf.slice('foobar'), '0123456789'); +assert.equal(buf.slice(undefined, undefined), '0123456789'); + +assert.equal(buf.slice(2), '23456789'); +assert.equal(buf.slice(5), '56789'); +assert.equal(buf.slice(10), ''); +assert.equal(buf.slice(5, 8), '567'); +assert.equal(buf.slice(8, -1), '8'); +assert.equal(buf.slice(-10), '0123456789'); +assert.equal(buf.slice(0, -9), '0'); +assert.equal(buf.slice(0, -10), ''); +assert.equal(buf.slice(0, -1), '012345678'); +assert.equal(buf.slice(2, -2), '234567'); +assert.equal(buf.slice(0, 65536), '0123456789'); +assert.equal(buf.slice(65536, 0), ''); +assert.equal(buf.slice(-5, -8), ''); +assert.equal(buf.slice(-5, -3), '56'); +assert.equal(buf.slice(-10, 10), '0123456789'); +for (let i = 0, s = buf.toString(); i < buf.length; ++i) { + assert.equal(buf.slice(i), s.slice(i)); + assert.equal(buf.slice(0, i), s.slice(0, i)); + assert.equal(buf.slice(-i), s.slice(-i)); + assert.equal(buf.slice(0, -i), s.slice(0, -i)); +} + +const utf16Buf = Buffer.from('0123456789', 'utf16le'); +assert.deepStrictEqual(utf16Buf.slice(0, 6), Buffer.from('012', 'utf16le')); + +assert.equal(buf.slice('0', '1'), '0'); +assert.equal(buf.slice('-5', '10'), '56789'); +assert.equal(buf.slice('-10', '10'), '0123456789'); +assert.equal(buf.slice('-10', '-5'), '01234'); +assert.equal(buf.slice('-10', '-0'), ''); +assert.equal(buf.slice('111'), ''); +assert.equal(buf.slice('0', '-111'), ''); + +// try to slice a zero length Buffer +// see https://github.com/joyent/node/issues/5881 +Buffer.alloc(0).slice(0, 1); diff --git a/test/parallel/test-buffer.js b/test/parallel/test-buffer.js index f368731a8b9f35..de92daaaeac441 100644 --- a/test/parallel/test-buffer.js +++ b/test/parallel/test-buffer.js @@ -1044,57 +1044,6 @@ assert.throws(function() { assert.equal(buf.readIntBE(0, 5), -0x0012000000); } -// test Buffer slice -{ - const buf = new Buffer('0123456789'); - assert.equal(buf.slice(-10, 10), '0123456789'); - assert.equal(buf.slice(-20, 10), '0123456789'); - assert.equal(buf.slice(-20, -10), ''); - assert.equal(buf.slice(), '0123456789'); - assert.equal(buf.slice(0), '0123456789'); - assert.equal(buf.slice(0, 0), ''); - assert.equal(buf.slice(undefined), '0123456789'); - assert.equal(buf.slice('foobar'), '0123456789'); - assert.equal(buf.slice(undefined, undefined), '0123456789'); - - assert.equal(buf.slice(2), '23456789'); - assert.equal(buf.slice(5), '56789'); - assert.equal(buf.slice(10), ''); - assert.equal(buf.slice(5, 8), '567'); - assert.equal(buf.slice(8, -1), '8'); - assert.equal(buf.slice(-10), '0123456789'); - assert.equal(buf.slice(0, -9), '0'); - assert.equal(buf.slice(0, -10), ''); - assert.equal(buf.slice(0, -1), '012345678'); - assert.equal(buf.slice(2, -2), '234567'); - assert.equal(buf.slice(0, 65536), '0123456789'); - assert.equal(buf.slice(65536, 0), ''); - assert.equal(buf.slice(-5, -8), ''); - assert.equal(buf.slice(-5, -3), '56'); - assert.equal(buf.slice(-10, 10), '0123456789'); - for (let i = 0, s = buf.toString(); i < buf.length; ++i) { - assert.equal(buf.slice(i), s.slice(i)); - assert.equal(buf.slice(0, i), s.slice(0, i)); - assert.equal(buf.slice(-i), s.slice(-i)); - assert.equal(buf.slice(0, -i), s.slice(0, -i)); - } - - const utf16Buf = new Buffer('0123456789', 'utf16le'); - assert.deepStrictEqual(utf16Buf.slice(0, 6), Buffer('012', 'utf16le')); - - assert.equal(buf.slice('0', '1'), '0'); - assert.equal(buf.slice('-5', '10'), '56789'); - assert.equal(buf.slice('-10', '10'), '0123456789'); - assert.equal(buf.slice('-10', '-5'), '01234'); - assert.equal(buf.slice('-10', '-0'), ''); - assert.equal(buf.slice('111'), ''); - assert.equal(buf.slice('0', '-111'), ''); - - // try to slice a zero length Buffer - // see https://github.com/joyent/node/issues/5881 - SlowBuffer(0).slice(0, 1); -} - // Regression test for #5482: should throw but not assert in C++ land. assert.throws(function() { Buffer('', 'buffer'); From add7ecc55aa61b432f460a5a99869a2292a0f61f Mon Sep 17 00:00:00 2001 From: James M Snell Date: Wed, 24 Aug 2016 07:25:06 -0700 Subject: [PATCH 11/12] test: separate out buffer isencoding test --- test/parallel/test-buffer-alloc.js | 30 ---------------------- test/parallel/test-buffer-isencoding.js | 33 +++++++++++++++++++++++++ test/parallel/test-buffer.js | 22 ----------------- 3 files changed, 33 insertions(+), 52 deletions(-) create mode 100644 test/parallel/test-buffer-isencoding.js diff --git a/test/parallel/test-buffer-alloc.js b/test/parallel/test-buffer-alloc.js index bc8b921a2be75f..b3de42fee841b4 100644 --- a/test/parallel/test-buffer-alloc.js +++ b/test/parallel/test-buffer-alloc.js @@ -764,36 +764,6 @@ assert.strictEqual(Buffer.from('13.37').length, 5); // issue GH-3416 Buffer.from(Buffer.allocUnsafe(0), 0, 0); -[ 'hex', - 'utf8', - 'utf-8', - 'ascii', - 'latin1', - 'binary', - 'base64', - 'ucs2', - 'ucs-2', - 'utf16le', - 'utf-16le' ].forEach(function(enc) { - assert.strictEqual(Buffer.isEncoding(enc), true); - }); - -[ 'utf9', - 'utf-7', - 'Unicode-FTW', - 'new gnu gun', - false, - NaN, - {}, - Infinity, - [], - 1, - 0, - -1 ].forEach(function(enc) { - assert.strictEqual(Buffer.isEncoding(enc), false); - }); - - // GH-5110 { const buffer = Buffer.from('test'); diff --git a/test/parallel/test-buffer-isencoding.js b/test/parallel/test-buffer-isencoding.js new file mode 100644 index 00000000000000..4ed380aae1ce69 --- /dev/null +++ b/test/parallel/test-buffer-isencoding.js @@ -0,0 +1,33 @@ +'use strict'; + +require('../common'); +const assert = require('assert'); + +[ 'hex', + 'utf8', + 'utf-8', + 'ascii', + 'latin1', + 'binary', + 'base64', + 'ucs2', + 'ucs-2', + 'utf16le', + 'utf-16le' ].forEach((enc) => { + assert.strictEqual(Buffer.isEncoding(enc), true); + }); + +[ 'utf9', + 'utf-7', + 'Unicode-FTW', + 'new gnu gun', + false, + NaN, + {}, + Infinity, + [], + 1, + 0, + -1 ].forEach((enc) => { + assert.strictEqual(Buffer.isEncoding(enc), false); + }); diff --git a/test/parallel/test-buffer.js b/test/parallel/test-buffer.js index de92daaaeac441..b6c78cd466a8f7 100644 --- a/test/parallel/test-buffer.js +++ b/test/parallel/test-buffer.js @@ -770,28 +770,6 @@ assert.equal(Buffer('13.37').length, 5); // issue GH-3416 Buffer(Buffer(0), 0, 0); -[ 'hex', - 'utf8', - 'utf-8', - 'ascii', - 'latin1', - 'binary', - 'base64', - 'ucs2', - 'ucs-2', - 'utf16le', - 'utf-16le' ].forEach(function(enc) { - assert.equal(Buffer.isEncoding(enc), true); - }); - -[ 'utf9', - 'utf-7', - 'Unicode-FTW', - 'new gnu gun' ].forEach(function(enc) { - assert.equal(Buffer.isEncoding(enc), false); - }); - - // GH-5110 { const buffer = new Buffer('test'); From d67bd342f09d90bb729b893f4c050e6dd0a3f014 Mon Sep 17 00:00:00 2001 From: James M Snell Date: Wed, 24 Aug 2016 10:24:29 -0700 Subject: [PATCH 12/12] test: clean up / refactor buffer tests, remove duplication --- test/parallel/test-buffer-alloc.js | 570 +++++++------- test/parallel/test-buffer-slice.js | 11 + test/parallel/test-buffer.js | 1108 ---------------------------- 3 files changed, 272 insertions(+), 1417 deletions(-) delete mode 100644 test/parallel/test-buffer.js diff --git a/test/parallel/test-buffer-alloc.js b/test/parallel/test-buffer-alloc.js index b3de42fee841b4..6d1ed552f24ad5 100644 --- a/test/parallel/test-buffer-alloc.js +++ b/test/parallel/test-buffer-alloc.js @@ -1,12 +1,11 @@ 'use strict'; -var common = require('../common'); -var assert = require('assert'); +const common = require('../common'); +const assert = require('assert'); -var Buffer = require('buffer').Buffer; +const Buffer = require('buffer').Buffer; +const SlowBuffer = require('buffer').SlowBuffer; -var b = Buffer.allocUnsafe(1024); - -console.log('b.length == %d', b.length); +const b = Buffer.allocUnsafe(1024); assert.strictEqual(1024, b.length); b[0] = -1; @@ -20,65 +19,60 @@ for (let i = 0; i < 1024; i++) { assert.strictEqual(i % 256, b[i]); } -var c = Buffer.allocUnsafe(512); -console.log('c.length == %d', c.length); +const c = Buffer.allocUnsafe(512); assert.strictEqual(512, c.length); -var d = Buffer.from([]); +const d = Buffer.from([]); assert.strictEqual(0, d.length); -var ui32 = new Uint32Array(4).fill(42); -var e = Buffer.from(ui32); -for (const [index, value] of e.entries()) { - assert.strictEqual(value, ui32[index]); +// Test creating a Buffer from a Uint32Array +{ + const ui32 = new Uint32Array(4).fill(42); + const e = Buffer.from(ui32); + for (const [index, value] of e.entries()) { + assert.strictEqual(value, ui32[index]); + } } - -var caught_error; - -// invalid encoding for Buffer.toString -caught_error = null; -try { - b.toString('invalid'); -} catch (err) { - caught_error = err; +// Test creating a Buffer from a Uint32Array (old constructor) +{ + const ui32 = new Uint32Array(4).fill(42); + const e = Buffer(ui32); + for (const [key, value] of e.entries()) { + assert.deepStrictEqual(value, ui32[key]); + } } -assert.strictEqual('Unknown encoding: invalid', caught_error.message); +// Test invalid encoding for Buffer.toString +assert.throws(() => b.toString('invalid'), + /Unknown encoding: invalid/); // invalid encoding for Buffer.write -caught_error = null; -try { - b.write('test string', 0, 5, 'invalid'); -} catch (err) { - caught_error = err; -} -assert.strictEqual('Unknown encoding: invalid', caught_error.message); +assert.throws(() => b.write('test string', 0, 5, 'invalid'), + /Unknown encoding: invalid/); + // try to create 0-length buffers -Buffer.from(''); -Buffer.from('', 'ascii'); -Buffer.from('', 'latin1'); -Buffer.alloc(0); -Buffer.allocUnsafe(0); +assert.doesNotThrow(() => Buffer.from('')); +assert.doesNotThrow(() => Buffer.from('', 'ascii')); +assert.doesNotThrow(() => Buffer.from('', 'latin1')); +assert.doesNotThrow(() => Buffer.alloc(0)); +assert.doesNotThrow(() => Buffer.allocUnsafe(0)); +assert.doesNotThrow(() => new Buffer('')); +assert.doesNotThrow(() => new Buffer('', 'ascii')); +assert.doesNotThrow(() => new Buffer('', 'latin1')); +assert.doesNotThrow(() => new Buffer('', 'binary')); +assert.doesNotThrow(() => Buffer(0)); // try to write a 0-length string beyond the end of b -assert.throws(function() { - b.write('', 2048); -}, RangeError); +assert.throws(() => b.write('', 2048), RangeError); // throw when writing to negative offset -assert.throws(function() { - b.write('a', -1); -}, RangeError); +assert.throws(() => b.write('a', -1), RangeError); // throw when writing past bounds from the pool -assert.throws(function() { - b.write('a', 2048); -}, RangeError); +assert.throws(() => b.write('a', 2048), RangeError); // throw when writing to negative offset -assert.throws(function() { - b.write('a', -1); -}, RangeError); +assert.throws(() => b.write('a', -1), RangeError); // try to copy 0 bytes worth of data into an empty buffer b.copy(Buffer.alloc(0), 0, 0, 0); @@ -91,19 +85,19 @@ b.copy(Buffer.alloc(1), 1, 1, 1); b.copy(Buffer.alloc(1), 0, 2048, 2048); // testing for smart defaults and ability to pass string values as offset -var writeTest = Buffer.from('abcdes'); -writeTest.write('n', 'ascii'); -writeTest.write('o', '1', 'ascii'); -writeTest.write('d', '2', 'ascii'); -writeTest.write('e', 3, 'ascii'); -writeTest.write('j', 4, 'ascii'); -assert.strictEqual(writeTest.toString(), 'nodejs'); +{ + const writeTest = Buffer.from('abcdes'); + writeTest.write('n', 'ascii'); + writeTest.write('o', '1', 'ascii'); + writeTest.write('d', '2', 'ascii'); + writeTest.write('e', 3, 'ascii'); + writeTest.write('j', 4, 'ascii'); + assert.strictEqual(writeTest.toString(), 'nodejs'); +} // Offset points to the end of the buffer // (see https://github.com/nodejs/node/issues/8127). -assert.doesNotThrow(() => { - Buffer.alloc(1).write('', 1, 0); -}); +assert.doesNotThrow(() => Buffer.alloc(1).write('', 1, 0)); // ASCII slice test { @@ -120,8 +114,7 @@ assert.doesNotThrow(() => { const asciiString = 'hello world'; const offset = 100; - const written = b.write(asciiString, offset, 'ascii'); - assert.strictEqual(asciiString.length, written); + assert.strictEqual(asciiString.length, b.write(asciiString, offset, 'ascii')); const asciiSlice = b.toString('ascii', offset, offset + asciiString.length); assert.strictEqual(asciiString, asciiSlice); } @@ -138,23 +131,25 @@ assert.doesNotThrow(() => { } // UTF-8 slice test +{ + const utf8String = '¡hέlló wôrld!'; + const offset = 100; -var utf8String = '¡hέlló wôrld!'; -var offset = 100; - -b.write(utf8String, 0, Buffer.byteLength(utf8String), 'utf8'); -var utf8Slice = b.toString('utf8', 0, Buffer.byteLength(utf8String)); -assert.equal(utf8String, utf8Slice); + b.write(utf8String, 0, Buffer.byteLength(utf8String), 'utf8'); + let utf8Slice = b.toString('utf8', 0, Buffer.byteLength(utf8String)); + assert.equal(utf8String, utf8Slice); -var written = b.write(utf8String, offset, 'utf8'); -assert.strictEqual(Buffer.byteLength(utf8String), written); -utf8Slice = b.toString('utf8', offset, offset + Buffer.byteLength(utf8String)); -assert.strictEqual(utf8String, utf8Slice); + assert.strictEqual(Buffer.byteLength(utf8String), + b.write(utf8String, offset, 'utf8')); + utf8Slice = b.toString('utf8', offset, + offset + Buffer.byteLength(utf8String)); + assert.strictEqual(utf8String, utf8Slice); -var sliceA = b.slice(offset, offset + Buffer.byteLength(utf8String)); -var sliceB = b.slice(offset, offset + Buffer.byteLength(utf8String)); -for (let i = 0; i < Buffer.byteLength(utf8String); i++) { - assert.strictEqual(sliceA[i], sliceB[i]); + const sliceA = b.slice(offset, offset + Buffer.byteLength(utf8String)); + const sliceB = b.slice(offset, offset + Buffer.byteLength(utf8String)); + for (let i = 0; i < Buffer.byteLength(utf8String); i++) { + assert.strictEqual(sliceA[i], sliceB[i]); + } } { @@ -187,7 +182,6 @@ for (let i = 0; i < Buffer.byteLength(utf8String); i++) { const testValue = '\u00F6\u65E5\u672C\u8A9E'; // ö日本語 const buffer = Buffer.allocUnsafe(32); const size = buffer.write(testValue, 0, 'utf8'); - console.log('bytes written to buffer: ' + size); const slice = buffer.toString('utf8', 0, size); assert.strictEqual(slice, testValue); } @@ -216,27 +210,27 @@ for (let i = 0; i < Buffer.byteLength(utf8String); i++) { } { + // Test for proper UTF-8 Encoding const e = Buffer.from('über'); - console.error('uber: \'%s\'', e.toString()); assert.deepStrictEqual(e, Buffer.from([195, 188, 98, 101, 114])); } { + // Test for proper ascii Encoding, length should be 4 const f = Buffer.from('über', 'ascii'); - console.error('f.length: %d (should be 4)', f.length); assert.deepStrictEqual(f, Buffer.from([252, 98, 101, 114])); } -['ucs2', 'ucs-2', 'utf16le', 'utf-16le'].forEach(function(encoding) { +['ucs2', 'ucs-2', 'utf16le', 'utf-16le'].forEach((encoding) => { { + // Test for proper UTF16LE encoding, length should be 8 const f = Buffer.from('über', encoding); - console.error('f.length: %d (should be 8)', f.length); assert.deepStrictEqual(f, Buffer.from([252, 0, 98, 0, 101, 0, 114, 0])); } { + // Length should be 12 const f = Buffer.from('привет', encoding); - console.error('f.length: %d (should be 12)', f.length); assert.deepStrictEqual(f, Buffer.from([63, 4, 64, 4, 56, 4, 50, 4, 53, 4, 66, 4])); assert.strictEqual(f.toString(encoding), 'привет'); @@ -246,7 +240,6 @@ for (let i = 0; i < Buffer.byteLength(utf8String); i++) { const f = Buffer.from([0, 0, 0, 0, 0]); assert.strictEqual(f.length, 5); const size = f.write('あいうえお', encoding); - console.error('bytes written to buffer: %d (should be 4)', size); assert.strictEqual(size, 4); assert.deepStrictEqual(f, Buffer.from([0x42, 0x30, 0x44, 0x30, 0x00])); } @@ -258,14 +251,15 @@ for (let i = 0; i < Buffer.byteLength(utf8String); i++) { assert.deepStrictEqual(f, Buffer.from('3DD84DDC', 'hex')); } - -var arrayIsh = {0: 0, 1: 1, 2: 2, 3: 3, length: 4}; -var g = Buffer.from(arrayIsh); -assert.deepStrictEqual(g, Buffer.from([0, 1, 2, 3])); -var strArrayIsh = {0: '0', 1: '1', 2: '2', 3: '3', length: 4}; -g = Buffer.from(strArrayIsh); -assert.deepStrictEqual(g, Buffer.from([0, 1, 2, 3])); - +// Test construction from arrayish object +{ + const arrayIsh = {0: 0, 1: 1, 2: 2, 3: 3, length: 4}; + let g = Buffer.from(arrayIsh); + assert.deepStrictEqual(g, Buffer.from([0, 1, 2, 3])); + const strArrayIsh = {0: '0', 1: '1', 2: '2', 3: '3', length: 4}; + g = Buffer.from(strArrayIsh); + assert.deepStrictEqual(g, Buffer.from([0, 1, 2, 3])); +} // // Test toString('base64') @@ -427,13 +421,15 @@ assert.strictEqual( 31 ); +{ // This string encodes single '.' character in UTF-16 -var dot = Buffer.from('//4uAA==', 'base64'); -assert.strictEqual(dot[0], 0xff); -assert.strictEqual(dot[1], 0xfe); -assert.strictEqual(dot[2], 0x2e); -assert.strictEqual(dot[3], 0x00); -assert.strictEqual(dot.toString('base64'), '//4uAA=='); + const dot = Buffer.from('//4uAA==', 'base64'); + assert.strictEqual(dot[0], 0xff); + assert.strictEqual(dot[1], 0xfe); + assert.strictEqual(dot[2], 0x2e); + assert.strictEqual(dot[3], 0x00); + assert.strictEqual(dot.toString('base64'), '//4uAA=='); +} { // Writing base64 at a position > 0 should not mangle the result. @@ -456,11 +452,7 @@ assert.strictEqual(Buffer.from('=bad'.repeat(1e4), 'base64').length, 0); { // Creating buffers larger than pool size. const l = Buffer.poolSize + 5; - let s = ''; - for (let i = 0; i < l; i++) { - s += 'h'; - } - + const s = 'h'.repeat(l); const b = Buffer.from(s); for (let i = 0; i < l; i++) { @@ -473,48 +465,46 @@ assert.strictEqual(Buffer.from('=bad'.repeat(1e4), 'base64').length, 0); } { - // Single argument slice - const b = Buffer.from('abcde'); - assert.strictEqual('bcde', b.slice(1).toString()); + // test hex toString + const hexb = Buffer.allocUnsafe(256); + for (let i = 0; i < 256; i++) { + hexb[i] = i; + } + const hexStr = hexb.toString('hex'); + assert.strictEqual(hexStr, + '000102030405060708090a0b0c0d0e0f' + + '101112131415161718191a1b1c1d1e1f' + + '202122232425262728292a2b2c2d2e2f' + + '303132333435363738393a3b3c3d3e3f' + + '404142434445464748494a4b4c4d4e4f' + + '505152535455565758595a5b5c5d5e5f' + + '606162636465666768696a6b6c6d6e6f' + + '707172737475767778797a7b7c7d7e7f' + + '808182838485868788898a8b8c8d8e8f' + + '909192939495969798999a9b9c9d9e9f' + + 'a0a1a2a3a4a5a6a7a8a9aaabacadaeaf' + + 'b0b1b2b3b4b5b6b7b8b9babbbcbdbebf' + + 'c0c1c2c3c4c5c6c7c8c9cacbcccdcecf' + + 'd0d1d2d3d4d5d6d7d8d9dadbdcdddedf' + + 'e0e1e2e3e4e5e6e7e8e9eaebecedeeef' + + 'f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff'); + + const hexb2 = Buffer.from(hexStr, 'hex'); + for (let i = 0; i < 256; i++) { + assert.strictEqual(hexb2[i], hexb[i]); + } } -// slice(0,0).length === 0 -assert.strictEqual(0, Buffer.from('hello').slice(0, 0).length); +// Test single hex character throws TypeError +// - https://github.com/nodejs/node/issues/6770 +assert.throws(() => Buffer.from('A', 'hex'), TypeError); + +// Test single base64 char encodes as 0 +assert.strictEqual(Buffer.from('A', 'base64').length, 0); -// test hex toString -console.log('Create hex string from buffer'); -var hexb = Buffer.allocUnsafe(256); -for (let i = 0; i < 256; i++) { - hexb[i] = i; -} -var hexStr = hexb.toString('hex'); -assert.strictEqual(hexStr, - '000102030405060708090a0b0c0d0e0f' + - '101112131415161718191a1b1c1d1e1f' + - '202122232425262728292a2b2c2d2e2f' + - '303132333435363738393a3b3c3d3e3f' + - '404142434445464748494a4b4c4d4e4f' + - '505152535455565758595a5b5c5d5e5f' + - '606162636465666768696a6b6c6d6e6f' + - '707172737475767778797a7b7c7d7e7f' + - '808182838485868788898a8b8c8d8e8f' + - '909192939495969798999a9b9c9d9e9f' + - 'a0a1a2a3a4a5a6a7a8a9aaabacadaeaf' + - 'b0b1b2b3b4b5b6b7b8b9babbbcbdbebf' + - 'c0c1c2c3c4c5c6c7c8c9cacbcccdcecf' + - 'd0d1d2d3d4d5d6d7d8d9dadbdcdddedf' + - 'e0e1e2e3e4e5e6e7e8e9eaebecedeeef' + - 'f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff'); - -console.log('Create buffer from hex string'); -var hexb2 = Buffer.from(hexStr, 'hex'); -for (let i = 0; i < 256; i++) { - assert.strictEqual(hexb2[i], hexb[i]); -} { // test an invalid slice end. - console.log('Try to slice off the end of the buffer'); const b = Buffer.from([1, 2, 3, 4, 5]); const b2 = b.toString('hex', 1, 10000); const b3 = b.toString('hex', 1, 5); @@ -525,24 +515,19 @@ for (let i = 0; i < 256; i++) { function buildBuffer(data) { if (Array.isArray(data)) { - var buffer = Buffer.allocUnsafe(data.length); - data.forEach(function(v, k) { - buffer[k] = v; - }); + const buffer = Buffer.allocUnsafe(data.length); + data.forEach((v, k) => buffer[k] = v); return buffer; } return null; } -var x = buildBuffer([0x81, 0xa3, 0x66, 0x6f, 0x6f, 0xa3, 0x62, 0x61, 0x72]); +const x = buildBuffer([0x81, 0xa3, 0x66, 0x6f, 0x6f, 0xa3, 0x62, 0x61, 0x72]); -console.log(x.inspect()); assert.strictEqual('', x.inspect()); { const z = x.slice(4); - console.log(z.inspect()); - console.log(z.length); assert.strictEqual(5, z.length); assert.strictEqual(0x6f, z[0]); assert.strictEqual(0xa3, z[1]); @@ -553,15 +538,11 @@ assert.strictEqual('', x.inspect()); { const z = x.slice(0); - console.log(z.inspect()); - console.log(z.length); assert.strictEqual(z.length, x.length); } { const z = x.slice(0, 4); - console.log(z.inspect()); - console.log(z.length); assert.strictEqual(4, z.length); assert.strictEqual(0x81, z[0]); assert.strictEqual(0xa3, z[1]); @@ -569,36 +550,45 @@ assert.strictEqual('', x.inspect()); { const z = x.slice(0, 9); - console.log(z.inspect()); - console.log(z.length); assert.strictEqual(9, z.length); } { const z = x.slice(1, 4); - console.log(z.inspect()); - console.log(z.length); assert.strictEqual(3, z.length); assert.strictEqual(0xa3, z[0]); } { const z = x.slice(2, 4); - console.log(z.inspect()); - console.log(z.length); assert.strictEqual(2, z.length); assert.strictEqual(0x66, z[0]); assert.strictEqual(0x6f, z[1]); } -assert.strictEqual(0, Buffer.from('hello').slice(0, 0).length); - -['ucs2', 'ucs-2', 'utf16le', 'utf-16le'].forEach(function(encoding) { +['ucs2', 'ucs-2', 'utf16le', 'utf-16le'].forEach((encoding) => { const b = Buffer.allocUnsafe(10); b.write('あいうえお', encoding); assert.strictEqual(b.toString(encoding), 'あいうえお'); }); +{ + // latin1 encoding should write only one byte per character. + const b = Buffer.from([0xde, 0xad, 0xbe, 0xef]); + let s = String.fromCharCode(0xffff); + b.write(s, 0, 'latin1'); + assert.strictEqual(0xff, b[0]); + assert.strictEqual(0xad, b[1]); + assert.strictEqual(0xbe, b[2]); + assert.strictEqual(0xef, b[3]); + s = String.fromCharCode(0xaaee); + b.write(s, 0, 'latin1'); + assert.strictEqual(0xee, b[0]); + assert.strictEqual(0xad, b[1]); + assert.strictEqual(0xbe, b[2]); + assert.strictEqual(0xef, b[3]); +} + { // Binary encoding should write only one byte per character. const b = Buffer.from([0xde, 0xad, 0xbe, 0xef]); @@ -626,72 +616,54 @@ assert.strictEqual(0, Buffer.from('hello').slice(0, 0).length); { const buf = Buffer.allocUnsafe(2); - let written = buf.write(''); // 0byte - assert.strictEqual(written, 0); - written = buf.write('\0'); // 1byte (v8 adds null terminator) - assert.strictEqual(written, 1); - written = buf.write('a\0'); // 1byte * 2 - assert.strictEqual(written, 2); - written = buf.write('あ'); // 3bytes - assert.strictEqual(written, 0); - written = buf.write('\0あ'); // 1byte + 3bytes - assert.strictEqual(written, 1); - written = buf.write('\0\0あ'); // 1byte * 2 + 3bytes - assert.strictEqual(written, 2); + assert.strictEqual(buf.write(''), 0); //0bytes + assert.strictEqual(buf.write('\0'), 1); // 1byte (v8 adds null terminator) + assert.strictEqual(buf.write('a\0'), 2); // 1byte * 2 + assert.strictEqual(buf.write('あ'), 0); // 3bytes + assert.strictEqual(buf.write('\0あ'), 1); // 1byte + 3bytes + assert.strictEqual(buf.write('\0\0あ'), 2); // 1byte * 2 + 3bytes } { const buf = Buffer.allocUnsafe(10); - written = buf.write('あいう'); // 3bytes * 3 (v8 adds null terminator) - assert.strictEqual(written, 9); - written = buf.write('あいう\0'); // 3bytes * 3 + 1byte - assert.strictEqual(written, 10); + assert.strictEqual(buf.write('あいう'), 9); // 3bytes * 3 (v8 adds null term.) + assert.strictEqual(buf.write('あいう\0'), 10); // 3bytes * 3 + 1byte } { // #243 Test write() with maxLength const buf = Buffer.allocUnsafe(4); buf.fill(0xFF); - let written = buf.write('abcd', 1, 2, 'utf8'); - console.log(buf); - assert.strictEqual(written, 2); + assert.strictEqual(buf.write('abcd', 1, 2, 'utf8'), 2); assert.strictEqual(buf[0], 0xFF); assert.strictEqual(buf[1], 0x61); assert.strictEqual(buf[2], 0x62); assert.strictEqual(buf[3], 0xFF); buf.fill(0xFF); - written = buf.write('abcd', 1, 4); - console.log(buf); - assert.strictEqual(written, 3); + assert.strictEqual(buf.write('abcd', 1, 4), 3); assert.strictEqual(buf[0], 0xFF); assert.strictEqual(buf[1], 0x61); assert.strictEqual(buf[2], 0x62); assert.strictEqual(buf[3], 0x63); buf.fill(0xFF); - written = buf.write('abcd', 1, 2, 'utf8'); - console.log(buf); - assert.strictEqual(written, 2); + assert.strictEqual(buf.write('abcd', 1, 2, 'utf8'), 2); assert.strictEqual(buf[0], 0xFF); assert.strictEqual(buf[1], 0x61); assert.strictEqual(buf[2], 0x62); assert.strictEqual(buf[3], 0xFF); buf.fill(0xFF); - written = buf.write('abcdef', 1, 2, 'hex'); - console.log(buf); - assert.strictEqual(written, 2); + assert.strictEqual(buf.write('abcdef', 1, 2, 'hex'), 2); assert.strictEqual(buf[0], 0xFF); assert.strictEqual(buf[1], 0xAB); assert.strictEqual(buf[2], 0xCD); assert.strictEqual(buf[3], 0xFF); - ['ucs2', 'ucs-2', 'utf16le', 'utf-16le'].forEach(function(encoding) { + ['ucs2', 'ucs-2', 'utf16le', 'utf-16le'].forEach((encoding) => { buf.fill(0xFF); - written = buf.write('abcd', 0, 2, encoding); - console.log(buf); - assert.strictEqual(written, 2); + assert.strictEqual(buf.write('abcd', 0, 2, encoding), 2); assert.strictEqual(buf[0], 0x61); assert.strictEqual(buf[1], 0x00); assert.strictEqual(buf[2], 0xFF); @@ -726,12 +698,14 @@ assert.strictEqual(0, Buffer.from('hello').slice(0, 0).length); { // test for buffer overrun const buf = Buffer.from([0, 0, 0, 0, 0]); // length: 5 - var sub = buf.slice(0, 4); // length: 4 - written = sub.write('12345', 'latin1'); - assert.strictEqual(written, 4); + const sub = buf.slice(0, 4); // length: 4 + assert.strictEqual(sub.write('12345', 'latin1'), 4); + assert.strictEqual(buf[4], 0); + assert.strictEqual(sub.write('12345', 'binary'), 4); assert.strictEqual(buf[4], 0); } + // Check for fractional length args, junk length args, etc. // https://github.com/joyent/node/issues/1758 @@ -749,7 +723,7 @@ assert.strictEqual(Buffer.from('99').length, 2); assert.strictEqual(Buffer.from('13.37').length, 5); // Ensure that the length argument is respected. -'ascii utf8 hex base64 latin1'.split(' ').forEach(function(enc) { +['ascii', 'utf8', 'hex', 'base64', 'latin1', 'binary'].forEach((enc) => { assert.strictEqual(Buffer.allocUnsafe(1).write('aaaaaa', 0, 1, enc), 1); }); @@ -771,7 +745,7 @@ Buffer.from(Buffer.allocUnsafe(0), 0, 0); assert.strictEqual(string, '{"type":"Buffer","data":[116,101,115,116]}'); - assert.deepStrictEqual(buffer, JSON.parse(string, function(key, value) { + assert.deepStrictEqual(buffer, JSON.parse(string, (key, value) => { return value && value.type === 'Buffer' ? Buffer.from(value.data) : value; @@ -789,63 +763,36 @@ Buffer.from(Buffer.allocUnsafe(0), 0, 0); } // issue GH-4331 -assert.throws(function() { - Buffer.allocUnsafe(0xFFFFFFFF); -}, RangeError); -assert.throws(function() { - Buffer.allocUnsafe(0xFFFFFFFFF); -}, RangeError); +assert.throws(() => Buffer.allocUnsafe(0xFFFFFFFF), RangeError); +assert.throws(() => Buffer.allocUnsafe(0xFFFFFFFFF), RangeError); +// issue GH-5587 +assert.throws(() => Buffer.alloc(8).writeFloatLE(0, 5), RangeError); +assert.throws(() => Buffer.alloc(16).writeDoubleLE(0, 9), RangeError); // attempt to overflow buffers, similar to previous bug in array buffers -assert.throws(function() { - var buf = Buffer.allocUnsafe(8); - buf.readFloatLE(0xffffffff); -}, RangeError); - -assert.throws(function() { - var buf = Buffer.allocUnsafe(8); - buf.writeFloatLE(0.0, 0xffffffff); -}, RangeError); - -assert.throws(function() { - var buf = Buffer.allocUnsafe(8); - buf.readFloatLE(0xffffffff); -}, RangeError); - -assert.throws(function() { - var buf = Buffer.allocUnsafe(8); - buf.writeFloatLE(0.0, 0xffffffff); -}, RangeError); +assert.throws(() => Buffer.allocUnsafe(8).readFloatLE(0xffffffff), + RangeError); +assert.throws(() => Buffer.allocUnsafe(8).writeFloatLE(0.0, 0xffffffff), + RangeError); +assert.throws(() => Buffer.allocUnsafe(8).readFloatLE(0xffffffff), + RangeError); +assert.throws(() => Buffer.allocUnsafe(8).writeFloatLE(0.0, 0xffffffff), + RangeError); // ensure negative values can't get past offset -assert.throws(function() { - var buf = Buffer.allocUnsafe(8); - buf.readFloatLE(-1); -}, RangeError); - -assert.throws(function() { - var buf = Buffer.allocUnsafe(8); - buf.writeFloatLE(0.0, -1); -}, RangeError); - -assert.throws(function() { - var buf = Buffer.allocUnsafe(8); - buf.readFloatLE(-1); -}, RangeError); - -assert.throws(function() { - var buf = Buffer.allocUnsafe(8); - buf.writeFloatLE(0.0, -1); -}, RangeError); +assert.throws(() => Buffer.allocUnsafe(8).readFloatLE(-1), RangeError); +assert.throws(() => Buffer.allocUnsafe(8).writeFloatLE(0.0, -1), RangeError); +assert.throws(() => Buffer.allocUnsafe(8).readFloatLE(-1), RangeError); +assert.throws(() => Buffer.allocUnsafe(8).writeFloatLE(0.0, -1), RangeError); // offset checks { const buf = Buffer.allocUnsafe(0); - assert.throws(function() { buf.readUInt8(0); }, RangeError); - assert.throws(function() { buf.readInt8(0); }, RangeError); + assert.throws(() => buf.readUInt8(0), RangeError); + assert.throws(() => buf.readInt8(0), RangeError); } { @@ -855,45 +802,45 @@ assert.throws(function() { assert.strictEqual(buf.readInt8(0), -1); } -[16, 32].forEach(function(bits) { - var buf = Buffer.allocUnsafe(bits / 8 - 1); +[16, 32].forEach((bits) => { + const buf = Buffer.allocUnsafe(bits / 8 - 1); - assert.throws(function() { buf['readUInt' + bits + 'BE'](0); }, + assert.throws(() => buf[`readUInt${bits}BE`](0), RangeError, - 'readUInt' + bits + 'BE'); + `readUInt${bits}BE()`); - assert.throws(function() { buf['readUInt' + bits + 'LE'](0); }, + assert.throws(() => buf[`readUInt${bits}LE`](0), RangeError, - 'readUInt' + bits + 'LE'); + `readUInt${bits}LE()`); - assert.throws(function() { buf['readInt' + bits + 'BE'](0); }, + assert.throws(() => buf[`readInt${bits}BE`](0), RangeError, - 'readInt' + bits + 'BE()'); + `readInt${bits}BE()`); - assert.throws(function() { buf['readInt' + bits + 'LE'](0); }, + assert.throws(() => buf[`readInt${bits}LE`](0), RangeError, - 'readInt' + bits + 'LE()'); + `readInt${bits}LE()`); }); -[16, 32].forEach(function(bits) { - var buf = Buffer.from([0xFF, 0xFF, 0xFF, 0xFF]); +[16, 32].forEach((bits) => { + const buf = Buffer.from([0xFF, 0xFF, 0xFF, 0xFF]); - assert.strictEqual(buf['readUInt' + bits + 'BE'](0), + assert.strictEqual(buf[`readUInt${bits}BE`](0), (0xFFFFFFFF >>> (32 - bits))); - assert.strictEqual(buf['readUInt' + bits + 'LE'](0), + assert.strictEqual(buf[`readUInt${bits}LE`](0), (0xFFFFFFFF >>> (32 - bits))); - assert.strictEqual(buf['readInt' + bits + 'BE'](0), + assert.strictEqual(buf[`readInt${bits}BE`](0), (0xFFFFFFFF >> (32 - bits))); - assert.strictEqual(buf['readInt' + bits + 'LE'](0), + assert.strictEqual(buf[`readInt${bits}LE`](0), (0xFFFFFFFF >> (32 - bits))); }); // test for common read(U)IntLE/BE { - var buf = Buffer.from([0x01, 0x02, 0x03, 0x04, 0x05, 0x06]); + const buf = Buffer.from([0x01, 0x02, 0x03, 0x04, 0x05, 0x06]); assert.strictEqual(buf.readUIntLE(0, 1), 0x01); assert.strictEqual(buf.readUIntBE(0, 1), 0x01); @@ -920,47 +867,47 @@ assert.throws(function() { assert.deepStrictEqual(buf.toJSON().data, [0x56, 0x34, 0x12]); assert.strictEqual(buf.readUIntLE(0, 3), 0x123456); - buf = Buffer.allocUnsafe(3); + buf.fill(0xFF); buf.writeUIntBE(0x123456, 0, 3); assert.deepStrictEqual(buf.toJSON().data, [0x12, 0x34, 0x56]); assert.strictEqual(buf.readUIntBE(0, 3), 0x123456); - buf = Buffer.allocUnsafe(3); + buf.fill(0xFF); buf.writeIntLE(0x123456, 0, 3); assert.deepStrictEqual(buf.toJSON().data, [0x56, 0x34, 0x12]); assert.strictEqual(buf.readIntLE(0, 3), 0x123456); - buf = Buffer.allocUnsafe(3); + buf.fill(0xFF); buf.writeIntBE(0x123456, 0, 3); assert.deepStrictEqual(buf.toJSON().data, [0x12, 0x34, 0x56]); assert.strictEqual(buf.readIntBE(0, 3), 0x123456); - buf = Buffer.allocUnsafe(3); + buf.fill(0xFF); buf.writeIntLE(-0x123456, 0, 3); assert.deepStrictEqual(buf.toJSON().data, [0xaa, 0xcb, 0xed]); assert.strictEqual(buf.readIntLE(0, 3), -0x123456); - buf = Buffer.allocUnsafe(3); + buf.fill(0xFF); buf.writeIntBE(-0x123456, 0, 3); assert.deepStrictEqual(buf.toJSON().data, [0xed, 0xcb, 0xaa]); assert.strictEqual(buf.readIntBE(0, 3), -0x123456); - buf = Buffer.allocUnsafe(3); + buf.fill(0xFF); buf.writeIntLE(-0x123400, 0, 3); assert.deepStrictEqual(buf.toJSON().data, [0x00, 0xcc, 0xed]); assert.strictEqual(buf.readIntLE(0, 3), -0x123400); - buf = Buffer.allocUnsafe(3); + buf.fill(0xFF); buf.writeIntBE(-0x123400, 0, 3); assert.deepStrictEqual(buf.toJSON().data, [0xed, 0xcc, 0x00]); assert.strictEqual(buf.readIntBE(0, 3), -0x123400); - buf = Buffer.allocUnsafe(3); + buf.fill(0xFF); buf.writeIntLE(-0x120000, 0, 3); assert.deepStrictEqual(buf.toJSON().data, [0x00, 0x00, 0xee]); assert.strictEqual(buf.readIntLE(0, 3), -0x120000); - buf = Buffer.allocUnsafe(3); + buf.fill(0xFF); buf.writeIntBE(-0x120000, 0, 3); assert.deepStrictEqual(buf.toJSON().data, [0xee, 0x00, 0x00]); assert.strictEqual(buf.readIntBE(0, 3), -0x120000); @@ -970,53 +917,51 @@ assert.throws(function() { assert.deepStrictEqual(buf.toJSON().data, [0x90, 0x78, 0x56, 0x34, 0x12]); assert.strictEqual(buf.readUIntLE(0, 5), 0x1234567890); - buf = Buffer.allocUnsafe(5); + buf.fill(0xFF); buf.writeUIntBE(0x1234567890, 0, 5); assert.deepStrictEqual(buf.toJSON().data, [0x12, 0x34, 0x56, 0x78, 0x90]); assert.strictEqual(buf.readUIntBE(0, 5), 0x1234567890); - buf = Buffer.allocUnsafe(5); + buf.fill(0xFF); buf.writeIntLE(0x1234567890, 0, 5); assert.deepStrictEqual(buf.toJSON().data, [0x90, 0x78, 0x56, 0x34, 0x12]); assert.strictEqual(buf.readIntLE(0, 5), 0x1234567890); - buf = Buffer.allocUnsafe(5); + buf.fill(0xFF); buf.writeIntBE(0x1234567890, 0, 5); assert.deepStrictEqual(buf.toJSON().data, [0x12, 0x34, 0x56, 0x78, 0x90]); assert.strictEqual(buf.readIntBE(0, 5), 0x1234567890); - buf = Buffer.allocUnsafe(5); + buf.fill(0xFF); buf.writeIntLE(-0x1234567890, 0, 5); assert.deepStrictEqual(buf.toJSON().data, [0x70, 0x87, 0xa9, 0xcb, 0xed]); assert.strictEqual(buf.readIntLE(0, 5), -0x1234567890); - buf = Buffer.allocUnsafe(5); + buf.fill(0xFF); buf.writeIntBE(-0x1234567890, 0, 5); assert.deepStrictEqual(buf.toJSON().data, [0xed, 0xcb, 0xa9, 0x87, 0x70]); assert.strictEqual(buf.readIntBE(0, 5), -0x1234567890); - buf = Buffer.allocUnsafe(5); + buf.fill(0xFF); buf.writeIntLE(-0x0012000000, 0, 5); assert.deepStrictEqual(buf.toJSON().data, [0x00, 0x00, 0x00, 0xee, 0xff]); assert.strictEqual(buf.readIntLE(0, 5), -0x0012000000); - buf = Buffer.allocUnsafe(5); + buf.fill(0xFF); buf.writeIntBE(-0x0012000000, 0, 5); assert.deepStrictEqual(buf.toJSON().data, [0xff, 0xee, 0x00, 0x00, 0x00]); assert.strictEqual(buf.readIntBE(0, 5), -0x0012000000); } // Regression test for #5482: should throw but not assert in C++ land. -assert.throws(function() { - Buffer.from('', 'buffer'); -}, TypeError); +assert.throws(() => Buffer.from('', 'buffer'), TypeError); // Regression test for #6111. Constructing a buffer from another buffer // should a) work, and b) not corrupt the source buffer. { let a = [0]; for (let i = 0; i < 7; ++i) a = a.concat(a); - a = a.map(function(_, i) { return i; }); + a = a.map((_, i) => {return i;}); const b = Buffer.from(a); const c = Buffer.from(b); assert.strictEqual(b.length, a.length); @@ -1028,21 +973,16 @@ assert.throws(function() { } } - -assert.throws(function() { - Buffer.allocUnsafe((-1 >>> 0) + 1); -}, RangeError); - -assert.throws(function() { - Buffer.allocUnsafeSlow((-1 >>> 0) + 1); -}, RangeError); +assert.throws(() => Buffer.allocUnsafe((-1 >>> 0) + 1), RangeError); +assert.throws(() => Buffer.allocUnsafeSlow((-1 >>> 0) + 1), RangeError); +assert.throws(() => SlowBuffer((-1 >>> 0) + 1), RangeError); if (common.hasCrypto) { // Test truncation after decode - var crypto = require('crypto'); + const crypto = require('crypto'); - var b1 = Buffer.from('YW55=======', 'base64'); - var b2 = Buffer.from('YW55', 'base64'); + const b1 = Buffer.from('YW55=======', 'base64'); + const b2 = Buffer.from('YW55', 'base64'); assert.strictEqual( crypto.createHash('sha1').update(b1).digest('hex'), @@ -1052,50 +992,62 @@ if (common.hasCrypto) { common.skip('missing crypto'); } -var ps = Buffer.poolSize; +const ps = Buffer.poolSize; Buffer.poolSize = 0; assert.strictEqual(Buffer.allocUnsafe(1).parent, undefined); Buffer.poolSize = ps; // Test Buffer.copy() segfault -assert.throws(function() { - Buffer.allocUnsafe(10).copy(); -}); +assert.throws(() => Buffer.allocUnsafe(10).copy()); const regErrorMsg = new RegExp('First argument must be a string, Buffer, ' + 'ArrayBuffer, Array, or array-like object.'); -assert.throws(function() { - Buffer.from(); -}, regErrorMsg); +assert.throws(() => Buffer.from(), regErrorMsg); +assert.throws(() => Buffer.from(null), regErrorMsg); + +// Test prototype getters don't throw +assert.equal(Buffer.prototype.parent, undefined); +assert.equal(Buffer.prototype.offset, undefined); +assert.equal(SlowBuffer.prototype.parent, undefined); +assert.equal(SlowBuffer.prototype.offset, undefined); + -assert.throws(function() { - Buffer.from(null); -}, regErrorMsg); +{ + // Test that large negative Buffer length inputs don't affect the pool offset. + // Use the fromArrayLike() variant here because it's more lenient + // about its input and passes the length directly to allocate(). + assert.deepStrictEqual(Buffer.from({ length: -Buffer.poolSize }), + Buffer.from('')); + assert.deepStrictEqual(Buffer.from({ length: -100 }), + Buffer.from('')); + + // Check pool offset after that by trying to write string into the pool. + assert.doesNotThrow(() => Buffer.from('abc')); +} // Test that ParseArrayIndex handles full uint32 -assert.throws(function() { - Buffer.from(new ArrayBuffer(0), -1 >>> 0); -}, /RangeError: 'offset' is out of bounds/); +assert.throws(() => Buffer.from(new ArrayBuffer(0), -1 >>> 0), + /RangeError: 'offset' is out of bounds/); // ParseArrayIndex() should reject values that don't fit in a 32 bits size_t. assert.throws(() => { - const a = Buffer(1).fill(0); - const b = Buffer(1).fill(0); + const a = Buffer.alloc(1); + const b = Buffer.alloc(1); a.copy(b, 0, 0x100000000, 0x100000001); }), /out of range index/; // Unpooled buffer (replaces SlowBuffer) -const ubuf = Buffer.allocUnsafeSlow(10); -assert(ubuf); -assert(ubuf.buffer); -assert.strictEqual(ubuf.buffer.byteLength, 10); +{ + const ubuf = Buffer.allocUnsafeSlow(10); + assert(ubuf); + assert(ubuf.buffer); + assert.strictEqual(ubuf.buffer.byteLength, 10); +} // Regression test -assert.doesNotThrow(() => { - Buffer.from(new ArrayBuffer()); -}); +assert.doesNotThrow(() => Buffer.from(new ArrayBuffer())); assert.throws(() => Buffer.alloc({ valueOf: () => 1 }), /"size" argument must be a number/); diff --git a/test/parallel/test-buffer-slice.js b/test/parallel/test-buffer-slice.js index 311acaebfae37f..4cd5feb6885138 100644 --- a/test/parallel/test-buffer-slice.js +++ b/test/parallel/test-buffer-slice.js @@ -3,6 +3,9 @@ require('../common'); const assert = require('assert'); +assert.strictEqual(0, Buffer.from('hello').slice(0, 0).length); +assert.strictEqual(0, Buffer('hello').slice(0, 0).length); + const buf = Buffer.from('0123456789'); assert.equal(buf.slice(-10, 10), '0123456789'); assert.equal(buf.slice(-20, 10), '0123456789'); @@ -50,3 +53,11 @@ assert.equal(buf.slice('0', '-111'), ''); // try to slice a zero length Buffer // see https://github.com/joyent/node/issues/5881 Buffer.alloc(0).slice(0, 1); + +{ + // Single argument slice + assert.strictEqual('bcde', Buffer.from('abcde').slice(1).toString()); +} + +// slice(0,0).length === 0 +assert.strictEqual(0, Buffer.from('hello').slice(0, 0).length); diff --git a/test/parallel/test-buffer.js b/test/parallel/test-buffer.js deleted file mode 100644 index b6c78cd466a8f7..00000000000000 --- a/test/parallel/test-buffer.js +++ /dev/null @@ -1,1108 +0,0 @@ -'use strict'; -var common = require('../common'); -var assert = require('assert'); - -var Buffer = require('buffer').Buffer; -var SlowBuffer = require('buffer').SlowBuffer; - -var b = Buffer(1024); // safe constructor - -console.log('b.length == %d', b.length); -assert.strictEqual(1024, b.length); - -b[0] = -1; -assert.strictEqual(b[0], 255); - -for (let i = 0; i < 1024; i++) { - b[i] = i % 256; -} - -for (let i = 0; i < 1024; i++) { - assert.strictEqual(i % 256, b[i]); -} - -var c = Buffer(512); -console.log('c.length == %d', c.length); -assert.strictEqual(512, c.length); - -var d = new Buffer([]); -assert.strictEqual(0, d.length); - -var ui32 = new Uint32Array(4).fill(42); -var e = Buffer(ui32); -for (const [key, value] of e.entries()) { - assert.deepStrictEqual(value, ui32[key]); -} - -var caught_error; - -// invalid encoding for Buffer.toString -caught_error = null; -try { - b.toString('invalid'); -} catch (err) { - caught_error = err; -} -assert.strictEqual('Unknown encoding: invalid', caught_error.message); - -// invalid encoding for Buffer.write -caught_error = null; -try { - b.write('test string', 0, 5, 'invalid'); -} catch (err) { - caught_error = err; -} -assert.strictEqual('Unknown encoding: invalid', caught_error.message); - -// try to create 0-length buffers -new Buffer(''); -new Buffer('', 'ascii'); -new Buffer('', 'latin1'); -new Buffer('', 'binary'); -Buffer(0); - -// try to write a 0-length string beyond the end of b -assert.throws(function() { - b.write('', 2048); -}, RangeError); - -// throw when writing to negative offset -assert.throws(function() { - b.write('a', -1); -}, RangeError); - -// throw when writing past bounds from the pool -assert.throws(function() { - b.write('a', 2048); -}, RangeError); - -// throw when writing to negative offset -assert.throws(function() { - b.write('a', -1); -}, RangeError); - -// try to copy 0 bytes worth of data into an empty buffer -b.copy(Buffer(0), 0, 0, 0); - -// try to copy 0 bytes past the end of the target buffer -b.copy(Buffer(0), 1, 1, 1); -b.copy(Buffer(1), 1, 1, 1); - -// try to copy 0 bytes from past the end of the source buffer -b.copy(Buffer(1), 0, 2048, 2048); - -// testing for smart defaults and ability to pass string values as offset -var writeTest = new Buffer('abcdes'); -writeTest.write('n', 'ascii'); -writeTest.write('o', '1', 'ascii'); -writeTest.write('d', '2', 'ascii'); -writeTest.write('e', 3, 'ascii'); -writeTest.write('j', 4, 'ascii'); -assert.equal(writeTest.toString(), 'nodejs'); - -// ASCII slice test -{ - const asciiString = 'hello world'; - - for (let i = 0; i < asciiString.length; i++) { - b[i] = asciiString.charCodeAt(i); - } - const asciiSlice = b.toString('ascii', 0, asciiString.length); - assert.equal(asciiString, asciiSlice); -} - -{ - const asciiString = 'hello world'; - const offset = 100; - - const written = b.write(asciiString, offset, 'ascii'); - assert.equal(asciiString.length, written); - const asciiSlice = b.toString('ascii', offset, offset + asciiString.length); - assert.equal(asciiString, asciiSlice); -} - -{ - const asciiString = 'hello world'; - const offset = 100; - - const sliceA = b.slice(offset, offset + asciiString.length); - const sliceB = b.slice(offset, offset + asciiString.length); - for (let i = 0; i < asciiString.length; i++) { - assert.equal(sliceA[i], sliceB[i]); - } -} - -// UTF-8 slice test - -var utf8String = '¡hέlló wôrld!'; -var offset = 100; - -b.write(utf8String, 0, Buffer.byteLength(utf8String), 'utf8'); -var utf8Slice = b.toString('utf8', 0, Buffer.byteLength(utf8String)); -assert.equal(utf8String, utf8Slice); - -var written = b.write(utf8String, offset, 'utf8'); -assert.equal(Buffer.byteLength(utf8String), written); -utf8Slice = b.toString('utf8', offset, offset + Buffer.byteLength(utf8String)); -assert.equal(utf8String, utf8Slice); - -var sliceA = b.slice(offset, offset + Buffer.byteLength(utf8String)); -var sliceB = b.slice(offset, offset + Buffer.byteLength(utf8String)); -for (let i = 0; i < Buffer.byteLength(utf8String); i++) { - assert.equal(sliceA[i], sliceB[i]); -} - -{ - const slice = b.slice(100, 150); - assert.equal(50, slice.length); - for (let i = 0; i < 50; i++) { - assert.equal(b[100 + i], slice[i]); - } -} - -{ - // make sure only top level parent propagates from allocPool - const b = new Buffer(5); - const c = b.slice(0, 4); - const d = c.slice(0, 2); - assert.equal(b.parent, c.parent); - assert.equal(b.parent, d.parent); -} - -{ - // also from a non-pooled instance - const b = new SlowBuffer(5); - const c = b.slice(0, 4); - const d = c.slice(0, 2); - assert.equal(c.parent, d.parent); -} - -{ - // Bug regression test - const testValue = '\u00F6\u65E5\u672C\u8A9E'; // ö日本語 - const buffer = new Buffer(32); - const size = buffer.write(testValue, 0, 'utf8'); - console.log('bytes written to buffer: ' + size); - const slice = buffer.toString('utf8', 0, size); - assert.equal(slice, testValue); -} - -{ - // Test triple slice - const a = new Buffer(8); - for (let i = 0; i < 8; i++) a[i] = i; - const b = a.slice(4, 8); - assert.equal(4, b[0]); - assert.equal(5, b[1]); - assert.equal(6, b[2]); - assert.equal(7, b[3]); - const c = b.slice(2, 4); - assert.equal(6, c[0]); - assert.equal(7, c[1]); -} - -{ - const d = new Buffer([23, 42, 255]); - assert.equal(d.length, 3); - assert.equal(d[0], 23); - assert.equal(d[1], 42); - assert.equal(d[2], 255); - assert.deepStrictEqual(d, new Buffer(d)); -} - -{ - const e = new Buffer('über'); - console.error('uber: \'%s\'', e.toString()); - assert.deepStrictEqual(e, new Buffer([195, 188, 98, 101, 114])); -} - -{ - const f = new Buffer('über', 'ascii'); - console.error('f.length: %d (should be 4)', f.length); - assert.deepStrictEqual(f, new Buffer([252, 98, 101, 114])); -} - -['ucs2', 'ucs-2', 'utf16le', 'utf-16le'].forEach(function(encoding) { - { - const f = new Buffer('über', encoding); - console.error('f.length: %d (should be 8)', f.length); - assert.deepStrictEqual(f, new Buffer([252, 0, 98, 0, 101, 0, 114, 0])); - } - - { - const f = new Buffer('привет', encoding); - console.error('f.length: %d (should be 12)', f.length); - const expected = new Buffer([63, 4, 64, 4, 56, 4, 50, 4, 53, 4, 66, 4]); - assert.deepStrictEqual(f, expected); - assert.equal(f.toString(encoding), 'привет'); - } - - { - const f = new Buffer([0, 0, 0, 0, 0]); - assert.equal(f.length, 5); - const size = f.write('あいうえお', encoding); - console.error('bytes written to buffer: %d (should be 4)', size); - assert.equal(size, 4); - assert.deepStrictEqual(f, new Buffer([0x42, 0x30, 0x44, 0x30, 0x00])); - } -}); - -{ - const f = new Buffer('\uD83D\uDC4D', 'utf-16le'); // THUMBS UP SIGN (U+1F44D) - assert.equal(f.length, 4); - assert.deepStrictEqual(f, new Buffer('3DD84DDC', 'hex')); -} - - -var arrayIsh = {0: 0, 1: 1, 2: 2, 3: 3, length: 4}; -var g = new Buffer(arrayIsh); -assert.deepStrictEqual(g, new Buffer([0, 1, 2, 3])); -var strArrayIsh = {0: '0', 1: '1', 2: '2', 3: '3', length: 4}; -g = new Buffer(strArrayIsh); -assert.deepStrictEqual(g, new Buffer([0, 1, 2, 3])); - - -// -// Test toString('base64') -// -assert.equal('TWFu', (new Buffer('Man')).toString('base64')); - -{ - // test that regular and URL-safe base64 both work - const expected = [0xff, 0xff, 0xbe, 0xff, 0xef, 0xbf, 0xfb, 0xef, 0xff]; - assert.deepStrictEqual(Buffer('//++/++/++//', 'base64'), Buffer(expected)); - assert.deepStrictEqual(Buffer('__--_--_--__', 'base64'), Buffer(expected)); -} - -{ - // big example - const quote = 'Man is distinguished, not only by his reason, but by this ' + - 'singular passion from other animals, which is a lust ' + - 'of the mind, that by a perseverance of delight in the ' + - 'continued and indefatigable generation of knowledge, ' + - 'exceeds the short vehemence of any carnal pleasure.'; - const expected = 'TWFuIGlzIGRpc3Rpbmd1aXNoZWQsIG5vdCBvbmx5IGJ5IGhpcyByZWFzb' + - '24sIGJ1dCBieSB0aGlzIHNpbmd1bGFyIHBhc3Npb24gZnJvbSBvdGhlci' + - 'BhbmltYWxzLCB3aGljaCBpcyBhIGx1c3Qgb2YgdGhlIG1pbmQsIHRoYXQ' + - 'gYnkgYSBwZXJzZXZlcmFuY2Ugb2YgZGVsaWdodCBpbiB0aGUgY29udGlu' + - 'dWVkIGFuZCBpbmRlZmF0aWdhYmxlIGdlbmVyYXRpb24gb2Yga25vd2xlZ' + - 'GdlLCBleGNlZWRzIHRoZSBzaG9ydCB2ZWhlbWVuY2Ugb2YgYW55IGNhcm' + - '5hbCBwbGVhc3VyZS4='; - assert.equal(expected, (new Buffer(quote)).toString('base64')); - - let b = new Buffer(1024); - let bytesWritten = b.write(expected, 0, 'base64'); - assert.equal(quote.length, bytesWritten); - assert.equal(quote, b.toString('ascii', 0, quote.length)); - - // check that the base64 decoder ignores whitespace - const expectedWhite = expected.slice(0, 60) + ' \n' + - expected.slice(60, 120) + ' \n' + - expected.slice(120, 180) + ' \n' + - expected.slice(180, 240) + ' \n' + - expected.slice(240, 300) + '\n' + - expected.slice(300, 360) + '\n'; - b = new Buffer(1024); - bytesWritten = b.write(expectedWhite, 0, 'base64'); - assert.equal(quote.length, bytesWritten); - assert.equal(quote, b.toString('ascii', 0, quote.length)); - - // check that the base64 decoder on the constructor works - // even in the presence of whitespace. - b = new Buffer(expectedWhite, 'base64'); - assert.equal(quote.length, b.length); - assert.equal(quote, b.toString('ascii', 0, quote.length)); - - // check that the base64 decoder ignores illegal chars - const expectedIllegal = expected.slice(0, 60) + ' \x80' + - expected.slice(60, 120) + ' \xff' + - expected.slice(120, 180) + ' \x00' + - expected.slice(180, 240) + ' \x98' + - expected.slice(240, 300) + '\x03' + - expected.slice(300, 360); - b = new Buffer(expectedIllegal, 'base64'); - assert.equal(quote.length, b.length); - assert.equal(quote, b.toString('ascii', 0, quote.length)); -} - -assert.equal(new Buffer('', 'base64').toString(), ''); -assert.equal(new Buffer('K', 'base64').toString(), ''); - -// multiple-of-4 with padding -assert.equal(new Buffer('Kg==', 'base64').toString(), '*'); -assert.equal(new Buffer('Kio=', 'base64').toString(), '**'); -assert.equal(new Buffer('Kioq', 'base64').toString(), '***'); -assert.equal(new Buffer('KioqKg==', 'base64').toString(), '****'); -assert.equal(new Buffer('KioqKio=', 'base64').toString(), '*****'); -assert.equal(new Buffer('KioqKioq', 'base64').toString(), '******'); -assert.equal(new Buffer('KioqKioqKg==', 'base64').toString(), '*******'); -assert.equal(new Buffer('KioqKioqKio=', 'base64').toString(), '********'); -assert.equal(new Buffer('KioqKioqKioq', 'base64').toString(), '*********'); -assert.equal(new Buffer('KioqKioqKioqKg==', 'base64').toString(), - '**********'); -assert.equal(new Buffer('KioqKioqKioqKio=', 'base64').toString(), - '***********'); -assert.equal(new Buffer('KioqKioqKioqKioq', 'base64').toString(), - '************'); -assert.equal(new Buffer('KioqKioqKioqKioqKg==', 'base64').toString(), - '*************'); -assert.equal(new Buffer('KioqKioqKioqKioqKio=', 'base64').toString(), - '**************'); -assert.equal(new Buffer('KioqKioqKioqKioqKioq', 'base64').toString(), - '***************'); -assert.equal(new Buffer('KioqKioqKioqKioqKioqKg==', 'base64').toString(), - '****************'); -assert.equal(new Buffer('KioqKioqKioqKioqKioqKio=', 'base64').toString(), - '*****************'); -assert.equal(new Buffer('KioqKioqKioqKioqKioqKioq', 'base64').toString(), - '******************'); -assert.equal(new Buffer('KioqKioqKioqKioqKioqKioqKg==', 'base64').toString(), - '*******************'); -assert.equal(new Buffer('KioqKioqKioqKioqKioqKioqKio=', 'base64').toString(), - '********************'); - -// no padding, not a multiple of 4 -assert.equal(new Buffer('Kg', 'base64').toString(), '*'); -assert.equal(new Buffer('Kio', 'base64').toString(), '**'); -assert.equal(new Buffer('KioqKg', 'base64').toString(), '****'); -assert.equal(new Buffer('KioqKio', 'base64').toString(), '*****'); -assert.equal(new Buffer('KioqKioqKg', 'base64').toString(), '*******'); -assert.equal(new Buffer('KioqKioqKio', 'base64').toString(), '********'); -assert.equal(new Buffer('KioqKioqKioqKg', 'base64').toString(), '**********'); -assert.equal(new Buffer('KioqKioqKioqKio', 'base64').toString(), '***********'); -assert.equal(new Buffer('KioqKioqKioqKioqKg', 'base64').toString(), - '*************'); -assert.equal(new Buffer('KioqKioqKioqKioqKio', 'base64').toString(), - '**************'); -assert.equal(new Buffer('KioqKioqKioqKioqKioqKg', 'base64').toString(), - '****************'); -assert.equal(new Buffer('KioqKioqKioqKioqKioqKio', 'base64').toString(), - '*****************'); -assert.equal(new Buffer('KioqKioqKioqKioqKioqKioqKg', 'base64').toString(), - '*******************'); -assert.equal(new Buffer('KioqKioqKioqKioqKioqKioqKio', 'base64').toString(), - '********************'); - -// handle padding graciously, multiple-of-4 or not -assert.equal( - new Buffer('72INjkR5fchcxk9+VgdGPFJDxUBFR5/rMFsghgxADiw==', 'base64').length, - 32 -); -assert.equal( - new Buffer('72INjkR5fchcxk9+VgdGPFJDxUBFR5/rMFsghgxADiw=', 'base64').length, - 32 -); -assert.equal( - new Buffer('72INjkR5fchcxk9+VgdGPFJDxUBFR5/rMFsghgxADiw', 'base64').length, - 32 -); -assert.equal( - new Buffer('w69jACy6BgZmaFvv96HG6MYksWytuZu3T1FvGnulPg==', 'base64').length, - 31 -); -assert.equal( - new Buffer('w69jACy6BgZmaFvv96HG6MYksWytuZu3T1FvGnulPg=', 'base64').length, - 31 -); -assert.equal( - new Buffer('w69jACy6BgZmaFvv96HG6MYksWytuZu3T1FvGnulPg', 'base64').length, - 31 -); - -// This string encodes single '.' character in UTF-16 -var dot = new Buffer('//4uAA==', 'base64'); -assert.equal(dot[0], 0xff); -assert.equal(dot[1], 0xfe); -assert.equal(dot[2], 0x2e); -assert.equal(dot[3], 0x00); -assert.equal(dot.toString('base64'), '//4uAA=='); - -{ - // Writing base64 at a position > 0 should not mangle the result. - // - // https://github.com/joyent/node/issues/402 - const segments = ['TWFkbmVzcz8h', 'IFRoaXM=', 'IGlz', 'IG5vZGUuanMh']; - const b = new Buffer(64); - let pos = 0; - - for (let i = 0; i < segments.length; ++i) { - pos += b.write(segments[i], pos, 'base64'); - } - assert.equal(b.toString('latin1', 0, pos), 'Madness?! This is node.js!'); - assert.equal(b.toString('binary', 0, pos), 'Madness?! This is node.js!'); -} - -// Regression test for https://github.com/nodejs/node/issues/3496. -assert.equal(Buffer('=bad'.repeat(1e4), 'base64').length, 0); - -{ - // Creating buffers larger than pool size. - const l = Buffer.poolSize + 5; - const s = 'h'.repeat(l); - - const b = new Buffer(s); - - for (let i = 0; i < l; i++) { - assert.equal('h'.charCodeAt(0), b[i]); - } - - const sb = b.toString(); - assert.equal(sb.length, s.length); - assert.equal(sb, s); -} - -{ - // Single argument slice - const b = new Buffer('abcde'); - assert.equal('bcde', b.slice(1).toString()); -} - -// slice(0,0).length === 0 -assert.equal(0, Buffer('hello').slice(0, 0).length); - -// test hex toString -console.log('Create hex string from buffer'); -var hexb = new Buffer(256); -for (let i = 0; i < 256; i++) { - hexb[i] = i; -} -var hexStr = hexb.toString('hex'); -assert.equal(hexStr, - '000102030405060708090a0b0c0d0e0f' + - '101112131415161718191a1b1c1d1e1f' + - '202122232425262728292a2b2c2d2e2f' + - '303132333435363738393a3b3c3d3e3f' + - '404142434445464748494a4b4c4d4e4f' + - '505152535455565758595a5b5c5d5e5f' + - '606162636465666768696a6b6c6d6e6f' + - '707172737475767778797a7b7c7d7e7f' + - '808182838485868788898a8b8c8d8e8f' + - '909192939495969798999a9b9c9d9e9f' + - 'a0a1a2a3a4a5a6a7a8a9aaabacadaeaf' + - 'b0b1b2b3b4b5b6b7b8b9babbbcbdbebf' + - 'c0c1c2c3c4c5c6c7c8c9cacbcccdcecf' + - 'd0d1d2d3d4d5d6d7d8d9dadbdcdddedf' + - 'e0e1e2e3e4e5e6e7e8e9eaebecedeeef' + - 'f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff'); - -console.log('Create buffer from hex string'); -var hexb2 = new Buffer(hexStr, 'hex'); -for (let i = 0; i < 256; i++) { - assert.equal(hexb2[i], hexb[i]); -} - -// Test single hex character throws TypeError -// - https://github.com/nodejs/node/issues/6770 -assert.throws(function() { - Buffer.from('A', 'hex'); -}, TypeError); - -// Test single base64 char encodes as 0 -assert.strictEqual(Buffer.from('A', 'base64').length, 0); - -{ - // test an invalid slice end. - console.log('Try to slice off the end of the buffer'); - const b = new Buffer([1, 2, 3, 4, 5]); - const b2 = b.toString('hex', 1, 10000); - const b3 = b.toString('hex', 1, 5); - const b4 = b.toString('hex', 1); - assert.equal(b2, b3); - assert.equal(b2, b4); -} - -function buildBuffer(data) { - if (Array.isArray(data)) { - var buffer = Buffer(data.length); - data.forEach(function(v, k) { - buffer[k] = v; - }); - return buffer; - } - return null; -} - -var x = buildBuffer([0x81, 0xa3, 0x66, 0x6f, 0x6f, 0xa3, 0x62, 0x61, 0x72]); - -console.log(x.inspect()); -assert.equal('', x.inspect()); - -{ - const z = x.slice(4); - console.log(z.inspect()); - console.log(z.length); - assert.equal(5, z.length); - assert.equal(0x6f, z[0]); - assert.equal(0xa3, z[1]); - assert.equal(0x62, z[2]); - assert.equal(0x61, z[3]); - assert.equal(0x72, z[4]); -} - -{ - const z = x.slice(0); - console.log(z.inspect()); - console.log(z.length); - assert.equal(z.length, x.length); -} - -{ - const z = x.slice(0, 4); - console.log(z.inspect()); - console.log(z.length); - assert.equal(4, z.length); - assert.equal(0x81, z[0]); - assert.equal(0xa3, z[1]); -} - -{ - const z = x.slice(0, 9); - console.log(z.inspect()); - console.log(z.length); - assert.equal(9, z.length); -} - -{ - const z = x.slice(1, 4); - console.log(z.inspect()); - console.log(z.length); - assert.equal(3, z.length); - assert.equal(0xa3, z[0]); -} - -{ - const z = x.slice(2, 4); - console.log(z.inspect()); - console.log(z.length); - assert.equal(2, z.length); - assert.equal(0x66, z[0]); - assert.equal(0x6f, z[1]); -} - -assert.equal(0, Buffer('hello').slice(0, 0).length); - -['ucs2', 'ucs-2', 'utf16le', 'utf-16le'].forEach(function(encoding) { - const b = new Buffer(10); - b.write('あいうえお', encoding); - assert.equal(b.toString(encoding), 'あいうえお'); -}); - -{ - // latin1 encoding should write only one byte per character. - const b = Buffer([0xde, 0xad, 0xbe, 0xef]); - let s = String.fromCharCode(0xffff); - b.write(s, 0, 'latin1'); - assert.equal(0xff, b[0]); - assert.equal(0xad, b[1]); - assert.equal(0xbe, b[2]); - assert.equal(0xef, b[3]); - s = String.fromCharCode(0xaaee); - b.write(s, 0, 'latin1'); - assert.equal(0xee, b[0]); - assert.equal(0xad, b[1]); - assert.equal(0xbe, b[2]); - assert.equal(0xef, b[3]); -} - -{ - // Binary encoding should write only one byte per character. - const b = Buffer([0xde, 0xad, 0xbe, 0xef]); - let s = String.fromCharCode(0xffff); - b.write(s, 0, 'binary'); - assert.equal(0xff, b[0]); - assert.equal(0xad, b[1]); - assert.equal(0xbe, b[2]); - assert.equal(0xef, b[3]); - s = String.fromCharCode(0xaaee); - b.write(s, 0, 'binary'); - assert.equal(0xee, b[0]); - assert.equal(0xad, b[1]); - assert.equal(0xbe, b[2]); - assert.equal(0xef, b[3]); -} - -{ - // #1210 Test UTF-8 string includes null character - let buf = new Buffer('\0'); - assert.equal(buf.length, 1); - buf = new Buffer('\0\0'); - assert.equal(buf.length, 2); -} - -{ - const buf = new Buffer(2); - let written = buf.write(''); // 0byte - assert.equal(written, 0); - written = buf.write('\0'); // 1byte (v8 adds null terminator) - assert.equal(written, 1); - written = buf.write('a\0'); // 1byte * 2 - assert.equal(written, 2); - written = buf.write('あ'); // 3bytes - assert.equal(written, 0); - written = buf.write('\0あ'); // 1byte + 3bytes - assert.equal(written, 1); - written = buf.write('\0\0あ'); // 1byte * 2 + 3bytes - assert.equal(written, 2); -} - -{ - const buf = new Buffer(10); - written = buf.write('あいう'); // 3bytes * 3 (v8 adds null terminator) - assert.equal(written, 9); - written = buf.write('あいう\0'); // 3bytes * 3 + 1byte - assert.equal(written, 10); -} - -{ - // #243 Test write() with maxLength - const buf = new Buffer(4); - buf.fill(0xFF); - let written = buf.write('abcd', 1, 2, 'utf8'); - console.log(buf); - assert.equal(written, 2); - assert.equal(buf[0], 0xFF); - assert.equal(buf[1], 0x61); - assert.equal(buf[2], 0x62); - assert.equal(buf[3], 0xFF); - - buf.fill(0xFF); - written = buf.write('abcd', 1, 4); - console.log(buf); - assert.equal(written, 3); - assert.equal(buf[0], 0xFF); - assert.equal(buf[1], 0x61); - assert.equal(buf[2], 0x62); - assert.equal(buf[3], 0x63); - - buf.fill(0xFF); - written = buf.write('abcd', 1, 2, 'utf8'); - console.log(buf); - assert.equal(written, 2); - assert.equal(buf[0], 0xFF); - assert.equal(buf[1], 0x61); - assert.equal(buf[2], 0x62); - assert.equal(buf[3], 0xFF); - - buf.fill(0xFF); - written = buf.write('abcdef', 1, 2, 'hex'); - console.log(buf); - assert.equal(written, 2); - assert.equal(buf[0], 0xFF); - assert.equal(buf[1], 0xAB); - assert.equal(buf[2], 0xCD); - assert.equal(buf[3], 0xFF); - - ['ucs2', 'ucs-2', 'utf16le', 'utf-16le'].forEach(function(encoding) { - buf.fill(0xFF); - written = buf.write('abcd', 0, 2, encoding); - console.log(buf); - assert.equal(written, 2); - assert.equal(buf[0], 0x61); - assert.equal(buf[1], 0x00); - assert.equal(buf[2], 0xFF); - assert.equal(buf[3], 0xFF); - }); -} - -{ - // test offset returns are correct - const b = new Buffer(16); - assert.equal(4, b.writeUInt32LE(0, 0)); - assert.equal(6, b.writeUInt16LE(0, 4)); - assert.equal(7, b.writeUInt8(0, 6)); - assert.equal(8, b.writeInt8(0, 7)); - assert.equal(16, b.writeDoubleLE(0, 8)); -} - -{ - // test unmatched surrogates not producing invalid utf8 output - // ef bf bd = utf-8 representation of unicode replacement character - // see https://codereview.chromium.org/121173009/ - const buf = new Buffer('ab\ud800cd', 'utf8'); - assert.equal(buf[0], 0x61); - assert.equal(buf[1], 0x62); - assert.equal(buf[2], 0xef); - assert.equal(buf[3], 0xbf); - assert.equal(buf[4], 0xbd); - assert.equal(buf[5], 0x63); - assert.equal(buf[6], 0x64); -} - -{ - // test for buffer overrun - const buf = new Buffer([0, 0, 0, 0, 0]); // length: 5 - var sub = buf.slice(0, 4); // length: 4 - written = sub.write('12345', 'latin1'); - assert.equal(written, 4); - assert.equal(buf[4], 0); - written = sub.write('12345', 'binary'); - assert.equal(written, 4); - assert.equal(buf[4], 0); -} - -// Check for fractional length args, junk length args, etc. -// https://github.com/joyent/node/issues/1758 - -// Call .fill() first, stops valgrind warning about uninitialized memory reads. -Buffer(3.3).fill().toString(); // throws bad argument error in commit 43cb4ec -assert.equal(Buffer(NaN).length, 0); -assert.equal(Buffer(3.3).length, 3); -assert.equal(Buffer({length: 3.3}).length, 3); -assert.equal(Buffer({length: 'BAM'}).length, 0); - -// Make sure that strings are not coerced to numbers. -assert.equal(Buffer('99').length, 2); -assert.equal(Buffer('13.37').length, 5); - -// Ensure that the length argument is respected. -'ascii utf8 hex base64 latin1 binary'.split(' ').forEach(function(enc) { - assert.equal(Buffer(1).write('aaaaaa', 0, 1, enc), 1); -}); - -{ - // Regression test, guard against buffer overrun in the base64 decoder. - const a = Buffer(3); - const b = Buffer('xxx'); - a.write('aaaaaaaa', 'base64'); - assert.equal(b.toString(), 'xxx'); -} - -// issue GH-3416 -Buffer(Buffer(0), 0, 0); - -// GH-5110 -{ - const buffer = new Buffer('test'); - const string = JSON.stringify(buffer); - - assert.strictEqual(string, '{"type":"Buffer","data":[116,101,115,116]}'); - - assert.deepStrictEqual(buffer, JSON.parse(string, function(key, value) { - return value && value.type === 'Buffer' - ? new Buffer(value.data) - : value; - })); -} - -// issue GH-7849 -{ - const buf = new Buffer('test'); - const json = JSON.stringify(buf); - const obj = JSON.parse(json); - const copy = new Buffer(obj); - - assert(buf.equals(copy)); -} - -// issue GH-4331 -assert.throws(function() { - Buffer(0xFFFFFFFF); -}, RangeError); -assert.throws(function() { - Buffer(0xFFFFFFFFF); -}, RangeError); - -// issue GH-5587 -assert.throws(function() { - var buf = new Buffer(8); - buf.writeFloatLE(0, 5); -}, RangeError); -assert.throws(function() { - var buf = new Buffer(16); - buf.writeDoubleLE(0, 9); -}, RangeError); - - -// attempt to overflow buffers, similar to previous bug in array buffers -assert.throws(function() { - var buf = Buffer(8); - buf.readFloatLE(0xffffffff); -}, RangeError); - -assert.throws(function() { - var buf = Buffer(8); - buf.writeFloatLE(0.0, 0xffffffff); -}, RangeError); - -assert.throws(function() { - var buf = Buffer(8); - buf.readFloatLE(0xffffffff); -}, RangeError); - -assert.throws(function() { - var buf = Buffer(8); - buf.writeFloatLE(0.0, 0xffffffff); -}, RangeError); - - -// ensure negative values can't get past offset -assert.throws(function() { - var buf = Buffer(8); - buf.readFloatLE(-1); -}, RangeError); - -assert.throws(function() { - var buf = Buffer(8); - buf.writeFloatLE(0.0, -1); -}, RangeError); - -assert.throws(function() { - var buf = Buffer(8); - buf.readFloatLE(-1); -}, RangeError); - -assert.throws(function() { - var buf = Buffer(8); - buf.writeFloatLE(0.0, -1); -}, RangeError); - -// offset checks -{ - const buf = new Buffer(0); - - assert.throws(function() { buf.readUInt8(0); }, RangeError); - assert.throws(function() { buf.readInt8(0); }, RangeError); -} - -{ - const buf = new Buffer([0xFF]); - - assert.equal(buf.readUInt8(0), 255); - assert.equal(buf.readInt8(0), -1); -} - -[16, 32].forEach(function(bits) { - var buf = new Buffer(bits / 8 - 1); - - assert.throws(function() { buf['readUInt' + bits + 'BE'](0); }, - RangeError, - 'readUInt' + bits + 'BE'); - - assert.throws(function() { buf['readUInt' + bits + 'LE'](0); }, - RangeError, - 'readUInt' + bits + 'LE'); - - assert.throws(function() { buf['readInt' + bits + 'BE'](0); }, - RangeError, - 'readInt' + bits + 'BE()'); - - assert.throws(function() { buf['readInt' + bits + 'LE'](0); }, - RangeError, - 'readInt' + bits + 'LE()'); -}); - -[16, 32].forEach(function(bits) { - var buf = new Buffer([0xFF, 0xFF, 0xFF, 0xFF]); - - assert.equal(buf['readUInt' + bits + 'BE'](0), - (0xFFFFFFFF >>> (32 - bits))); - - assert.equal(buf['readUInt' + bits + 'LE'](0), - (0xFFFFFFFF >>> (32 - bits))); - - assert.equal(buf['readInt' + bits + 'BE'](0), - (0xFFFFFFFF >> (32 - bits))); - - assert.equal(buf['readInt' + bits + 'LE'](0), - (0xFFFFFFFF >> (32 - bits))); -}); - -// test for common read(U)IntLE/BE -{ - const buf = new Buffer([0x01, 0x02, 0x03, 0x04, 0x05, 0x06]); - - assert.strictEqual(buf.readUIntLE(0, 1), 0x01); - assert.strictEqual(buf.readUIntBE(0, 1), 0x01); - assert.strictEqual(buf.readUIntLE(0, 3), 0x030201); - assert.strictEqual(buf.readUIntBE(0, 3), 0x010203); - assert.strictEqual(buf.readUIntLE(0, 5), 0x0504030201); - assert.strictEqual(buf.readUIntBE(0, 5), 0x0102030405); - assert.strictEqual(buf.readUIntLE(0, 6), 0x060504030201); - assert.strictEqual(buf.readUIntBE(0, 6), 0x010203040506); - assert.strictEqual(buf.readIntLE(0, 1), 0x01); - assert.strictEqual(buf.readIntBE(0, 1), 0x01); - assert.strictEqual(buf.readIntLE(0, 3), 0x030201); - assert.strictEqual(buf.readIntBE(0, 3), 0x010203); - assert.strictEqual(buf.readIntLE(0, 5), 0x0504030201); - assert.strictEqual(buf.readIntBE(0, 5), 0x0102030405); - assert.strictEqual(buf.readIntLE(0, 6), 0x060504030201); - assert.strictEqual(buf.readIntBE(0, 6), 0x010203040506); -} - -// test for common write(U)IntLE/BE -{ - let buf = Buffer(3); - buf.writeUIntLE(0x123456, 0, 3); - assert.deepStrictEqual(buf.toJSON().data, [0x56, 0x34, 0x12]); - assert.equal(buf.readUIntLE(0, 3), 0x123456); - - buf = Buffer(3); - buf.writeUIntBE(0x123456, 0, 3); - assert.deepStrictEqual(buf.toJSON().data, [0x12, 0x34, 0x56]); - assert.equal(buf.readUIntBE(0, 3), 0x123456); - - buf = Buffer(3); - buf.writeIntLE(0x123456, 0, 3); - assert.deepStrictEqual(buf.toJSON().data, [0x56, 0x34, 0x12]); - assert.equal(buf.readIntLE(0, 3), 0x123456); - - buf = Buffer(3); - buf.writeIntBE(0x123456, 0, 3); - assert.deepStrictEqual(buf.toJSON().data, [0x12, 0x34, 0x56]); - assert.equal(buf.readIntBE(0, 3), 0x123456); - - buf = Buffer(3); - buf.writeIntLE(-0x123456, 0, 3); - assert.deepStrictEqual(buf.toJSON().data, [0xaa, 0xcb, 0xed]); - assert.equal(buf.readIntLE(0, 3), -0x123456); - - buf = Buffer(3); - buf.writeIntBE(-0x123456, 0, 3); - assert.deepStrictEqual(buf.toJSON().data, [0xed, 0xcb, 0xaa]); - assert.equal(buf.readIntBE(0, 3), -0x123456); - - buf = Buffer(3); - buf.writeIntLE(-0x123400, 0, 3); - assert.deepStrictEqual(buf.toJSON().data, [0x00, 0xcc, 0xed]); - assert.equal(buf.readIntLE(0, 3), -0x123400); - - buf = Buffer(3); - buf.writeIntBE(-0x123400, 0, 3); - assert.deepStrictEqual(buf.toJSON().data, [0xed, 0xcc, 0x00]); - assert.equal(buf.readIntBE(0, 3), -0x123400); - - buf = Buffer(3); - buf.writeIntLE(-0x120000, 0, 3); - assert.deepStrictEqual(buf.toJSON().data, [0x00, 0x00, 0xee]); - assert.equal(buf.readIntLE(0, 3), -0x120000); - - buf = Buffer(3); - buf.writeIntBE(-0x120000, 0, 3); - assert.deepStrictEqual(buf.toJSON().data, [0xee, 0x00, 0x00]); - assert.equal(buf.readIntBE(0, 3), -0x120000); - - buf = Buffer(5); - buf.writeUIntLE(0x1234567890, 0, 5); - assert.deepStrictEqual(buf.toJSON().data, [0x90, 0x78, 0x56, 0x34, 0x12]); - assert.equal(buf.readUIntLE(0, 5), 0x1234567890); - - buf = Buffer(5); - buf.writeUIntBE(0x1234567890, 0, 5); - assert.deepStrictEqual(buf.toJSON().data, [0x12, 0x34, 0x56, 0x78, 0x90]); - assert.equal(buf.readUIntBE(0, 5), 0x1234567890); - - buf = Buffer(5); - buf.writeIntLE(0x1234567890, 0, 5); - assert.deepStrictEqual(buf.toJSON().data, [0x90, 0x78, 0x56, 0x34, 0x12]); - assert.equal(buf.readIntLE(0, 5), 0x1234567890); - - buf = Buffer(5); - buf.writeIntBE(0x1234567890, 0, 5); - assert.deepStrictEqual(buf.toJSON().data, [0x12, 0x34, 0x56, 0x78, 0x90]); - assert.equal(buf.readIntBE(0, 5), 0x1234567890); - - buf = Buffer(5); - buf.writeIntLE(-0x1234567890, 0, 5); - assert.deepStrictEqual(buf.toJSON().data, [0x70, 0x87, 0xa9, 0xcb, 0xed]); - assert.equal(buf.readIntLE(0, 5), -0x1234567890); - - buf = Buffer(5); - buf.writeIntBE(-0x1234567890, 0, 5); - assert.deepStrictEqual(buf.toJSON().data, [0xed, 0xcb, 0xa9, 0x87, 0x70]); - assert.equal(buf.readIntBE(0, 5), -0x1234567890); - - buf = Buffer(5); - buf.writeIntLE(-0x0012000000, 0, 5); - assert.deepStrictEqual(buf.toJSON().data, [0x00, 0x00, 0x00, 0xee, 0xff]); - assert.equal(buf.readIntLE(0, 5), -0x0012000000); - - buf = Buffer(5); - buf.writeIntBE(-0x0012000000, 0, 5); - assert.deepStrictEqual(buf.toJSON().data, [0xff, 0xee, 0x00, 0x00, 0x00]); - assert.equal(buf.readIntBE(0, 5), -0x0012000000); -} - -// Regression test for #5482: should throw but not assert in C++ land. -assert.throws(function() { - Buffer('', 'buffer'); -}, TypeError); - -// Regression test for #6111. Constructing a buffer from another buffer -// should a) work, and b) not corrupt the source buffer. -{ - let a = [0]; - for (let i = 0; i < 7; ++i) a = a.concat(a); - a = a.map(function(_, i) { return i; }); - const b = Buffer(a); - const c = Buffer(b); - assert.strictEqual(b.length, a.length); - assert.strictEqual(c.length, a.length); - for (let i = 0, k = a.length; i < k; ++i) { - assert.strictEqual(a[i], i); - assert.strictEqual(b[i], i); - assert.strictEqual(c[i], i); - } -} - - -assert.throws(function() { - new Buffer((-1 >>> 0) + 1); -}, RangeError); - -assert.throws(function() { - SlowBuffer((-1 >>> 0) + 1); -}, RangeError); - -if (common.hasCrypto) { - // Test truncation after decode - var crypto = require('crypto'); - - var b1 = new Buffer('YW55=======', 'base64'); - var b2 = new Buffer('YW55', 'base64'); - - assert.equal( - crypto.createHash('sha1').update(b1).digest('hex'), - crypto.createHash('sha1').update(b2).digest('hex') - ); -} else { - common.skip('missing crypto'); -} - -var ps = Buffer.poolSize; -Buffer.poolSize = 0; -assert.equal(Buffer(1).parent, undefined); -Buffer.poolSize = ps; - -// Test Buffer.copy() segfault -assert.throws(function() { - Buffer(10).copy(); -}); - -const regErrorMsg = new RegExp('First argument must be a string, Buffer, ' + - 'ArrayBuffer, Array, or array-like object.'); - -assert.throws(function() { - new Buffer(); -}, regErrorMsg); - -assert.throws(function() { - new Buffer(null); -}, regErrorMsg); - - -// Test prototype getters don't throw -assert.equal(Buffer.prototype.parent, undefined); -assert.equal(Buffer.prototype.offset, undefined); -assert.equal(SlowBuffer.prototype.parent, undefined); -assert.equal(SlowBuffer.prototype.offset, undefined); - -{ - // Test that large negative Buffer length inputs don't affect the pool offset. - // Use the fromArrayLike() variant here because it's more lenient - // about its input and passes the length directly to allocate(). - assert.deepStrictEqual(Buffer({ length: -Buffer.poolSize }), Buffer.from('')); - assert.deepStrictEqual(Buffer({ length: -100 }), Buffer.from('')); - - // Check pool offset after that by trying to write string into the pool. - assert.doesNotThrow(() => Buffer.from('abc')); -}