diff options
author | Сковорода Никита Андреевич <chalkerx@gmail.com> | 2018-02-24 19:52:14 +0300 |
---|---|---|
committer | Anatoli Papirovski <apapirovski@mac.com> | 2018-03-04 12:50:15 +0100 |
commit | 8ed44ff1c4b48fe62a0aef88bd1d0385f0eadd03 (patch) | |
tree | ae30dd20fbcfe684048084a472f949f6d9f33f2c /test | |
parent | 1572a5b6cd16aeb6cafd338814ead76c0f198f1d (diff) | |
download | android-node-v8-8ed44ff1c4b48fe62a0aef88bd1d0385f0eadd03.tar.gz android-node-v8-8ed44ff1c4b48fe62a0aef88bd1d0385f0eadd03.tar.bz2 android-node-v8-8ed44ff1c4b48fe62a0aef88bd1d0385f0eadd03.zip |
test,benchmark: use new Buffer API where appropriate
For tests / benchmarks that are creating Buffer instances for
any reason other than to test Buffer constructor, use the new
Buffer.alloc/Buffer.from API instead of the deprecated API.
PR-URL: https://github.com/nodejs/node/pull/18980
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Daijiro Wachi <daijiro.wachi@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Diffstat (limited to 'test')
-rw-r--r-- | test/async-hooks/test-udpsendwrap.js | 2 | ||||
-rw-r--r-- | test/parallel/test-buffer-badhex.js | 14 | ||||
-rw-r--r-- | test/parallel/test-buffer-fill.js | 2 | ||||
-rw-r--r-- | test/parallel/test-buffer-indexof.js | 4 | ||||
-rw-r--r-- | test/parallel/test-buffer-zero-fill.js | 1 | ||||
-rw-r--r-- | test/parallel/test-net-socket-byteswritten.js | 2 | ||||
-rw-r--r-- | test/parallel/test-zlib-empty-buffer.js | 2 |
7 files changed, 14 insertions, 13 deletions
diff --git a/test/async-hooks/test-udpsendwrap.js b/test/async-hooks/test-udpsendwrap.js index 10deaca845..d8ab77730f 100644 --- a/test/async-hooks/test-udpsendwrap.js +++ b/test/async-hooks/test-udpsendwrap.js @@ -18,7 +18,7 @@ const sock = dgram function onlistening() { sock.send( - new Buffer(2), 0, 2, sock.address().port, + Buffer.alloc(2), 0, 2, sock.address().port, undefined, common.mustCall(onsent)); // init not called synchronously because dns lookup always wraps diff --git a/test/parallel/test-buffer-badhex.js b/test/parallel/test-buffer-badhex.js index 94de97181d..61086659fa 100644 --- a/test/parallel/test-buffer-badhex.js +++ b/test/parallel/test-buffer-badhex.js @@ -6,12 +6,12 @@ const assert = require('assert'); { const buf = Buffer.alloc(4); assert.strictEqual(buf.length, 4); - assert.deepStrictEqual(buf, new Buffer([0, 0, 0, 0])); + assert.deepStrictEqual(buf, Buffer.from([0, 0, 0, 0])); assert.strictEqual(buf.write('abcdxx', 0, 'hex'), 2); - assert.deepStrictEqual(buf, new Buffer([0xab, 0xcd, 0x00, 0x00])); + assert.deepStrictEqual(buf, Buffer.from([0xab, 0xcd, 0x00, 0x00])); assert.strictEqual(buf.toString('hex'), 'abcd0000'); assert.strictEqual(buf.write('abcdef01', 0, 'hex'), 4); - assert.deepStrictEqual(buf, new Buffer([0xab, 0xcd, 0xef, 0x01])); + assert.deepStrictEqual(buf, Buffer.from([0xab, 0xcd, 0xef, 0x01])); assert.strictEqual(buf.toString('hex'), 'abcdef01'); const copy = Buffer.from(buf.toString('hex'), 'hex'); @@ -26,13 +26,13 @@ const assert = require('assert'); { const buf = Buffer.alloc(4); - assert.deepStrictEqual(buf, new Buffer([0, 0, 0, 0])); + assert.deepStrictEqual(buf, Buffer.from([0, 0, 0, 0])); assert.strictEqual(buf.write('xxabcd', 0, 'hex'), 0); - assert.deepStrictEqual(buf, new Buffer([0, 0, 0, 0])); + assert.deepStrictEqual(buf, Buffer.from([0, 0, 0, 0])); assert.strictEqual(buf.write('xxab', 1, 'hex'), 0); - assert.deepStrictEqual(buf, new Buffer([0, 0, 0, 0])); + assert.deepStrictEqual(buf, Buffer.from([0, 0, 0, 0])); assert.strictEqual(buf.write('cdxxab', 0, 'hex'), 1); - assert.deepStrictEqual(buf, new Buffer([0xcd, 0, 0, 0])); + assert.deepStrictEqual(buf, Buffer.from([0xcd, 0, 0, 0])); } { diff --git a/test/parallel/test-buffer-fill.js b/test/parallel/test-buffer-fill.js index bab1279680..b2f14c3e42 100644 --- a/test/parallel/test-buffer-fill.js +++ b/test/parallel/test-buffer-fill.js @@ -368,7 +368,7 @@ assert.strictEqual( // Test that bypassing 'length' won't cause an abort. common.expectsError(() => { - const buf = new Buffer('w00t'); + const buf = Buffer.from('w00t'); Object.defineProperty(buf, 'length', { value: 1337, enumerable: true diff --git a/test/parallel/test-buffer-indexof.js b/test/parallel/test-buffer-indexof.js index 08d640b1dc..357558c74d 100644 --- a/test/parallel/test-buffer-indexof.js +++ b/test/parallel/test-buffer-indexof.js @@ -504,7 +504,7 @@ assert.strictEqual(buf_bc.lastIndexOf('你好', 5, 'binary'), -1); assert.strictEqual(buf_bc.lastIndexOf(Buffer.from('你好'), 7), -1); // Test lastIndexOf on a longer buffer: -const bufferString = new Buffer('a man a plan a canal panama'); +const bufferString = Buffer.from('a man a plan a canal panama'); assert.strictEqual(15, bufferString.lastIndexOf('canal')); assert.strictEqual(21, bufferString.lastIndexOf('panama')); assert.strictEqual(0, bufferString.lastIndexOf('a man a plan a canal panama')); @@ -566,7 +566,7 @@ const parts = []; for (let i = 0; i < 1000000; i++) { parts.push((countBits(i) % 2 === 0) ? 'yolo' : 'swag'); } -const reallyLong = new Buffer(parts.join(' ')); +const reallyLong = Buffer.from(parts.join(' ')); assert.strictEqual('yolo swag swag yolo', reallyLong.slice(0, 19).toString()); // Expensive reverse searches. Stress test lastIndexOf: diff --git a/test/parallel/test-buffer-zero-fill.js b/test/parallel/test-buffer-zero-fill.js index 1aca4e9a5c..7a9f0c1250 100644 --- a/test/parallel/test-buffer-zero-fill.js +++ b/test/parallel/test-buffer-zero-fill.js @@ -3,6 +3,7 @@ require('../common'); const assert = require('assert'); +// Tests deprecated Buffer API on purpose const buf1 = Buffer(100); const buf2 = new Buffer(100); diff --git a/test/parallel/test-net-socket-byteswritten.js b/test/parallel/test-net-socket-byteswritten.js index 6f3ce8a3c6..b7b7af89e2 100644 --- a/test/parallel/test-net-socket-byteswritten.js +++ b/test/parallel/test-net-socket-byteswritten.js @@ -16,7 +16,7 @@ server.listen(0, common.mustCall(function() { socket.cork(); socket.write('one'); - socket.write(new Buffer('twø', 'utf8')); + socket.write(Buffer.from('twø', 'utf8')); socket.uncork(); diff --git a/test/parallel/test-zlib-empty-buffer.js b/test/parallel/test-zlib-empty-buffer.js index 908c89cbbc..8b299f8728 100644 --- a/test/parallel/test-zlib-empty-buffer.js +++ b/test/parallel/test-zlib-empty-buffer.js @@ -3,7 +3,7 @@ const common = require('../common'); const zlib = require('zlib'); const { inspect, promisify } = require('util'); const assert = require('assert'); -const emptyBuffer = new Buffer(0); +const emptyBuffer = Buffer.alloc(0); common.crashOnUnhandledRejection(); |