Skip to content

Commit 72a319e

Browse files
Trottjasnell
authored andcommitted
test: refactor event-emitter-remove-all-listeners
Use common.mustNotCall() to confirm that listener handles never run (as no events are emitted). PR-URL: #13165 Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>
1 parent c450272 commit 72a319e

File tree

1 file changed

+15
-14
lines changed

1 file changed

+15
-14
lines changed

‎test/parallel/test-event-emitter-remove-all-listeners.js‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,24 +38,25 @@ function expect(expected){
3838

3939
{
4040
constee=newevents.EventEmitter();
41-
ee.on('foo',common.noop);
42-
ee.on('bar',common.noop);
43-
ee.on('baz',common.noop);
44-
ee.on('baz',common.noop);
41+
constnoop=common.mustNotCall();
42+
ee.on('foo',noop);
43+
ee.on('bar',noop);
44+
ee.on('baz',noop);
45+
ee.on('baz',noop);
4546
constfooListeners=ee.listeners('foo');
4647
constbarListeners=ee.listeners('bar');
4748
constbazListeners=ee.listeners('baz');
4849
ee.on('removeListener',expect(['bar','baz','baz']));
4950
ee.removeAllListeners('bar');
5051
ee.removeAllListeners('baz');
51-
assert.deepStrictEqual(ee.listeners('foo'),[common.noop]);
52+
assert.deepStrictEqual(ee.listeners('foo'),[noop]);
5253
assert.deepStrictEqual(ee.listeners('bar'),[]);
5354
assert.deepStrictEqual(ee.listeners('baz'),[]);
5455
// After calling removeAllListeners(),
5556
// the old listeners array should stay unchanged.
56-
assert.deepStrictEqual(fooListeners,[common.noop]);
57-
assert.deepStrictEqual(barListeners,[common.noop]);
58-
assert.deepStrictEqual(bazListeners,[common.noop,common.noop]);
57+
assert.deepStrictEqual(fooListeners,[noop]);
58+
assert.deepStrictEqual(barListeners,[noop]);
59+
assert.deepStrictEqual(bazListeners,[noop,noop]);
5960
// After calling removeAllListeners(),
6061
// new listeners arrays is different from the old.
6162
assert.notStrictEqual(ee.listeners('bar'),barListeners);
@@ -64,8 +65,8 @@ function expect(expected){
6465

6566
{
6667
constee=newevents.EventEmitter();
67-
ee.on('foo',common.noop);
68-
ee.on('bar',common.noop);
68+
ee.on('foo',common.mustNotCall());
69+
ee.on('bar',common.mustNotCall());
6970
// Expect LIFO order
7071
ee.on('removeListener',expect(['foo','bar','removeListener']));
7172
ee.on('removeListener',expect(['foo','bar']));
@@ -76,7 +77,7 @@ function expect(expected){
7677

7778
{
7879
constee=newevents.EventEmitter();
79-
ee.on('removeListener',common.noop);
80+
ee.on('removeListener',common.mustNotCall());
8081
// Check for regression where removeAllListeners() throws when
8182
// there exists a 'removeListener' listener, but there exists
8283
// no listeners for the provided event type.
@@ -89,9 +90,9 @@ function expect(expected){
8990
ee.on('removeListener',function(name,noop){
9091
assert.strictEqual(expectLength--,this.listeners('baz').length);
9192
});
92-
ee.on('baz',common.noop);
93-
ee.on('baz',common.noop);
94-
ee.on('baz',common.noop);
93+
ee.on('baz',common.mustNotCall());
94+
ee.on('baz',common.mustNotCall());
95+
ee.on('baz',common.mustNotCall());
9596
assert.strictEqual(ee.listeners('baz').length,expectLength+1);
9697
ee.removeAllListeners('baz');
9798
assert.strictEqual(ee.listeners('baz').length,0);

0 commit comments

Comments
(0)