From e758bd541b29600b41f2761a4c1ae386b6e9036a Mon Sep 17 00:00:00 2001 From: Jeremiah Senkpiel Date: Sun, 17 Jul 2016 21:59:55 +0200 Subject: [PATCH] test: clean up test-buffer-badhex This test was recently (at the time of writing) introduced in 151d316b99d56a4614c95cc59ea7a0c9c0f1928b and could be cleaned up a bit. Refs: https://github.com/nodejs/node/pull/7602 PR-URL: https://github.com/nodejs/node/pull/7773 Reviewed-By: Anna Henningsen Reviewed-By: Colin Ihrig Reviewed-By: Minwoo Jung Reviewed-By: Ilkka Myller Reviewed-By: James M Snell --- test/parallel/test-buffer-badhex.js | 60 ++++++++++++++++------------- 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/test/parallel/test-buffer-badhex.js b/test/parallel/test-buffer-badhex.js index 3611ba3a09cdae..ad0b5133958e3a 100644 --- a/test/parallel/test-buffer-badhex.js +++ b/test/parallel/test-buffer-badhex.js @@ -5,39 +5,45 @@ const Buffer = require('buffer').Buffer; // Test hex strings and bad hex strings { - const buf1 = Buffer.alloc(4); - assert.strictEqual(buf1.length, 4); - assert.deepStrictEqual(buf1, new Buffer([0, 0, 0, 0])); - assert.strictEqual(buf1.write('abcdxx', 0, 'hex'), 2); - assert.deepStrictEqual(buf1, new Buffer([0xab, 0xcd, 0x00, 0x00])); - assert.strictEqual(buf1.toString('hex'), 'abcd0000'); - assert.strictEqual(buf1.write('abcdef01', 0, 'hex'), 4); - assert.deepStrictEqual(buf1, new Buffer([0xab, 0xcd, 0xef, 0x01])); - assert.strictEqual(buf1.toString('hex'), 'abcdef01'); + const buf = Buffer.alloc(4); + assert.strictEqual(buf.length, 4); + assert.deepStrictEqual(buf, new Buffer([0, 0, 0, 0])); + assert.strictEqual(buf.write('abcdxx', 0, 'hex'), 2); + assert.deepStrictEqual(buf, new Buffer([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.strictEqual(buf.toString('hex'), 'abcdef01'); - const buf2 = Buffer.from(buf1.toString('hex'), 'hex'); - assert.strictEqual(buf1.toString('hex'), buf2.toString('hex')); + const copy = Buffer.from(buf.toString('hex'), 'hex'); + assert.strictEqual(buf.toString('hex'), copy.toString('hex')); +} - const buf3 = Buffer.alloc(5); - assert.strictEqual(buf3.write('abcdxx', 1, 'hex'), 2); - assert.strictEqual(buf3.toString('hex'), '00abcd0000'); +{ + const buf = Buffer.alloc(5); + assert.strictEqual(buf.write('abcdxx', 1, 'hex'), 2); + assert.strictEqual(buf.toString('hex'), '00abcd0000'); +} - const buf4 = Buffer.alloc(4); - assert.deepStrictEqual(buf4, new Buffer([0, 0, 0, 0])); - assert.strictEqual(buf4.write('xxabcd', 0, 'hex'), 0); - assert.deepStrictEqual(buf4, new Buffer([0, 0, 0, 0])); - assert.strictEqual(buf4.write('xxab', 1, 'hex'), 0); - assert.deepStrictEqual(buf4, new Buffer([0, 0, 0, 0])); - assert.strictEqual(buf4.write('cdxxab', 0, 'hex'), 1); - assert.deepStrictEqual(buf4, new Buffer([0xcd, 0, 0, 0])); +{ + const buf = Buffer.alloc(4); + assert.deepStrictEqual(buf, new Buffer([0, 0, 0, 0])); + assert.strictEqual(buf.write('xxabcd', 0, 'hex'), 0); + assert.deepStrictEqual(buf, new Buffer([0, 0, 0, 0])); + assert.strictEqual(buf.write('xxab', 1, 'hex'), 0); + assert.deepStrictEqual(buf, new Buffer([0, 0, 0, 0])); + assert.strictEqual(buf.write('cdxxab', 0, 'hex'), 1); + assert.deepStrictEqual(buf, new Buffer([0xcd, 0, 0, 0])); +} - const buf5 = Buffer.alloc(256); +{ + const buf = Buffer.alloc(256); for (let i = 0; i < 256; i++) - buf5[i] = i; + buf[i] = i; - const hex = buf5.toString('hex'); - assert.deepStrictEqual(Buffer.from(hex, 'hex'), buf5); + const hex = buf.toString('hex'); + assert.deepStrictEqual(Buffer.from(hex, 'hex'), buf); const badHex = hex.slice(0, 256) + 'xx' + hex.slice(256, 510); - assert.deepStrictEqual(Buffer.from(badHex, 'hex'), buf5.slice(0, 128)); + assert.deepStrictEqual(Buffer.from(badHex, 'hex'), buf.slice(0, 128)); }