diff options
author | James M Snell <jasnell@gmail.com> | 2017-03-24 09:46:44 -0700 |
---|---|---|
committer | James M Snell <jasnell@gmail.com> | 2017-03-26 12:47:15 -0700 |
commit | 4f2e372716714ed030cb5ba6e67107b913f15343 (patch) | |
tree | 9b86be4f904c7844c48cca4194f3c3a5a1decad8 /test/parallel/test-event-emitter-remove-all-listeners.js | |
parent | d13bd4acc0b60191f0d6e9fae92087242d04dfbd (diff) | |
download | android-node-v8-4f2e372716714ed030cb5ba6e67107b913f15343.tar.gz android-node-v8-4f2e372716714ed030cb5ba6e67107b913f15343.tar.bz2 android-node-v8-4f2e372716714ed030cb5ba6e67107b913f15343.zip |
test: add common.noop, default for common.mustCall()
Export a new common.noop no-operation function for general use.
Allow using common.mustCall() without a fn argument to simplify
test cases.
Replace various non-op functions throughout tests with common.noop
PR-URL: https://github.com/nodejs/node/pull/12027
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Teddy Katz <teddy.katz@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
Diffstat (limited to 'test/parallel/test-event-emitter-remove-all-listeners.js')
-rw-r--r-- | test/parallel/test-event-emitter-remove-all-listeners.js | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/test/parallel/test-event-emitter-remove-all-listeners.js b/test/parallel/test-event-emitter-remove-all-listeners.js index 1784b0fc7b..a4c3f76f6c 100644 --- a/test/parallel/test-event-emitter-remove-all-listeners.js +++ b/test/parallel/test-event-emitter-remove-all-listeners.js @@ -36,28 +36,26 @@ function expect(expected) { return common.mustCall(listener, expected.length); } -function listener() {} - { const ee = new events.EventEmitter(); - ee.on('foo', listener); - ee.on('bar', listener); - ee.on('baz', listener); - ee.on('baz', listener); + ee.on('foo', common.noop); + ee.on('bar', common.noop); + ee.on('baz', common.noop); + ee.on('baz', common.noop); const fooListeners = ee.listeners('foo'); const barListeners = ee.listeners('bar'); const bazListeners = ee.listeners('baz'); ee.on('removeListener', expect(['bar', 'baz', 'baz'])); ee.removeAllListeners('bar'); ee.removeAllListeners('baz'); - assert.deepStrictEqual(ee.listeners('foo'), [listener]); + assert.deepStrictEqual(ee.listeners('foo'), [common.noop]); assert.deepStrictEqual(ee.listeners('bar'), []); assert.deepStrictEqual(ee.listeners('baz'), []); // After calling removeAllListeners(), // the old listeners array should stay unchanged. - assert.deepStrictEqual(fooListeners, [listener]); - assert.deepStrictEqual(barListeners, [listener]); - assert.deepStrictEqual(bazListeners, [listener, listener]); + assert.deepStrictEqual(fooListeners, [common.noop]); + assert.deepStrictEqual(barListeners, [common.noop]); + assert.deepStrictEqual(bazListeners, [common.noop, common.noop]); // After calling removeAllListeners(), // new listeners arrays is different from the old. assert.notStrictEqual(ee.listeners('bar'), barListeners); @@ -66,8 +64,8 @@ function listener() {} { const ee = new events.EventEmitter(); - ee.on('foo', listener); - ee.on('bar', listener); + ee.on('foo', common.noop); + ee.on('bar', common.noop); // Expect LIFO order ee.on('removeListener', expect(['foo', 'bar', 'removeListener'])); ee.on('removeListener', expect(['foo', 'bar'])); @@ -78,7 +76,7 @@ function listener() {} { const ee = new events.EventEmitter(); - ee.on('removeListener', listener); + ee.on('removeListener', common.noop); // Check for regression where removeAllListeners() throws when // there exists a 'removeListener' listener, but there exists // no listeners for the provided event type. @@ -88,12 +86,12 @@ function listener() {} { const ee = new events.EventEmitter(); let expectLength = 2; - ee.on('removeListener', function(name, listener) { + ee.on('removeListener', function(name, noop) { assert.strictEqual(expectLength--, this.listeners('baz').length); }); - ee.on('baz', function() {}); - ee.on('baz', function() {}); - ee.on('baz', function() {}); + ee.on('baz', common.noop); + ee.on('baz', common.noop); + ee.on('baz', common.noop); assert.strictEqual(ee.listeners('baz').length, expectLength + 1); ee.removeAllListeners('baz'); assert.strictEqual(ee.listeners('baz').length, 0); |