diff options
author | Deokjin Kim <deokjin81.kim@gmail.com> | 2023-05-03 11:28:57 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-03 02:28:57 +0000 |
commit | b0ca77032aa9314542c496fd6a6d109c7b4b29b3 (patch) | |
tree | 30e5b9f7af7b4d78408daeedd033078434211fdc /test | |
parent | 46c3f4da05e2b5ddbc9100ca170c479575edf013 (diff) | |
download | node-new-b0ca77032aa9314542c496fd6a6d109c7b4b29b3.tar.gz |
test: refactor to use `getEventListeners` in timers
Use `getEventListeners` instead of `listenerCount` because #35991
was landed.
Refs: https://github.com/nodejs/node/pull/35991
Refs: https://github.com/nodejs/node/pull/36006
PR-URL: https://github.com/nodejs/node/pull/47759
Reviewed-By: Daeyeon Jeong <daeyeon.dev@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Mestery <mestery@protonmail.com>
Diffstat (limited to 'test')
-rw-r--r-- | test/parallel/test-timers-immediate-promisified.js | 4 | ||||
-rw-r--r-- | test/parallel/test-timers-interval-promisified.js | 10 | ||||
-rw-r--r-- | test/parallel/test-timers-timeout-promisified.js | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/test/parallel/test-timers-immediate-promisified.js b/test/parallel/test-timers-immediate-promisified.js index 5808312b56..b504ce1778 100644 --- a/test/parallel/test-timers-immediate-promisified.js +++ b/test/parallel/test-timers-immediate-promisified.js @@ -6,7 +6,7 @@ const timers = require('timers'); const { promisify } = require('util'); const child_process = require('child_process'); -// TODO(benjamingr) - refactor to use getEventListeners when #35991 lands +const { getEventListeners } = require('events'); const { NodeEventTarget } = require('internal/event_target'); const timerPromises = require('timers/promises'); @@ -60,7 +60,7 @@ process.on('multipleResolves', common.mustNotCall()); const signal = new NodeEventTarget(); signal.aborted = false; setPromiseImmediate(0, { signal }).finally(common.mustCall(() => { - assert.strictEqual(signal.listenerCount('abort'), 0); + assert.strictEqual(getEventListeners(signal, 'abort').length, 0); })); } diff --git a/test/parallel/test-timers-interval-promisified.js b/test/parallel/test-timers-interval-promisified.js index e6550445f1..46b977ff80 100644 --- a/test/parallel/test-timers-interval-promisified.js +++ b/test/parallel/test-timers-interval-promisified.js @@ -6,7 +6,7 @@ const timers = require('timers'); const { promisify } = require('util'); const child_process = require('child_process'); -// TODO(benjamingr) - refactor to use getEventListeners when #35991 lands +const { getEventListeners } = require('events'); const { NodeEventTarget } = require('internal/event_target'); const timerPromises = require('timers/promises'); @@ -122,10 +122,10 @@ process.on('multipleResolves', common.mustNotCall()); signal.aborted = false; const iterator = setInterval(1, undefined, { signal }); iterator.next().then(common.mustCall(() => { - assert.strictEqual(signal.listenerCount('abort'), 1); + assert.strictEqual(getEventListeners(signal, 'abort').length, 1); iterator.return(); })).finally(common.mustCall(() => { - assert.strictEqual(signal.listenerCount('abort'), 0); + assert.strictEqual(getEventListeners(signal, 'abort').length, 0); })); } @@ -139,7 +139,7 @@ process.on('multipleResolves', common.mustNotCall()); // eslint-disable-next-line no-unused-vars for await (const _ of iterator) { if (i === 0) { - assert.strictEqual(signal.listenerCount('abort'), 1); + assert.strictEqual(getEventListeners(signal, 'abort').length, 1); } i++; if (i === 2) { @@ -147,7 +147,7 @@ process.on('multipleResolves', common.mustNotCall()); } } assert.strictEqual(i, 2); - assert.strictEqual(signal.listenerCount('abort'), 0); + assert.strictEqual(getEventListeners(signal, 'abort').length, 0); } tryBreak().then(common.mustCall()); diff --git a/test/parallel/test-timers-timeout-promisified.js b/test/parallel/test-timers-timeout-promisified.js index 4e3881acec..95298c6a42 100644 --- a/test/parallel/test-timers-timeout-promisified.js +++ b/test/parallel/test-timers-timeout-promisified.js @@ -6,7 +6,7 @@ const timers = require('timers'); const { promisify } = require('util'); const child_process = require('child_process'); -// TODO(benjamingr) - refactor to use getEventListeners when #35991 lands +const { getEventListeners } = require('events'); const { NodeEventTarget } = require('internal/event_target'); const timerPromises = require('timers/promises'); @@ -60,7 +60,7 @@ process.on('multipleResolves', common.mustNotCall()); const signal = new NodeEventTarget(); signal.aborted = false; setPromiseTimeout(0, null, { signal }).finally(common.mustCall(() => { - assert.strictEqual(signal.listenerCount('abort'), 0); + assert.strictEqual(getEventListeners(signal, 'abort').length, 0); })); } |