From 9100cac146761edbf8d8a8aefae422cdfc2b5c2b Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Sun, 21 May 2017 14:40:17 -0700 Subject: [PATCH] test: simplify assert usage in test-stream2-basic PR-URL: https://github.com/nodejs/node/pull/13146 Reviewed-By: Refael Ackermann Reviewed-By: James M Snell Reviewed-By: Luigi Pinca Reviewed-By: Matteo Collina Reviewed-By: Colin Ihrig --- test/pummel/test-stream2-basic.js | 37 ++++++++++++++----------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/test/pummel/test-stream2-basic.js b/test/pummel/test-stream2-basic.js index 8a1d940ce77211..cb017a17065e27 100644 --- a/test/pummel/test-stream2-basic.js +++ b/test/pummel/test-stream2-basic.js @@ -107,9 +107,6 @@ function run() { const fn = next[1]; console.log('# %s', name); fn({ - same: assert.deepStrictEqual, - ok: assert, - equal: assert.strictEqual, end: function() { count--; run(); @@ -147,7 +144,7 @@ test('a most basic test', function(t) { 'xxxxxxxxxxxxxxxxxxxxx' ]; r.on('end', function() { - assert.strict(reads, expect); + assert.deepStrictEqual(reads, expect); t.end(); }); @@ -180,7 +177,7 @@ test('pipe', function(t) { const w = new TestWriter(); w.on('end', function(received) { - assert.strict(received, expect); + assert.deepStrictEqual(received, expect); t.end(); }); @@ -211,10 +208,10 @@ test('pipe', function(t) { w[0].on('write', function() { if (--writes === 0) { r.unpipe(); - t.equal(r._readableState.pipes, null); + assert.strictEqual(r._readableState.pipes, null); w[0].end(); r.pipe(w[1]); - t.equal(r._readableState.pipes, w[1]); + assert.strictEqual(r._readableState.pipes, w[1]); } }); @@ -223,18 +220,18 @@ test('pipe', function(t) { let ended0 = false; let ended1 = false; w[0].on('end', function(results) { - t.equal(ended0, false); + assert.strictEqual(ended0, false); ended0 = true; ended++; - assert.strict(results, expect[0]); + assert.deepStrictEqual(results, expect[0]); }); w[1].on('end', function(results) { - t.equal(ended1, false); + assert.strictEqual(ended1, false); ended1 = true; ended++; - t.equal(ended, 2); - assert.strict(results, expect[1]); + assert.strictEqual(ended, 2); + assert.deepStrictEqual(results, expect[1]); t.end(); }); @@ -261,11 +258,11 @@ test('multipipe', function(t) { let c = 2; w[0].on('end', function(received) { - assert.strict(received, expect, 'first'); + assert.deepStrictEqual(received, expect, 'first'); if (--c === 0) t.end(); }); w[1].on('end', function(received) { - assert.strict(received, expect, 'second'); + assert.deepStrictEqual(received, expect, 'second'); if (--c === 0) t.end(); }); @@ -306,13 +303,13 @@ test('multipipe', function(t) { w[0].on('end', function(results) { ended++; - assert.strict(results, expect[0]); + assert.deepStrictEqual(results, expect[0]); }); w[1].on('end', function(results) { ended++; - t.equal(ended, 2); - assert.strict(results, expect[1]); + assert.strictEqual(ended, 2); + assert.deepStrictEqual(results, expect[1]); t.end(); }); @@ -463,8 +460,8 @@ test('adding readable triggers data flow', function(t) { }); r.on('end', function() { - t.equal(readCalled, 3); - t.ok(onReadable); + assert.strictEqual(readCalled, 3); + assert.ok(onReadable); t.end(); }); }); @@ -473,6 +470,6 @@ test('chainable', function(t) { const r = new R(); r._read = common.mustCall(); const r2 = r.setEncoding('utf8').pause().resume().pause(); - t.equal(r, r2); + assert.strictEqual(r, r2); t.end(); });