From ecde461810ceef0d82f059d11c7afaef05be6457 Mon Sep 17 00:00:00 2001 From: Jesse Tane Date: Tue, 23 Dec 2014 22:44:48 -0500 Subject: [PATCH] update node tests --- test/node-test-buffer-ascii.js | 11 +- test/node-test-buffer-big.js | 15 +- test/node-test-buffer-concat.js | 17 +- test/node-test-buffer-inspect.js | 21 +- test/node-test-buffer-slice.js | 9 +- test/node-test-buffer.js | 700 +++++++++++++++---------------- 6 files changed, 371 insertions(+), 402 deletions(-) diff --git a/test/node-test-buffer-ascii.js b/test/node-test-buffer-ascii.js index 1403b03..983841b 100644 --- a/test/node-test-buffer-ascii.js +++ b/test/node-test-buffer-ascii.js @@ -1,7 +1,5 @@ var Buffer = require('../').Buffer -var test = require('tape') if (process.env.OBJECT_IMPL) Buffer.TYPED_ARRAY_SUPPORT = false -test('test-buffer-ascii.js', function(t) { // Copyright Joyent, Inc. and other Node contributors. // // Permission is hereby granted, free of charge, to any person obtaining a @@ -24,11 +22,11 @@ test('test-buffer-ascii.js', function(t) { // USE OR OTHER DEALINGS IN THE SOFTWARE. // var common = require('../common'); -// var assert = require('assert'); +var assert = require('assert'); // ASCII conversion in node.js simply masks off the high bits, // it doesn't do transliteration. -t.equal(Buffer('hérité').toString('ascii'), 'hC)ritC)'); +assert.equal(Buffer('hérité').toString('ascii'), 'hC)ritC)'); // 71 characters, 78 bytes. The ’ character is a triple-byte sequence. var input = 'C’est, graphiquement, la réunion d’un accent aigu ' + @@ -41,13 +39,10 @@ var expected = 'Cb\u0000\u0019est, graphiquement, la rC)union ' + var buf = Buffer(input); for (var i = 0; i < expected.length; ++i) { - t.equal(buf.slice(i).toString('ascii'), expected.slice(i)); + assert.equal(buf.slice(i).toString('ascii'), expected.slice(i)); // Skip remainder of multi-byte sequence. if (input.charCodeAt(i) > 65535) ++i; if (input.charCodeAt(i) > 127) ++i; } - -t.end() -}) \ No newline at end of file diff --git a/test/node-test-buffer-big.js b/test/node-test-buffer-big.js index c0a080f..36ad13a 100644 --- a/test/node-test-buffer-big.js +++ b/test/node-test-buffer-big.js @@ -1,7 +1,5 @@ var Buffer = require('../').Buffer -var test = require('tape') if (process.env.OBJECT_IMPL) Buffer.TYPED_ARRAY_SUPPORT = false -test('test-buffer-big.js', function(t) { // Copyright Joyent, Inc. and other Node contributors. // // Permission is hereby granted, free of charge, to any person obtaining a @@ -24,14 +22,11 @@ test('test-buffer-big.js', function(t) { // USE OR OTHER DEALINGS IN THE SOFTWARE. // var common = require('../common'); -// var assert = require('assert'); +var assert = require('assert'); // The tests below should throw an error, not abort the process... -t.throws(function() { new Buffer(0x3fffffff + 1) }, RangeError); -// t.throws(function() { new Int8Array(0x3fffffff + 1) }, RangeError); -// t.throws(function() { new ArrayBuffer(0x3fffffff + 1) }, RangeError); -// t.throws(function() { new Float64Array(0x7ffffff + 1) }, RangeError); +assert.throws(function() { new Buffer(0x3fffffff + 1) }, RangeError); +// assert.throws(function() { new Int8Array(0x3fffffff + 1) }, RangeError); +// assert.throws(function() { new ArrayBuffer(0x3fffffff + 1) }, RangeError); +// assert.throws(function() { new Float64Array(0x7ffffff + 1) }, RangeError); - -t.end() -}) \ No newline at end of file diff --git a/test/node-test-buffer-concat.js b/test/node-test-buffer-concat.js index f7fffa8..28860a9 100644 --- a/test/node-test-buffer-concat.js +++ b/test/node-test-buffer-concat.js @@ -1,7 +1,5 @@ var Buffer = require('../').Buffer -var test = require('tape') if (process.env.OBJECT_IMPL) Buffer.TYPED_ARRAY_SUPPORT = false -test('test-buffer-concat.js', function(t) { // Copyright Joyent, Inc. and other Node contributors. // // Permission is hereby granted, free of charge, to any person obtaining a @@ -24,7 +22,7 @@ test('test-buffer-concat.js', function(t) { // USE OR OTHER DEALINGS IN THE SOFTWARE. // var common = require('../common'); -// var assert = require('assert'); +var assert = require('assert'); var zero = []; var one = [ new Buffer('asdf') ]; @@ -36,14 +34,11 @@ var flatOne = Buffer.concat(one); var flatLong = Buffer.concat(long); var flatLongLen = Buffer.concat(long, 40); -t.ok(flatZero.length === 0); -t.ok(flatOne.toString() === 'asdf'); -t.ok(flatOne === one[0]); -t.ok(flatLong.toString() === (new Array(10+1).join('asdf'))); -t.ok(flatLongLen.toString() === (new Array(10+1).join('asdf'))); +assert(flatZero.length === 0); +assert(flatOne.toString() === 'asdf'); +assert(flatOne === one[0]); +assert(flatLong.toString() === (new Array(10+1).join('asdf'))); +assert(flatLongLen.toString() === (new Array(10+1).join('asdf'))); // console.log("ok"); - -t.end() -}) \ No newline at end of file diff --git a/test/node-test-buffer-inspect.js b/test/node-test-buffer-inspect.js index 6f9b20d..c79bac9 100644 --- a/test/node-test-buffer-inspect.js +++ b/test/node-test-buffer-inspect.js @@ -1,7 +1,5 @@ var Buffer = require('../').Buffer -var test = require('tape') if (process.env.OBJECT_IMPL) Buffer.TYPED_ARRAY_SUPPORT = false -test('test-buffer-inspect.js', function(t) { // Copyright Joyent, Inc. and other Node contributors. // // Permission is hereby granted, free of charge, to any person obtaining a @@ -24,7 +22,7 @@ test('test-buffer-inspect.js', function(t) { // USE OR OTHER DEALINGS IN THE SOFTWARE. // var common = require('../common'); -// var assert = require('assert'); +var assert = require('assert'); var util = require('util'); @@ -40,8 +38,8 @@ s.fill('1234'); var expected = ''; -t.strictEqual(util.inspect(b), expected); -t.strictEqual(util.inspect(s), expected); +assert.strictEqual(util.inspect(b), expected); +assert.strictEqual(util.inspect(s), expected); b = new Buffer(2); b.fill('12'); @@ -51,15 +49,12 @@ s.fill('12'); expected = ''; -t.strictEqual(util.inspect(b), expected); -t.strictEqual(util.inspect(s), expected); +assert.strictEqual(util.inspect(b), expected); +assert.strictEqual(util.inspect(s), expected); buffer.INSPECT_MAX_BYTES = Infinity; -t.doesNotThrow(function() { - t.strictEqual(util.inspect(b), expected); - t.strictEqual(util.inspect(s), expected); +assert.doesNotThrow(function() { + assert.strictEqual(util.inspect(b), expected); + assert.strictEqual(util.inspect(s), expected); }); - -t.end() -}) \ No newline at end of file diff --git a/test/node-test-buffer-slice.js b/test/node-test-buffer-slice.js index d007a2b..d12a4e6 100644 --- a/test/node-test-buffer-slice.js +++ b/test/node-test-buffer-slice.js @@ -1,7 +1,5 @@ var Buffer = require('../').Buffer -var test = require('tape') if (process.env.OBJECT_IMPL) Buffer.TYPED_ARRAY_SUPPORT = false -test('test-buffer-slice.js', function(t) { // Copyright Joyent, Inc. and other Node contributors. // // Permission is hereby granted, free of charge, to any person obtaining a @@ -24,17 +22,14 @@ test('test-buffer-slice.js', function(t) { // USE OR OTHER DEALINGS IN THE SOFTWARE. // var common = require('../common'); -// var assert = require('assert'); +var assert = require('assert'); var Buffer = require('../').Buffer; var buff = new Buffer(Buffer.poolSize + 1); var slicedBuffer = buff.slice(); -t.equal(slicedBuffer.parent, +assert.equal(slicedBuffer.parent, buff, "slicedBufffer should have its parent set to the original " + " buffer"); - -t.end() -}) \ No newline at end of file diff --git a/test/node-test-buffer.js b/test/node-test-buffer.js index 6886ede..081404c 100644 --- a/test/node-test-buffer.js +++ b/test/node-test-buffer.js @@ -1,7 +1,5 @@ var Buffer = require('../').Buffer -var test = require('tape') if (process.env.OBJECT_IMPL) Buffer.TYPED_ARRAY_SUPPORT = false -test('test-buffer.js', function(t) { // Copyright Joyent, Inc. and other Node contributors. // // Permission is hereby granted, free of charge, to any person obtaining a @@ -24,7 +22,7 @@ test('test-buffer.js', function(t) { // USE OR OTHER DEALINGS IN THE SOFTWARE. // var common = require('../common'); -// var assert = require('assert'); +var assert = require('assert'); var Buffer = require('../').Buffer; var SlowBuffer = require('../').SlowBuffer; @@ -36,30 +34,30 @@ var cntr = 0; var b = Buffer(1024); // safe constructor // console.log('b.length == %d', b.length); -t.strictEqual(1024, b.length); +assert.strictEqual(1024, b.length); b[0] = 255; -t.strictEqual(b[0], 255); +assert.strictEqual(b[0], 255); for (var i = 0; i < 1024; i++) { b[i] = i % 256; } for (var i = 0; i < 1024; i++) { - t.strictEqual(i % 256, b[i]); + assert.strictEqual(i % 256, b[i]); } var c = new Buffer(512); // console.log('c.length == %d', c.length); -t.strictEqual(512, c.length); +assert.strictEqual(512, c.length); // First check Buffer#fill() works as expected. -t.throws(function() { +assert.throws(function() { Buffer(8).fill('a', -1); }); -t.throws(function() { +assert.throws(function() { Buffer(8).fill('a', 0, 9); }); @@ -69,48 +67,48 @@ Buffer(8).fill(''); var buf = new Buffer(64); buf.fill(10); for (var i = 0; i < buf.length; i++) - t.equal(buf[i], 10); + assert.equal(buf[i], 10); buf.fill(11, 0, buf.length >> 1); for (var i = 0; i < buf.length >> 1; i++) - t.equal(buf[i], 11); + assert.equal(buf[i], 11); for (var i = (buf.length >> 1) + 1; i < buf.length; i++) - t.equal(buf[i], 10); + assert.equal(buf[i], 10); buf.fill('h'); for (var i = 0; i < buf.length; i++) - t.equal('h'.charCodeAt(0), buf[i]); + assert.equal('h'.charCodeAt(0), buf[i]); buf.fill(0); for (var i = 0; i < buf.length; i++) - t.equal(0, buf[i]); + assert.equal(0, buf[i]); buf.fill(null); for (var i = 0; i < buf.length; i++) - t.equal(0, buf[i]); + assert.equal(0, buf[i]); buf.fill(1, 16, 32); for (var i = 0; i < 16; i++) - t.equal(0, buf[i]); + assert.equal(0, buf[i]); for (; i < 32; i++) - t.equal(1, buf[i]); + assert.equal(1, buf[i]); for (; i < buf.length; i++) - t.equal(0, buf[i]); + assert.equal(0, buf[i]); var buf = new Buffer(10); buf.fill('abc'); -t.equal(buf.toString(), 'abcabcabca'); +assert.equal(buf.toString(), 'abcabcabca'); buf.fill('է'); -t.equal(buf.toString(), 'էէէէէ'); +assert.equal(buf.toString(), 'էէէէէ'); // copy 512 bytes, from 0 to 512. b.fill(++cntr); c.fill(++cntr); var copied = b.copy(c, 0, 0, 512); // console.log('copied %d bytes from b into c', copied); -t.strictEqual(512, copied); +assert.strictEqual(512, copied); for (var i = 0; i < c.length; i++) { - t.strictEqual(b[i], c[i]); + assert.strictEqual(b[i], c[i]); } // copy c into b, without specifying sourceEnd @@ -118,9 +116,9 @@ b.fill(++cntr); c.fill(++cntr); var copied = c.copy(b, 0, 0); // console.log('copied %d bytes from c into b w/o sourceEnd', copied); -t.strictEqual(c.length, copied); +assert.strictEqual(c.length, copied); for (var i = 0; i < c.length; i++) { - t.strictEqual(c[i], b[i]); + assert.strictEqual(c[i], b[i]); } // copy c into b, without specifying sourceStart @@ -128,9 +126,9 @@ b.fill(++cntr); c.fill(++cntr); var copied = c.copy(b, 0); // console.log('copied %d bytes from c into b w/o sourceStart', copied); -t.strictEqual(c.length, copied); +assert.strictEqual(c.length, copied); for (var i = 0; i < c.length; i++) { - t.strictEqual(c[i], b[i]); + assert.strictEqual(c[i], b[i]); } // copy longer buffer b to shorter c without targetStart @@ -138,9 +136,9 @@ b.fill(++cntr); c.fill(++cntr); var copied = b.copy(c); // console.log('copied %d bytes from b into c w/o targetStart', copied); -t.strictEqual(c.length, copied); +assert.strictEqual(c.length, copied); for (var i = 0; i < c.length; i++) { - t.strictEqual(b[i], c[i]); + assert.strictEqual(b[i], c[i]); } // copy starting near end of b to c @@ -148,12 +146,12 @@ b.fill(++cntr); c.fill(++cntr); var 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); -t.strictEqual(Math.floor(c.length / 2), copied); +assert.strictEqual(Math.floor(c.length / 2), copied); for (var i = 0; i < Math.floor(c.length / 2); i++) { - t.strictEqual(b[b.length - Math.floor(c.length / 2) + i], c[i]); + assert.strictEqual(b[b.length - Math.floor(c.length / 2) + i], c[i]); } for (var i = Math.floor(c.length /2) + 1; i < c.length; i++) { - t.strictEqual(c[c.length-1], c[i]); + assert.strictEqual(c[c.length-1], c[i]); } // try to copy 513 bytes, and check we don't overrun c @@ -161,9 +159,9 @@ b.fill(++cntr); c.fill(++cntr); var copied = b.copy(c, 0, 0, 513); // console.log('copied %d bytes from b trying to overrun c', copied); -t.strictEqual(c.length, copied); +assert.strictEqual(c.length, copied); for (var i = 0; i < c.length; i++) { - t.strictEqual(b[i], c[i]); + assert.strictEqual(b[i], c[i]); } // copy 768 bytes from b into b @@ -171,9 +169,9 @@ b.fill(++cntr); b.fill(++cntr, 256); var copied = b.copy(b, 0, 256, 1024); // console.log('copied %d bytes from b into b', copied); -t.strictEqual(768, copied); +assert.strictEqual(768, copied); for (var i = 0; i < b.length; i++) { - t.strictEqual(cntr, b[i]); + assert.strictEqual(cntr, b[i]); } // copy string longer than buffer length (failure will segfault) @@ -192,7 +190,7 @@ try { } // copy throws at negative sourceStart -t.throws(function() { +assert.throws(function() { Buffer(5).copy(Buffer(5), 0, -1); }, RangeError); @@ -202,20 +200,20 @@ c.fill(++cntr); var copied = b.copy(c, 0, 0, 1025); // console.log('copied %d bytes from b into c', copied); for (var i = 0; i < c.length; i++) { - t.strictEqual(b[i], c[i]); + assert.strictEqual(b[i], c[i]); } // throw with negative sourceEnd // console.log('test copy at negative sourceEnd'); -t.throws(function() { +assert.throws(function() { b.copy(c, 0, 0, -1); }, RangeError); // when sourceStart is greater than sourceEnd, zero copied -t.equal(b.copy(c, 0, 100, 10), 0); +assert.equal(b.copy(c, 0, 100, 10), 0); // when targetStart > targetLength, zero copied -t.equal(b.copy(c, 512, 0, 10), 0); +assert.equal(b.copy(c, 512, 0, 10), 0); var caught_error; @@ -226,7 +224,7 @@ try { } catch (err) { caught_error = err; } -t.strictEqual('Unknown encoding: invalid', caught_error.message); +assert.strictEqual('Unknown encoding: invalid', caught_error.message); // invalid encoding for Buffer.write caught_error = null; @@ -235,7 +233,7 @@ try { } catch (err) { caught_error = err; } -t.strictEqual('Unknown encoding: invalid', caught_error.message); +assert.strictEqual('Unknown encoding: invalid', caught_error.message); // try to create 0-length buffers new Buffer(''); @@ -244,22 +242,22 @@ new Buffer('', 'binary'); new Buffer(0); // try to write a 0-length string beyond the end of b -t.throws(function() { +assert.throws(function() { b.write('', 2048); }, RangeError); // throw when writing to negative offset -t.throws(function() { +assert.throws(function() { b.write('a', -1); }, RangeError); // throw when writing past bounds from the pool -t.throws(function() { +assert.throws(function() { b.write('a', 2048); }, RangeError); // throw when writing to negative offset -t.throws(function() { +assert.throws(function() { b.write('a', -1); }, RangeError); @@ -275,12 +273,12 @@ b.copy(new Buffer(1), 0, 2048, 2048); // try to toString() a 0-length slice of a buffer, both within and without the // valid buffer range -t.equal(new Buffer('abc').toString('ascii', 0, 0), ''); -t.equal(new Buffer('abc').toString('ascii', -100, -100), ''); -t.equal(new Buffer('abc').toString('ascii', 100, 100), ''); +assert.equal(new Buffer('abc').toString('ascii', 0, 0), ''); +assert.equal(new Buffer('abc').toString('ascii', -100, -100), ''); +assert.equal(new Buffer('abc').toString('ascii', 100, 100), ''); // try toString() with a object as a encoding -t.equal(new Buffer('abc').toString({toString: function() { +assert.equal(new Buffer('abc').toString({toString: function() { return 'ascii'; }}), 'abc'); @@ -291,7 +289,7 @@ writeTest.write('o', 'ascii', '1'); writeTest.write('d', '2', 'ascii'); writeTest.write('e', 3, 'ascii'); writeTest.write('j', 'ascii', 4); -t.equal(writeTest.toString(), 'nodejs'); +assert.equal(writeTest.toString(), 'nodejs'); var asciiString = 'hello world'; var offset = 100; @@ -301,17 +299,17 @@ for (var j = 0; j < 500; j++) { b[i] = asciiString.charCodeAt(i); } var asciiSlice = b.toString('ascii', 0, asciiString.length); - t.equal(asciiString, asciiSlice); + assert.equal(asciiString, asciiSlice); var written = b.write(asciiString, offset, 'ascii'); - t.equal(asciiString.length, written); + assert.equal(asciiString.length, written); var asciiSlice = b.toString('ascii', offset, offset + asciiString.length); - t.equal(asciiString, asciiSlice); + assert.equal(asciiString, asciiSlice); var sliceA = b.slice(offset, offset + asciiString.length); var sliceB = b.slice(offset, offset + asciiString.length); for (var i = 0; i < asciiString.length; i++) { - t.equal(sliceA[i], sliceB[i]); + assert.equal(sliceA[i], sliceB[i]); } // TODO utf8 slice tests @@ -320,9 +318,9 @@ for (var j = 0; j < 500; j++) { for (var j = 0; j < 100; j++) { var slice = b.slice(100, 150); - t.equal(50, slice.length); + assert.equal(50, slice.length); for (var i = 0; i < 50; i++) { - t.equal(b[100 + i], slice[i]); + assert.equal(b[100 + i], slice[i]); } } @@ -331,15 +329,15 @@ for (var j = 0; j < 100; j++) { var b = new Buffer(5); var c = b.slice(0, 4); var d = c.slice(0, 2); -t.equal(b.parent, c.parent); -t.equal(b.parent, d.parent); +assert.equal(b.parent, c.parent); +assert.equal(b.parent, d.parent); // also from a non-pooled instance var b = new SlowBuffer(5); var c = b.slice(0, 4); var d = c.slice(0, 2); -t.equal(b, c.parent); -t.equal(b, d.parent); +assert.equal(b, c.parent); +assert.equal(b, d.parent); @@ -349,77 +347,77 @@ var buffer = new Buffer(32); var size = buffer.write(testValue, 0, 'utf8'); // console.log('bytes written to buffer: ' + size); var slice = buffer.toString('utf8', 0, size); -t.equal(slice, testValue); +assert.equal(slice, testValue); // Test triple slice var a = new Buffer(8); for (var i = 0; i < 8; i++) a[i] = i; var b = a.slice(4, 8); -t.equal(4, b[0]); -t.equal(5, b[1]); -t.equal(6, b[2]); -t.equal(7, b[3]); +assert.equal(4, b[0]); +assert.equal(5, b[1]); +assert.equal(6, b[2]); +assert.equal(7, b[3]); var c = b.slice(2, 4); -t.equal(6, c[0]); -t.equal(7, c[1]); +assert.equal(6, c[0]); +assert.equal(7, c[1]); var d = new Buffer([23, 42, 255]); -t.equal(d.length, 3); -t.equal(d[0], 23); -t.equal(d[1], 42); -t.equal(d[2], 255); -t.deepEqual(d, new Buffer(d)); +assert.equal(d.length, 3); +assert.equal(d[0], 23); +assert.equal(d[1], 42); +assert.equal(d[2], 255); +assert.deepEqual(d, new Buffer(d)); var e = new Buffer('über'); // console.error('uber: \'%s\'', e.toString()); -t.deepEqual(e, new Buffer([195, 188, 98, 101, 114])); +assert.deepEqual(e, new Buffer([195, 188, 98, 101, 114])); var f = new Buffer('über', 'ascii'); // console.error('f.length: %d (should be 4)', f.length); -t.deepEqual(f, new Buffer([252, 98, 101, 114])); +assert.deepEqual(f, new Buffer([252, 98, 101, 114])); ['ucs2', 'ucs-2', 'utf16le', 'utf-16le'].forEach(function(encoding) { var f = new Buffer('über', encoding); // console.error('f.length: %d (should be 8)', f.length); - t.deepEqual(f, new Buffer([252, 0, 98, 0, 101, 0, 114, 0])); + assert.deepEqual(f, new Buffer([252, 0, 98, 0, 101, 0, 114, 0])); var f = new Buffer('привет', encoding); // console.error('f.length: %d (should be 12)', f.length); - t.deepEqual(f, new Buffer([63, 4, 64, 4, 56, 4, 50, 4, 53, 4, 66, 4])); - t.equal(f.toString(encoding), 'привет'); + assert.deepEqual(f, new Buffer([63, 4, 64, 4, 56, 4, 50, 4, 53, 4, 66, 4])); + assert.equal(f.toString(encoding), 'привет'); var f = new Buffer([0, 0, 0, 0, 0]); - t.equal(f.length, 5); + assert.equal(f.length, 5); var size = f.write('あいうえお', encoding); // console.error('bytes written to buffer: %d (should be 4)', size); - t.equal(size, 4); - t.deepEqual(f, new Buffer([0x42, 0x30, 0x44, 0x30, 0x00])); + assert.equal(size, 4); + assert.deepEqual(f, new Buffer([0x42, 0x30, 0x44, 0x30, 0x00])); }); var f = new Buffer('\uD83D\uDC4D', 'utf-16le'); // THUMBS UP SIGN (U+1F44D) -t.equal(f.length, 4); -t.deepEqual(f, new Buffer('3DD84DDC', 'hex')); +assert.equal(f.length, 4); +assert.deepEqual(f, new Buffer('3DD84DDC', 'hex')); var arrayIsh = {0: 0, 1: 1, 2: 2, 3: 3, length: 4}; var g = new Buffer(arrayIsh); -t.deepEqual(g, new Buffer([0, 1, 2, 3])); +assert.deepEqual(g, new Buffer([0, 1, 2, 3])); var strArrayIsh = {0: '0', 1: '1', 2: '2', 3: '3', length: 4}; g = new Buffer(strArrayIsh); -t.deepEqual(g, new Buffer([0, 1, 2, 3])); +assert.deepEqual(g, new Buffer([0, 1, 2, 3])); // // Test toString('base64') // -t.equal('TWFu', (new Buffer('Man')).toString('base64')); +assert.equal('TWFu', (new Buffer('Man')).toString('base64')); // test that regular and URL-safe base64 both work var expected = [0xff, 0xff, 0xbe, 0xff, 0xef, 0xbf, 0xfb, 0xef, 0xff]; -t.deepEqual(Buffer('//++/++/++//', 'base64'), Buffer(expected)); -t.deepEqual(Buffer('__--_--_--__', 'base64'), Buffer(expected)); +assert.deepEqual(Buffer('//++/++/++//', 'base64'), Buffer(expected)); +assert.deepEqual(Buffer('__--_--_--__', 'base64'), Buffer(expected)); // big example var quote = 'Man is distinguished, not only by his reason, but by this ' + @@ -433,13 +431,13 @@ var expected = 'TWFuIGlzIGRpc3Rpbmd1aXNoZWQsIG5vdCBvbmx5IGJ5IGhpcyByZWFzb24s' + 'JzZXZlcmFuY2Ugb2YgZGVsaWdodCBpbiB0aGUgY29udGludWVkIGFuZCBpbmR' + 'lZmF0aWdhYmxlIGdlbmVyYXRpb24gb2Yga25vd2xlZGdlLCBleGNlZWRzIHRo' + 'ZSBzaG9ydCB2ZWhlbWVuY2Ugb2YgYW55IGNhcm5hbCBwbGVhc3VyZS4='; -t.equal(expected, (new Buffer(quote)).toString('base64')); +assert.equal(expected, (new Buffer(quote)).toString('base64')); b = new Buffer(1024); var bytesWritten = b.write(expected, 0, 'base64'); -t.equal(quote.length, bytesWritten); -t.equal(quote, b.toString('ascii', 0, quote.length)); +assert.equal(quote.length, bytesWritten); +assert.equal(quote, b.toString('ascii', 0, quote.length)); // check that the base64 decoder ignores whitespace var expectedWhite = expected.slice(0, 60) + ' \n' + @@ -450,14 +448,14 @@ var expectedWhite = expected.slice(0, 60) + ' \n' + expected.slice(300, 360) + '\n'; b = new Buffer(1024); bytesWritten = b.write(expectedWhite, 0, 'base64'); -t.equal(quote.length, bytesWritten); -t.equal(quote, b.toString('ascii', 0, quote.length)); +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'); -t.equal(quote.length, b.length); -t.equal(quote, b.toString('ascii', 0, quote.length)); +assert.equal(quote.length, b.length); +assert.equal(quote, b.toString('ascii', 0, quote.length)); // check that the base64 decoder ignores illegal chars var expectedIllegal = expected.slice(0, 60) + ' \x80' + @@ -467,89 +465,89 @@ var expectedIllegal = expected.slice(0, 60) + ' \x80' + expected.slice(240, 300) + '\x03' + expected.slice(300, 360); b = new Buffer(expectedIllegal, 'base64'); -t.equal(quote.length, b.length); -t.equal(quote, b.toString('ascii', 0, quote.length)); +assert.equal(quote.length, b.length); +assert.equal(quote, b.toString('ascii', 0, quote.length)); -t.equal(new Buffer('', 'base64').toString(), ''); -t.equal(new Buffer('K', 'base64').toString(), ''); +assert.equal(new Buffer('', 'base64').toString(), ''); +assert.equal(new Buffer('K', 'base64').toString(), ''); // multiple-of-4 with padding -t.equal(new Buffer('Kg==', 'base64').toString(), '*'); -t.equal(new Buffer('Kio=', 'base64').toString(), '**'); -t.equal(new Buffer('Kioq', 'base64').toString(), '***'); -t.equal(new Buffer('KioqKg==', 'base64').toString(), '****'); -t.equal(new Buffer('KioqKio=', 'base64').toString(), '*****'); -t.equal(new Buffer('KioqKioq', 'base64').toString(), '******'); -t.equal(new Buffer('KioqKioqKg==', 'base64').toString(), '*******'); -t.equal(new Buffer('KioqKioqKio=', 'base64').toString(), '********'); -t.equal(new Buffer('KioqKioqKioq', 'base64').toString(), '*********'); -t.equal(new Buffer('KioqKioqKioqKg==', 'base64').toString(), +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(), '**********'); -t.equal(new Buffer('KioqKioqKioqKio=', 'base64').toString(), +assert.equal(new Buffer('KioqKioqKioqKio=', 'base64').toString(), '***********'); -t.equal(new Buffer('KioqKioqKioqKioq', 'base64').toString(), +assert.equal(new Buffer('KioqKioqKioqKioq', 'base64').toString(), '************'); -t.equal(new Buffer('KioqKioqKioqKioqKg==', 'base64').toString(), +assert.equal(new Buffer('KioqKioqKioqKioqKg==', 'base64').toString(), '*************'); -t.equal(new Buffer('KioqKioqKioqKioqKio=', 'base64').toString(), +assert.equal(new Buffer('KioqKioqKioqKioqKio=', 'base64').toString(), '**************'); -t.equal(new Buffer('KioqKioqKioqKioqKioq', 'base64').toString(), +assert.equal(new Buffer('KioqKioqKioqKioqKioq', 'base64').toString(), '***************'); -t.equal(new Buffer('KioqKioqKioqKioqKioqKg==', 'base64').toString(), +assert.equal(new Buffer('KioqKioqKioqKioqKioqKg==', 'base64').toString(), '****************'); -t.equal(new Buffer('KioqKioqKioqKioqKioqKio=', 'base64').toString(), +assert.equal(new Buffer('KioqKioqKioqKioqKioqKio=', 'base64').toString(), '*****************'); -t.equal(new Buffer('KioqKioqKioqKioqKioqKioq', 'base64').toString(), +assert.equal(new Buffer('KioqKioqKioqKioqKioqKioq', 'base64').toString(), '******************'); -t.equal(new Buffer('KioqKioqKioqKioqKioqKioqKg==', 'base64').toString(), +assert.equal(new Buffer('KioqKioqKioqKioqKioqKioqKg==', 'base64').toString(), '*******************'); -t.equal(new Buffer('KioqKioqKioqKioqKioqKioqKio=', 'base64').toString(), +assert.equal(new Buffer('KioqKioqKioqKioqKioqKioqKio=', 'base64').toString(), '********************'); // no padding, not a multiple of 4 -t.equal(new Buffer('Kg', 'base64').toString(), '*'); -t.equal(new Buffer('Kio', 'base64').toString(), '**'); -t.equal(new Buffer('KioqKg', 'base64').toString(), '****'); -t.equal(new Buffer('KioqKio', 'base64').toString(), '*****'); -t.equal(new Buffer('KioqKioqKg', 'base64').toString(), '*******'); -t.equal(new Buffer('KioqKioqKio', 'base64').toString(), '********'); -t.equal(new Buffer('KioqKioqKioqKg', 'base64').toString(), '**********'); -t.equal(new Buffer('KioqKioqKioqKio', 'base64').toString(), '***********'); -t.equal(new Buffer('KioqKioqKioqKioqKg', 'base64').toString(), +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(), '*************'); -t.equal(new Buffer('KioqKioqKioqKioqKio', 'base64').toString(), +assert.equal(new Buffer('KioqKioqKioqKioqKio', 'base64').toString(), '**************'); -t.equal(new Buffer('KioqKioqKioqKioqKioqKg', 'base64').toString(), +assert.equal(new Buffer('KioqKioqKioqKioqKioqKg', 'base64').toString(), '****************'); -t.equal(new Buffer('KioqKioqKioqKioqKioqKio', 'base64').toString(), +assert.equal(new Buffer('KioqKioqKioqKioqKioqKio', 'base64').toString(), '*****************'); -t.equal(new Buffer('KioqKioqKioqKioqKioqKioqKg', 'base64').toString(), +assert.equal(new Buffer('KioqKioqKioqKioqKioqKioqKg', 'base64').toString(), '*******************'); -t.equal(new Buffer('KioqKioqKioqKioqKioqKioqKio', 'base64').toString(), +assert.equal(new Buffer('KioqKioqKioqKioqKioqKioqKio', 'base64').toString(), '********************'); // handle padding graciously, multiple-of-4 or not -t.equal(new Buffer('72INjkR5fchcxk9+VgdGPFJDxUBFR5/rMFsghgxADiw==', +assert.equal(new Buffer('72INjkR5fchcxk9+VgdGPFJDxUBFR5/rMFsghgxADiw==', 'base64').length, 32); -t.equal(new Buffer('72INjkR5fchcxk9+VgdGPFJDxUBFR5/rMFsghgxADiw=', +assert.equal(new Buffer('72INjkR5fchcxk9+VgdGPFJDxUBFR5/rMFsghgxADiw=', 'base64').length, 32); -t.equal(new Buffer('72INjkR5fchcxk9+VgdGPFJDxUBFR5/rMFsghgxADiw', +assert.equal(new Buffer('72INjkR5fchcxk9+VgdGPFJDxUBFR5/rMFsghgxADiw', 'base64').length, 32); -t.equal(new Buffer('w69jACy6BgZmaFvv96HG6MYksWytuZu3T1FvGnulPg==', +assert.equal(new Buffer('w69jACy6BgZmaFvv96HG6MYksWytuZu3T1FvGnulPg==', 'base64').length, 31); -t.equal(new Buffer('w69jACy6BgZmaFvv96HG6MYksWytuZu3T1FvGnulPg=', +assert.equal(new Buffer('w69jACy6BgZmaFvv96HG6MYksWytuZu3T1FvGnulPg=', 'base64').length, 31); -t.equal(new Buffer('w69jACy6BgZmaFvv96HG6MYksWytuZu3T1FvGnulPg', +assert.equal(new Buffer('w69jACy6BgZmaFvv96HG6MYksWytuZu3T1FvGnulPg', 'base64').length, 31); // This string encodes single '.' character in UTF-16 var dot = new Buffer('//4uAA==', 'base64'); -t.equal(dot[0], 0xff); -t.equal(dot[1], 0xfe); -t.equal(dot[2], 0x2e); -t.equal(dot[3], 0x00); -t.equal(dot.toString('base64'), '//4uAA=='); +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. // @@ -561,7 +559,7 @@ var pos = 0; for (var i = 0; i < segments.length; ++i) { pos += b.write(segments[i], pos, 'base64'); } -t.equal(b.toString('binary', 0, pos), 'Madness?! This is node.js!'); +assert.equal(b.toString('binary', 0, pos), 'Madness?! This is node.js!'); // Creating buffers larger than pool size. var l = Buffer.poolSize + 5; @@ -573,29 +571,29 @@ for (i = 0; i < l; i++) { var b = new Buffer(s); for (i = 0; i < l; i++) { - t.equal('h'.charCodeAt(0), b[i]); + assert.equal('h'.charCodeAt(0), b[i]); } var sb = b.toString(); -t.equal(sb.length, s.length); -t.equal(sb, s); +assert.equal(sb.length, s.length); +assert.equal(sb, s); // Single argument slice b = new Buffer('abcde'); -t.equal('bcde', b.slice(1).toString()); +assert.equal('bcde', b.slice(1).toString()); // byte length -t.equal(14, Buffer.byteLength('Il était tué')); -t.equal(14, Buffer.byteLength('Il était tué', 'utf8')); +assert.equal(14, Buffer.byteLength('Il était tué')); +assert.equal(14, Buffer.byteLength('Il était tué', 'utf8')); ['ucs2', 'ucs-2', 'utf16le', 'utf-16le'].forEach(function(encoding) { - t.equal(24, Buffer.byteLength('Il était tué', encoding)); + assert.equal(24, Buffer.byteLength('Il était tué', encoding)); }); -t.equal(12, Buffer.byteLength('Il était tué', 'ascii')); -t.equal(12, Buffer.byteLength('Il était tué', 'binary')); +assert.equal(12, Buffer.byteLength('Il était tué', 'ascii')); +assert.equal(12, Buffer.byteLength('Il était tué', 'binary')); // slice(0,0).length === 0 -t.equal(0, Buffer('hello').slice(0, 0).length); +assert.equal(0, Buffer('hello').slice(0, 0).length); // test hex toString // console.log('Create hex string from buffer'); @@ -604,7 +602,7 @@ for (var i = 0; i < 256; i++) { hexb[i] = i; } var hexStr = hexb.toString('hex'); -t.equal(hexStr, +assert.equal(hexStr, '000102030405060708090a0b0c0d0e0f' + '101112131415161718191a1b1c1d1e1f' + '202122232425262728292a2b2c2d2e2f' + @@ -625,7 +623,7 @@ t.equal(hexStr, // console.log('Create buffer from hex string'); var hexb2 = new Buffer(hexStr, 'hex'); for (var i = 0; i < 256; i++) { - t.equal(hexb2[i], hexb[i]); + assert.equal(hexb2[i], hexb[i]); } // test an invalid slice end. @@ -634,8 +632,8 @@ var b = new Buffer([1, 2, 3, 4, 5]); var b2 = b.toString('hex', 1, 10000); var b3 = b.toString('hex', 1, 5); var b4 = b.toString('hex', 1); -t.equal(b2, b3); -t.equal(b2, b4); +assert.equal(b2, b3); +assert.equal(b2, b4); function buildBuffer(data) { @@ -652,196 +650,196 @@ function buildBuffer(data) { var x = buildBuffer([0x81, 0xa3, 0x66, 0x6f, 0x6f, 0xa3, 0x62, 0x61, 0x72]); // console.log(x.inspect()); -t.equal('', x.inspect()); +assert.equal('', x.inspect()); var z = x.slice(4); // console.log(z.inspect()); // console.log(z.length); -t.equal(5, z.length); -t.equal(0x6f, z[0]); -t.equal(0xa3, z[1]); -t.equal(0x62, z[2]); -t.equal(0x61, z[3]); -t.equal(0x72, z[4]); +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]); var z = x.slice(0); // console.log(z.inspect()); // console.log(z.length); -t.equal(z.length, x.length); +assert.equal(z.length, x.length); var z = x.slice(0, 4); // console.log(z.inspect()); // console.log(z.length); -t.equal(4, z.length); -t.equal(0x81, z[0]); -t.equal(0xa3, z[1]); +assert.equal(4, z.length); +assert.equal(0x81, z[0]); +assert.equal(0xa3, z[1]); var z = x.slice(0, 9); // console.log(z.inspect()); // console.log(z.length); -t.equal(9, z.length); +assert.equal(9, z.length); var z = x.slice(1, 4); // console.log(z.inspect()); // console.log(z.length); -t.equal(3, z.length); -t.equal(0xa3, z[0]); +assert.equal(3, z.length); +assert.equal(0xa3, z[0]); var z = x.slice(2, 4); // console.log(z.inspect()); // console.log(z.length); -t.equal(2, z.length); -t.equal(0x66, z[0]); -t.equal(0x6f, z[1]); +assert.equal(2, z.length); +assert.equal(0x66, z[0]); +assert.equal(0x6f, z[1]); -t.equal(0, Buffer('hello').slice(0, 0).length); +assert.equal(0, Buffer('hello').slice(0, 0).length); ['ucs2', 'ucs-2', 'utf16le', 'utf-16le'].forEach(function(encoding) { var b = new Buffer(10); b.write('あいうえお', encoding); - t.equal(b.toString(encoding), 'あいうえお'); + assert.equal(b.toString(encoding), 'あいうえお'); }); // Binary encoding should write only one byte per character. var b = Buffer([0xde, 0xad, 0xbe, 0xef]); var s = String.fromCharCode(0xffff); b.write(s, 0, 'binary'); -t.equal(0xff, b[0]); -t.equal(0xad, b[1]); -t.equal(0xbe, b[2]); -t.equal(0xef, b[3]); +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'); -t.equal(0xee, b[0]); -t.equal(0xad, b[1]); -t.equal(0xbe, b[2]); -t.equal(0xef, b[3]); +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 var buf = new Buffer('\0'); -t.equal(buf.length, 1); +assert.equal(buf.length, 1); buf = new Buffer('\0\0'); -t.equal(buf.length, 2); +assert.equal(buf.length, 2); buf = new Buffer(2); var written = buf.write(''); // 0byte -t.equal(written, 0); +assert.equal(written, 0); written = buf.write('\0'); // 1byte (v8 adds null terminator) -t.equal(written, 1); +assert.equal(written, 1); written = buf.write('a\0'); // 1byte * 2 -t.equal(written, 2); +assert.equal(written, 2); written = buf.write('あ'); // 3bytes -t.equal(written, 0); +assert.equal(written, 0); written = buf.write('\0あ'); // 1byte + 3bytes -t.equal(written, 1); +assert.equal(written, 1); written = buf.write('\0\0あ'); // 1byte * 2 + 3bytes -t.equal(written, 2); +assert.equal(written, 2); buf = new Buffer(10); written = buf.write('あいう'); // 3bytes * 3 (v8 adds null terminator) -t.equal(written, 9); +assert.equal(written, 9); written = buf.write('あいう\0'); // 3bytes * 3 + 1byte -t.equal(written, 10); +assert.equal(written, 10); // #243 Test write() with maxLength var buf = new Buffer(4); buf.fill(0xFF); var written = buf.write('abcd', 1, 2, 'utf8'); // console.log(buf); -t.equal(written, 2); -t.equal(buf[0], 0xFF); -t.equal(buf[1], 0x61); -t.equal(buf[2], 0x62); -t.equal(buf[3], 0xFF); +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); -t.equal(written, 3); -t.equal(buf[0], 0xFF); -t.equal(buf[1], 0x61); -t.equal(buf[2], 0x62); -t.equal(buf[3], 0x63); +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', 'utf8', 1, 2); // legacy style // console.log(buf); -t.equal(written, 2); -t.equal(buf[0], 0xFF); -t.equal(buf[1], 0x61); -t.equal(buf[2], 0x62); -t.equal(buf[3], 0xFF); +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); -t.equal(written, 2); -t.equal(buf[0], 0xFF); -t.equal(buf[1], 0xAB); -t.equal(buf[2], 0xCD); -t.equal(buf[3], 0xFF); +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); - t.equal(written, 2); - t.equal(buf[0], 0x61); - t.equal(buf[1], 0x00); - t.equal(buf[2], 0xFF); - t.equal(buf[3], 0xFF); + 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 var b = new Buffer(16); -t.equal(4, b.writeUInt32LE(0, 0)); -t.equal(6, b.writeUInt16LE(0, 4)); -t.equal(7, b.writeUInt8(0, 6)); -t.equal(8, b.writeInt8(0, 7)); -t.equal(16, b.writeDoubleLE(0, 8)); +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/ buf = new Buffer('ab\ud800cd', 'utf8'); -t.equal(buf[0], 0x61); -t.equal(buf[1], 0x62); -t.equal(buf[2], 0xef); -t.equal(buf[3], 0xbf); -t.equal(buf[4], 0xbd); -t.equal(buf[5], 0x63); -t.equal(buf[6], 0x64); +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 buf = new Buffer([0, 0, 0, 0, 0]); // length: 5 var sub = buf.slice(0, 4); // length: 4 written = sub.write('12345', 'binary'); -t.equal(written, 4); -t.equal(buf[4], 0); +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 Buffer(3.3).toString(); // throws bad argument error in commit 43cb4ec -t.equal(Buffer(-1).length, 0); -t.equal(Buffer(NaN).length, 0); -t.equal(Buffer(3.3).length, 3); -t.equal(Buffer({length: 3.3}).length, 3); -t.equal(Buffer({length: 'BAM'}).length, 0); +assert.equal(Buffer(-1).length, 0); +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. -t.equal(Buffer('99').length, 2); -t.equal(Buffer('13.37').length, 5); +assert.equal(Buffer('99').length, 2); +assert.equal(Buffer('13.37').length, 5); // Ensure that the length argument is respected. 'ascii utf8 hex base64 binary'.split(' ').forEach(function(enc) { - t.equal(Buffer(1).write('aaaaaa', 0, 1, enc), 1); + assert.equal(Buffer(1).write('aaaaaa', 0, 1, enc), 1); }); // Regression test, guard against buffer overrun in the base64 decoder. var a = Buffer(3); var b = Buffer('xxx'); a.write('aaaaaaaa', 'base64'); -t.equal(b.toString(), 'xxx'); +assert.equal(b.toString(), 'xxx'); // issue GH-3416 Buffer(Buffer(0), 0, 0); @@ -856,14 +854,14 @@ Buffer(Buffer(0), 0, 0); 'ucs-2', 'utf16le', 'utf-16le' ].forEach(function(enc) { - t.equal(Buffer.isEncoding(enc), true); + assert.equal(Buffer.isEncoding(enc), true); }); [ 'utf9', 'utf-7', 'Unicode-FTW', 'new gnu gun' ].forEach(function(enc) { - t.equal(Buffer.isEncoding(enc), false); + assert.equal(Buffer.isEncoding(enc), false); }); @@ -872,9 +870,9 @@ Buffer(Buffer(0), 0, 0); var buffer = new Buffer('test'), string = JSON.stringify(buffer); - t.equal(string, '{"type":"Buffer","data":[116,101,115,116]}'); + assert.equal(string, '{"type":"Buffer","data":[116,101,115,116]}'); - t.deepEqual(buffer, JSON.parse(string, function(key, value) { + assert.deepEqual(buffer, JSON.parse(string, function(key, value) { return value && value.type === 'Buffer' ? new Buffer(value.data) : value; @@ -888,57 +886,57 @@ Buffer(Buffer(0), 0, 0); var obj = JSON.parse(json); var copy = new Buffer(obj); - t.ok(buf.equals(copy)); + assert(buf.equals(copy)); })(); // issue GH-4331 -t.throws(function() { +assert.throws(function() { new Buffer(0xFFFFFFFF); }, RangeError); -t.throws(function() { +assert.throws(function() { new Buffer(0xFFFFFFFFF); }, RangeError); // attempt to overflow buffers, similar to previous bug in array buffers -t.throws(function() { +assert.throws(function() { var buf = new Buffer(8); buf.readFloatLE(0xffffffff); }, RangeError); -t.throws(function() { +assert.throws(function() { var buf = new Buffer(8); buf.writeFloatLE(0.0, 0xffffffff); }, RangeError); -t.throws(function() { +assert.throws(function() { var buf = new Buffer(8); buf.readFloatLE(0xffffffff); }, RangeError); -t.throws(function() { +assert.throws(function() { var buf = new Buffer(8); buf.writeFloatLE(0.0, 0xffffffff); }, RangeError); // ensure negative values can't get past offset -t.throws(function() { +assert.throws(function() { var buf = new Buffer(8); buf.readFloatLE(-1); }, RangeError); -t.throws(function() { +assert.throws(function() { var buf = new Buffer(8); buf.writeFloatLE(0.0, -1); }, RangeError); -t.throws(function() { +assert.throws(function() { var buf = new Buffer(8); buf.readFloatLE(-1); }, RangeError); -t.throws(function() { +assert.throws(function() { var buf = new Buffer(8); buf.writeFloatLE(0.0, -1); }, RangeError); @@ -946,30 +944,30 @@ t.throws(function() { // offset checks var buf = new Buffer(0); -t.throws(function() { buf.readUInt8(0); }, RangeError); -t.throws(function() { buf.readInt8(0); }, RangeError); +assert.throws(function() { buf.readUInt8(0); }, RangeError); +assert.throws(function() { buf.readInt8(0); }, RangeError); var buf = new Buffer([0xFF]); -t.equal(buf.readUInt8(0), 255); -t.equal(buf.readInt8(0), -1); +assert.equal(buf.readUInt8(0), 255); +assert.equal(buf.readInt8(0), -1); [16, 32].forEach(function(bits) { var buf = new Buffer(bits / 8 - 1); - t.throws(function() { buf['readUInt' + bits + 'BE'](0); }, + assert.throws(function() { buf['readUInt' + bits + 'BE'](0); }, RangeError, 'readUInt' + bits + 'BE'); - t.throws(function() { buf['readUInt' + bits + 'LE'](0); }, + assert.throws(function() { buf['readUInt' + bits + 'LE'](0); }, RangeError, 'readUInt' + bits + 'LE'); - t.throws(function() { buf['readInt' + bits + 'BE'](0); }, + assert.throws(function() { buf['readInt' + bits + 'BE'](0); }, RangeError, 'readInt' + bits + 'BE()'); - t.throws(function() { buf['readInt' + bits + 'LE'](0); }, + assert.throws(function() { buf['readInt' + bits + 'LE'](0); }, RangeError, 'readInt' + bits + 'LE()'); }); @@ -977,16 +975,16 @@ t.equal(buf.readInt8(0), -1); [16, 32].forEach(function(bits) { var buf = new Buffer([0xFF, 0xFF, 0xFF, 0xFF]); - t.equal(buf['readUInt' + bits + 'BE'](0), + assert.equal(buf['readUInt' + bits + 'BE'](0), (0xFFFFFFFF >>> (32 - bits))); - t.equal(buf['readUInt' + bits + 'LE'](0), + assert.equal(buf['readUInt' + bits + 'LE'](0), (0xFFFFFFFF >>> (32 - bits))); - t.equal(buf['readInt' + bits + 'BE'](0), + assert.equal(buf['readInt' + bits + 'BE'](0), (0xFFFFFFFF >> (32 - bits))); - t.equal(buf['readInt' + bits + 'LE'](0), + assert.equal(buf['readInt' + bits + 'LE'](0), (0xFFFFFFFF >> (32 - bits))); }); @@ -994,116 +992,116 @@ t.equal(buf.readInt8(0), -1); (function() { var buf = new Buffer([0x01, 0x02, 0x03, 0x04, 0x05, 0x06]); - t.equal(buf.readUIntLE(0, 1), 0x01); - t.equal(buf.readUIntBE(0, 1), 0x01); - t.equal(buf.readUIntLE(0, 3), 0x030201); - t.equal(buf.readUIntBE(0, 3), 0x010203); - t.equal(buf.readUIntLE(0, 5), 0x0504030201); - t.equal(buf.readUIntBE(0, 5), 0x0102030405); - t.equal(buf.readUIntLE(0, 6), 0x060504030201); - t.equal(buf.readUIntBE(0, 6), 0x010203040506); - t.equal(buf.readIntLE(0, 1), 0x01); - t.equal(buf.readIntBE(0, 1), 0x01); - t.equal(buf.readIntLE(0, 3), 0x030201); - t.equal(buf.readIntBE(0, 3), 0x010203); - t.equal(buf.readIntLE(0, 5), 0x0504030201); - t.equal(buf.readIntBE(0, 5), 0x0102030405); - t.equal(buf.readIntLE(0, 6), 0x060504030201); - t.equal(buf.readIntBE(0, 6), 0x010203040506); + assert.equal(buf.readUIntLE(0, 1), 0x01); + assert.equal(buf.readUIntBE(0, 1), 0x01); + assert.equal(buf.readUIntLE(0, 3), 0x030201); + assert.equal(buf.readUIntBE(0, 3), 0x010203); + assert.equal(buf.readUIntLE(0, 5), 0x0504030201); + assert.equal(buf.readUIntBE(0, 5), 0x0102030405); + assert.equal(buf.readUIntLE(0, 6), 0x060504030201); + assert.equal(buf.readUIntBE(0, 6), 0x010203040506); + assert.equal(buf.readIntLE(0, 1), 0x01); + assert.equal(buf.readIntBE(0, 1), 0x01); + assert.equal(buf.readIntLE(0, 3), 0x030201); + assert.equal(buf.readIntBE(0, 3), 0x010203); + assert.equal(buf.readIntLE(0, 5), 0x0504030201); + assert.equal(buf.readIntBE(0, 5), 0x0102030405); + assert.equal(buf.readIntLE(0, 6), 0x060504030201); + assert.equal(buf.readIntBE(0, 6), 0x010203040506); })(); // test for common write(U)IntLE/BE (function() { var buf = new Buffer(3); buf.writeUIntLE(0x123456, 0, 3); - t.deepEqual(buf.toJSON().data, [0x56, 0x34, 0x12]); - t.equal(buf.readUIntLE(0, 3), 0x123456); + assert.deepEqual(buf.toJSON().data, [0x56, 0x34, 0x12]); + assert.equal(buf.readUIntLE(0, 3), 0x123456); buf = new Buffer(3); buf.writeUIntBE(0x123456, 0, 3); - t.deepEqual(buf.toJSON().data, [0x12, 0x34, 0x56]); - t.equal(buf.readUIntBE(0, 3), 0x123456); + assert.deepEqual(buf.toJSON().data, [0x12, 0x34, 0x56]); + assert.equal(buf.readUIntBE(0, 3), 0x123456); buf = new Buffer(3); buf.writeIntLE(0x123456, 0, 3); - t.deepEqual(buf.toJSON().data, [0x56, 0x34, 0x12]); - t.equal(buf.readIntLE(0, 3), 0x123456); + assert.deepEqual(buf.toJSON().data, [0x56, 0x34, 0x12]); + assert.equal(buf.readIntLE(0, 3), 0x123456); buf = new Buffer(3); buf.writeIntBE(0x123456, 0, 3); - t.deepEqual(buf.toJSON().data, [0x12, 0x34, 0x56]); - t.equal(buf.readIntBE(0, 3), 0x123456); + assert.deepEqual(buf.toJSON().data, [0x12, 0x34, 0x56]); + assert.equal(buf.readIntBE(0, 3), 0x123456); buf = new Buffer(3); buf.writeIntLE(-0x123456, 0, 3); - t.deepEqual(buf.toJSON().data, [0xaa, 0xcb, 0xed]); - t.equal(buf.readIntLE(0, 3), -0x123456); + assert.deepEqual(buf.toJSON().data, [0xaa, 0xcb, 0xed]); + assert.equal(buf.readIntLE(0, 3), -0x123456); buf = new Buffer(3); buf.writeIntBE(-0x123456, 0, 3); - t.deepEqual(buf.toJSON().data, [0xed, 0xcb, 0xaa]); - t.equal(buf.readIntBE(0, 3), -0x123456); + assert.deepEqual(buf.toJSON().data, [0xed, 0xcb, 0xaa]); + assert.equal(buf.readIntBE(0, 3), -0x123456); buf = new Buffer(5); buf.writeUIntLE(0x1234567890, 0, 5); - t.deepEqual(buf.toJSON().data, [0x90, 0x78, 0x56, 0x34, 0x12]); - t.equal(buf.readUIntLE(0, 5), 0x1234567890); + assert.deepEqual(buf.toJSON().data, [0x90, 0x78, 0x56, 0x34, 0x12]); + assert.equal(buf.readUIntLE(0, 5), 0x1234567890); buf = new Buffer(5); buf.writeUIntBE(0x1234567890, 0, 5); - t.deepEqual(buf.toJSON().data, [0x12, 0x34, 0x56, 0x78, 0x90]); - t.equal(buf.readUIntBE(0, 5), 0x1234567890); + assert.deepEqual(buf.toJSON().data, [0x12, 0x34, 0x56, 0x78, 0x90]); + assert.equal(buf.readUIntBE(0, 5), 0x1234567890); buf = new Buffer(5); buf.writeIntLE(0x1234567890, 0, 5); - t.deepEqual(buf.toJSON().data, [0x90, 0x78, 0x56, 0x34, 0x12]); - t.equal(buf.readIntLE(0, 5), 0x1234567890); + assert.deepEqual(buf.toJSON().data, [0x90, 0x78, 0x56, 0x34, 0x12]); + assert.equal(buf.readIntLE(0, 5), 0x1234567890); buf = new Buffer(5); buf.writeIntBE(0x1234567890, 0, 5); - t.deepEqual(buf.toJSON().data, [0x12, 0x34, 0x56, 0x78, 0x90]); - t.equal(buf.readIntBE(0, 5), 0x1234567890); + assert.deepEqual(buf.toJSON().data, [0x12, 0x34, 0x56, 0x78, 0x90]); + assert.equal(buf.readIntBE(0, 5), 0x1234567890); buf = new Buffer(5); buf.writeIntLE(-0x1234567890, 0, 5); - t.deepEqual(buf.toJSON().data, [0x70, 0x87, 0xa9, 0xcb, 0xed]); - t.equal(buf.readIntLE(0, 5), -0x1234567890); + assert.deepEqual(buf.toJSON().data, [0x70, 0x87, 0xa9, 0xcb, 0xed]); + assert.equal(buf.readIntLE(0, 5), -0x1234567890); buf = new Buffer(5); buf.writeIntBE(-0x1234567890, 0, 5); - t.deepEqual(buf.toJSON().data, [0xed, 0xcb, 0xa9, 0x87, 0x70]); - t.equal(buf.readIntBE(0, 5), -0x1234567890); + assert.deepEqual(buf.toJSON().data, [0xed, 0xcb, 0xa9, 0x87, 0x70]); + assert.equal(buf.readIntBE(0, 5), -0x1234567890); })(); // test Buffer slice (function() { var buf = new Buffer('0123456789'); - t.equal(buf.slice(-10, 10).toString(), '0123456789'); - t.equal(buf.slice(-20, 10).toString(), '0123456789'); - t.equal(buf.slice(-20, -10).toString(), ''); - t.equal(buf.slice(0, -1).toString(), '012345678'); - t.equal(buf.slice(2, -2).toString(), '234567'); - t.equal(buf.slice(0, 65536).toString(), '0123456789'); - t.equal(buf.slice(65536, 0).toString(), ''); + assert.equal(buf.slice(-10, 10), '0123456789'); + assert.equal(buf.slice(-20, 10), '0123456789'); + assert.equal(buf.slice(-20, -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), ''); for (var i = 0, s = buf.toString(); i < buf.length; ++i) { - t.equal(buf.slice(-i).toString(), s.slice(-i)); - t.equal(buf.slice(0, -i).toString(), s.slice(0, -i)); + assert.equal(buf.slice(-i), s.slice(-i)); + assert.equal(buf.slice(0, -i), s.slice(0, -i)); } // try to slice a zero length Buffer // see https://github.com/joyent/node/issues/5881 SlowBuffer(0).slice(0, 1); // make sure a zero length slice doesn't set the .parent attribute - t.equal(Buffer(5).slice(0,0).parent, undefined); + assert.equal(Buffer(5).slice(0,0).parent, undefined); // and make sure a proper slice does have a parent - t.ok(typeof Buffer(5).slice(0, 5).parent === 'object'); + assert.ok(typeof Buffer(5).slice(0, 5).parent === 'object'); })(); // Make sure byteLength properly checks for base64 padding -t.equal(Buffer.byteLength('aaa=', 'base64'), 2); -t.equal(Buffer.byteLength('aaaa==', 'base64'), 3); +assert.equal(Buffer.byteLength('aaa=', 'base64'), 2); +assert.equal(Buffer.byteLength('aaaa==', 'base64'), 3); -// Regression test for #5482: should throw but not t in C++ land. -t.throws(function() { +// Regression test for #5482: should throw but not assert in C++ land. +assert.throws(function() { Buffer('', 'buffer'); }, TypeError); @@ -1115,21 +1113,21 @@ t.throws(function() { a = a.map(function(_, i) { return i }); var b = Buffer(a); var c = Buffer(b); - t.equal(b.length, a.length); - t.equal(c.length, a.length); + assert.equal(b.length, a.length); + assert.equal(c.length, a.length); for (var i = 0, k = a.length; i < k; ++i) { - t.equal(a[i], i); - t.equal(b[i], i); - t.equal(c[i], i); + assert.equal(a[i], i); + assert.equal(b[i], i); + assert.equal(c[i], i); } })(); -t.throws(function () { +assert.throws(function () { new Buffer(smalloc.kMaxLength + 1); }, RangeError); -t.throws(function () { +assert.throws(function () { new SlowBuffer(smalloc.kMaxLength + 1); }, RangeError); @@ -1139,7 +1137,7 @@ var crypto = require('crypto'); var b1 = new Buffer('YW55=======', 'base64'); var b2 = new Buffer('YW55', 'base64'); -t.equal( +assert.equal( 1 /*crypto.createHash('sha1').update(b1).digest('hex')*/, 1 /*crypto.createHash('sha1').update(b2).digest('hex')*/ ); @@ -1149,27 +1147,27 @@ var b = new Buffer(1).fill('a'); var c = new Buffer(1).fill('c'); var d = new Buffer(2).fill('aa'); -t.equal(b.compare(c), -1); -t.equal(c.compare(d), 1); -t.equal(d.compare(b), 1); -t.equal(b.compare(d), -1); +assert.equal(b.compare(c), -1); +assert.equal(c.compare(d), 1); +assert.equal(d.compare(b), 1); +assert.equal(b.compare(d), -1); -t.equal(Buffer.compare(b, c), -1); -t.equal(Buffer.compare(c, d), 1); -t.equal(Buffer.compare(d, b), 1); -t.equal(Buffer.compare(b, d), -1); +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); -t.throws(function() { +assert.throws(function() { var b = new Buffer(1); Buffer.compare(b, 'abc'); }); -t.throws(function() { +assert.throws(function() { var b = new Buffer(1); Buffer.compare('abc', b); }); -t.throws(function() { +assert.throws(function() { var b = new Buffer(1); b.compare('abc'); }); @@ -1180,15 +1178,11 @@ var c = new Buffer(5).fill('abcdf'); var d = new Buffer(5).fill('abcde'); var e = new Buffer(6).fill('abcdef'); -t.ok(b.equals(c)); -t.ok(!c.equals(d)); -t.ok(!d.equals(e)); +assert.ok(b.equals(c)); +assert.ok(!c.equals(d)); +assert.ok(!d.equals(e)); -t.throws(function() { +assert.throws(function() { var b = new Buffer(1); b.equals('abc'); }); - - -t.end() -}) \ No newline at end of file -- 2.34.1