Skip to content

Commit dedbeee

Browse files
deokjinkimMoLow
authored andcommitted
test: refactor to use getEventListeners in timers
Use `getEventListeners` instead of `listenerCount` because #35991 was landed. Refs: #35991 Refs: #36006 PR-URL: #47759 Reviewed-By: Daeyeon Jeong <daeyeon.dev@gmail.com> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: Mestery <mestery@protonmail.com>
1 parent 4b2a015 commit dedbeee

3 files changed

Lines changed: 9 additions & 9 deletions

File tree

‎test/parallel/test-timers-immediate-promisified.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const timers = require('timers');
66
const{ promisify }=require('util');
77
constchild_process=require('child_process');
88

9-
// TODO(benjamingr) - refactor to use getEventListeners when #35991 lands
9+
const{getEventListeners }=require('events');
1010
const{ NodeEventTarget }=require('internal/event_target');
1111

1212
consttimerPromises=require('timers/promises');
@@ -60,7 +60,7 @@ process.on('multipleResolves', common.mustNotCall());
6060
constsignal=newNodeEventTarget();
6161
signal.aborted=false;
6262
setPromiseImmediate(0,{ signal }).finally(common.mustCall(()=>{
63-
assert.strictEqual(signal.listenerCount('abort'),0);
63+
assert.strictEqual(getEventListeners(signal,'abort').length,0);
6464
}));
6565
}
6666

‎test/parallel/test-timers-interval-promisified.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const timers = require('timers');
66
const{ promisify }=require('util');
77
constchild_process=require('child_process');
88

9-
// TODO(benjamingr) - refactor to use getEventListeners when #35991 lands
9+
const{getEventListeners }=require('events');
1010
const{ NodeEventTarget }=require('internal/event_target');
1111

1212
consttimerPromises=require('timers/promises');
@@ -122,10 +122,10 @@ process.on('multipleResolves', common.mustNotCall());
122122
signal.aborted=false;
123123
constiterator=setInterval(1,undefined,{ signal });
124124
iterator.next().then(common.mustCall(()=>{
125-
assert.strictEqual(signal.listenerCount('abort'),1);
125+
assert.strictEqual(getEventListeners(signal,'abort').length,1);
126126
iterator.return();
127127
})).finally(common.mustCall(()=>{
128-
assert.strictEqual(signal.listenerCount('abort'),0);
128+
assert.strictEqual(getEventListeners(signal,'abort').length,0);
129129
}));
130130
}
131131

@@ -139,15 +139,15 @@ process.on('multipleResolves', common.mustNotCall());
139139
// eslint-disable-next-line no-unused-vars
140140
forawait(const_ofiterator){
141141
if(i===0){
142-
assert.strictEqual(signal.listenerCount('abort'),1);
142+
assert.strictEqual(getEventListeners(signal,'abort').length,1);
143143
}
144144
i++;
145145
if(i===2){
146146
break;
147147
}
148148
}
149149
assert.strictEqual(i,2);
150-
assert.strictEqual(signal.listenerCount('abort'),0);
150+
assert.strictEqual(getEventListeners(signal,'abort').length,0);
151151
}
152152

153153
tryBreak().then(common.mustCall());

‎test/parallel/test-timers-timeout-promisified.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const timers = require('timers');
66
const{ promisify }=require('util');
77
constchild_process=require('child_process');
88

9-
// TODO(benjamingr) - refactor to use getEventListeners when #35991 lands
9+
const{getEventListeners }=require('events');
1010
const{ NodeEventTarget }=require('internal/event_target');
1111

1212
consttimerPromises=require('timers/promises');
@@ -60,7 +60,7 @@ process.on('multipleResolves', common.mustNotCall());
6060
constsignal=newNodeEventTarget();
6161
signal.aborted=false;
6262
setPromiseTimeout(0,null,{ signal }).finally(common.mustCall(()=>{
63-
assert.strictEqual(signal.listenerCount('abort'),0);
63+
assert.strictEqual(getEventListeners(signal,'abort').length,0);
6464
}));
6565
}
6666

0 commit comments

Comments
 (0)