diff options
Diffstat (limited to 'test/parallel/test-buffer-indexof.js')
| -rw-r--r-- | test/parallel/test-buffer-indexof.js | 82 |
1 files changed, 41 insertions, 41 deletions
diff --git a/test/parallel/test-buffer-indexof.js b/test/parallel/test-buffer-indexof.js index 101a60cbe5..7fb862d919 100644 --- a/test/parallel/test-buffer-indexof.js +++ b/test/parallel/test-buffer-indexof.js @@ -4,12 +4,12 @@ var assert = require('assert'); var Buffer = require('buffer').Buffer; -var b = new Buffer('abcdef'); -var buf_a = new Buffer('a'); -var buf_bc = new Buffer('bc'); -var buf_f = new Buffer('f'); -var buf_z = new Buffer('z'); -var buf_empty = new Buffer(''); +var b = Buffer.from('abcdef'); +var buf_a = Buffer.from('a'); +var buf_bc = Buffer.from('bc'); +var buf_f = Buffer.from('f'); +var buf_z = Buffer.from('z'); +var buf_empty = Buffer.from(''); assert.equal(b.indexOf('a'), 0); assert.equal(b.indexOf('a', 1), -1); @@ -71,86 +71,86 @@ assert.equal(b.indexOf('f', 5), 5); assert.equal(b.indexOf('f', -1), 5); assert.equal(b.indexOf('f', 6), -1); -assert.equal(b.indexOf(Buffer('d'), 2), 3); -assert.equal(b.indexOf(Buffer('f'), 5), 5); -assert.equal(b.indexOf(Buffer('f'), -1), 5); -assert.equal(b.indexOf(Buffer('f'), 6), -1); +assert.equal(b.indexOf(Buffer.from('d'), 2), 3); +assert.equal(b.indexOf(Buffer.from('f'), 5), 5); +assert.equal(b.indexOf(Buffer.from('f'), -1), 5); +assert.equal(b.indexOf(Buffer.from('f'), 6), -1); -assert.equal(Buffer('ff').indexOf(Buffer('f'), 1, 'ucs2'), -1); +assert.equal(Buffer.from('ff').indexOf(Buffer.from('f'), 1, 'ucs2'), -1); // test hex encoding assert.equal( - Buffer(b.toString('hex'), 'hex') + Buffer.from(b.toString('hex'), 'hex') .indexOf('64', 0, 'hex'), 3); assert.equal( - Buffer(b.toString('hex'), 'hex') - .indexOf(Buffer('64', 'hex'), 0, 'hex'), 3); + Buffer.from(b.toString('hex'), 'hex') + .indexOf(Buffer.from('64', 'hex'), 0, 'hex'), 3); // test base64 encoding assert.equal( - Buffer(b.toString('base64'), 'base64') + Buffer.from(b.toString('base64'), 'base64') .indexOf('ZA==', 0, 'base64'), 3); assert.equal( - Buffer(b.toString('base64'), 'base64') - .indexOf(Buffer('ZA==', 'base64'), 0, 'base64'), 3); + Buffer.from(b.toString('base64'), 'base64') + .indexOf(Buffer.from('ZA==', 'base64'), 0, 'base64'), 3); // test ascii encoding assert.equal( - Buffer(b.toString('ascii'), 'ascii') + Buffer.from(b.toString('ascii'), 'ascii') .indexOf('d', 0, 'ascii'), 3); assert.equal( - Buffer(b.toString('ascii'), 'ascii') - .indexOf(Buffer('d', 'ascii'), 0, 'ascii'), 3); + Buffer.from(b.toString('ascii'), 'ascii') + .indexOf(Buffer.from('d', 'ascii'), 0, 'ascii'), 3); // test binary encoding assert.equal( - Buffer(b.toString('binary'), 'binary') + Buffer.from(b.toString('binary'), 'binary') .indexOf('d', 0, 'binary'), 3); assert.equal( - Buffer(b.toString('binary'), 'binary') - .indexOf(Buffer('d', 'binary'), 0, 'binary'), 3); + Buffer.from(b.toString('binary'), 'binary') + .indexOf(Buffer.from('d', 'binary'), 0, 'binary'), 3); assert.equal( - Buffer('aa\u00e8aa', 'binary') + Buffer.from('aa\u00e8aa', 'binary') .indexOf('\u00e8', 'binary'), 2); assert.equal( - Buffer('\u00e8', 'binary') + Buffer.from('\u00e8', 'binary') .indexOf('\u00e8', 'binary'), 0); assert.equal( - Buffer('\u00e8', 'binary') - .indexOf(Buffer('\u00e8', 'binary'), 'binary'), 0); + Buffer.from('\u00e8', 'binary') + .indexOf(Buffer.from('\u00e8', 'binary'), 'binary'), 0); // test optional offset with passed encoding -assert.equal(new Buffer('aaaa0').indexOf('30', 'hex'), 4); -assert.equal(new Buffer('aaaa00a').indexOf('3030', 'hex'), 4); +assert.equal(Buffer.from('aaaa0').indexOf('30', 'hex'), 4); +assert.equal(Buffer.from('aaaa00a').indexOf('3030', 'hex'), 4); { // test usc2 encoding - const twoByteString = new Buffer('\u039a\u0391\u03a3\u03a3\u0395', 'ucs2'); + const twoByteString = Buffer.from('\u039a\u0391\u03a3\u03a3\u0395', 'ucs2'); assert.equal(8, twoByteString.indexOf('\u0395', 4, 'ucs2')); assert.equal(6, twoByteString.indexOf('\u03a3', -4, 'ucs2')); assert.equal(4, twoByteString.indexOf('\u03a3', -6, 'ucs2')); assert.equal(4, twoByteString.indexOf( - new Buffer('\u03a3', 'ucs2'), -6, 'ucs2')); + Buffer.from('\u03a3', 'ucs2'), -6, 'ucs2')); assert.equal(-1, twoByteString.indexOf('\u03a3', -2, 'ucs2')); } var mixedByteStringUcs2 = - new Buffer('\u039a\u0391abc\u03a3\u03a3\u0395', 'ucs2'); + Buffer.from('\u039a\u0391abc\u03a3\u03a3\u0395', 'ucs2'); assert.equal(6, mixedByteStringUcs2.indexOf('bc', 0, 'ucs2')); assert.equal(10, mixedByteStringUcs2.indexOf('\u03a3', 0, 'ucs2')); assert.equal(-1, mixedByteStringUcs2.indexOf('\u0396', 0, 'ucs2')); assert.equal( - 6, mixedByteStringUcs2.indexOf(new Buffer('bc', 'ucs2'), 0, 'ucs2')); + 6, mixedByteStringUcs2.indexOf(Buffer.from('bc', 'ucs2'), 0, 'ucs2')); assert.equal( - 10, mixedByteStringUcs2.indexOf(new Buffer('\u03a3', 'ucs2'), 0, 'ucs2')); + 10, mixedByteStringUcs2.indexOf(Buffer.from('\u03a3', 'ucs2'), 0, 'ucs2')); assert.equal( - -1, mixedByteStringUcs2.indexOf(new Buffer('\u0396', 'ucs2'), 0, 'ucs2')); + -1, mixedByteStringUcs2.indexOf(Buffer.from('\u0396', 'ucs2'), 0, 'ucs2')); { - const twoByteString = new Buffer('\u039a\u0391\u03a3\u03a3\u0395', 'ucs2'); + const twoByteString = Buffer.from('\u039a\u0391\u03a3\u03a3\u0395', 'ucs2'); // Test single char pattern assert.equal(0, twoByteString.indexOf('\u039a', 0, 'ucs2')); @@ -171,7 +171,7 @@ assert.equal( 6, twoByteString.indexOf('\u03a3\u0395', 0, 'ucs2'), 'Sigma Epsilon'); } -var mixedByteStringUtf8 = new Buffer('\u039a\u0391abc\u03a3\u03a3\u0395'); +var mixedByteStringUtf8 = Buffer.from('\u039a\u0391abc\u03a3\u03a3\u0395'); assert.equal(5, mixedByteStringUtf8.indexOf('bc')); assert.equal(5, mixedByteStringUtf8.indexOf('bc', 5)); assert.equal(5, mixedByteStringUtf8.indexOf('bc', -8)); @@ -186,7 +186,7 @@ for (let i = 66; i < 76; i++) { // from 'B' to 'K' longString = longString + String.fromCharCode(i) + longString; } -var longBufferString = new Buffer(longString); +var longBufferString = Buffer.from(longString); // pattern of 15 chars, repeated every 16 chars in long var pattern = 'ABACABADABACABA'; @@ -205,7 +205,7 @@ assert.equal( 1535, longBufferString.indexOf(pattern, 512), 'Long JABACABA..., Second J'); // Search for a non-ASCII string in a pure ASCII string. -var asciiString = new Buffer( +var asciiString = Buffer.from( 'arglebargleglopglyfarglebargleglopglyfarglebargleglopglyf'); assert.equal(-1, asciiString.indexOf('\x2061')); assert.equal(3, asciiString.indexOf('leb', 0)); @@ -214,8 +214,8 @@ assert.equal(3, asciiString.indexOf('leb', 0)); var allCodePoints = []; for (let i = 0; i < 65536; i++) allCodePoints[i] = i; var allCharsString = String.fromCharCode.apply(String, allCodePoints); -var allCharsBufferUtf8 = new Buffer(allCharsString); -var allCharsBufferUcs2 = new Buffer(allCharsString, 'ucs2'); +var allCharsBufferUtf8 = Buffer.from(allCharsString); +var allCharsBufferUcs2 = Buffer.from(allCharsString, 'ucs2'); // Search for string long enough to trigger complex search with ASCII pattern // and UC16 subject. |